authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-02-20 17:03:44-08:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-02-20 17:03:44-08:00
log38ecddb9d7b4a813b0ddf5a81957800acb3d275c
treedeaf46c842771b5da0920852e6b1ef9943d3480d
parentfa74ed1f5790f39b336d899857206e47c31160cb
parent6669c604a73c635a4e2b65ae98065745003fc9cc
signature Commit is signed but in an unrecognized format.

Merge branch 'main' of paperclover.dev:nix/config

26 files changed, 303 insertions(+), 786 deletions(-)

flake.lock+97-636
......@@ -9,11 +9,11 @@
99 ]
1010 },
1111 "locked": {
12 "lastModified": 1767990299,
13 "narHash": "sha256-Jz+cp9Ln4++1XiKw9KvZEM2dJ9AdOvayk97ybi9g7zc=",
12 "lastModified": 1771360638,
13 "narHash": "sha256-s6dqFccvgDj5+q10/CroMzMzjMWWjEOiQsmi1CFeqiw=",
1414 "owner": "tadfisher",
1515 "repo": "android-nixpkgs",
16 "rev": "449f2cadee7cb7b665aea209a67f8ecf30176653",
16 "rev": "1a9b8a0d2950d9aedb788b74ebd60effae3a58a4",
1717 "type": "github"
1818 },
1919 "original": {
......@@ -25,9 +25,7 @@
2525 },
2626 "apple-fonts": {
2727 "inputs": {
28 "nixpkgs": [
29 "nixpkgs"
30 ],
28 "nixpkgs": "nixpkgs",
3129 "ny": "ny",
3230 "sf-arabic": "sf-arabic",
3331 "sf-armenian": "sf-armenian",
......@@ -38,52 +36,19 @@
3836 "sf-pro": "sf-pro"
3937 },
4038 "locked": {
41 "lastModified": 1758228441,
42 "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=",
43 "owner": "Lyndeno",
39 "lastModified": 1770758542,
40 "narHash": "sha256-MhtCW601b9tAMP20FBToytRSUMoThtefJ3/7kCThwsE=",
41 "owner": "nmarks413",
4442 "repo": "apple-fonts.nix",
45 "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72",
43 "rev": "96173002252e90bac2a1f863d709508220cb5db7",
4644 "type": "github"
4745 },
4846 "original": {
49 "owner": "Lyndeno",
47 "owner": "nmarks413",
5048 "repo": "apple-fonts.nix",
5149 "type": "github"
5250 }
5351 },
54 "aquamarine": {
55 "inputs": {
56 "hyprutils": [
57 "hyprland",
58 "hyprutils"
59 ],
60 "hyprwayland-scanner": [
61 "hyprland",
62 "hyprwayland-scanner"
63 ],
64 "nixpkgs": [
65 "hyprland",
66 "nixpkgs"
67 ],
68 "systems": [
69 "hyprland",
70 "systems"
71 ]
72 },
73 "locked": {
74 "lastModified": 1767024902,
75 "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
76 "owner": "hyprwm",
77 "repo": "aquamarine",
78 "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
79 "type": "github"
80 },
81 "original": {
82 "owner": "hyprwm",
83 "repo": "aquamarine",
84 "type": "github"
85 }
86 },
8752 "darwin": {
8853 "inputs": {
8954 "nixpkgs": [
......@@ -91,11 +56,11 @@
9156 ]
9257 },
9358 "locked": {
94 "lastModified": 1767718503,
95 "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=",
59 "lastModified": 1771371916,
60 "narHash": "sha256-G14VTfmzzRYxAhtEBNanQgCNA++Cv0/9iV4h/lkqX9U=",
9661 "owner": "lnl7",
9762 "repo": "nix-darwin",
98 "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1",
63 "rev": "aff4c008cec17d6a6760949df641ca0ea9179cac",
9964 "type": "github"
10065 },
10166 "original": {
......@@ -113,11 +78,11 @@
11378 ]
11479 },
11580 "locked": {
116 "lastModified": 1764011051,
117 "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=",
81 "lastModified": 1768818222,
82 "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
11883 "owner": "numtide",
11984 "repo": "devshell",
120 "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071",
85 "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
12186 "type": "github"
12287 },
12388 "original": {
......@@ -127,22 +92,6 @@
12792 }
12893 },
12994 "flake-compat": {
130 "flake": false,
131 "locked": {
132 "lastModified": 1767039857,
133 "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
134 "owner": "NixOS",
135 "repo": "flake-compat",
136 "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
137 "type": "github"
138 },
139 "original": {
140 "owner": "NixOS",
141 "repo": "flake-compat",
142 "type": "github"
143 }
144 },
145 "flake-compat_2": {
14695 "flake": false,
14796 "locked": {
14897 "lastModified": 1751685974,
......@@ -158,7 +107,7 @@
158107 "url": "https://git.lix.systems/lix-project/flake-compat.git"
159108 }
160109 },
161 "flake-compat_3": {
110 "flake-compat_2": {
162111 "flake": false,
163112 "locked": {
164113 "lastModified": 1696426674,
......@@ -174,7 +123,7 @@
174123 "type": "github"
175124 }
176125 },
177 "flake-compat_4": {
126 "flake-compat_3": {
178127 "flake": false,
179128 "locked": {
180129 "lastModified": 1696426674,
......@@ -198,11 +147,11 @@
198147 ]
199148 },
200149 "locked": {
201 "lastModified": 1760948891,
202 "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
150 "lastModified": 1769996383,
151 "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
203152 "owner": "hercules-ci",
204153 "repo": "flake-parts",
205 "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
154 "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
206155 "type": "github"
207156 },
208157 "original": {
......@@ -231,7 +180,7 @@
231180 },
232181 "flake-utils_2": {
233182 "inputs": {
234 "systems": "systems_3"
183 "systems": "systems_2"
235184 },
236185 "locked": {
237186 "lastModified": 1731533236,
......@@ -251,24 +200,6 @@
251200 "inputs": {
252201 "systems": "systems_6"
253202 },
254 "locked": {
255 "lastModified": 1705309234,
256 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
257 "owner": "numtide",
258 "repo": "flake-utils",
259 "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
260 "type": "github"
261 },
262 "original": {
263 "owner": "numtide",
264 "repo": "flake-utils",
265 "type": "github"
266 }
267 },
268 "flake-utils_4": {
269 "inputs": {
270 "systems": "systems_7"
271 },
272203 "locked": {
273204 "lastModified": 1710146030,
274205 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
......@@ -283,9 +214,9 @@
283214 "type": "github"
284215 }
285216 },
286 "flake-utils_5": {
217 "flake-utils_4": {
287218 "inputs": {
288 "systems": "systems_8"
219 "systems": "systems_7"
289220 },
290221 "locked": {
291222 "lastModified": 1705309234,
......@@ -302,28 +233,6 @@
302233 }
303234 },
304235 "gitignore": {
305 "inputs": {
306 "nixpkgs": [
307 "hyprland",
308 "pre-commit-hooks",
309 "nixpkgs"
310 ]
311 },
312 "locked": {
313 "lastModified": 1709087332,
314 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
315 "owner": "hercules-ci",
316 "repo": "gitignore.nix",
317 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
318 "type": "github"
319 },
320 "original": {
321 "owner": "hercules-ci",
322 "repo": "gitignore.nix",
323 "type": "github"
324 }
325 },
326 "gitignore_2": {
327236 "flake": false,
328237 "locked": {
329238 "lastModified": 1762808025,
......@@ -339,7 +248,7 @@
339248 "type": "github"
340249 }
341250 },
342 "gitignore_3": {
251 "gitignore_2": {
343252 "inputs": {
344253 "nixpkgs": [
345254 "zls",
......@@ -367,11 +276,11 @@
367276 ]
368277 },
369278 "locked": {
370 "lastModified": 1768018810,
371 "narHash": "sha256-WREj1ZQ2wSGtyPAhQJ3SX/7PJ29PNKv04h/7NgqUS+M=",
279 "lastModified": 1771269455,
280 "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=",
372281 "owner": "nix-community",
373282 "repo": "home-manager",
374 "rev": "7c5d9345ad7cc38832cd4007f5cd03daad64d75b",
283 "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3",
375284 "type": "github"
376285 },
377286 "original": {
......@@ -381,325 +290,6 @@
381290 "type": "github"
382291 }
383292 },
384 "hyprcursor": {
385 "inputs": {
386 "hyprlang": [
387 "hyprland",
388 "hyprlang"
389 ],
390 "nixpkgs": [
391 "hyprland",
392 "nixpkgs"
393 ],
394 "systems": [
395 "hyprland",
396 "systems"
397 ]
398 },
399 "locked": {
400 "lastModified": 1753964049,
401 "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
402 "owner": "hyprwm",
403 "repo": "hyprcursor",
404 "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
405 "type": "github"
406 },
407 "original": {
408 "owner": "hyprwm",
409 "repo": "hyprcursor",
410 "type": "github"
411 }
412 },
413 "hyprgraphics": {
414 "inputs": {
415 "hyprutils": [
416 "hyprland",
417 "hyprutils"
418 ],
419 "nixpkgs": [
420 "hyprland",
421 "nixpkgs"
422 ],
423 "systems": [
424 "hyprland",
425 "systems"
426 ]
427 },
428 "locked": {
429 "lastModified": 1766946335,
430 "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
431 "owner": "hyprwm",
432 "repo": "hyprgraphics",
433 "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
434 "type": "github"
435 },
436 "original": {
437 "owner": "hyprwm",
438 "repo": "hyprgraphics",
439 "type": "github"
440 }
441 },
442 "hyprland": {
443 "inputs": {
444 "aquamarine": "aquamarine",
445 "hyprcursor": "hyprcursor",
446 "hyprgraphics": "hyprgraphics",
447 "hyprland-guiutils": "hyprland-guiutils",
448 "hyprland-protocols": "hyprland-protocols",
449 "hyprlang": "hyprlang",
450 "hyprutils": "hyprutils",
451 "hyprwayland-scanner": "hyprwayland-scanner",
452 "hyprwire": "hyprwire",
453 "nixpkgs": "nixpkgs",
454 "pre-commit-hooks": "pre-commit-hooks",
455 "systems": "systems_2",
456 "xdph": "xdph"
457 },
458 "locked": {
459 "lastModified": 1768000181,
460 "narHash": "sha256-/E66+tcVBnvJcOFL/CjnjBfKew6A2e+28EZrcRHioBw=",
461 "owner": "hyprwm",
462 "repo": "Hyprland",
463 "rev": "81e7498ec27156ee97aabba6fe4993412d98d1ab",
464 "type": "github"
465 },
466 "original": {
467 "owner": "hyprwm",
468 "repo": "Hyprland",
469 "type": "github"
470 }
471 },
472 "hyprland-guiutils": {
473 "inputs": {
474 "aquamarine": [
475 "hyprland",
476 "aquamarine"
477 ],
478 "hyprgraphics": [
479 "hyprland",
480 "hyprgraphics"
481 ],
482 "hyprlang": [
483 "hyprland",
484 "hyprlang"
485 ],
486 "hyprtoolkit": "hyprtoolkit",
487 "hyprutils": [
488 "hyprland",
489 "hyprutils"
490 ],
491 "hyprwayland-scanner": [
492 "hyprland",
493 "hyprwayland-scanner"
494 ],
495 "nixpkgs": [
496 "hyprland",
497 "nixpkgs"
498 ],
499 "systems": [
500 "hyprland",
501 "systems"
502 ]
503 },
504 "locked": {
505 "lastModified": 1767023960,
506 "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
507 "owner": "hyprwm",
508 "repo": "hyprland-guiutils",
509 "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
510 "type": "github"
511 },
512 "original": {
513 "owner": "hyprwm",
514 "repo": "hyprland-guiutils",
515 "type": "github"
516 }
517 },
518 "hyprland-protocols": {
519 "inputs": {
520 "nixpkgs": [
521 "hyprland",
522 "nixpkgs"
523 ],
524 "systems": [
525 "hyprland",
526 "systems"
527 ]
528 },
529 "locked": {
530 "lastModified": 1765214753,
531 "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
532 "owner": "hyprwm",
533 "repo": "hyprland-protocols",
534 "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
535 "type": "github"
536 },
537 "original": {
538 "owner": "hyprwm",
539 "repo": "hyprland-protocols",
540 "type": "github"
541 }
542 },
543 "hyprlang": {
544 "inputs": {
545 "hyprutils": [
546 "hyprland",
547 "hyprutils"
548 ],
549 "nixpkgs": [
550 "hyprland",
551 "nixpkgs"
552 ],
553 "systems": [
554 "hyprland",
555 "systems"
556 ]
557 },
558 "locked": {
559 "lastModified": 1764612430,
560 "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
561 "owner": "hyprwm",
562 "repo": "hyprlang",
563 "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
564 "type": "github"
565 },
566 "original": {
567 "owner": "hyprwm",
568 "repo": "hyprlang",
569 "type": "github"
570 }
571 },
572 "hyprtoolkit": {
573 "inputs": {
574 "aquamarine": [
575 "hyprland",
576 "hyprland-guiutils",
577 "aquamarine"
578 ],
579 "hyprgraphics": [
580 "hyprland",
581 "hyprland-guiutils",
582 "hyprgraphics"
583 ],
584 "hyprlang": [
585 "hyprland",
586 "hyprland-guiutils",
587 "hyprlang"
588 ],
589 "hyprutils": [
590 "hyprland",
591 "hyprland-guiutils",
592 "hyprutils"
593 ],
594 "hyprwayland-scanner": [
595 "hyprland",
596 "hyprland-guiutils",
597 "hyprwayland-scanner"
598 ],
599 "nixpkgs": [
600 "hyprland",
601 "hyprland-guiutils",
602 "nixpkgs"
603 ],
604 "systems": [
605 "hyprland",
606 "hyprland-guiutils",
607 "systems"
608 ]
609 },
610 "locked": {
611 "lastModified": 1764592794,
612 "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
613 "owner": "hyprwm",
614 "repo": "hyprtoolkit",
615 "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
616 "type": "github"
617 },
618 "original": {
619 "owner": "hyprwm",
620 "repo": "hyprtoolkit",
621 "type": "github"
622 }
623 },
624 "hyprutils": {
625 "inputs": {
626 "nixpkgs": [
627 "hyprland",
628 "nixpkgs"
629 ],
630 "systems": [
631 "hyprland",
632 "systems"
633 ]
634 },
635 "locked": {
636 "lastModified": 1766253372,
637 "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
638 "owner": "hyprwm",
639 "repo": "hyprutils",
640 "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
641 "type": "github"
642 },
643 "original": {
644 "owner": "hyprwm",
645 "repo": "hyprutils",
646 "type": "github"
647 }
648 },
649 "hyprwayland-scanner": {
650 "inputs": {
651 "nixpkgs": [
652 "hyprland",
653 "nixpkgs"
654 ],
655 "systems": [
656 "hyprland",
657 "systems"
658 ]
659 },
660 "locked": {
661 "lastModified": 1763640274,
662 "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
663 "owner": "hyprwm",
664 "repo": "hyprwayland-scanner",
665 "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
666 "type": "github"
667 },
668 "original": {
669 "owner": "hyprwm",
670 "repo": "hyprwayland-scanner",
671 "type": "github"
672 }
673 },
674 "hyprwire": {
675 "inputs": {
676 "hyprutils": [
677 "hyprland",
678 "hyprutils"
679 ],
680 "nixpkgs": [
681 "hyprland",
682 "nixpkgs"
683 ],
684 "systems": [
685 "hyprland",
686 "systems"
687 ]
688 },
689 "locked": {
690 "lastModified": 1767473322,
691 "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
692 "owner": "hyprwm",
693 "repo": "hyprwire",
694 "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
695 "type": "github"
696 },
697 "original": {
698 "owner": "hyprwm",
699 "repo": "hyprwire",
700 "type": "github"
701 }
702 },
703293 "langref": {
704294 "flake": false,
705295 "locked": {
......@@ -714,11 +304,11 @@
714304 },
715305 "mnw": {
716306 "locked": {
717 "lastModified": 1758834834,
718 "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
307 "lastModified": 1770419553,
308 "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
719309 "owner": "Gerg-L",
720310 "repo": "mnw",
721 "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
311 "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
722312 "type": "github"
723313 },
724314 "original": {
......@@ -734,11 +324,11 @@
734324 ]
735325 },
736326 "locked": {
737 "lastModified": 1765916709,
738 "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=",
327 "lastModified": 1770835386,
328 "narHash": "sha256-Yp0ooU66hXjGq0cAG9WwhmLCfqCVzRxGXx7+nggPlqI=",
739329 "owner": "moonlight-mod",
740330 "repo": "moonlight",
741 "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce",
331 "rev": "6e0829e81d363e4ebb7c3f04601a50853f752c99",
742332 "type": "github"
743333 },
744334 "original": {
......@@ -749,37 +339,26 @@
749339 },
750340 "ndg": {
751341 "inputs": {
752 "nixpkgs": "nixpkgs_4"
342 "nixpkgs": [
343 "nvf",
344 "nixpkgs"
345 ]
753346 },
754347 "locked": {
755 "lastModified": 1765435293,
756 "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=",
348 "lastModified": 1768214250,
349 "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
757350 "owner": "feel-co",
758351 "repo": "ndg",
759 "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971",
352 "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
760353 "type": "github"
761354 },
762355 "original": {
763356 "owner": "feel-co",
357 "ref": "refs/tags/v2.6.0",
764358 "repo": "ndg",
765359 "type": "github"
766360 }
767361 },
768 "nix-filter": {
769 "locked": {
770 "lastModified": 1693833173,
771 "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=",
772 "owner": "numtide",
773 "repo": "nix-filter",
774 "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b",
775 "type": "github"
776 },
777 "original": {
778 "owner": "numtide",
779 "repo": "nix-filter",
780 "type": "github"
781 }
782 },
783362 "nix-index-database": {
784363 "inputs": {
785364 "nixpkgs": [
......@@ -787,11 +366,11 @@
787366 ]
788367 },
789368 "locked": {
790 "lastModified": 1765267181,
791 "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
369 "lastModified": 1771130777,
370 "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
792371 "owner": "nix-community",
793372 "repo": "nix-index-database",
794 "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
373 "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
795374 "type": "github"
796375 },
797376 "original": {
......@@ -803,15 +382,15 @@
803382 "nix-options-search": {
804383 "inputs": {
805384 "flake-utils": "flake-utils_2",
806 "gitignore": "gitignore_2",
385 "gitignore": "gitignore",
807386 "nixpkgs": "nixpkgs_2"
808387 },
809388 "locked": {
810 "lastModified": 1765642879,
811 "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=",
389 "lastModified": 1768731915,
390 "narHash": "sha256-5lMgfTfLpsqMMlbRbaQ0jZMsh764IocBsM3cbR0QvPU=",
812391 "owner": "madsbv",
813392 "repo": "nix-options-search",
814 "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e",
393 "rev": "f8f48b94dd931eff54e17d2185ef310c02bfa0bb",
815394 "type": "github"
816395 },
817396 "original": {
......@@ -822,15 +401,15 @@
822401 },
823402 "nixpkgs": {
824403 "locked": {
825 "lastModified": 1767379071,
826 "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
827 "owner": "NixOS",
404 "lastModified": 1770562336,
405 "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
406 "owner": "nixos",
828407 "repo": "nixpkgs",
829 "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
408 "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
830409 "type": "github"
831410 },
832411 "original": {
833 "owner": "NixOS",
412 "owner": "nixos",
834413 "ref": "nixos-unstable",
835414 "repo": "nixpkgs",
836415 "type": "github"
......@@ -854,11 +433,11 @@
854433 },
855434 "nixpkgs_3": {
856435 "locked": {
857 "lastModified": 1767966113,
858 "narHash": "sha256-mSTsvXa4WveSRJexsmCbm9dY17B1fKp7NLpJxllpQw4=",
436 "lastModified": 1771177547,
437 "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=",
859438 "owner": "NixOS",
860439 "repo": "nixpkgs",
861 "rev": "5f02c91314c8ba4afe83b256b023756412218535",
440 "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2",
862441 "type": "github"
863442 },
864443 "original": {
......@@ -868,22 +447,6 @@
868447 }
869448 },
870449 "nixpkgs_4": {
871 "locked": {
872 "lastModified": 1764242076,
873 "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
874 "owner": "NixOS",
875 "repo": "nixpkgs",
876 "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
877 "type": "github"
878 },
879 "original": {
880 "owner": "NixOS",
881 "ref": "nixos-unstable",
882 "repo": "nixpkgs",
883 "type": "github"
884 }
885 },
886 "nixpkgs_5": {
887450 "locked": {
888451 "lastModified": 1762111121,
889452 "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
......@@ -899,23 +462,23 @@
899462 "type": "github"
900463 }
901464 },
902 "nixpkgs_6": {
465 "nixpkgs_5": {
903466 "locked": {
904 "lastModified": 1708161998,
905 "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
467 "lastModified": 1771043024,
468 "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
906469 "owner": "NixOS",
907470 "repo": "nixpkgs",
908 "rev": "84d981bae8b5e783b3b548de505b22880559515f",
471 "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
909472 "type": "github"
910473 },
911474 "original": {
912475 "owner": "NixOS",
913 "ref": "nixos-23.11",
476 "ref": "nixos-25.11",
914477 "repo": "nixpkgs",
915478 "type": "github"
916479 }
917480 },
918 "nixpkgs_7": {
481 "nixpkgs_6": {
919482 "locked": {
920483 "lastModified": 1717696253,
921484 "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
......@@ -933,26 +496,25 @@
933496 },
934497 "nvf": {
935498 "inputs": {
936 "flake-compat": "flake-compat_2",
499 "flake-compat": "flake-compat",
937500 "flake-parts": "flake-parts",
938501 "mnw": "mnw",
939502 "ndg": "ndg",
940503 "nixpkgs": [
941504 "nixpkgs"
942505 ],
943 "systems": "systems_4"
506 "systems": "systems_3"
944507 },
945508 "locked": {
946 "lastModified": 1765537745,
947 "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=",
509 "lastModified": 1771331465,
510 "narHash": "sha256-lTWc6reKRLQfhh4uRsBWGbdwcHt5fQpOxt6jueHZ20c=",
948511 "owner": "notashelf",
949512 "repo": "nvf",
950 "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0",
513 "rev": "0c650e0801aebbfc2817c11140c90768c178b13b",
951514 "type": "github"
952515 },
953516 "original": {
954517 "owner": "notashelf",
955 "ref": "v0.8",
956518 "repo": "nvf",
957519 "type": "github"
958520 }
......@@ -969,43 +531,18 @@
969531 "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
970532 }
971533 },
972 "pre-commit-hooks": {
973 "inputs": {
974 "flake-compat": "flake-compat",
975 "gitignore": "gitignore",
976 "nixpkgs": [
977 "hyprland",
978 "nixpkgs"
979 ]
980 },
981 "locked": {
982 "lastModified": 1767281941,
983 "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
984 "owner": "cachix",
985 "repo": "git-hooks.nix",
986 "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
987 "type": "github"
988 },
989 "original": {
990 "owner": "cachix",
991 "repo": "git-hooks.nix",
992 "type": "github"
993 }
994 },
995534 "root": {
996535 "inputs": {
997536 "android-nixpkgs": "android-nixpkgs",
998537 "apple-fonts": "apple-fonts",
999538 "darwin": "darwin",
1000539 "home-manager": "home-manager",
1001 "hyprland": "hyprland",
1002540 "moonlight": "moonlight",
1003541 "nix-index-database": "nix-index-database",
1004542 "nix-options-search": "nix-options-search",
1005543 "nixpkgs": "nixpkgs_3",
1006544 "nvf": "nvf",
1007545 "rust-overlay": "rust-overlay",
1008 "split-monitor-workspaces": "split-monitor-workspaces",
1009546 "vicinae": "vicinae",
1010547 "zen-browser": "zen-browser",
1011548 "zig": "zig",
......@@ -1019,11 +556,11 @@
1019556 ]
1020557 },
1021558 "locked": {
1022 "lastModified": 1768012928,
1023 "narHash": "sha256-HFFVQaux1JoOjEvgBT0ASk1Je+jsipyO5c91FoLMed8=",
559 "lastModified": 1771384185,
560 "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=",
1024561 "owner": "oxalica",
1025562 "repo": "rust-overlay",
1026 "rev": "312b4371e72f644ffcff25b23615195e3b390643",
563 "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2",
1027564 "type": "github"
1028565 },
1029566 "original": {
......@@ -1059,7 +596,7 @@
1059596 "sf-compact": {
1060597 "flake": false,
1061598 "locked": {
1062 "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=",
599 "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=",
1063600 "type": "file",
1064601 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
1065602 },
......@@ -1107,7 +644,7 @@
1107644 "sf-pro": {
1108645 "flake": false,
1109646 "locked": {
1110 "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=",
647 "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=",
1111648 "type": "file",
1112649 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
1113650 },
......@@ -1116,27 +653,6 @@
1116653 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
1117654 }
1118655 },
1119 "split-monitor-workspaces": {
1120 "inputs": {
1121 "hyprland": [
1122 "hyprland"
1123 ],
1124 "nix-filter": "nix-filter"
1125 },
1126 "locked": {
1127 "lastModified": 1767711026,
1128 "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=",
1129 "owner": "Duckonaut",
1130 "repo": "split-monitor-workspaces",
1131 "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec",
1132 "type": "github"
1133 },
1134 "original": {
1135 "owner": "Duckonaut",
1136 "repo": "split-monitor-workspaces",
1137 "type": "github"
1138 }
1139 },
1140656 "systems": {
1141657 "locked": {
1142658 "lastModified": 1681028828,
......@@ -1153,21 +669,6 @@
1153669 }
1154670 },
1155671 "systems_2": {
1156 "locked": {
1157 "lastModified": 1689347949,
1158 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
1159 "owner": "nix-systems",
1160 "repo": "default-linux",
1161 "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
1162 "type": "github"
1163 },
1164 "original": {
1165 "owner": "nix-systems",
1166 "repo": "default-linux",
1167 "type": "github"
1168 }
1169 },
1170 "systems_3": {
1171672 "locked": {
1172673 "lastModified": 1681028828,
1173674 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1182,7 +683,7 @@
1182683 "type": "github"
1183684 }
1184685 },
1185 "systems_4": {
686 "systems_3": {
1186687 "locked": {
1187688 "lastModified": 1681028828,
1188689 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1197,7 +698,7 @@
1197698 "type": "github"
1198699 }
1199700 },
1200 "systems_5": {
701 "systems_4": {
1201702 "locked": {
1202703 "lastModified": 1681028828,
1203704 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1212,7 +713,8 @@
1212713 "type": "github"
1213714 }
1214715 },
1215 "systems_6": {
716 "systems_5": {
717 "flake": false,
1216718 "locked": {
1217719 "lastModified": 1681028828,
1218720 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1227,7 +729,7 @@
1227729 "type": "github"
1228730 }
1229731 },
1230 "systems_7": {
732 "systems_6": {
1231733 "locked": {
1232734 "lastModified": 1681028828,
1233735 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1242,7 +744,7 @@
1242744 "type": "github"
1243745 }
1244746 },
1245 "systems_8": {
747 "systems_7": {
1246748 "locked": {
1247749 "lastModified": 1681028828,
1248750 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1259,15 +761,15 @@
1259761 },
1260762 "vicinae": {
1261763 "inputs": {
1262 "nixpkgs": "nixpkgs_5",
1263 "systems": "systems_5"
764 "nixpkgs": "nixpkgs_4",
765 "systems": "systems_4"
1264766 },
1265767 "locked": {
1266 "lastModified": 1767958732,
1267 "narHash": "sha256-Jy7Px8fWfZgRRWcv5d8XTddPDaHRJ1o4mG3yTlEkXTo=",
768 "lastModified": 1771257846,
769 "narHash": "sha256-2tz4RVC1IwSpQL/t0raRZ+ydHQje0QzN65rcJo+JjyQ=",
1268770 "owner": "vicinaehq",
1269771 "repo": "vicinae",
1270 "rev": "c80929ea3f44d540a5063ad1262799aa32a7929c",
772 "rev": "e9d804bfddad02ff80347401ae0d42ca8202519f",
1271773 "type": "github"
1272774 },
1273775 "original": {
......@@ -1276,47 +778,6 @@
1276778 "type": "github"
1277779 }
1278780 },
1279 "xdph": {
1280 "inputs": {
1281 "hyprland-protocols": [
1282 "hyprland",
1283 "hyprland-protocols"
1284 ],
1285 "hyprlang": [
1286 "hyprland",
1287 "hyprlang"
1288 ],
1289 "hyprutils": [
1290 "hyprland",
1291 "hyprutils"
1292 ],
1293 "hyprwayland-scanner": [
1294 "hyprland",
1295 "hyprwayland-scanner"
1296 ],
1297 "nixpkgs": [
1298 "hyprland",
1299 "nixpkgs"
1300 ],
1301 "systems": [
1302 "hyprland",
1303 "systems"
1304 ]
1305 },
1306 "locked": {
1307 "lastModified": 1761431178,
1308 "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
1309 "owner": "hyprwm",
1310 "repo": "xdg-desktop-portal-hyprland",
1311 "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
1312 "type": "github"
1313 },
1314 "original": {
1315 "owner": "hyprwm",
1316 "repo": "xdg-desktop-portal-hyprland",
1317 "type": "github"
1318 }
1319 },
1320781 "zen-browser": {
1321782 "inputs": {
1322783 "nixpkgs": [
......@@ -1324,11 +785,11 @@
1324785 ]
1325786 },
1326787 "locked": {
1327 "lastModified": 1767618227,
1328 "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=",
788 "lastModified": 1771303137,
789 "narHash": "sha256-CQ0j9kovzdO6pAjesebt6uxkcFsjbhENVrengRvKpUc=",
1329790 "owner": "youwen5",
1330791 "repo": "zen-browser-flake",
1331 "rev": "1586e49b3908b058e221f11d843eb46392dba17b",
792 "rev": "271488f067d8452dd0494b650e2e263ac4104e06",
1332793 "type": "github"
1333794 },
1334795 "original": {
......@@ -1339,16 +800,16 @@
1339800 },
1340801 "zig": {
1341802 "inputs": {
1342 "flake-compat": "flake-compat_3",
1343 "flake-utils": "flake-utils_3",
1344 "nixpkgs": "nixpkgs_6"
803 "flake-compat": "flake-compat_2",
804 "nixpkgs": "nixpkgs_5",
805 "systems": "systems_5"
1345806 },
1346807 "locked": {
1347 "lastModified": 1767919086,
1348 "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=",
808 "lastModified": 1771352843,
809 "narHash": "sha256-AZ3TT5BWcdl/0eNCmUmJm8153YkBBpiSfuTyvxzCyjY=",
1349810 "owner": "mitchellh",
1350811 "repo": "zig-overlay",
1351 "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b",
812 "rev": "46010092e447ffc31d7e35d55b4fb466000f3f17",
1352813 "type": "github"
1353814 },
1354815 "original": {
......@@ -1359,8 +820,8 @@
1359820 },
1360821 "zig-overlay": {
1361822 "inputs": {
1362 "flake-compat": "flake-compat_4",
1363 "flake-utils": "flake-utils_5",
823 "flake-compat": "flake-compat_3",
824 "flake-utils": "flake-utils_4",
1364825 "nixpkgs": [
1365826 "zls",
1366827 "nixpkgs"
......@@ -1382,10 +843,10 @@
1382843 },
1383844 "zls": {
1384845 "inputs": {
1385 "flake-utils": "flake-utils_4",
1386 "gitignore": "gitignore_3",
846 "flake-utils": "flake-utils_3",
847 "gitignore": "gitignore_2",
1387848 "langref": "langref",
1388 "nixpkgs": "nixpkgs_7",
849 "nixpkgs": "nixpkgs_6",
1389850 "zig-overlay": "zig-overlay"
1390851 },
1391852 "locked": {
flake.nix+37-23
......@@ -9,10 +9,9 @@
99 rust-overlay.url = "github:oxalica/rust-overlay";
1010 rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
1111
12 apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
13 apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
12 apple-fonts.url = "github:nmarks413/apple-fonts.nix";
1413
15 nvf.url = "github:notashelf/nvf/v0.8";
14 nvf.url = "github:notashelf/nvf";
1615 nvf.inputs.nixpkgs.follows = "nixpkgs";
1716
1817 darwin.url = "github:lnl7/nix-darwin/master";
......@@ -24,14 +23,6 @@
2423 moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
2524 moonlight.inputs.nixpkgs.follows = "nixpkgs";
2625
27 hyprland.url = "github:hyprwm/Hyprland";
28 split-monitor-workspaces = {
29 url = "github:Duckonaut/split-monitor-workspaces";
30 inputs.hyprland.follows = "hyprland";
31 };
32
33 vicinae.url = "github:vicinaehq/vicinae";
34
3526 zen-browser = {
3627 url = "github:youwen5/zen-browser-flake";
3728 inputs.nixpkgs.follows = "nixpkgs";
......@@ -43,6 +34,8 @@
4334
4435 };
4536
37 vicinae.url = "github:vicinaehq/vicinae";
38
4639 nix-options-search.url = "github:madsbv/nix-options-search";
4740
4841 nix-index-database.url = "github:nix-community/nix-index-database";
......@@ -74,6 +67,27 @@
7467 };
7568 });
7669 })
70 # https://github.com/NixOS/nixpkgs/issues/476669#issuecomment-3707850520
71 (_: prev: {
72 vesktop = prev.vesktop.overrideAttrs (_: {
73 preBuild = ''
74 cp -r ${prev.electron.dist} electron-dist
75 chmod -R u+w electron-dist
76 '';
77 buildPhase = ''
78 runHook preBuild
79
80 pnpm build
81 pnpm exec electron-builder \
82 --dir \
83 -c.asarUnpack="**/*.node" \
84 -c.electronDist="electron-dist" \
85 -c.electronVersion=${prev.electron.version}
86
87 runHook postBuild
88 '';
89 });
90 })
7791
7892 # custom packages
7993 (_: pkgs: {
......@@ -158,17 +172,17 @@
158172 };
159173
160174 # generate checks for "nix flake check --all-systems --no-build"
161 checks.aarch64-darwin = builtins.listToAttrs (
162 builtins.map (
163 name:
164 let
165 d = darwinConfigurations.${name}.system;
166 in
167 {
168 name = "darwinConfiguration-" + d.name;
169 value = d;
170 }
171 ) (builtins.attrNames darwinConfigurations)
172 );
175 # checks.aarch64-darwin = builtins.listToAttrs (
176 # builtins.map (
177 # name:
178 # let
179 # d = darwinConfigurations.${name}.system;
180 # in
181 # {
182 # name = "darwinConfiguration-" + d.name;
183 # value = d;
184 # }
185 # ) (builtins.attrNames darwinConfigurations)
186 # );
173187 };
174188}
lib/mkNeovim.nix+1-1
......@@ -1,7 +1,7 @@
11{ self, inputs }:
22user: pkgs:
33let
4 darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.system;
4 darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
55
66 host = {
77 inherit darwin;
modules/neovim/default.nix+1-9
......@@ -84,14 +84,6 @@
8484 treesitter = {
8585 enable = false;
8686 addDefaultGrammars = true;
87 # this is buggy and keybind.nix overwrites its keymaps anyways
88 incrementalSelection.enable = false;
89 mappings.incrementalSelection = {
90 decrementByNode = null;
91 incrementByNode = null;
92 incrementByScope = null;
93 init = null;
94 };
9587 };
9688 debugger.nvim-dap = {
9789 enable = true;
......@@ -111,13 +103,13 @@
111103 html.enable = true;
112104 nix.enable = true;
113105 python.enable = true;
106 rust.extensions.crates-nvim.enable = true;
114107 rust.enable = true;
115108 ts.enable = true;
116109 zig.enable = true;
117110 # sort-lines: off
118111
119112 nix.lsp.servers = [ "nixd" ];
120 rust.extensions.crates-nvim.enable = true;
121113 };
122114 filetree.neo-tree = {
123115 enable = true;
modules/nixos/boot.nix+1-1
......@@ -1,7 +1,7 @@
11{ pkgs, ... }:
22{
33 boot = {
4 kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.
4 kernelPackages = pkgs.linuxPackages_6_18; # _zen, _hardened, _rt, _rt_latest, etc.
55 loader = {
66 efi = {
77 canTouchEfiVariables = true;
modules/nixos/ld.nix+24-24
......@@ -9,25 +9,25 @@
99 libxcrypt
1010
1111 # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L72-L79
12 xorg.libXcomposite
13 xorg.libXtst
14 xorg.libXrandr
15 xorg.libXext
16 xorg.libX11
17 xorg.libXfixes
12 libXcomposite
13 libXtst
14 libXrandr
15 libXext
16 libX11
17 libXfixes
1818 libGL
1919 libva
2020
2121 # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L124-L136
2222 fontconfig
2323 freetype
24 xorg.libXt
25 xorg.libXmu
24 libXt
25 libXmu
2626 libogg
2727 libvorbis
2828 SDL
2929 SDL2_image
30 glew110
30 glew_1_10
3131 libdrm
3232 libidn
3333 tbb
......@@ -68,20 +68,20 @@
6868 stdenv.cc.cc
6969 systemd
7070 vulkan-loader
71 xorg.libX11
72 xorg.libXScrnSaver
73 xorg.libXcomposite
74 xorg.libXcursor
75 xorg.libXdamage
76 xorg.libXext
77 xorg.libXfixes
78 xorg.libXi
79 xorg.libXrandr
80 xorg.libXrender
81 xorg.libXtst
82 xorg.libxcb
83 xorg.libxkbfile
84 xorg.libxshmfence
71 libX11
72 libXScrnSaver
73 libXcomposite
74 libXcursor
75 libXdamage
76 libXext
77 libXfixes
78 libXi
79 libXrandr
80 libXrender
81 libXtst
82 libxcb
83 libxkbfile
84 libxshmfence
8585 zlib
8686 libxslt
8787
......@@ -90,6 +90,6 @@
9090 gtk2
9191 gtk2-x11
9292 libsecret
93 xorg.libXinerama
93 libXinerama
9494 ];
9595}
modules/nixos/nvidia.nix+4-4
......@@ -4,7 +4,7 @@
44 ...
55}:
66let
7 nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest;
7 nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.stable;
88in
99{
1010 services.xserver.videoDrivers = [
......@@ -76,7 +76,7 @@ in
7676 # #Fixes a glitch
7777 # nvidiaPersistenced = true;
7878 };
79 nvidia-container-toolkit.enable = true;
79 nvidia-container-toolkit.enable = false;
8080
8181 graphics = {
8282 enable = true;
......@@ -84,7 +84,7 @@ in
8484 enable32Bit = true;
8585 extraPackages = with pkgs; [
8686 nvidia-vaapi-driver
87 vaapiVdpau
87 libva-vdpau-driver
8888 libvdpau-va-gl
8989 mesa
9090 egl-wayland
......@@ -104,7 +104,7 @@ in
104104
105105 environment.systemPackages = with pkgs; [
106106 vulkan-tools
107 glxinfo
107 mesa-demos
108108 libva-utils # VA-API debugging tools
109109 ];
110110}
modules/nixos/services.nix+14
......@@ -76,5 +76,19 @@
7676 X11Forwarding = true;
7777 };
7878 };
79 earlyoom = {
80 enable = true;
81 freeSwapThreshold = 2;
82 freeMemThreshold = 2;
83
84 extraArgs = [
85 "-g"
86 "--avoid"
87 "^(Xwayland|.cosmic*|ghostty|.vicinae*|.xdg*)$"
88 "--prefer"
89 "^(electron)$"
90 ];
91
92 };
7993 };
8094}
modules/shared/nix.nix+1-4
......@@ -28,15 +28,12 @@
2828 "https://nix-community.cachix.org"
2929 # For haskell
3030 "https://cache.iog.io"
31 #vicinae
32 "https://vicinae.cachix.org"
31
3332 ];
3433 trusted-public-keys = [
3534 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
3635 # For haskell
3736 "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
38 #vicinae
39 "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
4037 ];
4138 };
4239 gc = {
packages/autofmt/autofmt.js+1-1
......@@ -101,7 +101,7 @@ const formatters = {
101101 `--stdin-file-path=${file}`,
102102 ],
103103 },
104 "nixfmt-rfc-style": {
104 "nixfmt": {
105105 languages: ["nix"],
106106 files: {
107107 "flake.nix": ({ text }) => text.includes("nixfmt"),
packages/awakened_poe_trade/default.nix+2-2
......@@ -17,12 +17,12 @@ pkgs.appimageTools.wrapType2 rec {
1717 inherit pname version src;
1818
1919 extraInstallCommands = ''
20 install -m 444 -D ${appimageContents}/awakened-poe-trade.desktop $out/share/applications/${pname}.desktop
20 install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
2121
2222 install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
2323
2424 substituteInPlace $out/share/applications/${pname}.desktop \
25 --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
25 --replace 'Exec=AppRun' 'Exec=${pname}'
2626 '';
2727
2828 meta = with lib; {
users/fish/cattop/hardware-configuration.nix+31-17
......@@ -1,32 +1,46 @@
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, ... }:
4{
5 config,
6 lib,
7 pkgs,
8 modulesPath,
9 ...
10}:
511
612{
7 imports =
8 [ (modulesPath + "/installer/scan/not-detected.nix")
9 ];
13 imports = [
14 (modulesPath + "/installer/scan/not-detected.nix")
15 ];
1016
11 boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ];
17 boot.initrd.availableKernelModules = [
18 "xhci_pci"
19 "thunderbolt"
20 "vmd"
21 "nvme"
22 ];
1223 boot.initrd.kernelModules = [ ];
1324 boot.kernelModules = [ "kvm-intel" ];
1425 boot.extraModulePackages = [ ];
1526
16 fileSystems."/" =
17 { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6";
18 fsType = "ext4";
19 };
27 fileSystems."/" = {
28 device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6";
29 fsType = "ext4";
30 };
2031
21 fileSystems."/boot/EFI" =
22 { device = "/dev/disk/by-uuid/473A-B8FD";
23 fsType = "vfat";
24 options = [ "fmask=0077" "dmask=0077" ];
25 };
26
27 swapDevices =
28 [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; }
32 fileSystems."/boot/EFI" = {
33 device = "/dev/disk/by-uuid/473A-B8FD";
34 fsType = "vfat";
35 options = [
36 "fmask=0077"
37 "dmask=0077"
2938 ];
39 };
40
41 swapDevices = [
42 { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; }
43 ];
3044
3145 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
3246 # (the default) this is the recommended approach. When using systemd-networkd it's
users/fish/vim/languages.nix+1-4
......@@ -14,7 +14,7 @@
1414 lua.lsp.enable = true;
1515 lua.lsp.lazydev.enable = true;
1616 python = {
17 format.type = "ruff";
17 format.type = [ "ruff" ];
1818 };
1919 markdown = {
2020 enable = true;
......@@ -69,9 +69,6 @@
6969 enable = true;
7070 fold = true;
7171 addDefaultGrammars = true;
72 highlight = {
73 additionalVimRegexHighlighting = true;
74 };
7572
7673 grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
7774 markdown_inline
users/natalie/configuration.nix+1-1
......@@ -13,7 +13,7 @@
1313 iosevka
1414 nerd-fonts.symbols-only
1515 nerd-fonts.iosevka
16 inputs.apple-fonts.packages.${pkgs.system}.sf-pro
16 inputs.apple-fonts.packages.${pkgs.stdenv.hostPlatform.system}.sf-pro
1717 sketchybar-app-font
1818 ];
1919
users/natalie/desktop/configuration.nix+29-12
......@@ -12,17 +12,25 @@
1212 documentation.man.generateCaches = false;
1313 services.displayManager = {
1414 enable = true;
15 sddm = {
15 cosmic-greeter.enable = true;
16 autoLogin = {
1617 enable = true;
17 wayland.enable = true;
18 user = user.username;
1819 };
1920 };
2021
22 services.desktopManager = {
23 cosmic.enable = true;
24 };
25
26 # Slightly improves cosmic performances
27 services.system76-scheduler.enable = true;
28
2129 programs = {
22 hyprland = {
23 enable = true;
24 withUWSM = true;
25 };
30 # hyprland = {
31 # enable = true;
32 # withUWSM = true;
33 # };
2634 gamemode.enable = true;
2735
2836 _1password.enable = true;
......@@ -86,14 +94,23 @@
8694 enable = true;
8795 xdgOpenUsePortal = true;
8896 config = {
89 common.default = [ "gtk" ];
90 hyprland.default = [
91 "gtk"
92 "hyprland"
93 ];
97 common = {
98 default = [
99 "cosmic"
100 "gtk"
101 ];
102
103 "org.freedesktop.impl.portal.Secret" = [
104 "gnome-keyring"
105 ];
106 };
107
94108 };
95109
96 extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
110 extraPortals = with pkgs; [
111 xdg-desktop-portal-gtk
112 xdg-desktop-portal-cosmic
113 ];
97114 };
98115 virtualisation = {
99116 waydroid.enable = true;
users/natalie/desktop/home.nix+3-5
......@@ -25,13 +25,12 @@
2525 dxvk_2
2626 steam-run
2727 vulkan-tools
28 path-of-building
29 wineWowPackages.stable
28 rusty-path-of-building
29 wineWow64Packages.stable
3030 winetricks
3131 (prismlauncher.override { gamemodeSupport = true; })
3232 umu-launcher
3333 limo
34 nexusmods-app-unfree
3534 protontricks
3635 (pkgs.callPackage ../../../packages/exiled_exchange_2 { })
3736 awakened_poe_trade
......@@ -39,7 +38,7 @@
3938
4039 #window manager stuff
4140 wofi
42 xorg.xauth
41 xauth
4342 #linux tools
4443 legcord
4544 pavucontrol
......@@ -55,7 +54,6 @@
5554 mpv
5655 wireguard-tools
5756 signal-desktop
58 inputs.zls.packages.x86_64-linux.zls
5957 rust-bin.stable.latest.default
6058 inputs.zen-browser.packages.x86_64-linux.default
6159 ];
users/natalie/home/default.nix+4-4
......@@ -2,11 +2,11 @@
22{
33 imports = [
44 ./tmux.nix
5 ./hyprland
5 # ./hyprland
66 ./vicinae.nix
7 ./swaync.nix
8 ./gtk.nix
9 ./waybar
7 # ./swaync.nix
8 # ./gtk.nix
9 # ./waybar
1010 ./scripts
1111 ];
1212}
users/natalie/home/hyprland/exec-once.nix+1-1
......@@ -17,7 +17,7 @@
1717 "${pkgs.wl-clipboard}/bin/wl-paste --watch cliphist store &"
1818 # "${pkgs.waybar}/bin/waybar &"
1919 "${pkgs.swaynotificationcenter}/bin/swaync &"
20 "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &"
20 "${pkgs.vicinae}/bin/vicinae server &"
2121 "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &"
2222 "${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Ice 24 &"
2323 "${pkgs.tmux}/bin/tmux setenv -g HYPRLAND_INSTANCE_SIGNATURE '$HYPRLAND_INSTANCE_SIGNATURE'"
users/natalie/home/hyprland/hyprland.nix+10-3
......@@ -1,4 +1,9 @@
1{ config, pkgs, ... }:
1{
2 inputs,
3 config,
4 pkgs,
5 ...
6}:
27{
38 home.packages = with pkgs; [
49 swww
......@@ -23,8 +28,10 @@
2328 # ];
2429 wayland.windowManager.hyprland = {
2530 enable = true;
26 package = null;
27 portalPackage = null;
31 package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
32 # make sure to also set the portal package, so that they are in sync
33 portalPackage =
34 inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
2835
2936 xwayland = {
3037 enable = true;
users/natalie/home/hyprland/plugins.nix-1
......@@ -8,7 +8,6 @@
88 plugin = {
99 split-monitor-workspaces = {
1010 count = 5;
11 keep_focused = 0;
1211 };
1312 };
1413 };
users/natalie/home/hyprland/settings.nix+3-3
......@@ -1,6 +1,7 @@
11{ ... }:
22{
33 wayland.windowManager.hyprland.settings = {
4 "$mainMod" = "SUPER";
45 # see: https://wiki.hypr.land/Configuring/Variables/#input
56 input = {
67 kb_layout = "us";
......@@ -9,9 +10,8 @@
910 };
1011 # https://wiki.hypr.land/Configuring/Variables/#general
1112 general = {
12 "$mainMod" = "SUPER";
1313 layout = "dwindle";
14 no_border_on_floating = false;
14 #no_border_on_floating = false;
1515
1616 };
1717 # https://wiki.hypr.land/Configuring/Variables/#misc
......@@ -23,7 +23,7 @@
2323 enable_swallow = true;
2424 swallow_regex = "^(ghostty)$";
2525 focus_on_activate = true;
26 new_window_takes_over_fullscreen = 2;
26 on_focus_under_fullscreen = 2;
2727 middle_click_paste = false;
2828 };
2929
users/natalie/home/hyprland/windowrules.nix+24-23
......@@ -3,29 +3,30 @@
33 wayland.windowManager.hyprland.settings = {
44 # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules
55 windowrule = [
6 "float,class:^(mpv)$"
7 "pin,class:^(rofi)$"
8 "pin,class:^(waypaper)$"
9 "float,title:^(Volume Control)$"
6 # "float,class:^(mpv)$"
7 # "pin,class:^(rofi)$"
8 # "pin,class:^(waypaper)$"
9 "match:class ^(Volume Control)$, float on"
10 # "float,title:^(Volume Control)$"
1011
1112 #awakened-poe-trade
1213 # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569
13 "tag +apt, class:^(awakened-poe-trade)$"
14 "tag +apt, title:(Awakened PoE Trade)"
15 "float, tag:apt"
16 "noblur, tag:apt"
17 "nofocus, tag:apt"
18 "noshadow, tag:apt"
19 "noborder, tag:apt"
20 "pin, tag:apt"
21 "renderunfocused, tag:apt"
22 "size 100% 100%, tag:apt"
23 "center, tag:apt"
24
25 #POE
26 "tag +poe, title:(Path of Exile)"
27 "tag +poe class:(steam_app_238960)"
28 "fullscreen, tag:poe$"
14 # "tag +apt, class:^(awakened-poe-trade)$"
15 # "tag +apt, title:(Awakened PoE Trade)"
16 # "float, tag:apt"
17 # "noblur, tag:apt"
18 # "nofocus, tag:apt"
19 # "noshadow, tag:apt"
20 # "noborder, tag:apt"
21 # "pin, tag:apt"
22 # "renderunfocused, tag:apt"
23 # "size 100% 100%, tag:apt"
24 # "center, tag:apt"
25 #
26 # #POE
27 # "tag +poe, title:(Path of Exile)"
28 # "tag +poe class:(steam_app_238960)"
29 # "fullscreen, tag:poe$"
2930 # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-3037816727
3031 # "tag +fakefullscreen, title:(Path of Exile),class:(steam_app_238960)"
3132 # "tile, tag:fakefullscreen"
......@@ -97,9 +98,9 @@
9798
9899 # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules
99100 layerrule = [
100 "blur, vicinae"
101 "ignorealpha 0, vicinae"
102 "noanim, vicinae"
101 "blur on, match:namespace vicinae"
102 "ignore_alpha 0, match:namespace vicinae"
103 "no_anim on, match:namespace vicinae"
103104 # "dimaround, rofi"
104105 # "dimaround, swaync-control-center"
105106 ];
users/natalie/home/vicinae.nix+9-2
......@@ -2,7 +2,14 @@
22{
33 services.vicinae = {
44 enable = true;
5 autoStart = false;
5 systemd = {
6 enable = true;
7 autoStart = true;
8 environment = {
9 USE_LAYER_SHELL = 0;
10 };
11
12 };
613 settings = {
714 faviconService = "twenty"; # twenty | google | none
815 font.size = 11;
......@@ -18,7 +25,7 @@
1825 };
1926
2027 # extensions = [
21 # (inputs.vicinae.mkVicinaeExtension.${pkgs.system} {
28 # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} {
2229 # inherit pkgs;
2330 # name = "nixpkgs search";
2431 # src = pkgs.fetchFromGithub {
users/natalie/home/waybar/settings.nix+1-1
......@@ -145,7 +145,7 @@ in
145145 "custom/launcher" = {
146146 format = "";
147147 on-click = "random-wallpaper";
148 on-click-right = "${inputs.vicinae.packages.${currentSystem}.default}vicinae vicinae://toggle";
148 on-click-right = "${pkgs.vicinae}/bin/vicinae vicinae://toggle";
149149 tooltip = "true";
150150 tooltip-format = "Random Wallpaper";
151151 };
users/natalie/packages.nix+2
......@@ -34,6 +34,7 @@ with pkgs;
3434 anki-bin
3535 tailscale
3636 openconnect
37 zoom-us
3738
3839 #nix tools
3940 direnv
......@@ -92,6 +93,7 @@ with pkgs;
9293 # nodePackages.npm
9394 go
9495 elan
96 zola
9597
9698 #expo deps
9799 watchman
users/natalie/vim/languages.nix+1-4
......@@ -14,7 +14,7 @@
1414 lua.lsp.enable = true;
1515 lua.lsp.lazydev.enable = true;
1616 python = {
17 format.type = "ruff";
17 format.type = [ "ruff" ];
1818 };
1919 markdown = {
2020 enable = true;
......@@ -69,9 +69,6 @@
6969 enable = true;
7070 fold = true;
7171 addDefaultGrammars = true;
72 highlight = {
73 additionalVimRegexHighlighting = true;
74 };
7572
7673 grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
7774 markdown_inline