aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock173
-rw-r--r--flake.nix17
-rw-r--r--hosts/olive/configuration.nix1
-rw-r--r--programs/tmux.nix4
4 files changed, 152 insertions, 43 deletions
diff --git a/flake.lock b/flake.lock
index f38f7a5..aec452b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,6 +19,25 @@
19 "type": "github" 19 "type": "github"
20 } 20 }
21 }, 21 },
22 "fenix_2": {
23 "inputs": {
24 "nixpkgs": "nixpkgs_6",
25 "rust-analyzer-src": "rust-analyzer-src_2"
26 },
27 "locked": {
28 "lastModified": 1642141613,
29 "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=",
30 "owner": "nix-community",
31 "repo": "fenix",
32 "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e",
33 "type": "github"
34 },
35 "original": {
36 "owner": "nix-community",
37 "repo": "fenix",
38 "type": "github"
39 }
40 },
22 "flake-compat": { 41 "flake-compat": {
23 "flake": false, 42 "flake": false,
24 "locked": { 43 "locked": {
@@ -68,6 +87,24 @@
68 "type": "github" 87 "type": "github"
69 } 88 }
70 }, 89 },
90 "gitignore_2": {
91 "inputs": {
92 "nixpkgs": "nixpkgs_7"
93 },
94 "locked": {
95 "lastModified": 1635165013,
96 "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=",
97 "owner": "hercules-ci",
98 "repo": "gitignore.nix",
99 "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1",
100 "type": "github"
101 },
102 "original": {
103 "owner": "hercules-ci",
104 "repo": "gitignore.nix",
105 "type": "github"
106 }
107 },
71 "home-manager": { 108 "home-manager": {
72 "inputs": { 109 "inputs": {
73 "nixpkgs": [ 110 "nixpkgs": [
@@ -75,11 +112,11 @@
75 ] 112 ]
76 }, 113 },
77 "locked": { 114 "locked": {
78 "lastModified": 1639871969, 115 "lastModified": 1642653493,
79 "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=", 116 "narHash": "sha256-22mGPjiHUo2Jmze4IjXCJLjeK2mbvvCztHmUyUMr4yw=",
80 "owner": "nix-community", 117 "owner": "nix-community",
81 "repo": "home-manager", 118 "repo": "home-manager",
82 "rev": "697cc8c68ed6a606296efbbe9614c32537078756", 119 "rev": "28b9ae40c45c5e7711c353fee1b7af734e293979",
83 "type": "github" 120 "type": "github"
84 }, 121 },
85 "original": { 122 "original": {
@@ -96,11 +133,11 @@
96 "nixpkgs": "nixpkgs_2" 133 "nixpkgs": "nixpkgs_2"
97 }, 134 },
98 "locked": { 135 "locked": {
99 "lastModified": 1642320861, 136 "lastModified": 1643443970,
100 "narHash": "sha256-gj68dBwDH0LjeBnt+03nbYiCwz97l7Ouz8/Ghbry4aY=", 137 "narHash": "sha256-NVm4ccMpP72i5kD8izidLD3a4s/5WlWesrYv1Arz8O4=",
101 "owner": "nix-community", 138 "owner": "nix-community",
102 "repo": "neovim-nightly-overlay", 139 "repo": "neovim-nightly-overlay",
103 "rev": "41934fe7e0c6b2b338f6e3bcd6b756638b556319", 140 "rev": "4c80ac9a435c2a0d22cb7067eb65cf3f6962124d",
104 "type": "github" 141 "type": "github"
105 }, 142 },
106 "original": { 143 "original": {
@@ -116,11 +153,11 @@
116 }, 153 },
117 "locked": { 154 "locked": {
118 "dir": "contrib", 155 "dir": "contrib",
119 "lastModified": 1642316915, 156 "lastModified": 1643415762,
120 "narHash": "sha256-6afFNKsYHSOAupMUmFKKZ9l1YD2pAGKVoZZfJHzUia4=", 157 "narHash": "sha256-qyk81eVlmm2U7apLHZlggoj1v9MIKX1YWWaALPKPNFc=",
121 "owner": "neovim", 158 "owner": "neovim",
122 "repo": "neovim", 159 "repo": "neovim",
123 "rev": "7085e5b0c8588618e643c87802afc515f67812d9", 160 "rev": "082ff2190c793d21c213748e556191f8aaa76cde",
124 "type": "github" 161 "type": "github"
125 }, 162 },
126 "original": { 163 "original": {
@@ -147,11 +184,11 @@
147 }, 184 },
148 "nixpkgs": { 185 "nixpkgs": {
149 "locked": { 186 "locked": {
150 "lastModified": 1642104392, 187 "lastModified": 1643347846,
151 "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", 188 "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=",
152 "owner": "nixos", 189 "owner": "nixos",
153 "repo": "nixpkgs", 190 "repo": "nixpkgs",
154 "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", 191 "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41",
155 "type": "github" 192 "type": "github"
156 }, 193 },
157 "original": { 194 "original": {
@@ -163,11 +200,11 @@
163 }, 200 },
164 "nixpkgs_2": { 201 "nixpkgs_2": {
165 "locked": { 202 "locked": {
166 "lastModified": 1642104392, 203 "lastModified": 1643169865,
167 "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", 204 "narHash": "sha256-+KIpNRazbc8Gac9jdWCKQkFv9bjceaLaLhlwqUEYu8c=",
168 "owner": "nixos", 205 "owner": "nixos",
169 "repo": "nixpkgs", 206 "repo": "nixpkgs",
170 "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", 207 "rev": "945ec499041db73043f745fad3b2a3a01e826081",
171 "type": "github" 208 "type": "github"
172 }, 209 },
173 "original": { 210 "original": {
@@ -179,11 +216,11 @@
179 }, 216 },
180 "nixpkgs_3": { 217 "nixpkgs_3": {
181 "locked": { 218 "locked": {
182 "lastModified": 1642190797, 219 "lastModified": 1643247693,
183 "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=", 220 "narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=",
184 "owner": "NixOS", 221 "owner": "NixOS",
185 "repo": "nixpkgs", 222 "repo": "nixpkgs",
186 "rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9", 223 "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca",
187 "type": "github" 224 "type": "github"
188 }, 225 },
189 "original": { 226 "original": {
@@ -195,11 +232,11 @@
195 }, 232 },
196 "nixpkgs_4": { 233 "nixpkgs_4": {
197 "locked": { 234 "locked": {
198 "lastModified": 1642104392, 235 "lastModified": 1643347846,
199 "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", 236 "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=",
200 "owner": "nixos", 237 "owner": "nixos",
201 "repo": "nixpkgs", 238 "repo": "nixpkgs",
202 "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", 239 "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41",
203 "type": "github" 240 "type": "github"
204 }, 241 },
205 "original": { 242 "original": {
@@ -211,11 +248,11 @@
211 }, 248 },
212 "nixpkgs_5": { 249 "nixpkgs_5": {
213 "locked": { 250 "locked": {
214 "lastModified": 1642069818, 251 "lastModified": 1643322911,
215 "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", 252 "narHash": "sha256-WLe4lXAYXH/v80iO02npX1wdXq4nIVEHJTONLXbQrL0=",
216 "owner": "NixOS", 253 "owner": "NixOS",
217 "repo": "nixpkgs", 254 "repo": "nixpkgs",
218 "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", 255 "rev": "d9e21f284317f85b3476c0043f4efea87a226c3a",
219 "type": "github" 256 "type": "github"
220 }, 257 },
221 "original": { 258 "original": {
@@ -225,18 +262,54 @@
225 }, 262 },
226 "nixpkgs_6": { 263 "nixpkgs_6": {
227 "locked": { 264 "locked": {
228 "lastModified": 1642069818, 265 "lastModified": 1643347846,
229 "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", 266 "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=",
230 "owner": "nixos", 267 "owner": "nixos",
231 "repo": "nixpkgs", 268 "repo": "nixpkgs",
232 "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", 269 "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41",
233 "type": "github" 270 "type": "github"
234 }, 271 },
235 "original": { 272 "original": {
236 "owner": "nixos", 273 "owner": "nixos",
237 "ref": "nixpkgs-unstable", 274 "ref": "nixos-unstable",
275 "repo": "nixpkgs",
276 "type": "github"
277 }
278 },
279 "nixpkgs_7": {
280 "locked": {
281 "lastModified": 1643322911,
282 "narHash": "sha256-WLe4lXAYXH/v80iO02npX1wdXq4nIVEHJTONLXbQrL0=",
283 "owner": "NixOS",
238 "repo": "nixpkgs", 284 "repo": "nixpkgs",
285 "rev": "d9e21f284317f85b3476c0043f4efea87a226c3a",
239 "type": "github" 286 "type": "github"
287 },
288 "original": {
289 "id": "nixpkgs",
290 "type": "indirect"
291 }
292 },
293 "prompt": {
294 "inputs": {
295 "fenix": "fenix",
296 "gitignore": "gitignore",
297 "nixpkgs": [
298 "nixpkgs"
299 ]
300 },
301 "locked": {
302 "lastModified": 1643476516,
303 "narHash": "sha256-v1reqZPpdlyyOYs7ygbvhsH702++3bHdFe6RayJagvw=",
304 "ref": "master",
305 "rev": "4d3e72f5f03b5a0db1d69f262990a0519a9d8947",
306 "revCount": 2,
307 "type": "git",
308 "url": "https://git.peppe.rs/cli/prompt"
309 },
310 "original": {
311 "type": "git",
312 "url": "https://git.peppe.rs/cli/prompt"
240 } 313 }
241 }, 314 },
242 "root": { 315 "root": {
@@ -245,6 +318,7 @@
245 "neovim": "neovim", 318 "neovim": "neovim",
246 "nixos-hardware": "nixos-hardware", 319 "nixos-hardware": "nixos-hardware",
247 "nixpkgs": "nixpkgs_3", 320 "nixpkgs": "nixpkgs_3",
321 "prompt": "prompt",
248 "statix": "statix" 322 "statix": "statix"
249 } 323 }
250 }, 324 },
@@ -265,24 +339,43 @@
265 "type": "github" 339 "type": "github"
266 } 340 }
267 }, 341 },
342 "rust-analyzer-src_2": {
343 "flake": false,
344 "locked": {
345 "lastModified": 1642101527,
346 "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=",
347 "owner": "rust-analyzer",
348 "repo": "rust-analyzer",
349 "rev": "b4c31481a554d0132003228ba319bd9476fe85ae",
350 "type": "github"
351 },
352 "original": {
353 "owner": "rust-analyzer",
354 "ref": "nightly",
355 "repo": "rust-analyzer",
356 "type": "github"
357 }
358 },
268 "statix": { 359 "statix": {
269 "inputs": { 360 "inputs": {
270 "fenix": "fenix", 361 "fenix": "fenix_2",
271 "gitignore": "gitignore", 362 "gitignore": "gitignore_2",
272 "nixpkgs": "nixpkgs_6" 363 "nixpkgs": [
364 "nixpkgs"
365 ]
273 }, 366 },
274 "locked": { 367 "locked": {
275 "lastModified": 1642238855, 368 "lastModified": 1643431421,
276 "narHash": "sha256-K+J3KeUnjoqMpL67sX7pQodCCCDTrfXSrd8sn/TnZEw=", 369 "narHash": "sha256-LOuaDkOU5E+I6NTLboU1q5Of2HBAMALfxdg2gQTF2zg=",
277 "owner": "nerdypepper", 370 "ref": "master",
278 "repo": "statix", 371 "rev": "8e4eeb979ebaa8f0f461e66d986a75c3a80220b6",
279 "rev": "23892b034d710bfbfa1f82c48fbfecb68f791f13", 372 "revCount": 106,
280 "type": "github" 373 "type": "git",
374 "url": "https://git.peppe.rs/languages/statix"
281 }, 375 },
282 "original": { 376 "original": {
283 "owner": "nerdypepper", 377 "type": "git",
284 "repo": "statix", 378 "url": "https://git.peppe.rs/languages/statix"
285 "type": "github"
286 } 379 }
287 } 380 }
288 }, 381 },
diff --git a/flake.nix b/flake.nix
index 07b27e1..06ce985 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,13 +3,26 @@
3 3
4 inputs = { 4 inputs = {
5 nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; 5 nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
6
6 nixos-hardware.url = "github:nixos/nixos-hardware"; 7 nixos-hardware.url = "github:nixos/nixos-hardware";
8
7 home-manager = { 9 home-manager = {
8 url = "github:nix-community/home-manager/release-21.11"; 10 url = "github:nix-community/home-manager/release-21.11";
9 inputs.nixpkgs.follows = "nixpkgs"; 11 inputs.nixpkgs.follows = "nixpkgs";
10 }; 12 };
13
11 neovim.url = "github:nix-community/neovim-nightly-overlay"; 14 neovim.url = "github:nix-community/neovim-nightly-overlay";
12 statix.url = "github:nerdypepper/statix"; 15
16 statix = {
17 url = "git+https://git.peppe.rs/languages/statix";
18 inputs.nixpkgs.follows = "nixpkgs";
19 };
20
21 prompt = {
22 url = "git+https://git.peppe.rs/cli/prompt";
23 inputs.nixpkgs.follows = "nixpkgs";
24 };
25
13 }; 26 };
14 27
15 outputs = 28 outputs =
@@ -19,12 +32,14 @@
19 , home-manager 32 , home-manager
20 , neovim 33 , neovim
21 , statix 34 , statix
35 , prompt
22 , ... 36 , ...
23 } @ inputs: { 37 } @ inputs: {
24 38
25 overlays = { 39 overlays = {
26 nvim-nightly = neovim.overlay; 40 nvim-nightly = neovim.overlay;
27 statix = statix.overlay; 41 statix = statix.overlay;
42 prompt = prompt.overlay;
28 }; 43 };
29 44
30 nixosConfigurations = { 45 nixosConfigurations = {
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index 02bf4a5..77e3ffb 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -62,6 +62,7 @@
62 nixpkgs.overlays = with self.overlays; [ 62 nixpkgs.overlays = with self.overlays; [
63 nvim-nightly 63 nvim-nightly
64 statix 64 statix
65 prompt
65 ]; 66 ];
66 67
67 environment.systemPackages = with pkgs; [ 68 environment.systemPackages = with pkgs; [
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 8975f44..1e3a488 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -82,8 +82,8 @@
82 set -ag status-right "#[fg=colour7]#(bat -q)#[fg=colour12]" 82 set -ag status-right "#[fg=colour7]#(bat -q)#[fg=colour12]"
83 83
84 # status left 84 # status left
85 set -g status-left "#[fg=colour7]#(/home/np/code/rust/prompt/target/debug/prompt cwd #{pane_current_path}) " 85 set -g status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd #{pane_current_path}) "
86 set -ag status-left "#[fg=colour7]#(/home/np/code/rust/prompt/target/debug/prompt vcs #{pane_current_path})" 86 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs #{pane_current_path})"
87 ''; 87 '';
88 }; 88 };
89} 89}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:10:29 +0000