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 @@
2020 ]
2121 },
2222 "locked": {
23 "lastModified": 1731959031,
24 "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
23 "lastModified": 1738183445,
24 "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=",
2525 "owner": "hyprwm",
2626 "repo": "aquamarine",
27 "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
27 "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74",
2828 "type": "github"
2929 },
3030 "original": {
......@@ -40,11 +40,11 @@
4040 ]
4141 },
4242 "locked": {
43 "lastModified": 1733105089,
44 "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
43 "lastModified": 1738033138,
44 "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
4545 "owner": "lnl7",
4646 "repo": "nix-darwin",
47 "rev": "c6b65d946097baf3915dd51373251de98199280d",
47 "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
4848 "type": "github"
4949 },
5050 "original": {
......@@ -54,6 +54,27 @@
5454 "type": "github"
5555 }
5656 },
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 },
5778 "flake-compat": {
5879 "flake": false,
5980 "locked": {
......@@ -118,27 +139,30 @@
118139 "type": "github"
119140 }
120141 },
121 "flake-utils": {
142 "flake-parts": {
122143 "inputs": {
123 "systems": "systems"
144 "nixpkgs-lib": [
145 "nh_darwin",
146 "nixpkgs"
147 ]
124148 },
125149 "locked": {
126 "lastModified": 1705309234,
127 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
128 "owner": "numtide",
129 "repo": "flake-utils",
130 "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
150 "lastModified": 1725234343,
151 "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
152 "owner": "hercules-ci",
153 "repo": "flake-parts",
154 "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
131155 "type": "github"
132156 },
133157 "original": {
134 "owner": "numtide",
135 "repo": "flake-utils",
158 "owner": "hercules-ci",
159 "repo": "flake-parts",
136160 "type": "github"
137161 }
138162 },
139 "flake-utils_2": {
163 "flake-utils": {
140164 "inputs": {
141 "systems": "systems_3"
165 "systems": "systems_2"
142166 },
143167 "locked": {
144168 "lastModified": 1731533236,
......@@ -154,9 +178,9 @@
154178 "type": "github"
155179 }
156180 },
157 "flake-utils_3": {
181 "flake-utils_2": {
158182 "inputs": {
159 "systems": "systems_4"
183 "systems": "systems_3"
160184 },
161185 "locked": {
162186 "lastModified": 1705309234,
......@@ -172,9 +196,9 @@
172196 "type": "github"
173197 }
174198 },
175 "flake-utils_4": {
199 "flake-utils_3": {
176200 "inputs": {
177 "systems": "systems_5"
201 "systems": "systems_4"
178202 },
179203 "locked": {
180204 "lastModified": 1710146030,
......@@ -190,9 +214,9 @@
190214 "type": "github"
191215 }
192216 },
193 "flake-utils_5": {
217 "flake-utils_4": {
194218 "inputs": {
195 "systems": "systems_6"
219 "systems": "systems_5"
196220 },
197221 "locked": {
198222 "lastModified": 1705309234,
......@@ -208,26 +232,6 @@
208232 "type": "github"
209233 }
210234 },
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 },
231235 "gitignore": {
232236 "inputs": {
233237 "nixpkgs": [
......@@ -294,11 +298,11 @@
294298 ]
295299 },
296300 "locked": {
297 "lastModified": 1733175814,
298 "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
301 "lastModified": 1738178313,
302 "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=",
299303 "owner": "nix-community",
300304 "repo": "home-manager",
301 "rev": "bf23fe41082aa0289c209169302afd3397092f22",
305 "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6",
302306 "type": "github"
303307 },
304308 "original": {
......@@ -313,11 +317,11 @@
313317 "nixpkgs": "nixpkgs"
314318 },
315319 "locked": {
316 "lastModified": 1733165231,
317 "narHash": "sha256-NV0u/JezyBGFk0wPz74/w+3PTsTyoJ7R5ZlupOBo7Jk=",
320 "lastModified": 1737949234,
321 "narHash": "sha256-rkOIzVI0ND7775hWR+N4RxnI31ajYrsqkXVStB+Qf+8=",
318322 "owner": "StevenBlack",
319323 "repo": "hosts",
320 "rev": "485083e4bc8947248c3eab3e416f7d0b5917dafd",
324 "rev": "a0af3d5cb1b0fb88c8e6f2037331758f8fcb6109",
321325 "type": "github"
322326 },
323327 "original": {
......@@ -342,11 +346,11 @@
342346 ]
343347 },
344348 "locked": {
345 "lastModified": 1728669738,
346 "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
349 "lastModified": 1738178255,
350 "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=",
347351 "owner": "hyprwm",
348352 "repo": "hyprcursor",
349 "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
353 "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82",
350354 "type": "github"
351355 },
352356 "original": {
......@@ -355,25 +359,56 @@
355359 "type": "github"
356360 }
357361 },
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 },
358391 "hyprland": {
359392 "inputs": {
360393 "aquamarine": "aquamarine",
361394 "hyprcursor": "hyprcursor",
395 "hyprgraphics": "hyprgraphics",
362396 "hyprland-protocols": "hyprland-protocols",
397 "hyprland-qtutils": "hyprland-qtutils",
363398 "hyprlang": "hyprlang",
364399 "hyprutils": "hyprutils",
365400 "hyprwayland-scanner": "hyprwayland-scanner",
366401 "nixpkgs": "nixpkgs_2",
367402 "pre-commit-hooks": "pre-commit-hooks",
368 "systems": "systems_2",
403 "systems": "systems",
369404 "xdph": "xdph"
370405 },
371406 "locked": {
372 "lastModified": 1733157082,
373 "narHash": "sha256-rmJkUKyvaejRaQeEOpInjGjQv6rgFkm2uJ2iVlMEuOk=",
407 "lastModified": 1738183538,
408 "narHash": "sha256-USMuV15YsPaz0FMTZrLHWOg8KNgUF3PPdx/JZhsJTgs=",
374409 "owner": "hyprwm",
375410 "repo": "Hyprland",
376 "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888",
411 "rev": "6fc9c8e4797a272c688fc74b872db5d828c21f02",
377412 "type": "github"
378413 },
379414 "original": {
......@@ -399,11 +434,11 @@
399434 ]
400435 },
401436 "locked": {
402 "lastModified": 1732053779,
403 "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=",
437 "lastModified": 1738011374,
438 "narHash": "sha256-WSgu+IWBUhUZdnrdx19yE4afevtheDV88Q6kawsJ1pE=",
404439 "owner": "hyprwm",
405440 "repo": "hyprland-plugins",
406 "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991",
441 "rev": "014003b2bd3744dfabb8c2c20a80e89f721be238",
407442 "type": "github"
408443 },
409444 "original": {
......@@ -424,11 +459,11 @@
424459 ]
425460 },
426461 "locked": {
427 "lastModified": 1728345020,
428 "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
462 "lastModified": 1737556638,
463 "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
429464 "owner": "hyprwm",
430465 "repo": "hyprland-protocols",
431 "rev": "a7c183800e74f337753de186522b9017a07a8cee",
466 "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
432467 "type": "github"
433468 },
434469 "original": {
......@@ -437,6 +472,74 @@
437472 "type": "github"
438473 }
439474 },
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 },
440543 "hyprlang": {
441544 "inputs": {
442545 "hyprutils": [
......@@ -453,11 +556,11 @@
453556 ]
454557 },
455558 "locked": {
456 "lastModified": 1728168612,
457 "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
559 "lastModified": 1737634606,
560 "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
458561 "owner": "hyprwm",
459562 "repo": "hyprlang",
460 "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
563 "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
461564 "type": "github"
462565 },
463566 "original": {
......@@ -478,11 +581,11 @@
478581 ]
479582 },
480583 "locked": {
481 "lastModified": 1732288281,
482 "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
584 "lastModified": 1737978343,
585 "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=",
483586 "owner": "hyprwm",
484587 "repo": "hyprutils",
485 "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
588 "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab",
486589 "type": "github"
487590 },
488591 "original": {
......@@ -503,11 +606,11 @@
503606 ]
504607 },
505608 "locked": {
506 "lastModified": 1726874836,
507 "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
609 "lastModified": 1735493474,
610 "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
508611 "owner": "hyprwm",
509612 "repo": "hyprwayland-scanner",
510 "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
613 "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
511614 "type": "github"
512615 },
513616 "original": {
......@@ -530,17 +633,18 @@
530633 },
531634 "nh_darwin": {
532635 "inputs": {
533 "nix-darwin": "nix-darwin",
636 "devshell": "devshell",
637 "flake-parts": "flake-parts",
534638 "nixpkgs": [
535639 "nixpkgs"
536640 ]
537641 },
538642 "locked": {
539 "lastModified": 1733092619,
540 "narHash": "sha256-kpzViKJZFIU8DryCQzdpdHdOZN5nWrryZBiMLy3kEEE=",
643 "lastModified": 1734649198,
644 "narHash": "sha256-ZgHTep4WPfIeCQYP6y7ls3YFYmLxBZckZ6aPiZ1mqVA=",
541645 "owner": "ToyVo",
542646 "repo": "nh_darwin",
543 "rev": "80e64a85d349aa2075973c68053ab475949f3bfd",
647 "rev": "5549630d2a9556209f287c6982865875a87f3e77",
544648 "type": "github"
545649 },
546650 "original": {
......@@ -549,39 +653,18 @@
549653 "type": "github"
550654 }
551655 },
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 },
573656 "nix-options-search": {
574657 "inputs": {
575 "flake-utils": "flake-utils_2",
658 "flake-utils": "flake-utils",
576659 "gitignore": "gitignore_2",
577660 "nixpkgs": "nixpkgs_3"
578661 },
579662 "locked": {
580 "lastModified": 1721325991,
581 "narHash": "sha256-eJ9nFrrbWystBX9EhHE3wou+1kqf+CjVeys12z7u3fs=",
663 "lastModified": 1737269558,
664 "narHash": "sha256-8FgCXvokcoSEF4LK8AwE+zhCXKp0OI1IoccNGGj4g1c=",
582665 "owner": "madsbv",
583666 "repo": "nix-options-search",
584 "rev": "e7b9b6e4be12bfb5fb6792372f18470e3718027a",
667 "rev": "9bcdff5e825021a2f4775910f1619dd1d573f698",
585668 "type": "github"
586669 },
587670 "original": {
......@@ -596,15 +679,14 @@
596679 "nixpkgs": [
597680 "nixpkgs"
598681 ],
599 "nixpkgs-stable": "nixpkgs-stable_3",
600 "rust-overlay": "rust-overlay"
682 "nixpkgs-stable": "nixpkgs-stable"
601683 },
602684 "locked": {
603 "lastModified": 1733095793,
604 "narHash": "sha256-woqkmcGxOleK1RyoZpXU3NaC4+epr2qYau2mVhVQFjY=",
685 "lastModified": 1738041275,
686 "narHash": "sha256-4Oqq357Q//Ra5qV9PdPLMkdH0uFFxy1stQF8hTe8xEM=",
605687 "owner": "lilyinstarlight",
606688 "repo": "nixos-cosmic",
607 "rev": "e468c8b79dd55f1ce8803887d3593fb0016f1f81",
689 "rev": "36eabddc2d033f4fd31c53570db7e1e21591cba3",
608690 "type": "github"
609691 },
610692 "original": {
......@@ -616,8 +698,8 @@
616698 "nixpkgs": {
617699 "locked": {
618700 "lastModified": 0,
619 "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
620 "path": "/nix/store/sh0v21n9zc03b94qjj4jkkg5mbsjkpzr-source",
701 "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
702 "path": "/nix/store/2g3q36zra5ix7qhkb8b4ikr5pmmhfm6g-source",
621703 "type": "path"
622704 },
623705 "original": {
......@@ -627,53 +709,21 @@
627709 },
628710 "nixpkgs-stable": {
629711 "locked": {
630 "lastModified": 1726062281,
631 "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
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=",
712 "lastModified": 1737885640,
713 "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
648714 "owner": "NixOS",
649715 "repo": "nixpkgs",
650 "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
716 "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
651717 "type": "github"
652718 },
653719 "original": {
654720 "owner": "NixOS",
655 "ref": "nixos-24.05",
721 "ref": "nixos-24.11",
656722 "repo": "nixpkgs",
657723 "type": "github"
658724 }
659725 },
660 "nixpkgs-stable_3": {
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": {
726 "nixpkgs-stable_2": {
677727 "locked": {
678728 "lastModified": 1720535198,
679729 "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
......@@ -688,29 +738,13 @@
688738 "type": "indirect"
689739 }
690740 },
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 },
707741 "nixpkgs_2": {
708742 "locked": {
709 "lastModified": 1732758367,
710 "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
743 "lastModified": 1737885589,
744 "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
711745 "owner": "NixOS",
712746 "repo": "nixpkgs",
713 "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
747 "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
714748 "type": "github"
715749 },
716750 "original": {
......@@ -722,11 +756,11 @@
722756 },
723757 "nixpkgs_3": {
724758 "locked": {
725 "lastModified": 1733015953,
726 "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
759 "lastModified": 1736012469,
760 "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
727761 "owner": "nixos",
728762 "repo": "nixpkgs",
729 "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
763 "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
730764 "type": "github"
731765 },
732766 "original": {
......@@ -738,11 +772,11 @@
738772 },
739773 "nixpkgs_4": {
740774 "locked": {
741 "lastModified": 1733015953,
742 "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
775 "lastModified": 1737885589,
776 "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
743777 "owner": "NixOS",
744778 "repo": "nixpkgs",
745 "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
779 "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
746780 "type": "github"
747781 },
748782 "original": {
......@@ -790,15 +824,14 @@
790824 "nixpkgs": [
791825 "hyprland",
792826 "nixpkgs"
793 ],
794 "nixpkgs-stable": "nixpkgs-stable_2"
827 ]
795828 },
796829 "locked": {
797 "lastModified": 1732021966,
798 "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
830 "lastModified": 1737465171,
831 "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
799832 "owner": "cachix",
800833 "repo": "git-hooks.nix",
801 "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
834 "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
802835 "type": "github"
803836 },
804837 "original": {
......@@ -810,7 +843,6 @@
810843 "root": {
811844 "inputs": {
812845 "darwin": "darwin",
813 "ghostty": "ghostty",
814846 "home-manager": "home-manager",
815847 "hosts": "hosts",
816848 "hyprland": "hyprland",
......@@ -819,48 +851,12 @@
819851 "nix-options-search": "nix-options-search",
820852 "nixos-cosmic": "nixos-cosmic",
821853 "nixpkgs": "nixpkgs_4",
822 "nixpkgs-stable": "nixpkgs-stable_4",
823 "zig": "zig_2",
854 "nixpkgs-stable": "nixpkgs-stable_2",
855 "zig": "zig",
824856 "zls": "zls"
825857 }
826858 },
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 },
848859 "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": {
864860 "locked": {
865861 "lastModified": 1689347949,
866862 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
......@@ -875,7 +871,7 @@
875871 "type": "github"
876872 }
877873 },
878 "systems_3": {
874 "systems_2": {
879875 "locked": {
880876 "lastModified": 1681028828,
881877 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -890,7 +886,7 @@
890886 "type": "github"
891887 }
892888 },
893 "systems_4": {
889 "systems_3": {
894890 "locked": {
895891 "lastModified": 1681028828,
896892 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -905,7 +901,7 @@
905901 "type": "github"
906902 }
907903 },
908 "systems_5": {
904 "systems_4": {
909905 "locked": {
910906 "lastModified": 1681028828,
911907 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -920,7 +916,7 @@
920916 "type": "github"
921917 }
922918 },
923 "systems_6": {
919 "systems_5": {
924920 "locked": {
925921 "lastModified": 1681028828,
926922 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -963,11 +959,11 @@
963959 ]
964960 },
965961 "locked": {
966 "lastModified": 1731703417,
967 "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
962 "lastModified": 1737634991,
963 "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
968964 "owner": "hyprwm",
969965 "repo": "xdg-desktop-portal-hyprland",
970 "rev": "8070f36deec723de71e7557441acb17e478204d3",
966 "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
971967 "type": "github"
972968 },
973969 "original": {
......@@ -978,21 +974,16 @@
978974 },
979975 "zig": {
980976 "inputs": {
981 "flake-compat": [
982 "ghostty"
983 ],
984 "flake-utils": "flake-utils",
985 "nixpkgs": [
986 "ghostty",
987 "nixpkgs-stable"
988 ]
977 "flake-compat": "flake-compat_3",
978 "flake-utils": "flake-utils_2",
979 "nixpkgs": "nixpkgs_5"
989980 },
990981 "locked": {
991 "lastModified": 1717848532,
992 "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
982 "lastModified": 1737419334,
983 "narHash": "sha256-xEQ+2zoihSR8TSHH5KMceReUd9Ae2tPNLFoQviGpaAg=",
993984 "owner": "mitchellh",
994985 "repo": "zig-overlay",
995 "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
986 "rev": "11ba4193561b6096b2c72174163940a50251a99c",
996987 "type": "github"
997988 },
998989 "original": {
......@@ -1004,7 +995,7 @@
1004995 "zig-overlay": {
1005996 "inputs": {
1006997 "flake-compat": "flake-compat_4",
1007 "flake-utils": "flake-utils_5",
998 "flake-utils": "flake-utils_4",
1008999 "nixpkgs": [
10091000 "zls",
10101001 "nixpkgs"
......@@ -1024,29 +1015,9 @@
10241015 "type": "github"
10251016 }
10261017 },
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 },
10471018 "zls": {
10481019 "inputs": {
1049 "flake-utils": "flake-utils_4",
1020 "flake-utils": "flake-utils_3",
10501021 "gitignore": "gitignore_3",
10511022 "langref": "langref",
10521023 "nixpkgs": "nixpkgs_6",
flake.nix-8
......@@ -30,10 +30,6 @@
3030
3131 # foundryvtt.url = "github:reckenrode/nix-foundryvtt";
3232
33 ghostty = {
34 url = "git+ssh://git@github.com/ghostty-org/ghostty";
35 };
36
3733 nixos-cosmic = {
3834 url = "github:lilyinstarlight/nixos-cosmic";
3935 inputs.nixpkgs.follows = "nixpkgs";
......@@ -58,7 +54,6 @@
5854 hyprland-plugins,
5955 zig,
6056 zls,
61 ghostty,
6257 nixos-cosmic,
6358 nh_darwin,
6459 ...
......@@ -87,7 +82,6 @@
8782 home-manager.extraSpecialArgs = {
8883 inherit hyprland-plugins;
8984 inherit zls;
90 inherit ghostty;
9185 };
9286 }
9387 nixos-cosmic.nixosModules.default
......@@ -113,7 +107,6 @@
113107 };
114108 home-manager.extraSpecialArgs = {
115109 inherit zls;
116 inherit ghostty;
117110 };
118111 users.users.nmarks.home = "/Users/nmarks";
119112 }
......@@ -121,7 +114,6 @@
121114 specialArgs = {
122115 inherit nh_darwin;
123116 inherit inputs;
124 inherit ghostty;
125117 };
126118 };
127119 };
hosts/desktop/configuration.nix+30-16
......@@ -16,6 +16,8 @@
1616 openFirewall = true;
1717 };
1818
19 programs.gamemode.enable = true;
20
1921 programs._1password.enable = true;
2022 programs._1password-gui = {
2123 enable = true;
......@@ -43,23 +45,26 @@
4345 virtualisation.containers.enable = true;
4446 virtualisation.podman = {
4547 enable = true;
46 dockerCompat = true;
48 # dockerCompat = true;
4749 };
50 virtualisation.docker.enable = true;
4851
4952 nix.settings.trusted-users = ["root" "nmarks"];
5053
5154 nix.settings.experimental-features = ["nix-command" "flakes"];
5255 nix.settings = {
5356 substituters = [
54 "https://nix-community.cachix.org"
5557 "https://cache.nixos.org/"
56 "https://cuda-maintainers.cachix.org"
58 "https://nix-community.cachix.org"
5759 "https://cosmic.cachix.org/"
60 "https://cache.iog.io"
61 "https://cuda-maintainers.cachix.org"
5862 ];
5963 trusted-public-keys = [
6064 "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
6165 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
6266 "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
67 "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
6368 ];
6469 };
6570 programs.hyprland.enable = true;
......@@ -99,7 +104,8 @@
99104 };
100105
101106 fonts.packages = with pkgs; [
102 (nerdfonts.override {fonts = ["FiraCode" "Iosevka"];})
107 nerd-fonts.fira-code
108 nerd-fonts.iosevka
103109 ];
104110
105111 imports = [
......@@ -160,19 +166,21 @@
160166 #boot.loader.systemd-boot.enable = true;
161167 #boot.loader.efi.canTouchEfiVariables = true;
162168
169 boot.kernelPackages = pkgs.linuxPackages_latest;
170
163171 boot.loader = {
164 systemd-boot.enable = true;
172 # systemd-boot.enable = true;
165173 efi = {
166174 canTouchEfiVariables = true;
167175 # 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;
169183 };
170 # grub = {
171 # enable = true;
172 # device = "/dev/sdb1";
173 # theme = pkgs.nixos-grub2-theme;
174 # useOSProber = true;
175 # };
176184 };
177185
178186 boot.supportedFilesystems = ["ntfs"];
......@@ -205,7 +213,7 @@
205213
206214 # Enable the KDE Plasma Desktop Environment.
207215 # services.displayManager.sddm.enable = true;
208 # services.desktopManager.plasma6.enable = true;
216 services.desktopManager.plasma6.enable = true;
209217
210218 services.desktopManager.cosmic.enable = true;
211219 services.displayManager.cosmic-greeter.enable = true;
......@@ -220,14 +228,15 @@
220228 services.printing.enable = true;
221229
222230 # Enable sound with pipewire.
223 #sound.enable = true;
224 #hardware.pulseaudio.enable = false;
231 # services.pulseaudio.enable = true;
225232 security.rtkit.enable = true;
226233 services.pipewire = {
227234 enable = true;
235 audio.enable = true;
228236 alsa.enable = true;
229237 alsa.support32Bit = true;
230238 pulse.enable = true;
239 # systemWide = true;
231240 # If you want to use JACK applications, uncomment this
232241 #jack.enable = true;
233242
......@@ -269,6 +278,11 @@
269278 package = with pkgs; steam.override {extraPkgs = pkgs: [attr];};
270279 };
271280
281 programs.git = {
282 enable = true;
283 lfs.enable = true;
284 };
285
272286 # Allow unfree packages
273287 # List packages installed in system profile. To search, run:
274288 # $ nix search wget
......@@ -407,7 +421,7 @@
407421 nss
408422 openssl
409423 pango
410 pipewire
424 # pipewire
411425 stdenv.cc.cc
412426 systemd
413427 vulkan-loader
hosts/desktop/hardware-configuration.nix+34-30
......@@ -1,37 +1,41 @@
11# Do not modify this file! It was generated by ‘nixos-generate-config’
22# and may be overwritten by future invocations. Please make changes
33# to /etc/nixos/configuration.nix instead.
4{ config, lib, pkgs, modulesPath, ... }:
5
64{
7 imports =
8 [ (modulesPath + "/installer/scan/not-detected.nix")
9 ];
10
11 boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "sd_mod" ];
12 boot.initrd.kernelModules = [ ];
13 boot.kernelModules = [ "kvm-amd" ];
14 boot.extraModulePackages = [ ];
15
16 fileSystems."/" =
17 { device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";
18 fsType = "ext4";
19 };
20
21 fileSystems."/boot" =
22 { device = "/dev/disk/by-uuid/2319-EE79";
23 fsType = "vfat";
24 options = [ "fmask=0022" "dmask=0022" ];
25 };
26
27 fileSystems."/home/nmarks/Games/steam" =
28 { device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3";
29 fsType = "ext4";
30 };
31
32 swapDevices =
33 [ { device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28"; }
34 ];
5 config,
6 lib,
7 pkgs,
8 modulesPath,
9 ...
10}: {
11 imports = [
12 (modulesPath + "/installer/scan/not-detected.nix")
13 ];
14
15 boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "sd_mod"];
16 boot.initrd.kernelModules = [];
17 boot.kernelModules = ["kvm-amd"];
18 boot.extraModulePackages = [];
19
20 fileSystems."/" = {
21 device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";
22 fsType = "ext4";
23 };
24
25 fileSystems."/boot/efi" = {
26 device = "/dev/disk/by-uuid/2319-EE79";
27 fsType = "vfat";
28 options = ["fmask=0022" "dmask=0022"];
29 };
30
31 fileSystems."/home/nmarks/Games/steam" = {
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
3640 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
3741 # (the default) this is the recommended approach. When using systemd-networkd it's
hosts/desktop/home.nix+1-5
......@@ -3,7 +3,6 @@
33 config,
44 pkgs,
55 zls,
6 ghostty,
76 nix-options-search,
87 ...
98}: {
......@@ -49,7 +48,6 @@
4948 imagemagick
5049 lua51Packages.lua
5150 lua51Packages.luarocks-nix
52 lemonade
5351 legcord
5452 calibre
5553 pyright
......@@ -68,7 +66,7 @@
6866 pavucontrol
6967 efibootmgr
7068 zigpkgs.master
71 ghostty.packages.x86_64-linux.default
69 ghostty
7270 stylua
7371 webcord
7472 cachix
......@@ -136,8 +134,6 @@
136134 alejandra
137135 statix
138136 texlab
139 typst-fmt
140 typst-lsp
141137 clang-tools
142138 # rust-analyzer
143139 #clippy