aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock544
-rw-r--r--hosts/myrtle/configuration.nix6
-rw-r--r--programs/default.nix9
-rw-r--r--programs/git.nix1
-rw-r--r--programs/readline.nix1
5 files changed, 549 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock
index d485422..572eb13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,38 @@
1{ 1{
2 "nodes": { 2 "nodes": {
3 "attic": {
4 "inputs": {
5 "crane": [
6 "chaotic",
7 "crane"
8 ],
9 "flake-compat": [
10 "chaotic",
11 "flake-compat"
12 ],
13 "flake-utils": [
14 "chaotic",
15 "flake-utils"
16 ],
17 "nixpkgs": [
18 "chaotic",
19 "nixpkgs"
20 ],
21 "nixpkgs-stable": "nixpkgs-stable"
22 },
23 "locked": {
24 "lastModified": 1711742460,
25 "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
26 "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",
27 "revCount": 197,
28 "type": "tarball",
29 "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.197%2Brev-4dbdbee45728d8ce5788db6461aaaa89d98081f0/018e8bce-1229-7d78-a052-5121272f0341/source.tar.gz"
30 },
31 "original": {
32 "type": "tarball",
33 "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz"
34 }
35 },
3 "better-text-objs": { 36 "better-text-objs": {
4 "inputs": { 37 "inputs": {
5 "nixpkgs": [ 38 "nixpkgs": [
@@ -20,6 +53,207 @@
20 "url": "https://git.peppe.rs/vim/better-text-objs" 53 "url": "https://git.peppe.rs/vim/better-text-objs"
21 } 54 }
22 }, 55 },
56 "chaotic": {
57 "inputs": {
58 "attic": "attic",
59 "compare-to": "compare-to",
60 "conduit": "conduit",
61 "crane": "crane",
62 "fenix": "fenix",
63 "flake-compat": "flake-compat",
64 "flake-schemas": "flake-schemas",
65 "flake-utils": "flake-utils",
66 "home-manager": "home-manager",
67 "jovian": "jovian",
68 "jujutsu": "jujutsu",
69 "niri": "niri",
70 "nix-filter": "nix-filter",
71 "nixpkgs": "nixpkgs",
72 "systems": "systems",
73 "yafas": "yafas"
74 },
75 "locked": {
76 "lastModified": 1716750091,
77 "narHash": "sha256-E5WktBEPQPk49hhgI7ttpHKYjjWO9WqtRDmZ/i6a1io=",
78 "rev": "651cfaba624e7bf0876fbd528f3fa8f1b0c0c614",
79 "revCount": 1161,
80 "type": "tarball",
81 "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1161%2Brev-651cfaba624e7bf0876fbd528f3fa8f1b0c0c614/018fb649-16a4-7b14-a024-40ecbab6ea35/source.tar.gz"
82 },
83 "original": {
84 "type": "tarball",
85 "url": "https://flakehub.com/f/chaotic-cx/nyx/%2A.tar.gz"
86 }
87 },
88 "compare-to": {
89 "locked": {
90 "lastModified": 1695341185,
91 "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=",
92 "rev": "98b8e330823a3570d328720f87a1153f8a7f2224",
93 "revCount": 2,
94 "type": "tarball",
95 "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz"
96 },
97 "original": {
98 "type": "tarball",
99 "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz"
100 }
101 },
102 "complement": {
103 "flake": false,
104 "locked": {
105 "lastModified": 1715700731,
106 "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=",
107 "owner": "matrix-org",
108 "repo": "complement",
109 "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5",
110 "type": "github"
111 },
112 "original": {
113 "owner": "matrix-org",
114 "ref": "main",
115 "repo": "complement",
116 "type": "github"
117 }
118 },
119 "conduit": {
120 "inputs": {
121 "attic": [
122 "chaotic",
123 "attic"
124 ],
125 "complement": "complement",
126 "crane": [
127 "chaotic",
128 "crane"
129 ],
130 "fenix": [
131 "chaotic",
132 "fenix"
133 ],
134 "flake-compat": [
135 "chaotic",
136 "flake-compat"
137 ],
138 "flake-utils": [
139 "chaotic",
140 "flake-utils"
141 ],
142 "liburing": "liburing",
143 "nix-filter": [
144 "chaotic",
145 "nix-filter"
146 ],
147 "nixpkgs": [
148 "chaotic",
149 "nixpkgs"
150 ],
151 "rocksdb": "rocksdb"
152 },
153 "locked": {
154 "lastModified": 1716690523,
155 "narHash": "sha256-II8U33DM1NZmUDmAhi941KeMErUTcFtLtw5RKIEHTtc=",
156 "owner": "girlbossceo",
157 "repo": "conduwuit",
158 "rev": "30beb2023076e073d666f620899f94443577ed4c",
159 "type": "github"
160 },
161 "original": {
162 "owner": "girlbossceo",
163 "repo": "conduwuit",
164 "type": "github"
165 }
166 },
167 "crane": {
168 "inputs": {
169 "nixpkgs": [
170 "chaotic",
171 "nixpkgs"
172 ]
173 },
174 "locked": {
175 "lastModified": 1716156051,
176 "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=",
177 "rev": "7443df1c478947bf96a2e699209f53b2db26209d",
178 "revCount": 571,
179 "type": "tarball",
180 "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.1/018f92f7-d079-7a6a-8660-4fa94147552e/source.tar.gz"
181 },
182 "original": {
183 "type": "tarball",
184 "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz"
185 }
186 },
187 "fenix": {
188 "inputs": {
189 "nixpkgs": [
190 "chaotic",
191 "nixpkgs"
192 ],
193 "rust-analyzer-src": "rust-analyzer-src"
194 },
195 "locked": {
196 "lastModified": 1714544767,
197 "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=",
198 "rev": "73124e1356bde9411b163d636b39fe4804b7ca45",
199 "revCount": 1852,
200 "type": "tarball",
201 "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1852%2Brev-73124e1356bde9411b163d636b39fe4804b7ca45/018f333a-c195-795f-9e07-b43b47d5391f/source.tar.gz"
202 },
203 "original": {
204 "type": "tarball",
205 "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz"
206 }
207 },
208 "flake-compat": {
209 "flake": false,
210 "locked": {
211 "lastModified": 1696426674,
212 "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
213 "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
214 "revCount": 57,
215 "type": "tarball",
216 "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
217 },
218 "original": {
219 "type": "tarball",
220 "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz"
221 }
222 },
223 "flake-schemas": {
224 "locked": {
225 "lastModified": 1693491534,
226 "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=",
227 "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279",
228 "revCount": 21,
229 "type": "tarball",
230 "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz"
231 },
232 "original": {
233 "type": "tarball",
234 "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz"
235 }
236 },
237 "flake-utils": {
238 "inputs": {
239 "systems": [
240 "chaotic",
241 "systems"
242 ]
243 },
244 "locked": {
245 "lastModified": 1710146030,
246 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
247 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
248 "revCount": 92,
249 "type": "tarball",
250 "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.92%2Brev-b1d9ab70662946ef0850d488da1c9019f3a9752a/018e2ca5-e5a2-7f80-9261-445a8cecd4d7/source.tar.gz"
251 },
252 "original": {
253 "type": "tarball",
254 "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz"
255 }
256 },
23 "flaresolverr": { 257 "flaresolverr": {
24 "inputs": { 258 "inputs": {
25 "flaresolverr-src": "flaresolverr-src", 259 "flaresolverr-src": "flaresolverr-src",
@@ -62,15 +296,36 @@
62 "home-manager": { 296 "home-manager": {
63 "inputs": { 297 "inputs": {
64 "nixpkgs": [ 298 "nixpkgs": [
299 "chaotic",
300 "nixpkgs"
301 ]
302 },
303 "locked": {
304 "lastModified": 1716711219,
305 "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=",
306 "owner": "nix-community",
307 "repo": "home-manager",
308 "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a",
309 "type": "github"
310 },
311 "original": {
312 "owner": "nix-community",
313 "repo": "home-manager",
314 "type": "github"
315 }
316 },
317 "home-manager_2": {
318 "inputs": {
319 "nixpkgs": [
65 "nixpkgs" 320 "nixpkgs"
66 ] 321 ]
67 }, 322 },
68 "locked": { 323 "locked": {
69 "lastModified": 1710532761, 324 "lastModified": 1716736760,
70 "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", 325 "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
71 "owner": "nix-community", 326 "owner": "nix-community",
72 "repo": "home-manager", 327 "repo": "home-manager",
73 "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", 328 "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
74 "type": "github" 329 "type": "github"
75 }, 330 },
76 "original": { 331 "original": {
@@ -79,6 +334,146 @@
79 "type": "github" 334 "type": "github"
80 } 335 }
81 }, 336 },
337 "jovian": {
338 "inputs": {
339 "nix-github-actions": "nix-github-actions",
340 "nixpkgs": [
341 "chaotic",
342 "nixpkgs"
343 ]
344 },
345 "locked": {
346 "lastModified": 1716618639,
347 "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=",
348 "owner": "Jovian-Experiments",
349 "repo": "Jovian-NixOS",
350 "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38",
351 "type": "github"
352 },
353 "original": {
354 "owner": "Jovian-Experiments",
355 "repo": "Jovian-NixOS",
356 "type": "github"
357 }
358 },
359 "jujutsu": {
360 "inputs": {
361 "flake-utils": [
362 "chaotic",
363 "flake-utils"
364 ],
365 "nixpkgs": [
366 "chaotic",
367 "nixpkgs"
368 ],
369 "rust-overlay": "rust-overlay"
370 },
371 "locked": {
372 "lastModified": 1716690105,
373 "narHash": "sha256-M2C+BuLrKvtXuZbnijpISfPNIKxCbEESfuMf1mt18Tk=",
374 "owner": "martinvonz",
375 "repo": "jj",
376 "rev": "b31f75bc94c4552454ab929b54b9f37340231fac",
377 "type": "github"
378 },
379 "original": {
380 "owner": "martinvonz",
381 "repo": "jj",
382 "type": "github"
383 }
384 },
385 "liburing": {
386 "flake": false,
387 "locked": {
388 "lastModified": 1716565485,
389 "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=",
390 "owner": "axboe",
391 "repo": "liburing",
392 "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e",
393 "type": "github"
394 },
395 "original": {
396 "owner": "axboe",
397 "ref": "master",
398 "repo": "liburing",
399 "type": "github"
400 }
401 },
402 "niri": {
403 "inputs": {
404 "crane": [
405 "chaotic",
406 "crane"
407 ],
408 "fenix": [
409 "chaotic",
410 "fenix"
411 ],
412 "flake-utils": [
413 "chaotic",
414 "flake-utils"
415 ],
416 "nix-filter": [
417 "chaotic",
418 "nix-filter"
419 ],
420 "nixpkgs": [
421 "chaotic",
422 "nixpkgs"
423 ]
424 },
425 "locked": {
426 "lastModified": 1716554875,
427 "narHash": "sha256-BBAiAeWPwoOJyeW9PAnxSxS9kAi2b/T8bh8ChIfAD5Q=",
428 "owner": "YaLTeR",
429 "repo": "niri",
430 "rev": "2ac8d840343dc964981507353c9128c68361cb6f",
431 "type": "github"
432 },
433 "original": {
434 "owner": "YaLTeR",
435 "repo": "niri",
436 "type": "github"
437 }
438 },
439 "nix-filter": {
440 "locked": {
441 "lastModified": 1710156097,
442 "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
443 "owner": "numtide",
444 "repo": "nix-filter",
445 "rev": "3342559a24e85fc164b295c3444e8a139924675b",
446 "type": "github"
447 },
448 "original": {
449 "owner": "numtide",
450 "repo": "nix-filter",
451 "type": "github"
452 }
453 },
454 "nix-github-actions": {
455 "inputs": {
456 "nixpkgs": [
457 "chaotic",
458 "jovian",
459 "nixpkgs"
460 ]
461 },
462 "locked": {
463 "lastModified": 1690328911,
464 "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
465 "owner": "zhaofengli",
466 "repo": "nix-github-actions",
467 "rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
468 "type": "github"
469 },
470 "original": {
471 "owner": "zhaofengli",
472 "ref": "matrix-name",
473 "repo": "nix-github-actions",
474 "type": "github"
475 }
476 },
82 "nixos-hardware": { 477 "nixos-hardware": {
83 "locked": { 478 "locked": {
84 "lastModified": 1662714967, 479 "lastModified": 1662714967,
@@ -96,16 +491,46 @@
96 }, 491 },
97 "nixpkgs": { 492 "nixpkgs": {
98 "locked": { 493 "locked": {
99 "lastModified": 1710534455, 494 "lastModified": 1716509168,
100 "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", 495 "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
496 "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
497 "revCount": 630835,
498 "type": "tarball",
499 "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.630835%2Brev-bfb7a882678e518398ce9a31a881538679f6f092/018fafb0-ec0d-7254-8082-b09ecc86e5fc/source.tar.gz"
500 },
501 "original": {
502 "type": "tarball",
503 "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
504 }
505 },
506 "nixpkgs-stable": {
507 "locked": {
508 "lastModified": 1711460390,
509 "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
101 "owner": "NixOS", 510 "owner": "NixOS",
102 "repo": "nixpkgs", 511 "repo": "nixpkgs",
103 "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", 512 "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
104 "type": "github" 513 "type": "github"
105 }, 514 },
106 "original": { 515 "original": {
107 "owner": "NixOS", 516 "owner": "NixOS",
108 "ref": "nixpkgs-unstable", 517 "ref": "nixos-23.11",
518 "repo": "nixpkgs",
519 "type": "github"
520 }
521 },
522 "nixpkgs_2": {
523 "locked": {
524 "lastModified": 1716509168,
525 "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
526 "owner": "NixOS",
527 "repo": "nixpkgs",
528 "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
529 "type": "github"
530 },
531 "original": {
532 "owner": "NixOS",
533 "ref": "nixos-unstable",
109 "repo": "nixpkgs", 534 "repo": "nixpkgs",
110 "type": "github" 535 "type": "github"
111 } 536 }
@@ -130,17 +555,94 @@
130 "url": "https://git.peppe.rs/cli/prompt" 555 "url": "https://git.peppe.rs/cli/prompt"
131 } 556 }
132 }, 557 },
558 "rocksdb": {
559 "flake": false,
560 "locked": {
561 "lastModified": 1716563894,
562 "narHash": "sha256-LT3RVOcIZmPWetkRfFKMi8dce0QgWvN0Sr7STD1hgxo=",
563 "owner": "girlbossceo",
564 "repo": "rocksdb",
565 "rev": "7c0e7f7666678e3ad5c82485f9bfe405e92ff727",
566 "type": "github"
567 },
568 "original": {
569 "owner": "girlbossceo",
570 "ref": "v9.2.1",
571 "repo": "rocksdb",
572 "type": "github"
573 }
574 },
133 "root": { 575 "root": {
134 "inputs": { 576 "inputs": {
135 "better-text-objs": "better-text-objs", 577 "better-text-objs": "better-text-objs",
578 "chaotic": "chaotic",
136 "flaresolverr": "flaresolverr", 579 "flaresolverr": "flaresolverr",
137 "home-manager": "home-manager", 580 "home-manager": "home-manager_2",
138 "nixos-hardware": "nixos-hardware", 581 "nixos-hardware": "nixos-hardware",
139 "nixpkgs": "nixpkgs", 582 "nixpkgs": "nixpkgs_2",
140 "prompt": "prompt", 583 "prompt": "prompt",
141 "vim-colors-plain": "vim-colors-plain" 584 "vim-colors-plain": "vim-colors-plain"
142 } 585 }
143 }, 586 },
587 "rust-analyzer-src": {
588 "flake": false,
589 "locked": {
590 "lastModified": 1714501997,
591 "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=",
592 "owner": "rust-lang",
593 "repo": "rust-analyzer",
594 "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef",
595 "type": "github"
596 },
597 "original": {
598 "owner": "rust-lang",
599 "ref": "nightly",
600 "repo": "rust-analyzer",
601 "type": "github"
602 }
603 },
604 "rust-overlay": {
605 "inputs": {
606 "flake-utils": [
607 "chaotic",
608 "jujutsu",
609 "flake-utils"
610 ],
611 "nixpkgs": [
612 "chaotic",
613 "jujutsu",
614 "nixpkgs"
615 ]
616 },
617 "locked": {
618 "lastModified": 1714961776,
619 "narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=",
620 "owner": "oxalica",
621 "repo": "rust-overlay",
622 "rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf",
623 "type": "github"
624 },
625 "original": {
626 "owner": "oxalica",
627 "repo": "rust-overlay",
628 "type": "github"
629 }
630 },
631 "systems": {
632 "locked": {
633 "lastModified": 1689347949,
634 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
635 "owner": "nix-systems",
636 "repo": "default-linux",
637 "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
638 "type": "github"
639 },
640 "original": {
641 "owner": "nix-systems",
642 "repo": "default-linux",
643 "type": "github"
644 }
645 },
144 "undetected-chromedriver-src": { 646 "undetected-chromedriver-src": {
145 "flake": false, 647 "flake": false,
146 "locked": { 648 "locked": {
@@ -176,6 +678,30 @@
176 "type": "git", 678 "type": "git",
177 "url": "https://git.peppe.rs/vim/vim-colors-plain" 679 "url": "https://git.peppe.rs/vim/vim-colors-plain"
178 } 680 }
681 },
682 "yafas": {
683 "inputs": {
684 "flake-schemas": [
685 "chaotic",
686 "flake-schemas"
687 ],
688 "systems": [
689 "chaotic",
690 "systems"
691 ]
692 },
693 "locked": {
694 "lastModified": 1695926485,
695 "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=",
696 "rev": "7772afd6686458ca0ddbc599a52cf5d337367653",
697 "revCount": 4,
698 "type": "tarball",
699 "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz"
700 },
701 "original": {
702 "type": "tarball",
703 "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz"
704 }
179 } 705 }
180 }, 706 },
181 "root": "root", 707 "root": "root",
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index afec6b7..4067b4e 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -203,7 +203,7 @@
203 ''; 203 '';
204 204
205 virtualisation.docker.enable = true; 205 virtualisation.docker.enable = true;
206 virtualisation.virtualbox.host.enable = true; 206 virtualisation.virtualbox.host.enable = false;
207 users.extraGroups.vboxusers.members = [ "np" ]; 207 users.extraGroups.vboxusers.members = [ "np" ];
208 208
209 security.sudo = { 209 security.sudo = {
@@ -247,9 +247,9 @@
247 }; 247 };
248 248
249 nix = { 249 nix = {
250 package = pkgs.nixUnstable; 250 package = pkgs.nixVersions.latest;
251 extraOptions = '' 251 extraOptions = ''
252 experimental-features = nix-command flakes repl-flake 252 experimental-features = nix-command flakes
253 warn-dirty = false 253 warn-dirty = false
254 keep-outputs = false 254 keep-outputs = false
255 keep-derivations = false 255 keep-derivations = false
diff --git a/programs/default.nix b/programs/default.nix
index 70ded22..482c02e 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -48,5 +48,14 @@
48 }; 48 };
49 gpg.enable = true; 49 gpg.enable = true;
50 info.enable = true; 50 info.enable = true;
51 broot = {
52 enable = true;
53 enableBashIntegration = true;
54 settings = {
55 imports = [
56 "native-16.hjson"
57 ];
58 };
59 };
51 }; 60 };
52} 61}
diff --git a/programs/git.nix b/programs/git.nix
index e4b5e0f..69dd409 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -67,6 +67,7 @@ with theme;
67 enabled = true; 67 enabled = true;
68 autoUpdate = true; 68 autoUpdate = true;
69 }; 69 };
70 merge.conflictstyle = "diff3";
70 }; 71 };
71 }; 72 };
72} 73}
diff --git a/programs/readline.nix b/programs/readline.nix
index 8afdd82..c4d5046 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -8,6 +8,7 @@
8 enable = true; 8 enable = true;
9 bindings = { 9 bindings = {
10 "\\C-o" = ''"tmux-fzf\n"''; 10 "\\C-o" = ''"tmux-fzf\n"'';
11 "\\C-b" = ''"br\n"'';
11 "\\t" = "menu-complete"; 12 "\\t" = "menu-complete";
12 "\\e[Z" = "menu-complete-backward"; 13 "\\e[Z" = "menu-complete-backward";
13 }; 14 };