diff --git a/flake-parts/formatter.nix b/flake-parts/formatter.nix index 20411ba..c2350b8 100644 --- a/flake-parts/formatter.nix +++ b/flake-parts/formatter.nix @@ -11,7 +11,6 @@ prettier.enable = true; just.enable = true; }; - settings.formatter.nixfmt.excludes = [ "modules/home/programs/shell/aliases.nix" ]; }).config.build.wrapper; }; } diff --git a/modules/home/programs/shell/aliases.nix b/modules/home/programs/shell/aliases.nix index a0ef510..8a3d799 100644 --- a/modules/home/programs/shell/aliases.nix +++ b/modules/home/programs/shell/aliases.nix @@ -12,7 +12,7 @@ enable = true; options = [ "--cmd cd" ]; }; - + home = { packages = [ pkgs.eza @@ -23,12 +23,25 @@ let lsAliases = let - eza = [ "eza" "--header" "--group" "--time-style=long-iso" "--group-directories-first" "--sort=name" "--icons=auto" "--git" "--git-repos-no-status" "--binary" ]; + eza = [ + "eza" + "--header" + "--group" + "--time-style=long-iso" + "--group-directories-first" + "--sort=name" + "--icons=auto" + "--git" + "--git-repos-no-status" + "--binary" + ]; + aliasPartsToCommand = aliasParts: aliasParts |> lib.filter (aliasPart: aliasPart != "") - |> lib.map (aliasPart: + |> lib.map ( + aliasPart: { "l" = "--oneline --dereference"; "ll" = "--long"; @@ -37,18 +50,47 @@ "d" = "--only-dirs"; "f" = "--only-files"; } - .${aliasPart}) + .${aliasPart} + ) |> (flags: eza ++ flags) |> lib.concatStringsSep " "; in - { format = [ "l" "ll" "lt" ]; visibility = [ "" "a" ]; restriction = [ "" "d" "f" ]; } - |> lib.mapCartesianProduct ({ format, visibility, restriction, }: [ format visibility restriction ]) - |> lib.map (aliasParts: lib.nameValuePair (lib.concatStrings aliasParts) (aliasPartsToCommand aliasParts)) - |> lib.listToAttrs; - in - lsAliases // { + { + format = [ + "l" + "ll" + "lt" + ]; + visibility = [ + "" + "a" + ]; + restriction = [ + "" + "d" + "f" + ]; + } + |> lib.mapCartesianProduct ( + { + format, + visibility, + restriction, + }: + [ + format + visibility + restriction + ] + ) + |> lib.map ( + aliasParts: lib.nameValuePair (lib.concatStrings aliasParts) (aliasPartsToCommand aliasParts) + ) + |> lib.listToAttrs; + in + lsAliases + // { ls = "l"; - btm = "btm --group_processes"; cat = let theme =