diff --git a/default.nix b/default.nix index 72aa71bd..04566338 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,8 @@ { nixpkgs ? import ./nix/nixpkgs.nix , system ? builtins.currentSystem +, overlays ? [ ] }: import nixpkgs { inherit system; - overlays = [ (import ./overlay.nix) ]; + overlays = [ (import ./overlay.nix) ] ++ overlays; } diff --git a/mkDevShell/options.nix b/mkDevShell/options.nix index 11aff60c..03f2415c 100644 --- a/mkDevShell/options.nix +++ b/mkDevShell/options.nix @@ -48,7 +48,7 @@ let opCat = { name, value }: let - opCmd = { name, help, ...}: + opCmd = { name, help, ... }: let len = maxCommandLength - (builtins.stringLength name); in @@ -57,7 +57,7 @@ let else "${pad name len} - ${help}"; in - "\n[${name}]\n" + builtins.concatStringsSep "\n" (map opCmd value); + "\n[${name}]\n" + builtins.concatStringsSep "\n" (map opCmd value); in builtins.concatStringsSep "\n" (map opCat commandByCategoriesSorted) ; @@ -226,7 +226,8 @@ in ]; packages = - builtins.filter (x: x != null) + builtins.filter + (x: x != null) (map (x: x.package) config.commands); }; }