Skip to content

Commit 294f28f

Browse files
committed
nix: allow fallback for shell.nix in case user can't use flakes
1 parent 0d0e440 commit 294f28f

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed

.envrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
use flake
1+
watch_file shell.nix
2+
use flake || use nix

flake.nix

+1-24
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,7 @@
1616
pkgs = nixpkgs.legacyPackages.${system};
1717
in {
1818
formatter = pkgs.alejandra;
19-
devShells.default = pkgs.mkShell {
20-
packages = with pkgs; [
21-
# general
22-
lefthook # precommit
23-
gitleaks # secret leak detection
24-
just # task runner
25-
litecli # sqlite CLI client with advanced features
26-
27-
# JS
28-
bun # runner / tester
29-
# biome # style checker / linter ... replaced by deno because biome doesn't support HTML and svelte
30-
deno # used to format svelte
31-
32-
# Nix
33-
alejandra # formatter
34-
nil # langserver
35-
statix # nix linter
36-
deadnix # code analyzer (detects dead code)
37-
];
38-
39-
shellHook = ''
40-
lefthook install
41-
'';
42-
};
19+
devShells.default = pkgs.callPackage ./shell.nix {};
4320
}
4421
);
4522
}

shell.nix

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{pkgs ? import <nixpkgs> {}}:
2+
pkgs.mkShell {
3+
name = "How Match development";
4+
packages = with pkgs; [
5+
# general
6+
lefthook # precommit
7+
gitleaks # secret leak detection
8+
just # task runner
9+
litecli # sqlite CLI client with advanced features
10+
11+
# JS
12+
bun # runner / tester
13+
# biome # style checker / linter ... replaced by deno because biome doesn't support HTML and svelte
14+
deno # used to format svelte
15+
16+
# Nix
17+
alejandra # formatter
18+
nil # langserver
19+
statix # nix linter
20+
deadnix # code analyzer (detects dead code)
21+
];
22+
23+
shellHook = ''
24+
lefthook install
25+
'';
26+
}

0 commit comments

Comments
 (0)