Skip to content

Commit 75ec1dd

Browse files
committed
refactor(shells): Convert to flake-parts module
1 parent 3b7f452 commit 75ec1dd

File tree

3 files changed

+45
-53
lines changed

3 files changed

+45
-53
lines changed

flake.nix

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@
217217
...
218218
}:
219219
let
220-
lib = import "${nixpkgs}/lib";
221-
flake = import "${self}/flake.nix";
220+
inherit (nixpkgs) lib;
222221
in
223222
flake-parts.lib.mkFlake { inherit inputs; } {
224223
imports = [
225224
./modules
226225
./packages
226+
./shells
227227
];
228228
systems = [
229229
"x86_64-linux"
@@ -232,19 +232,12 @@
232232
"aarch64-darwin"
233233
];
234234
perSystem =
235-
{
236-
system,
237-
pkgs,
238-
inputs',
239-
...
240-
}:
235+
{ system, ... }:
241236
{
242237
_module.args.pkgs = import nixpkgs {
243238
inherit system;
244239
config.allowUnfree = true;
245240
};
246-
devShells.default = import ./shells/default.nix { inherit pkgs flake inputs'; };
247-
devShells.ci = import ./shells/ci.nix { inherit pkgs; };
248241
};
249242
flake.lib.create =
250243
{

shells/ci.nix

Lines changed: 0 additions & 8 deletions
This file was deleted.

shells/default.nix

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,45 @@
1+
{ ... }:
12
{
2-
pkgs,
3-
inputs',
4-
...
5-
}:
6-
let
7-
repl = pkgs.writeShellApplication {
8-
name = "repl";
9-
text = ''
10-
nix repl --file "$REPO_ROOT/repl.nix";
11-
'';
12-
};
13-
in
14-
pkgs.mkShell {
15-
packages =
16-
with pkgs;
17-
[
18-
inputs'.agenix.packages.agenix
19-
inputs'.nixos-anywhere.packages.nixos-anywhere
20-
figlet
21-
just
22-
jq
23-
nix-eval-jobs
24-
nixos-rebuild
25-
nix-output-monitor
26-
repl
27-
rage
28-
inputs'.dlang-nix.packages.dub
29-
]
30-
++ pkgs.lib.optionals (pkgs.stdenv.system == "x86_64-linux") [
31-
inputs'.dlang-nix.packages.dmd
32-
];
3+
perSystem =
4+
{
5+
pkgs,
6+
inputs',
7+
...
8+
}:
9+
{
10+
devShells.default =
11+
let
12+
repl = pkgs.writeShellApplication {
13+
name = "repl";
14+
text = ''
15+
nix repl --file "$REPO_ROOT/repl.nix";
16+
'';
17+
};
18+
in
19+
pkgs.mkShell {
20+
packages =
21+
with pkgs;
22+
[
23+
inputs'.agenix.packages.agenix
24+
inputs'.nixos-anywhere.packages.nixos-anywhere
25+
figlet
26+
just
27+
jq
28+
nix-eval-jobs
29+
nixos-rebuild
30+
nix-output-monitor
31+
repl
32+
rage
33+
inputs'.dlang-nix.packages.dub
34+
]
35+
++ pkgs.lib.optionals (pkgs.stdenv.system == "x86_64-linux") [
36+
inputs'.dlang-nix.packages.dmd
37+
];
3338

34-
shellHook = ''
35-
export REPO_ROOT="$PWD"
36-
figlet -t "Metacraft Nixos Modules"
37-
'';
39+
shellHook = ''
40+
export REPO_ROOT="$PWD"
41+
figlet -t "Metacraft Nixos Modules"
42+
'';
43+
};
44+
};
3845
}

0 commit comments

Comments
 (0)