authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-02-11 09:14:44-08:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-02-11 09:14:44-08:00
log8e3d03d24d9de94a5d864a7cc408b6797f059e33
treefef169e8c272889092a2c5cdb280b27b9c2ef80e
parent7b05391e4f457acc760bb15f37e568323d99bc35
parent0273f736b1484b52376089ad65a50bf9437310b0

Merge branch 'main' of github.com:nmarks413/nix-config

5 files changed, 289 insertions(+), 312 deletions(-)

flake.lock+224-253
...@@ -20,11 +20,11 @@...@@ -20,11 +20,11 @@
20 ]20 ]
21 },21 },
22 "locked": {22 "locked": {
23 "lastModified": 1731959031,23 "lastModified": 1738183445,
24 "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",24 "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=",
25 "owner": "hyprwm",25 "owner": "hyprwm",
26 "repo": "aquamarine",26 "repo": "aquamarine",
27 "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",27 "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74",
28 "type": "github"28 "type": "github"
29 },29 },
30 "original": {30 "original": {
...@@ -40,11 +40,11 @@...@@ -40,11 +40,11 @@
40 ]40 ]
41 },41 },
42 "locked": {42 "locked": {
43 "lastModified": 1733105089,43 "lastModified": 1738033138,
44 "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",44 "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
45 "owner": "lnl7",45 "owner": "lnl7",
46 "repo": "nix-darwin",46 "repo": "nix-darwin",
47 "rev": "c6b65d946097baf3915dd51373251de98199280d",47 "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
48 "type": "github"48 "type": "github"
49 },49 },
50 "original": {50 "original": {
...@@ -54,6 +54,27 @@...@@ -54,6 +54,27 @@
54 "type": "github"54 "type": "github"
55 }55 }
56 },56 },
57 "devshell": {
58 "inputs": {
59 "nixpkgs": [
60 "nh_darwin",
61 "nixpkgs"
62 ]
63 },
64 "locked": {
65 "lastModified": 1722113426,
66 "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
67 "owner": "numtide",
68 "repo": "devshell",
69 "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
70 "type": "github"
71 },
72 "original": {
73 "owner": "numtide",
74 "repo": "devshell",
75 "type": "github"
76 }
77 },
57 "flake-compat": {78 "flake-compat": {
58 "flake": false,79 "flake": false,
59 "locked": {80 "locked": {
...@@ -118,27 +139,30 @@...@@ -118,27 +139,30 @@
118 "type": "github"139 "type": "github"
119 }140 }
120 },141 },
121 "flake-utils": {142 "flake-parts": {
122 "inputs": {143 "inputs": {
123 "systems": "systems"144 "nixpkgs-lib": [
145 "nh_darwin",
146 "nixpkgs"
147 ]
124 },148 },
125 "locked": {149 "locked": {
126 "lastModified": 1705309234,150 "lastModified": 1725234343,
127 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",151 "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
128 "owner": "numtide",152 "owner": "hercules-ci",
129 "repo": "flake-utils",153 "repo": "flake-parts",
130 "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",154 "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
131 "type": "github"155 "type": "github"
132 },156 },
133 "original": {157 "original": {
134 "owner": "numtide",158 "owner": "hercules-ci",
135 "repo": "flake-utils",159 "repo": "flake-parts",
136 "type": "github"160 "type": "github"
137 }161 }
138 },162 },
139 "flake-utils_2": {163 "flake-utils": {
140 "inputs": {164 "inputs": {
141 "systems": "systems_3"165 "systems": "systems_2"
142 },166 },
143 "locked": {167 "locked": {
144 "lastModified": 1731533236,168 "lastModified": 1731533236,
...@@ -154,9 +178,9 @@...@@ -154,9 +178,9 @@
154 "type": "github"178 "type": "github"
155 }179 }
156 },180 },
157 "flake-utils_3": {181 "flake-utils_2": {
158 "inputs": {182 "inputs": {
159 "systems": "systems_4"183 "systems": "systems_3"
160 },184 },
161 "locked": {185 "locked": {
162 "lastModified": 1705309234,186 "lastModified": 1705309234,
...@@ -172,9 +196,9 @@...@@ -172,9 +196,9 @@
172 "type": "github"196 "type": "github"
173 }197 }
174 },198 },
175 "flake-utils_4": {199 "flake-utils_3": {
176 "inputs": {200 "inputs": {
177 "systems": "systems_5"201 "systems": "systems_4"
178 },202 },
179 "locked": {203 "locked": {
180 "lastModified": 1710146030,204 "lastModified": 1710146030,
...@@ -190,9 +214,9 @@...@@ -190,9 +214,9 @@
190 "type": "github"214 "type": "github"
191 }215 }
192 },216 },
193 "flake-utils_5": {217 "flake-utils_4": {
194 "inputs": {218 "inputs": {
195 "systems": "systems_6"219 "systems": "systems_5"
196 },220 },
197 "locked": {221 "locked": {
198 "lastModified": 1705309234,222 "lastModified": 1705309234,
...@@ -208,26 +232,6 @@...@@ -208,26 +232,6 @@
208 "type": "github"232 "type": "github"
209 }233 }
210 },234 },
211 "ghostty": {
212 "inputs": {
213 "nixpkgs-stable": "nixpkgs-stable",
214 "nixpkgs-unstable": "nixpkgs-unstable",
215 "zig": "zig"
216 },
217 "locked": {
218 "lastModified": 1733179821,
219 "narHash": "sha256-dKJpRERwG4b/HBsG/U4VLXn603dOU3nfYsqghQr4OYw=",
220 "ref": "refs/heads/main",
221 "rev": "91ae0e16f4ef142d86b59b489e4f0610ac60f3fd",
222 "revCount": 8153,
223 "type": "git",
224 "url": "ssh://git@github.com/ghostty-org/ghostty"
225 },
226 "original": {
227 "type": "git",
228 "url": "ssh://git@github.com/ghostty-org/ghostty"
229 }
230 },
231 "gitignore": {235 "gitignore": {
232 "inputs": {236 "inputs": {
233 "nixpkgs": [237 "nixpkgs": [
...@@ -294,11 +298,11 @@...@@ -294,11 +298,11 @@
294 ]298 ]
295 },299 },
296 "locked": {300 "locked": {
297 "lastModified": 1733175814,301 "lastModified": 1738178313,
298 "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",302 "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=",
299 "owner": "nix-community",303 "owner": "nix-community",
300 "repo": "home-manager",304 "repo": "home-manager",
301 "rev": "bf23fe41082aa0289c209169302afd3397092f22",305 "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6",
302 "type": "github"306 "type": "github"
303 },307 },
304 "original": {308 "original": {
...@@ -313,11 +317,11 @@...@@ -313,11 +317,11 @@
313 "nixpkgs": "nixpkgs"317 "nixpkgs": "nixpkgs"
314 },318 },
315 "locked": {319 "locked": {
316 "lastModified": 1733165231,320 "lastModified": 1737949234,
317 "narHash": "sha256-NV0u/JezyBGFk0wPz74/w+3PTsTyoJ7R5ZlupOBo7Jk=",321 "narHash": "sha256-rkOIzVI0ND7775hWR+N4RxnI31ajYrsqkXVStB+Qf+8=",
318 "owner": "StevenBlack",322 "owner": "StevenBlack",
319 "repo": "hosts",323 "repo": "hosts",
320 "rev": "485083e4bc8947248c3eab3e416f7d0b5917dafd",324 "rev": "a0af3d5cb1b0fb88c8e6f2037331758f8fcb6109",
321 "type": "github"325 "type": "github"
322 },326 },
323 "original": {327 "original": {
...@@ -342,11 +346,11 @@...@@ -342,11 +346,11 @@
342 ]346 ]
343 },347 },
344 "locked": {348 "locked": {
345 "lastModified": 1728669738,349 "lastModified": 1738178255,
346 "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",350 "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=",
347 "owner": "hyprwm",351 "owner": "hyprwm",
348 "repo": "hyprcursor",352 "repo": "hyprcursor",
349 "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",353 "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82",
350 "type": "github"354 "type": "github"
351 },355 },
352 "original": {356 "original": {
...@@ -355,25 +359,56 @@...@@ -355,25 +359,56 @@
355 "type": "github"359 "type": "github"
356 }360 }
357 },361 },
362 "hyprgraphics": {
363 "inputs": {
364 "hyprutils": [
365 "hyprland",
366 "hyprutils"
367 ],
368 "nixpkgs": [
369 "hyprland",
370 "nixpkgs"
371 ],
372 "systems": [
373 "hyprland",
374 "systems"
375 ]
376 },
377 "locked": {
378 "lastModified": 1738018829,
379 "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=",
380 "owner": "hyprwm",
381 "repo": "hyprgraphics",
382 "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b",
383 "type": "github"
384 },
385 "original": {
386 "owner": "hyprwm",
387 "repo": "hyprgraphics",
388 "type": "github"
389 }
390 },
358 "hyprland": {391 "hyprland": {
359 "inputs": {392 "inputs": {
360 "aquamarine": "aquamarine",393 "aquamarine": "aquamarine",
361 "hyprcursor": "hyprcursor",394 "hyprcursor": "hyprcursor",
395 "hyprgraphics": "hyprgraphics",
362 "hyprland-protocols": "hyprland-protocols",396 "hyprland-protocols": "hyprland-protocols",
397 "hyprland-qtutils": "hyprland-qtutils",
363 "hyprlang": "hyprlang",398 "hyprlang": "hyprlang",
364 "hyprutils": "hyprutils",399 "hyprutils": "hyprutils",
365 "hyprwayland-scanner": "hyprwayland-scanner",400 "hyprwayland-scanner": "hyprwayland-scanner",
366 "nixpkgs": "nixpkgs_2",401 "nixpkgs": "nixpkgs_2",
367 "pre-commit-hooks": "pre-commit-hooks",402 "pre-commit-hooks": "pre-commit-hooks",
368 "systems": "systems_2",403 "systems": "systems",
369 "xdph": "xdph"404 "xdph": "xdph"
370 },405 },
371 "locked": {406 "locked": {
372 "lastModified": 1733157082,407 "lastModified": 1738183538,
373 "narHash": "sha256-rmJkUKyvaejRaQeEOpInjGjQv6rgFkm2uJ2iVlMEuOk=",408 "narHash": "sha256-USMuV15YsPaz0FMTZrLHWOg8KNgUF3PPdx/JZhsJTgs=",
374 "owner": "hyprwm",409 "owner": "hyprwm",
375 "repo": "Hyprland",410 "repo": "Hyprland",
376 "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888",411 "rev": "6fc9c8e4797a272c688fc74b872db5d828c21f02",
377 "type": "github"412 "type": "github"
378 },413 },
379 "original": {414 "original": {
...@@ -399,11 +434,11 @@...@@ -399,11 +434,11 @@
399 ]434 ]
400 },435 },
401 "locked": {436 "locked": {
402 "lastModified": 1732053779,437 "lastModified": 1738011374,
403 "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=",438 "narHash": "sha256-WSgu+IWBUhUZdnrdx19yE4afevtheDV88Q6kawsJ1pE=",
404 "owner": "hyprwm",439 "owner": "hyprwm",
405 "repo": "hyprland-plugins",440 "repo": "hyprland-plugins",
406 "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991",441 "rev": "014003b2bd3744dfabb8c2c20a80e89f721be238",
407 "type": "github"442 "type": "github"
408 },443 },
409 "original": {444 "original": {
...@@ -424,11 +459,11 @@...@@ -424,11 +459,11 @@
424 ]459 ]
425 },460 },
426 "locked": {461 "locked": {
427 "lastModified": 1728345020,462 "lastModified": 1737556638,
428 "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",463 "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
429 "owner": "hyprwm",464 "owner": "hyprwm",
430 "repo": "hyprland-protocols",465 "repo": "hyprland-protocols",
431 "rev": "a7c183800e74f337753de186522b9017a07a8cee",466 "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
432 "type": "github"467 "type": "github"
433 },468 },
434 "original": {469 "original": {
...@@ -437,6 +472,74 @@...@@ -437,6 +472,74 @@
437 "type": "github"472 "type": "github"
438 }473 }
439 },474 },
475 "hyprland-qt-support": {
476 "inputs": {
477 "hyprlang": [
478 "hyprland",
479 "hyprland-qtutils",
480 "hyprlang"
481 ],
482 "nixpkgs": [
483 "hyprland",
484 "hyprland-qtutils",
485 "nixpkgs"
486 ],
487 "systems": [
488 "hyprland",
489 "hyprland-qtutils",
490 "systems"
491 ]
492 },
493 "locked": {
494 "lastModified": 1737634706,
495 "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
496 "owner": "hyprwm",
497 "repo": "hyprland-qt-support",
498 "rev": "8810df502cdee755993cb803eba7b23f189db795",
499 "type": "github"
500 },
501 "original": {
502 "owner": "hyprwm",
503 "repo": "hyprland-qt-support",
504 "type": "github"
505 }
506 },
507 "hyprland-qtutils": {
508 "inputs": {
509 "hyprland-qt-support": "hyprland-qt-support",
510 "hyprlang": [
511 "hyprland",
512 "hyprlang"
513 ],
514 "hyprutils": [
515 "hyprland",
516 "hyprland-qtutils",
517 "hyprlang",
518 "hyprutils"
519 ],
520 "nixpkgs": [
521 "hyprland",
522 "nixpkgs"
523 ],
524 "systems": [
525 "hyprland",
526 "systems"
527 ]
528 },
529 "locked": {
530 "lastModified": 1737981711,
531 "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=",
532 "owner": "hyprwm",
533 "repo": "hyprland-qtutils",
534 "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73",
535 "type": "github"
536 },
537 "original": {
538 "owner": "hyprwm",
539 "repo": "hyprland-qtutils",
540 "type": "github"
541 }
542 },
440 "hyprlang": {543 "hyprlang": {
441 "inputs": {544 "inputs": {
442 "hyprutils": [545 "hyprutils": [
...@@ -453,11 +556,11 @@...@@ -453,11 +556,11 @@
453 ]556 ]
454 },557 },
455 "locked": {558 "locked": {
456 "lastModified": 1728168612,559 "lastModified": 1737634606,
457 "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",560 "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
458 "owner": "hyprwm",561 "owner": "hyprwm",
459 "repo": "hyprlang",562 "repo": "hyprlang",
460 "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",563 "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
461 "type": "github"564 "type": "github"
462 },565 },
463 "original": {566 "original": {
...@@ -478,11 +581,11 @@...@@ -478,11 +581,11 @@
478 ]581 ]
479 },582 },
480 "locked": {583 "locked": {
481 "lastModified": 1732288281,584 "lastModified": 1737978343,
482 "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",585 "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=",
483 "owner": "hyprwm",586 "owner": "hyprwm",
484 "repo": "hyprutils",587 "repo": "hyprutils",
485 "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",588 "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab",
486 "type": "github"589 "type": "github"
487 },590 },
488 "original": {591 "original": {
...@@ -503,11 +606,11 @@...@@ -503,11 +606,11 @@
503 ]606 ]
504 },607 },
505 "locked": {608 "locked": {
506 "lastModified": 1726874836,609 "lastModified": 1735493474,
507 "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",610 "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
508 "owner": "hyprwm",611 "owner": "hyprwm",
509 "repo": "hyprwayland-scanner",612 "repo": "hyprwayland-scanner",
510 "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",613 "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
511 "type": "github"614 "type": "github"
512 },615 },
513 "original": {616 "original": {
...@@ -530,17 +633,18 @@...@@ -530,17 +633,18 @@
530 },633 },
531 "nh_darwin": {634 "nh_darwin": {
532 "inputs": {635 "inputs": {
533 "nix-darwin": "nix-darwin",636 "devshell": "devshell",
637 "flake-parts": "flake-parts",
534 "nixpkgs": [638 "nixpkgs": [
535 "nixpkgs"639 "nixpkgs"
536 ]640 ]
537 },641 },
538 "locked": {642 "locked": {
539 "lastModified": 1733092619,643 "lastModified": 1734649198,
540 "narHash": "sha256-kpzViKJZFIU8DryCQzdpdHdOZN5nWrryZBiMLy3kEEE=",644 "narHash": "sha256-ZgHTep4WPfIeCQYP6y7ls3YFYmLxBZckZ6aPiZ1mqVA=",
541 "owner": "ToyVo",645 "owner": "ToyVo",
542 "repo": "nh_darwin",646 "repo": "nh_darwin",
543 "rev": "80e64a85d349aa2075973c68053ab475949f3bfd",647 "rev": "5549630d2a9556209f287c6982865875a87f3e77",
544 "type": "github"648 "type": "github"
545 },649 },
546 "original": {650 "original": {
...@@ -549,39 +653,18 @@...@@ -549,39 +653,18 @@
549 "type": "github"653 "type": "github"
550 }654 }
551 },655 },
552 "nix-darwin": {
553 "inputs": {
554 "nixpkgs": [
555 "nh_darwin",
556 "nixpkgs"
557 ]
558 },
559 "locked": {
560 "lastModified": 1733047432,
561 "narHash": "sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg=",
562 "owner": "LnL7",
563 "repo": "nix-darwin",
564 "rev": "e30a3622b606dffc622305b4bbe1cfe37e78fa40",
565 "type": "github"
566 },
567 "original": {
568 "owner": "LnL7",
569 "repo": "nix-darwin",
570 "type": "github"
571 }
572 },
573 "nix-options-search": {656 "nix-options-search": {
574 "inputs": {657 "inputs": {
575 "flake-utils": "flake-utils_2",658 "flake-utils": "flake-utils",
576 "gitignore": "gitignore_2",659 "gitignore": "gitignore_2",
577 "nixpkgs": "nixpkgs_3"660 "nixpkgs": "nixpkgs_3"
578 },661 },
579 "locked": {662 "locked": {
580 "lastModified": 1721325991,663 "lastModified": 1737269558,
581 "narHash": "sha256-eJ9nFrrbWystBX9EhHE3wou+1kqf+CjVeys12z7u3fs=",664 "narHash": "sha256-8FgCXvokcoSEF4LK8AwE+zhCXKp0OI1IoccNGGj4g1c=",
582 "owner": "madsbv",665 "owner": "madsbv",
583 "repo": "nix-options-search",666 "repo": "nix-options-search",
584 "rev": "e7b9b6e4be12bfb5fb6792372f18470e3718027a",667 "rev": "9bcdff5e825021a2f4775910f1619dd1d573f698",
585 "type": "github"668 "type": "github"
586 },669 },
587 "original": {670 "original": {
...@@ -596,15 +679,14 @@...@@ -596,15 +679,14 @@
596 "nixpkgs": [679 "nixpkgs": [
597 "nixpkgs"680 "nixpkgs"
598 ],681 ],
599 "nixpkgs-stable": "nixpkgs-stable_3",682 "nixpkgs-stable": "nixpkgs-stable"
600 "rust-overlay": "rust-overlay"
601 },683 },
602 "locked": {684 "locked": {
603 "lastModified": 1733095793,685 "lastModified": 1738041275,
604 "narHash": "sha256-woqkmcGxOleK1RyoZpXU3NaC4+epr2qYau2mVhVQFjY=",686 "narHash": "sha256-4Oqq357Q//Ra5qV9PdPLMkdH0uFFxy1stQF8hTe8xEM=",
605 "owner": "lilyinstarlight",687 "owner": "lilyinstarlight",
606 "repo": "nixos-cosmic",688 "repo": "nixos-cosmic",
607 "rev": "e468c8b79dd55f1ce8803887d3593fb0016f1f81",689 "rev": "36eabddc2d033f4fd31c53570db7e1e21591cba3",
608 "type": "github"690 "type": "github"
609 },691 },
610 "original": {692 "original": {
...@@ -616,8 +698,8 @@...@@ -616,8 +698,8 @@
616 "nixpkgs": {698 "nixpkgs": {
617 "locked": {699 "locked": {
618 "lastModified": 0,700 "lastModified": 0,
619 "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",701 "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
620 "path": "/nix/store/sh0v21n9zc03b94qjj4jkkg5mbsjkpzr-source",702 "path": "/nix/store/2g3q36zra5ix7qhkb8b4ikr5pmmhfm6g-source",
621 "type": "path"703 "type": "path"
622 },704 },
623 "original": {705 "original": {
...@@ -627,53 +709,21 @@...@@ -627,53 +709,21 @@
627 },709 },
628 "nixpkgs-stable": {710 "nixpkgs-stable": {
629 "locked": {711 "locked": {
630 "lastModified": 1726062281,712 "lastModified": 1737885640,
631 "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",713 "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
632 "owner": "nixos",
633 "repo": "nixpkgs",
634 "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
635 "type": "github"
636 },
637 "original": {
638 "owner": "nixos",
639 "ref": "release-24.05",
640 "repo": "nixpkgs",
641 "type": "github"
642 }
643 },
644 "nixpkgs-stable_2": {
645 "locked": {
646 "lastModified": 1730741070,
647 "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
648 "owner": "NixOS",714 "owner": "NixOS",
649 "repo": "nixpkgs",715 "repo": "nixpkgs",
650 "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",716 "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
651 "type": "github"717 "type": "github"
652 },718 },
653 "original": {719 "original": {
654 "owner": "NixOS",720 "owner": "NixOS",
655 "ref": "nixos-24.05",721 "ref": "nixos-24.11",
656 "repo": "nixpkgs",722 "repo": "nixpkgs",
657 "type": "github"723 "type": "github"
658 }724 }
659 },725 },
660 "nixpkgs-stable_3": {726 "nixpkgs-stable_2": {
661 "locked": {
662 "lastModified": 1732749044,
663 "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
664 "owner": "NixOS",
665 "repo": "nixpkgs",
666 "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
667 "type": "github"
668 },
669 "original": {
670 "owner": "NixOS",
671 "ref": "nixos-24.05",
672 "repo": "nixpkgs",
673 "type": "github"
674 }
675 },
676 "nixpkgs-stable_4": {
677 "locked": {727 "locked": {
678 "lastModified": 1720535198,728 "lastModified": 1720535198,
679 "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",729 "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
...@@ -688,29 +738,13 @@...@@ -688,29 +738,13 @@
688 "type": "indirect"738 "type": "indirect"
689 }739 }
690 },740 },
691 "nixpkgs-unstable": {
692 "locked": {
693 "lastModified": 1719082008,
694 "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
695 "owner": "nixos",
696 "repo": "nixpkgs",
697 "rev": "9693852a2070b398ee123a329e68f0dab5526681",
698 "type": "github"
699 },
700 "original": {
701 "owner": "nixos",
702 "ref": "nixpkgs-unstable",
703 "repo": "nixpkgs",
704 "type": "github"
705 }
706 },
707 "nixpkgs_2": {741 "nixpkgs_2": {
708 "locked": {742 "locked": {
709 "lastModified": 1732758367,743 "lastModified": 1737885589,
710 "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",744 "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
711 "owner": "NixOS",745 "owner": "NixOS",
712 "repo": "nixpkgs",746 "repo": "nixpkgs",
713 "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",747 "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
714 "type": "github"748 "type": "github"
715 },749 },
716 "original": {750 "original": {
...@@ -722,11 +756,11 @@...@@ -722,11 +756,11 @@
722 },756 },
723 "nixpkgs_3": {757 "nixpkgs_3": {
724 "locked": {758 "locked": {
725 "lastModified": 1733015953,759 "lastModified": 1736012469,
726 "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",760 "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
727 "owner": "nixos",761 "owner": "nixos",
728 "repo": "nixpkgs",762 "repo": "nixpkgs",
729 "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",763 "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
730 "type": "github"764 "type": "github"
731 },765 },
732 "original": {766 "original": {
...@@ -738,11 +772,11 @@...@@ -738,11 +772,11 @@
738 },772 },
739 "nixpkgs_4": {773 "nixpkgs_4": {
740 "locked": {774 "locked": {
741 "lastModified": 1733015953,775 "lastModified": 1737885589,
742 "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",776 "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
743 "owner": "NixOS",777 "owner": "NixOS",
744 "repo": "nixpkgs",778 "repo": "nixpkgs",
745 "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",779 "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
746 "type": "github"780 "type": "github"
747 },781 },
748 "original": {782 "original": {
...@@ -790,15 +824,14 @@...@@ -790,15 +824,14 @@
790 "nixpkgs": [824 "nixpkgs": [
791 "hyprland",825 "hyprland",
792 "nixpkgs"826 "nixpkgs"
793 ],827 ]
794 "nixpkgs-stable": "nixpkgs-stable_2"
795 },828 },
796 "locked": {829 "locked": {
797 "lastModified": 1732021966,830 "lastModified": 1737465171,
798 "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",831 "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
799 "owner": "cachix",832 "owner": "cachix",
800 "repo": "git-hooks.nix",833 "repo": "git-hooks.nix",
801 "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",834 "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
802 "type": "github"835 "type": "github"
803 },836 },
804 "original": {837 "original": {
...@@ -810,7 +843,6 @@...@@ -810,7 +843,6 @@
810 "root": {843 "root": {
811 "inputs": {844 "inputs": {
812 "darwin": "darwin",845 "darwin": "darwin",
813 "ghostty": "ghostty",
814 "home-manager": "home-manager",846 "home-manager": "home-manager",
815 "hosts": "hosts",847 "hosts": "hosts",
816 "hyprland": "hyprland",848 "hyprland": "hyprland",
...@@ -819,48 +851,12 @@...@@ -819,48 +851,12 @@
819 "nix-options-search": "nix-options-search",851 "nix-options-search": "nix-options-search",
820 "nixos-cosmic": "nixos-cosmic",852 "nixos-cosmic": "nixos-cosmic",
821 "nixpkgs": "nixpkgs_4",853 "nixpkgs": "nixpkgs_4",
822 "nixpkgs-stable": "nixpkgs-stable_4",854 "nixpkgs-stable": "nixpkgs-stable_2",
823 "zig": "zig_2",855 "zig": "zig",
824 "zls": "zls"856 "zls": "zls"
825 }857 }
826 },858 },
827 "rust-overlay": {
828 "inputs": {
829 "nixpkgs": [
830 "nixos-cosmic",
831 "nixpkgs"
832 ]
833 },
834 "locked": {
835 "lastModified": 1732933841,
836 "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=",
837 "owner": "oxalica",
838 "repo": "rust-overlay",
839 "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1",
840 "type": "github"
841 },
842 "original": {
843 "owner": "oxalica",
844 "repo": "rust-overlay",
845 "type": "github"
846 }
847 },
848 "systems": {859 "systems": {
849 "locked": {
850 "lastModified": 1681028828,
851 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
852 "owner": "nix-systems",
853 "repo": "default",
854 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
855 "type": "github"
856 },
857 "original": {
858 "owner": "nix-systems",
859 "repo": "default",
860 "type": "github"
861 }
862 },
863 "systems_2": {
864 "locked": {860 "locked": {
865 "lastModified": 1689347949,861 "lastModified": 1689347949,
866 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",862 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
...@@ -875,7 +871,7 @@...@@ -875,7 +871,7 @@
875 "type": "github"871 "type": "github"
876 }872 }
877 },873 },
878 "systems_3": {874 "systems_2": {
879 "locked": {875 "locked": {
880 "lastModified": 1681028828,876 "lastModified": 1681028828,
881 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",877 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -890,7 +886,7 @@...@@ -890,7 +886,7 @@
890 "type": "github"886 "type": "github"
891 }887 }
892 },888 },
893 "systems_4": {889 "systems_3": {
894 "locked": {890 "locked": {
895 "lastModified": 1681028828,891 "lastModified": 1681028828,
896 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",892 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -905,7 +901,7 @@...@@ -905,7 +901,7 @@
905 "type": "github"901 "type": "github"
906 }902 }
907 },903 },
908 "systems_5": {904 "systems_4": {
909 "locked": {905 "locked": {
910 "lastModified": 1681028828,906 "lastModified": 1681028828,
911 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",907 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -920,7 +916,7 @@...@@ -920,7 +916,7 @@
920 "type": "github"916 "type": "github"
921 }917 }
922 },918 },
923 "systems_6": {919 "systems_5": {
924 "locked": {920 "locked": {
925 "lastModified": 1681028828,921 "lastModified": 1681028828,
926 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",922 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -963,11 +959,11 @@...@@ -963,11 +959,11 @@
963 ]959 ]
964 },960 },
965 "locked": {961 "locked": {
966 "lastModified": 1731703417,962 "lastModified": 1737634991,
967 "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",963 "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
968 "owner": "hyprwm",964 "owner": "hyprwm",
969 "repo": "xdg-desktop-portal-hyprland",965 "repo": "xdg-desktop-portal-hyprland",
970 "rev": "8070f36deec723de71e7557441acb17e478204d3",966 "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
971 "type": "github"967 "type": "github"
972 },968 },
973 "original": {969 "original": {
...@@ -978,21 +974,16 @@...@@ -978,21 +974,16 @@
978 },974 },
979 "zig": {975 "zig": {
980 "inputs": {976 "inputs": {
981 "flake-compat": [977 "flake-compat": "flake-compat_3",
982 "ghostty"978 "flake-utils": "flake-utils_2",
983 ],979 "nixpkgs": "nixpkgs_5"
984 "flake-utils": "flake-utils",
985 "nixpkgs": [
986 "ghostty",
987 "nixpkgs-stable"
988 ]
989 },980 },
990 "locked": {981 "locked": {
991 "lastModified": 1717848532,982 "lastModified": 1737419334,
992 "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",983 "narHash": "sha256-xEQ+2zoihSR8TSHH5KMceReUd9Ae2tPNLFoQviGpaAg=",
993 "owner": "mitchellh",984 "owner": "mitchellh",
994 "repo": "zig-overlay",985 "repo": "zig-overlay",
995 "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",986 "rev": "11ba4193561b6096b2c72174163940a50251a99c",
996 "type": "github"987 "type": "github"
997 },988 },
998 "original": {989 "original": {
...@@ -1004,7 +995,7 @@...@@ -1004,7 +995,7 @@
1004 "zig-overlay": {995 "zig-overlay": {
1005 "inputs": {996 "inputs": {
1006 "flake-compat": "flake-compat_4",997 "flake-compat": "flake-compat_4",
1007 "flake-utils": "flake-utils_5",998 "flake-utils": "flake-utils_4",
1008 "nixpkgs": [999 "nixpkgs": [
1009 "zls",1000 "zls",
1010 "nixpkgs"1001 "nixpkgs"
...@@ -1024,29 +1015,9 @@...@@ -1024,29 +1015,9 @@
1024 "type": "github"1015 "type": "github"
1025 }1016 }
1026 },1017 },
1027 "zig_2": {
1028 "inputs": {
1029 "flake-compat": "flake-compat_3",
1030 "flake-utils": "flake-utils_3",
1031 "nixpkgs": "nixpkgs_5"
1032 },
1033 "locked": {
1034 "lastModified": 1733141566,
1035 "narHash": "sha256-ZEI6jN6KS2CHuSQuvo1zB4ty8x78XYiWvySn2c5vVE0=",
1036 "owner": "mitchellh",
1037 "repo": "zig-overlay",
1038 "rev": "2b42ec31944b58fb08a0e7501bbae558935a9a2c",
1039 "type": "github"
1040 },
1041 "original": {
1042 "owner": "mitchellh",
1043 "repo": "zig-overlay",
1044 "type": "github"
1045 }
1046 },
1047 "zls": {1018 "zls": {
1048 "inputs": {1019 "inputs": {
1049 "flake-utils": "flake-utils_4",1020 "flake-utils": "flake-utils_3",
1050 "gitignore": "gitignore_3",1021 "gitignore": "gitignore_3",
1051 "langref": "langref",1022 "langref": "langref",
1052 "nixpkgs": "nixpkgs_6",1023 "nixpkgs": "nixpkgs_6",
flake.nix-8
...@@ -30,10 +30,6 @@...@@ -30,10 +30,6 @@
3030
31 # foundryvtt.url = "github:reckenrode/nix-foundryvtt";31 # foundryvtt.url = "github:reckenrode/nix-foundryvtt";
3232
33 ghostty = {
34 url = "git+ssh://git@github.com/ghostty-org/ghostty";
35 };
36
37 nixos-cosmic = {33 nixos-cosmic = {
38 url = "github:lilyinstarlight/nixos-cosmic";34 url = "github:lilyinstarlight/nixos-cosmic";
39 inputs.nixpkgs.follows = "nixpkgs";35 inputs.nixpkgs.follows = "nixpkgs";
...@@ -58,7 +54,6 @@...@@ -58,7 +54,6 @@
58 hyprland-plugins,54 hyprland-plugins,
59 zig,55 zig,
60 zls,56 zls,
61 ghostty,
62 nixos-cosmic,57 nixos-cosmic,
63 nh_darwin,58 nh_darwin,
64 ...59 ...
...@@ -87,7 +82,6 @@...@@ -87,7 +82,6 @@
87 home-manager.extraSpecialArgs = {82 home-manager.extraSpecialArgs = {
88 inherit hyprland-plugins;83 inherit hyprland-plugins;
89 inherit zls;84 inherit zls;
90 inherit ghostty;
91 };85 };
92 }86 }
93 nixos-cosmic.nixosModules.default87 nixos-cosmic.nixosModules.default
...@@ -113,7 +107,6 @@...@@ -113,7 +107,6 @@
113 };107 };
114 home-manager.extraSpecialArgs = {108 home-manager.extraSpecialArgs = {
115 inherit zls;109 inherit zls;
116 inherit ghostty;
117 };110 };
118 users.users.nmarks.home = "/Users/nmarks";111 users.users.nmarks.home = "/Users/nmarks";
119 }112 }
...@@ -121,7 +114,6 @@...@@ -121,7 +114,6 @@
121 specialArgs = {114 specialArgs = {
122 inherit nh_darwin;115 inherit nh_darwin;
123 inherit inputs;116 inherit inputs;
124 inherit ghostty;
125 };117 };
126 };118 };
127 };119 };
hosts/desktop/configuration.nix+30-16
...@@ -16,6 +16,8 @@...@@ -16,6 +16,8 @@
16 openFirewall = true;16 openFirewall = true;
17 };17 };
1818
19 programs.gamemode.enable = true;
20
19 programs._1password.enable = true;21 programs._1password.enable = true;
20 programs._1password-gui = {22 programs._1password-gui = {
21 enable = true;23 enable = true;
...@@ -43,23 +45,26 @@...@@ -43,23 +45,26 @@
43 virtualisation.containers.enable = true;45 virtualisation.containers.enable = true;
44 virtualisation.podman = {46 virtualisation.podman = {
45 enable = true;47 enable = true;
46 dockerCompat = true;48 # dockerCompat = true;
47 };49 };
50 virtualisation.docker.enable = true;
4851
49 nix.settings.trusted-users = ["root" "nmarks"];52 nix.settings.trusted-users = ["root" "nmarks"];
5053
51 nix.settings.experimental-features = ["nix-command" "flakes"];54 nix.settings.experimental-features = ["nix-command" "flakes"];
52 nix.settings = {55 nix.settings = {
53 substituters = [56 substituters = [
54 "https://nix-community.cachix.org"
55 "https://cache.nixos.org/"57 "https://cache.nixos.org/"
56 "https://cuda-maintainers.cachix.org"58 "https://nix-community.cachix.org"
57 "https://cosmic.cachix.org/"59 "https://cosmic.cachix.org/"
60 "https://cache.iog.io"
61 "https://cuda-maintainers.cachix.org"
58 ];62 ];
59 trusted-public-keys = [63 trusted-public-keys = [
60 "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="64 "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
61 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="65 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
62 "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="66 "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
67 "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
63 ];68 ];
64 };69 };
65 programs.hyprland.enable = true;70 programs.hyprland.enable = true;
...@@ -99,7 +104,8 @@...@@ -99,7 +104,8 @@
99 };104 };
100105
101 fonts.packages = with pkgs; [106 fonts.packages = with pkgs; [
102 (nerdfonts.override {fonts = ["FiraCode" "Iosevka"];})107 nerd-fonts.fira-code
108 nerd-fonts.iosevka
103 ];109 ];
104110
105 imports = [111 imports = [
...@@ -160,19 +166,21 @@...@@ -160,19 +166,21 @@
160 #boot.loader.systemd-boot.enable = true;166 #boot.loader.systemd-boot.enable = true;
161 #boot.loader.efi.canTouchEfiVariables = true;167 #boot.loader.efi.canTouchEfiVariables = true;
162168
169 boot.kernelPackages = pkgs.linuxPackages_latest;
170
163 boot.loader = {171 boot.loader = {
164 systemd-boot.enable = true;172 # systemd-boot.enable = true;
165 efi = {173 efi = {
166 canTouchEfiVariables = true;174 canTouchEfiVariables = true;
167 # assuming /boot is the mount point of the EFI partition in NixOS (as the installation section recommends).175 # assuming /boot is the mount point of the EFI partition in NixOS (as the installation section recommends).
168 efiSysMountPoint = "/boot";176 efiSysMountPoint = "/boot/efi";
177 };
178 grub = {
179 enable = true;
180 device = "nodev";
181 theme = pkgs.nixos-grub2-theme;
182 useOSProber = true;
169 };183 };
170 # grub = {
171 # enable = true;
172 # device = "/dev/sdb1";
173 # theme = pkgs.nixos-grub2-theme;
174 # useOSProber = true;
175 # };
176 };184 };
177185
178 boot.supportedFilesystems = ["ntfs"];186 boot.supportedFilesystems = ["ntfs"];
...@@ -205,7 +213,7 @@...@@ -205,7 +213,7 @@
205213
206 # Enable the KDE Plasma Desktop Environment.214 # Enable the KDE Plasma Desktop Environment.
207 # services.displayManager.sddm.enable = true;215 # services.displayManager.sddm.enable = true;
208 # services.desktopManager.plasma6.enable = true;216 services.desktopManager.plasma6.enable = true;
209217
210 services.desktopManager.cosmic.enable = true;218 services.desktopManager.cosmic.enable = true;
211 services.displayManager.cosmic-greeter.enable = true;219 services.displayManager.cosmic-greeter.enable = true;
...@@ -220,14 +228,15 @@...@@ -220,14 +228,15 @@
220 services.printing.enable = true;228 services.printing.enable = true;
221229
222 # Enable sound with pipewire.230 # Enable sound with pipewire.
223 #sound.enable = true;231 # services.pulseaudio.enable = true;
224 #hardware.pulseaudio.enable = false;
225 security.rtkit.enable = true;232 security.rtkit.enable = true;
226 services.pipewire = {233 services.pipewire = {
227 enable = true;234 enable = true;
235 audio.enable = true;
228 alsa.enable = true;236 alsa.enable = true;
229 alsa.support32Bit = true;237 alsa.support32Bit = true;
230 pulse.enable = true;238 pulse.enable = true;
239 # systemWide = true;
231 # If you want to use JACK applications, uncomment this240 # If you want to use JACK applications, uncomment this
232 #jack.enable = true;241 #jack.enable = true;
233242
...@@ -269,6 +278,11 @@...@@ -269,6 +278,11 @@
269 package = with pkgs; steam.override {extraPkgs = pkgs: [attr];};278 package = with pkgs; steam.override {extraPkgs = pkgs: [attr];};
270 };279 };
271280
281 programs.git = {
282 enable = true;
283 lfs.enable = true;
284 };
285
272 # Allow unfree packages286 # Allow unfree packages
273 # List packages installed in system profile. To search, run:287 # List packages installed in system profile. To search, run:
274 # $ nix search wget288 # $ nix search wget
...@@ -407,7 +421,7 @@...@@ -407,7 +421,7 @@
407 nss421 nss
408 openssl422 openssl
409 pango423 pango
410 pipewire424 # pipewire
411 stdenv.cc.cc425 stdenv.cc.cc
412 systemd426 systemd
413 vulkan-loader427 vulkan-loader
hosts/desktop/hardware-configuration.nix+34-30
...@@ -1,37 +1,41 @@...@@ -1,37 +1,41 @@
1# Do not modify this file! It was generated by ‘nixos-generate-config’1# Do not modify this file! It was generated by ‘nixos-generate-config’
2# and may be overwritten by future invocations. Please make changes2# and may be overwritten by future invocations. Please make changes
3# to /etc/nixos/configuration.nix instead.3# to /etc/nixos/configuration.nix instead.
4{ config, lib, pkgs, modulesPath, ... }:
5
6{4{
7 imports =5 config,
8 [ (modulesPath + "/installer/scan/not-detected.nix")6 lib,
9 ];7 pkgs,
108 modulesPath,
11 boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "sd_mod" ];9 ...
12 boot.initrd.kernelModules = [ ];10}: {
13 boot.kernelModules = [ "kvm-amd" ];11 imports = [
14 boot.extraModulePackages = [ ];12 (modulesPath + "/installer/scan/not-detected.nix")
1513 ];
16 fileSystems."/" =14
17 { device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";15 boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "sd_mod"];
18 fsType = "ext4";16 boot.initrd.kernelModules = [];
19 };17 boot.kernelModules = ["kvm-amd"];
2018 boot.extraModulePackages = [];
21 fileSystems."/boot" =19
22 { device = "/dev/disk/by-uuid/2319-EE79";20 fileSystems."/" = {
23 fsType = "vfat";21 device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";
24 options = [ "fmask=0022" "dmask=0022" ];22 fsType = "ext4";
25 };23 };
2624
27 fileSystems."/home/nmarks/Games/steam" =25 fileSystems."/boot/efi" = {
28 { device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3";26 device = "/dev/disk/by-uuid/2319-EE79";
29 fsType = "ext4";27 fsType = "vfat";
30 };28 options = ["fmask=0022" "dmask=0022"];
3129 };
32 swapDevices =30
33 [ { device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28"; }31 fileSystems."/home/nmarks/Games/steam" = {
34 ];32 device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3";
33 fsType = "ext4";
34 };
35
36 swapDevices = [
37 {device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28";}
38 ];
3539
36 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking40 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
37 # (the default) this is the recommended approach. When using systemd-networkd it's41 # (the default) this is the recommended approach. When using systemd-networkd it's
hosts/desktop/home.nix+1-5
...@@ -3,7 +3,6 @@...@@ -3,7 +3,6 @@
3 config,3 config,
4 pkgs,4 pkgs,
5 zls,5 zls,
6 ghostty,
7 nix-options-search,6 nix-options-search,
8 ...7 ...
9}: {8}: {
...@@ -49,7 +48,6 @@...@@ -49,7 +48,6 @@
49 imagemagick48 imagemagick
50 lua51Packages.lua49 lua51Packages.lua
51 lua51Packages.luarocks-nix50 lua51Packages.luarocks-nix
52 lemonade
53 legcord51 legcord
54 calibre52 calibre
55 pyright53 pyright
...@@ -68,7 +66,7 @@...@@ -68,7 +66,7 @@
68 pavucontrol66 pavucontrol
69 efibootmgr67 efibootmgr
70 zigpkgs.master68 zigpkgs.master
71 ghostty.packages.x86_64-linux.default69 ghostty
72 stylua70 stylua
73 webcord71 webcord
74 cachix72 cachix
...@@ -136,8 +134,6 @@...@@ -136,8 +134,6 @@
136 alejandra134 alejandra
137 statix135 statix
138 texlab136 texlab
139 typst-fmt
140 typst-lsp
141 clang-tools137 clang-tools
142 # rust-analyzer138 # rust-analyzer
143 #clippy139 #clippy