format with nixpkgs#nixpkgs-fmt

This commit is contained in:
Timothy DeHerrera 2019-12-15 01:08:22 -07:00
parent ddb256725e
commit da6e3fee94
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
4 changed files with 46 additions and 51 deletions

View file

@ -15,16 +15,12 @@ let
global = { global = {
_module.args.utils = utils; _module.args.utils = utils;
system.configurationRevision = flake.rev;
networking.hostName = self; networking.hostName = self;
nix.package = nix.defaultPackage."${system}"; nix.package = nix.defaultPackage."${system}";
system.configurationRevision = flake.rev;
}; };
local = vimport ./. "${self}.nix"; local = vimport ./. "${self}.nix";
in in
[ [
core core
@ -34,4 +30,4 @@ let
}; };
in in
reqImport { dir = ./.; _import = config; } reqImport { dir = ./.; _import = config; }

View file

@ -26,26 +26,26 @@ rec {
vimport = path: name: import (path + "/${name}"); vimport = path: name: import (path + "/${name}");
reqImport = { reqImport =
dir, { dir
_import ? base: vimport dir (base + ".nix") , _import ? base: vimport dir (base + ".nix")
}: }:
mapFilterAttrs mapFilterAttrs
(_: v: v != null) (_: v: v != null)
( (
n: v: n: v:
if if
n != "default.nix" n != "default.nix"
&& hasSuffix ".nix" n && hasSuffix ".nix" n
&& v == "regular" && v == "regular"
then let then let
name = removeSuffix ".nix" n; name = removeSuffix ".nix" n;
in in
nameValuePair (name) (_import name) nameValuePair (name) (_import name)
else else
nameValuePair ("") (null) nameValuePair ("") (null)
) )
(readDir dir); (readDir dir);
} }

View file

@ -12,14 +12,14 @@ let
pluginConf = plugins: pluginConf = plugins:
concatStringsSep "\n\n" concatStringsSep "\n\n"
( (
map ( map (
plugin: let plugin: let
name = removePrefix "tmuxplugin-" plugin.name; name = removePrefix "tmuxplugin-" plugin.name;
in in
"run-shell ${plugin}/share/tmux-plugins/${name}/${name}.tmux" "run-shell ${plugin}/share/tmux-plugins/${name}/${name}.tmux"
) plugins ) plugins
); );
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
copycat copycat

View file

@ -17,15 +17,15 @@ in
sessionVariables = let sessionVariables = let
fd = "${pkgs.fd}/bin/fd -H"; fd = "${pkgs.fd}/bin/fd -H";
in in
{ {
BAT_PAGER = "less"; BAT_PAGER = "less";
SKIM_ALT_C_COMMAND = SKIM_ALT_C_COMMAND =
"while read line; do " "while read line; do "
+ "line=\"'\${(Q)line}'\"; [[ -d \"'$line'\" ]] && echo \"'$line'\"; " + "line=\"'\${(Q)line}'\"; [[ -d \"'$line'\" ]] && echo \"'$line'\"; "
+ "done < $HOME/.cache/zsh-cdr/recent-dirs"; + "done < $HOME/.cache/zsh-cdr/recent-dirs";
SKIM_DEFAULT_COMMAND = fd; SKIM_DEFAULT_COMMAND = fd;
SKIM_CTRL_T_COMMAND = fd; SKIM_CTRL_T_COMMAND = fd;
}; };
shellAliases = { shellAliases = {
cat = "${pkgs.bat}/bin/bat"; cat = "${pkgs.bat}/bin/bat";
@ -58,9 +58,9 @@ in
nixpkgs.overlays = let nixpkgs.overlays = let
purs = self: super: purs = self: super:
{ purs = super.callPackage ../../../pkgs/shells/zsh/purs {}; }; { purs = super.callPackage ../../../pkgs/shells/zsh/purs {}; };
in in
[ purs ]; [ purs ];
programs.zsh = { programs.zsh = {
@ -86,12 +86,11 @@ in
paths; paths;
plugins = concatStringsSep "\n" plugins = concatStringsSep "\n"
( (
[ [
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin" "${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
] ++ ] ++ source
source );
);