Personal Nix flake
nixos
home-manager
nix
refactor(shell): Rework default shell maker
+12
-14
+10
-3
lib/shell/default.nix
+10
-3
lib/shell/default.nix
···
1
1
{
2
2
shell = rec {
3
-
makeDevShell = { pkgs, packages ? [ ], shellHook ? "", mkShell ? pkgs.mkShell, ... }@args:
3
+
makeDevShell = { pkgs, mkShell, packages ? [ ], shellHook ? "", ... }:
4
4
mkShell {
5
5
inherit packages shellHook;
6
6
};
7
-
makeDevShellWithDefaultPackages = { pkgs, packages ? [ ], shellHook ? "", mkShell ? pkgs.mkShell, ... }@args:
7
+
makeDevShellWithDefaults = { pkgs, mkShell, packages ? [ ], shellHook ? "", ... }:
8
8
makeDevShell {
9
-
inherit pkgs shellHook mkShell;
9
+
inherit pkgs mkShell;
10
10
packages = packages ++ (with pkgs; [
11
+
age
11
12
nil
12
13
nixd
13
14
nixpkgs-fmt
15
+
pre-commit
16
+
ssh-to-age
14
17
snowfallorg.flake
18
+
sops
15
19
]);
20
+
shellHook = shellHook + ''
21
+
pre-commit install
22
+
'';
16
23
};
17
24
};
18
25
}
+2
-11
shells/default/default.nix
+2
-11
shells/default/default.nix
···
5
5
}:
6
6
7
7
let
8
-
inherit (lib.lpchaim.shell) makeDevShellWithDefaultPackages;
8
+
inherit (lib.lpchaim.shell) makeDevShellWithDefaults;
9
9
in
10
-
makeDevShellWithDefaultPackages {
10
+
makeDevShellWithDefaults {
11
11
inherit pkgs mkShell;
12
-
packages = with pkgs; [
13
-
age
14
-
pre-commit
15
-
ssh-to-age
16
-
sops
17
-
];
18
-
shellHook = ''
19
-
pre-commit install
20
-
'';
21
12
}