Skip to content

Commit 2a59867

Browse files
committed
add ripgrep, devenv cleanup
1 parent 70d85f3 commit 2a59867

File tree

5 files changed

+23
-25
lines changed

5 files changed

+23
-25
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44
.pre-commit-config.yaml
55
/result
66

7+
# Devenv
8+
.devenv*
9+
devenv.local.nix
10+
11+
# direnv
12+
.direnv
713
node_modules/
8-
.devenv.flake.nix

devenv.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"devenv": {
44
"locked": {
55
"dir": "src/modules",
6-
"lastModified": 1749243968,
6+
"lastModified": 1749416335,
77
"owner": "cachix",
88
"repo": "devenv",
9-
"rev": "f46d6d8f67a44a2a9be862a78a179cfe1bd317fb",
9+
"rev": "e8fffc7d61259f27c27b0fbe39a052a604807a2e",
1010
"type": "github"
1111
},
1212
"original": {

devenv.nix

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
pkgs,
3-
lib,
4-
config,
5-
inputs,
63
...
74
}:
85

@@ -16,6 +13,10 @@
1613
biome
1714
];
1815

16+
languages.nix = {
17+
enable = true;
18+
};
19+
1920
# https://devenv.sh/languages/
2021
languages.javascript = {
2122
enable = true;
@@ -31,30 +32,21 @@
3132

3233
# https://devenv.sh/git-hooks/
3334
git-hooks.hooks = {
34-
# Format Nix files
35-
nixfmt-rfc-style = {
36-
enable = true;
37-
entry = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
38-
files = "\.nix$";
39-
};
35+
nixfmt-rfc-style.enable = true;
4036
# Format shell scripts
41-
shfmt = {
42-
enable = true;
43-
entry = "${pkgs.shfmt}/bin/shfmt -w";
44-
files = "\.(sh|bash|zsh)$";
45-
};
37+
shfmt.enable = true;
4638
# Format JavaScript/TypeScript/JSON/CSS files with Biome
4739
biome = {
4840
enable = true;
4941
entry = "${pkgs.biome}/bin/biome format --write";
50-
files = "\.(js|jsx|ts|tsx|css|graphql)$";
42+
files = "\.(js|jsx|ts|tsx|css|graphql|json|jsonc)$";
5143
excludes = [ "config/.*\\.json$" ];
5244
};
5345
# Run prettier on other files that Biome doesn't support
5446
prettier = {
5547
enable = true;
5648
entry = "${pkgs.nodePackages.prettier}/bin/prettier --write --ignore-unknown";
57-
files = "\.(md|html|yml|yaml|json|jsonc)$";
49+
files = "\.(md|html|yml|yaml)$";
5850
};
5951
};
6052
}

nix/flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/home/common.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
git
1313
htop
1414
silver-searcher
15+
ripgrep
1516
tmux
1617
unzip
1718
wget

0 commit comments

Comments
 (0)