authorgravatar for git@paperclover.netclover caruso <git@paperclover.net> 2026-01-24 15:48:42-08:00
committergravatar for git@paperclover.netclover caruso <git@paperclover.net> 2026-01-24 15:48:44-08:00
log9687d552742d9dea6d65e2bb9efee9c31a03ff8f
treec6fa05d059f5622b4ff58d67963cf2941dad0fe0
parent805848d13e1e4a69204c90497033d2edac055443

do a flake upgrade

5 files changed, 130 insertions(+), 205 deletions(-)

flake.lock+111-76
...@@ -9,11 +9,11 @@...@@ -9,11 +9,11 @@
9 ]9 ]
10 },10 },
11 "locked": {11 "locked": {
12 "lastModified": 1764707074,12 "lastModified": 1767990299,
13 "narHash": "sha256-XONQ/zRv36w1Cyx+YBPStg+o8xH5J5Kqg0olLWs0O4M=",13 "narHash": "sha256-Jz+cp9Ln4++1XiKw9KvZEM2dJ9AdOvayk97ybi9g7zc=",
14 "owner": "tadfisher",14 "owner": "tadfisher",
15 "repo": "android-nixpkgs",15 "repo": "android-nixpkgs",
16 "rev": "f9c31127b45e3955a22c0d76b2d15e239b645879",16 "rev": "449f2cadee7cb7b665aea209a67f8ecf30176653",
17 "type": "github"17 "type": "github"
18 },18 },
19 "original": {19 "original": {
...@@ -71,11 +71,11 @@...@@ -71,11 +71,11 @@
71 ]71 ]
72 },72 },
73 "locked": {73 "locked": {
74 "lastModified": 1764714051,74 "lastModified": 1767024902,
75 "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=",75 "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
76 "owner": "hyprwm",76 "owner": "hyprwm",
77 "repo": "aquamarine",77 "repo": "aquamarine",
78 "rev": "a43bedcceced5c21ad36578ed823e6099af78214",78 "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
79 "type": "github"79 "type": "github"
80 },80 },
81 "original": {81 "original": {
...@@ -91,11 +91,11 @@...@@ -91,11 +91,11 @@
91 ]91 ]
92 },92 },
93 "locked": {93 "locked": {
94 "lastModified": 1765065051,94 "lastModified": 1767718503,
95 "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",95 "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=",
96 "owner": "lnl7",96 "owner": "lnl7",
97 "repo": "nix-darwin",97 "repo": "nix-darwin",
98 "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",98 "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1",
99 "type": "github"99 "type": "github"
100 },100 },
101 "original": {101 "original": {
...@@ -129,15 +129,15 @@...@@ -129,15 +129,15 @@
129 "flake-compat": {129 "flake-compat": {
130 "flake": false,130 "flake": false,
131 "locked": {131 "locked": {
132 "lastModified": 1761588595,132 "lastModified": 1767039857,
133 "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",133 "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
134 "owner": "edolstra",134 "owner": "NixOS",
135 "repo": "flake-compat",135 "repo": "flake-compat",
136 "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",136 "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
137 "type": "github"137 "type": "github"
138 },138 },
139 "original": {139 "original": {
140 "owner": "edolstra",140 "owner": "NixOS",
141 "repo": "flake-compat",141 "repo": "flake-compat",
142 "type": "github"142 "type": "github"
143 }143 }
...@@ -367,11 +367,11 @@...@@ -367,11 +367,11 @@
367 ]367 ]
368 },368 },
369 "locked": {369 "locked": {
370 "lastModified": 1764998300,370 "lastModified": 1768018810,
371 "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=",371 "narHash": "sha256-WREj1ZQ2wSGtyPAhQJ3SX/7PJ29PNKv04h/7NgqUS+M=",
372 "owner": "nix-community",372 "owner": "nix-community",
373 "repo": "home-manager",373 "repo": "home-manager",
374 "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",374 "rev": "7c5d9345ad7cc38832cd4007f5cd03daad64d75b",
375 "type": "github"375 "type": "github"
376 },376 },
377 "original": {377 "original": {
...@@ -426,11 +426,11 @@...@@ -426,11 +426,11 @@
426 ]426 ]
427 },427 },
428 "locked": {428 "locked": {
429 "lastModified": 1763733840,429 "lastModified": 1766946335,
430 "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",430 "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
431 "owner": "hyprwm",431 "owner": "hyprwm",
432 "repo": "hyprgraphics",432 "repo": "hyprgraphics",
433 "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",433 "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
434 "type": "github"434 "type": "github"
435 },435 },
436 "original": {436 "original": {
...@@ -456,11 +456,11 @@...@@ -456,11 +456,11 @@
456 "xdph": "xdph"456 "xdph": "xdph"
457 },457 },
458 "locked": {458 "locked": {
459 "lastModified": 1765104552,459 "lastModified": 1768000181,
460 "narHash": "sha256-oaYLaXFEOHrS67UBWUcG8S8lFNTmLo65x8CmT++iLug=",460 "narHash": "sha256-/E66+tcVBnvJcOFL/CjnjBfKew6A2e+28EZrcRHioBw=",
461 "owner": "hyprwm",461 "owner": "hyprwm",
462 "repo": "Hyprland",462 "repo": "Hyprland",
463 "rev": "76ac655c9e624069cf17f470773e37d8172ee290",463 "rev": "81e7498ec27156ee97aabba6fe4993412d98d1ab",
464 "type": "github"464 "type": "github"
465 },465 },
466 "original": {466 "original": {
...@@ -502,11 +502,11 @@...@@ -502,11 +502,11 @@
502 ]502 ]
503 },503 },
504 "locked": {504 "locked": {
505 "lastModified": 1764812575,505 "lastModified": 1767023960,
506 "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=",506 "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
507 "owner": "hyprwm",507 "owner": "hyprwm",
508 "repo": "hyprland-guiutils",508 "repo": "hyprland-guiutils",
509 "rev": "fd321368a40c782cfa299991e5584ca338e36ebe",509 "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
510 "type": "github"510 "type": "github"
511 },511 },
512 "original": {512 "original": {
...@@ -527,11 +527,11 @@...@@ -527,11 +527,11 @@
527 ]527 ]
528 },528 },
529 "locked": {529 "locked": {
530 "lastModified": 1759610243,530 "lastModified": 1765214753,
531 "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",531 "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
532 "owner": "hyprwm",532 "owner": "hyprwm",
533 "repo": "hyprland-protocols",533 "repo": "hyprland-protocols",
534 "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",534 "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
535 "type": "github"535 "type": "github"
536 },536 },
537 "original": {537 "original": {
...@@ -633,11 +633,11 @@...@@ -633,11 +633,11 @@
633 ]633 ]
634 },634 },
635 "locked": {635 "locked": {
636 "lastModified": 1764962281,636 "lastModified": 1766253372,
637 "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",637 "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
638 "owner": "hyprwm",638 "owner": "hyprwm",
639 "repo": "hyprutils",639 "repo": "hyprutils",
640 "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",640 "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
641 "type": "github"641 "type": "github"
642 },642 },
643 "original": {643 "original": {
...@@ -687,11 +687,11 @@...@@ -687,11 +687,11 @@
687 ]687 ]
688 },688 },
689 "locked": {689 "locked": {
690 "lastModified": 1764872015,690 "lastModified": 1767473322,
691 "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=",691 "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
692 "owner": "hyprwm",692 "owner": "hyprwm",
693 "repo": "hyprwire",693 "repo": "hyprwire",
694 "rev": "7997451dcaab7b9d9d442f18985d514ec5891608",694 "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
695 "type": "github"695 "type": "github"
696 },696 },
697 "original": {697 "original": {
...@@ -734,11 +734,11 @@...@@ -734,11 +734,11 @@
734 ]734 ]
735 },735 },
736 "locked": {736 "locked": {
737 "lastModified": 1764208378,737 "lastModified": 1765916709,
738 "narHash": "sha256-Qur5AWl4Vx+It65DX+I+sc4lViz52OmXqvg+fL2t9I4=",738 "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=",
739 "owner": "moonlight-mod",739 "owner": "moonlight-mod",
740 "repo": "moonlight",740 "repo": "moonlight",
741 "rev": "059476af87f7335c05424b805833864d6d9ed0e3",741 "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce",
742 "type": "github"742 "type": "github"
743 },743 },
744 "original": {744 "original": {
...@@ -747,6 +747,24 @@...@@ -747,6 +747,24 @@
747 "type": "github"747 "type": "github"
748 }748 }
749 },749 },
750 "ndg": {
751 "inputs": {
752 "nixpkgs": "nixpkgs_4"
753 },
754 "locked": {
755 "lastModified": 1765435293,
756 "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=",
757 "owner": "feel-co",
758 "repo": "ndg",
759 "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971",
760 "type": "github"
761 },
762 "original": {
763 "owner": "feel-co",
764 "repo": "ndg",
765 "type": "github"
766 }
767 },
750 "nix-filter": {768 "nix-filter": {
751 "locked": {769 "locked": {
752 "lastModified": 1693833173,770 "lastModified": 1693833173,
...@@ -769,11 +787,11 @@...@@ -769,11 +787,11 @@
769 ]787 ]
770 },788 },
771 "locked": {789 "locked": {
772 "lastModified": 1765080594,790 "lastModified": 1765267181,
773 "narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=",791 "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
774 "owner": "nix-community",792 "owner": "nix-community",
775 "repo": "nix-index-database",793 "repo": "nix-index-database",
776 "rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754",794 "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
777 "type": "github"795 "type": "github"
778 },796 },
779 "original": {797 "original": {
...@@ -789,11 +807,11 @@...@@ -789,11 +807,11 @@
789 "nixpkgs": "nixpkgs_2"807 "nixpkgs": "nixpkgs_2"
790 },808 },
791 "locked": {809 "locked": {
792 "lastModified": 1764771319,810 "lastModified": 1765642879,
793 "narHash": "sha256-SllXl+Void1CIMk2jkKJXp7PL/31JeWir/Q8GAsuvEM=",811 "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=",
794 "owner": "madsbv",812 "owner": "madsbv",
795 "repo": "nix-options-search",813 "repo": "nix-options-search",
796 "rev": "cccbb97d813c462bd85012740bc1c02c9c267808",814 "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e",
797 "type": "github"815 "type": "github"
798 },816 },
799 "original": {817 "original": {
...@@ -804,11 +822,11 @@...@@ -804,11 +822,11 @@
804 },822 },
805 "nixpkgs": {823 "nixpkgs": {
806 "locked": {824 "locked": {
807 "lastModified": 1764950072,825 "lastModified": 1767379071,
808 "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",826 "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
809 "owner": "NixOS",827 "owner": "NixOS",
810 "repo": "nixpkgs",828 "repo": "nixpkgs",
811 "rev": "f61125a668a320878494449750330ca58b78c557",829 "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
812 "type": "github"830 "type": "github"
813 },831 },
814 "original": {832 "original": {
...@@ -836,11 +854,11 @@...@@ -836,11 +854,11 @@
836 },854 },
837 "nixpkgs_3": {855 "nixpkgs_3": {
838 "locked": {856 "locked": {
839 "lastModified": 1764947035,857 "lastModified": 1767966113,
840 "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=",858 "narHash": "sha256-mSTsvXa4WveSRJexsmCbm9dY17B1fKp7NLpJxllpQw4=",
841 "owner": "NixOS",859 "owner": "NixOS",
842 "repo": "nixpkgs",860 "repo": "nixpkgs",
843 "rev": "a672be65651c80d3f592a89b3945466584a22069",861 "rev": "5f02c91314c8ba4afe83b256b023756412218535",
844 "type": "github"862 "type": "github"
845 },863 },
846 "original": {864 "original": {
...@@ -850,6 +868,22 @@...@@ -850,6 +868,22 @@
850 }868 }
851 },869 },
852 "nixpkgs_4": {870 "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": {
853 "locked": {887 "locked": {
854 "lastModified": 1762111121,888 "lastModified": 1762111121,
855 "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",889 "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
...@@ -865,7 +899,7 @@...@@ -865,7 +899,7 @@
865 "type": "github"899 "type": "github"
866 }900 }
867 },901 },
868 "nixpkgs_5": {902 "nixpkgs_6": {
869 "locked": {903 "locked": {
870 "lastModified": 1708161998,904 "lastModified": 1708161998,
871 "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",905 "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
...@@ -881,7 +915,7 @@...@@ -881,7 +915,7 @@
881 "type": "github"915 "type": "github"
882 }916 }
883 },917 },
884 "nixpkgs_6": {918 "nixpkgs_7": {
885 "locked": {919 "locked": {
886 "lastModified": 1717696253,920 "lastModified": 1717696253,
887 "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",921 "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
...@@ -902,17 +936,18 @@...@@ -902,17 +936,18 @@
902 "flake-compat": "flake-compat_2",936 "flake-compat": "flake-compat_2",
903 "flake-parts": "flake-parts",937 "flake-parts": "flake-parts",
904 "mnw": "mnw",938 "mnw": "mnw",
939 "ndg": "ndg",
905 "nixpkgs": [940 "nixpkgs": [
906 "nixpkgs"941 "nixpkgs"
907 ],942 ],
908 "systems": "systems_4"943 "systems": "systems_4"
909 },944 },
910 "locked": {945 "locked": {
911 "lastModified": 1764871278,946 "lastModified": 1765537745,
912 "narHash": "sha256-ezKJwZeAtZSO9EA3aLl5bmjjAVUoLE69IC+yX/KSqDM=",947 "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=",
913 "owner": "notashelf",948 "owner": "notashelf",
914 "repo": "nvf",949 "repo": "nvf",
915 "rev": "43b48909a3d0c96f5c3d9a9e50d6faabbeccc9dd",950 "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0",
916 "type": "github"951 "type": "github"
917 },952 },
918 "original": {953 "original": {
...@@ -944,11 +979,11 @@...@@ -944,11 +979,11 @@
944 ]979 ]
945 },980 },
946 "locked": {981 "locked": {
947 "lastModified": 1765016596,982 "lastModified": 1767281941,
948 "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",983 "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
949 "owner": "cachix",984 "owner": "cachix",
950 "repo": "git-hooks.nix",985 "repo": "git-hooks.nix",
951 "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",986 "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
952 "type": "github"987 "type": "github"
953 },988 },
954 "original": {989 "original": {
...@@ -984,11 +1019,11 @@...@@ -984,11 +1019,11 @@
984 ]1019 ]
985 },1020 },
986 "locked": {1021 "locked": {
987 "lastModified": 1765075567,1022 "lastModified": 1768012928,
988 "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=",1023 "narHash": "sha256-HFFVQaux1JoOjEvgBT0ASk1Je+jsipyO5c91FoLMed8=",
989 "owner": "oxalica",1024 "owner": "oxalica",
990 "repo": "rust-overlay",1025 "repo": "rust-overlay",
991 "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f",1026 "rev": "312b4371e72f644ffcff25b23615195e3b390643",
992 "type": "github"1027 "type": "github"
993 },1028 },
994 "original": {1029 "original": {
...@@ -1089,11 +1124,11 @@...@@ -1089,11 +1124,11 @@
1089 "nix-filter": "nix-filter"1124 "nix-filter": "nix-filter"
1090 },1125 },
1091 "locked": {1126 "locked": {
1092 "lastModified": 1764873455,1127 "lastModified": 1767711026,
1093 "narHash": "sha256-ehm3Y0xCUkJnbDwM0wwu9DBj7f3lLTwFW9GBxH93w2s=",1128 "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=",
1094 "owner": "Duckonaut",1129 "owner": "Duckonaut",
1095 "repo": "split-monitor-workspaces",1130 "repo": "split-monitor-workspaces",
1096 "rev": "34d1ce459b4f13e77d8f2a0851475497abee2c98",1131 "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec",
1097 "type": "github"1132 "type": "github"
1098 },1133 },
1099 "original": {1134 "original": {
...@@ -1224,15 +1259,15 @@...@@ -1224,15 +1259,15 @@
1224 },1259 },
1225 "vicinae": {1260 "vicinae": {
1226 "inputs": {1261 "inputs": {
1227 "nixpkgs": "nixpkgs_4",1262 "nixpkgs": "nixpkgs_5",
1228 "systems": "systems_5"1263 "systems": "systems_5"
1229 },1264 },
1230 "locked": {1265 "locked": {
1231 "lastModified": 1764939234,1266 "lastModified": 1767958732,
1232 "narHash": "sha256-o/0emFrTtNzfxQis6U1onAJMR63APCigiZNmqLxVM1E=",1267 "narHash": "sha256-Jy7Px8fWfZgRRWcv5d8XTddPDaHRJ1o4mG3yTlEkXTo=",
1233 "owner": "vicinaehq",1268 "owner": "vicinaehq",
1234 "repo": "vicinae",1269 "repo": "vicinae",
1235 "rev": "d50101fc04c76a9acc3785da5459f6884fc6984b",1270 "rev": "c80929ea3f44d540a5063ad1262799aa32a7929c",
1236 "type": "github"1271 "type": "github"
1237 },1272 },
1238 "original": {1273 "original": {
...@@ -1289,11 +1324,11 @@...@@ -1289,11 +1324,11 @@
1289 ]1324 ]
1290 },1325 },
1291 "locked": {1326 "locked": {
1292 "lastModified": 1764648680,1327 "lastModified": 1767618227,
1293 "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",1328 "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=",
1294 "owner": "youwen5",1329 "owner": "youwen5",
1295 "repo": "zen-browser-flake",1330 "repo": "zen-browser-flake",
1296 "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",1331 "rev": "1586e49b3908b058e221f11d843eb46392dba17b",
1297 "type": "github"1332 "type": "github"
1298 },1333 },
1299 "original": {1334 "original": {
...@@ -1306,14 +1341,14 @@...@@ -1306,14 +1341,14 @@
1306 "inputs": {1341 "inputs": {
1307 "flake-compat": "flake-compat_3",1342 "flake-compat": "flake-compat_3",
1308 "flake-utils": "flake-utils_3",1343 "flake-utils": "flake-utils_3",
1309 "nixpkgs": "nixpkgs_5"1344 "nixpkgs": "nixpkgs_6"
1310 },1345 },
1311 "locked": {1346 "locked": {
1312 "lastModified": 1764203689,1347 "lastModified": 1767919086,
1313 "narHash": "sha256-ivb0SqCptyIxx5g8ryRrUL0xrJhLrJPlvZbZjxVaui0=",1348 "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=",
1314 "owner": "mitchellh",1349 "owner": "mitchellh",
1315 "repo": "zig-overlay",1350 "repo": "zig-overlay",
1316 "rev": "8f7347545dea59b75e40247cc1ed55a42f64dbbf",1351 "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b",
1317 "type": "github"1352 "type": "github"
1318 },1353 },
1319 "original": {1354 "original": {
...@@ -1350,7 +1385,7 @@...@@ -1350,7 +1385,7 @@
1350 "flake-utils": "flake-utils_4",1385 "flake-utils": "flake-utils_4",
1351 "gitignore": "gitignore_3",1386 "gitignore": "gitignore_3",
1352 "langref": "langref",1387 "langref": "langref",
1353 "nixpkgs": "nixpkgs_6",1388 "nixpkgs": "nixpkgs_7",
1354 "zig-overlay": "zig-overlay"1389 "zig-overlay": "zig-overlay"
1355 },1390 },
1356 "locked": {1391 "locked": {
modules/home/default.nix+6-4
...@@ -69,8 +69,10 @@ in...@@ -69,8 +69,10 @@ in
6969
70 git = {70 git = {
71 enable = true;71 enable = true;
72 userName = lib.mkDefault user.name;72 settings.user = {
73 userEmail = lib.mkDefault user.email;73 name = lib.mkDefault user.name;
74 email = lib.mkDefault user.email;
75 };
74 ignores = [76 ignores = [
75 (lib.mkIf host.darwin ".DS_Store") # When using Finder77 (lib.mkIf host.darwin ".DS_Store") # When using Finder
76 (lib.mkIf host.darwin "._*") # When using non-APFS drives78 (lib.mkIf host.darwin "._*") # When using non-APFS drives
...@@ -138,8 +140,8 @@ in...@@ -138,8 +140,8 @@ in
138 jujutsu = {140 jujutsu = {
139 settings = {141 settings = {
140 user = {142 user = {
141 email = config.programs.git.userEmail;143 name = config.programs.git.settings.user.name;
142 name = config.programs.git.userName;144 email = config.programs.git.settings.user.email;
143 };145 };
144 signing = lib.mkIf (config.programs.git.signing.key != null) {146 signing = lib.mkIf (config.programs.git.signing.key != null) {
145 inherit (config.programs.git.signing) key;147 inherit (config.programs.git.signing) key;
modules/neovim/default.nix+4-4
...@@ -82,7 +82,7 @@...@@ -82,7 +82,7 @@
82 servers.nixd.init_options.autoArchive = true;82 servers.nixd.init_options.autoArchive = true;
83 };83 };
84 treesitter = {84 treesitter = {
85 enable = true;85 enable = false;
86 addDefaultGrammars = true;86 addDefaultGrammars = true;
87 # this is buggy and keybind.nix overwrites its keymaps anyways87 # this is buggy and keybind.nix overwrites its keymaps anyways
88 incrementalSelection.enable = false;88 incrementalSelection.enable = false;
...@@ -99,7 +99,7 @@...@@ -99,7 +99,7 @@
99 };99 };
100 languages = {100 languages = {
101 enableFormat = true;101 enableFormat = true;
102 enableTreesitter = true;102 enableTreesitter = false;
103 enableExtraDiagnostics = true;103 enableExtraDiagnostics = true;
104 # enable debug adapter protocol by default104 # enable debug adapter protocol by default
105 enableDAP = true;105 enableDAP = true;
...@@ -111,13 +111,13 @@...@@ -111,13 +111,13 @@
111 html.enable = true;111 html.enable = true;
112 nix.enable = true;112 nix.enable = true;
113 python.enable = true;113 python.enable = true;
114 rust.crates.enable = true;
115 rust.enable = true;114 rust.enable = true;
116 ts.enable = true;115 ts.enable = true;
117 zig.enable = true;116 zig.enable = true;
118 # sort-lines: off117 # sort-lines: off
119118
120 nix.lsp.servers = "nixd";119 nix.lsp.servers = [ "nixd" ];
120 rust.extensions.crates-nvim.enable = true;
121 };121 };
122 filetree.neo-tree = {122 filetree.neo-tree = {
123 enable = true;123 enable = true;
packages/autofmt/default.nix+1-1
...@@ -6,7 +6,7 @@ pkgs.writeShellApplication {...@@ -6,7 +6,7 @@ pkgs.writeShellApplication {
6 clang-tools6 clang-tools
7 deno7 deno
8 dprint8 dprint
9 nixfmt-rfc-style9 nixfmt
10 prettierd # autofmt only runs on a local build of prettier10 prettierd # autofmt only runs on a local build of prettier
11 rustfmt11 rustfmt
12 zig12 zig
users/clover/home.nix+8-120
...@@ -1,7 +1,7 @@...@@ -1,7 +1,7 @@
1{1{
2 config,
2 pkgs,3 pkgs,
3 host,4 host,
4 lib,
5 ...5 ...
6}:6}:
7let7let
...@@ -64,6 +64,7 @@ in...@@ -64,6 +64,7 @@ in
64 # zsh is the shell i use64 # zsh is the shell i use
65 zsh = {65 zsh = {
66 enable = true;66 enable = true;
67 dotDir = "${config.xdg.configHome}/zsh";
67 shellAliases = {68 shellAliases = {
68 switch = "~/config/switch";69 switch = "~/config/switch";
6970
...@@ -144,10 +145,10 @@ in...@@ -144,10 +145,10 @@ in
144 };145 };
145146
146 # use a git-specific email147 # use a git-specific email
147 git.userEmail = "git@paperclover.net";148 git = {
148 git.signing = {149 settings.user.email = "git@paperclover.net";
149 signByDefault = true;150 settings.gpg.format = "ssh";
150 key = lib.mkDefault "C0D577FD799F9D11";151 signing.signByDefault = true;
151 };152 };
152153
153 jujutsu = {154 jujutsu = {
...@@ -218,132 +219,19 @@ in...@@ -218,132 +219,19 @@ in
218 };219 };
219 # ui.graph.style = "square";220 # ui.graph.style = "square";
220 revsets = {221 revsets = {
221 log = "ancestors(description(regex:\"^(WIP:|\\\\s+$)\"):: | working_copies() | bookmarks(exact:\"master\")::remote_bookmarks(exact:\"master\") | bookmarks(glob:\"clo/*\")::, 5)";
222 short-prefixes = "(trunk()..@)::";222 short-prefixes = "(trunk()..@)::";
223 };223 };
224 # templates.log = "hl_wip(self)";
225
226 template-aliases = {
227 # log template, highlighting the WIP commits by making everything else faded out
228 "hl_wip(commit)" = ''
229 if(commit.root(), format_root_commit(commit),
230 label("__commit__",
231 format_short_commit_header(commit) ++ "\n" ++
232 format_commit_description(commit)
233 )
234 )
235 '';
236
237 "format_commit_description(commit)" = ''
238 label("desc", format_commit_firstline(commit.description().first_line())) ++
239 "\n" ++ if(
240 commit.description().starts_with("WIP:") || commit.current_working_copy(),
241 commit.description().remove_prefix(commit.description().first_line()).remove_prefix("\n").trim_end() ++ "\n ",
242 if(commit.description().remove_prefix(commit.description().first_line()).trim().len() > 0,
243 label("muted", lines_collapsed(commit.description().lines().filter(|x| x.trim().len() > 0).len() - 1)),
244 " "
245 )
246 )
247 '';
248 "lines_collapsed(count)" =
249 ''("[" ++ stringify(count ++ " line" ++ if(count == 1, "", "s")) ++ " collapsed]\n")'';
250 "format_commit_firstline(line)" = ''
251 if(line.starts_with("WIP:"),
252 label("cc_wip", " WIP ") ++ " " ++ format_commit_firstline_a_wip(line.remove_prefix("WIP:").trim()),
253 format_commit_firstline_a_wip(line)
254 )
255 '';
256 "format_commit_firstline_a_wip(line)" = ''
257 if(line.starts_with("feat:") || line.starts_with("feat("),
258 label("cc_feat", "feat") ++ format_commit_firstline_a_cc_type(line.remove_prefix("feat")),
259 if(line.starts_with("fix:") || line.starts_with("fix("),
260 label("cc_fix", "fix") ++ format_commit_firstline_a_cc_type(line.remove_prefix("fix")),
261 if(line.starts_with("hotfix:") || line.starts_with("hotfix("),
262 label("cc_hotfix", "hotfix") ++ format_commit_firstline_a_cc_type(line.remove_prefix("hotfix")),
263 if(line.starts_with("chore:") || line.starts_with("chore("),
264 label("cc_chore", "chore") ++ format_commit_firstline_a_cc_type(line.remove_prefix("chore")),
265 if(line.starts_with("test:") || line.starts_with("test("),
266 label("cc_other", "test") ++ format_commit_firstline_a_cc_type(line.remove_prefix("test")),
267 if(line.starts_with("refactor:") || line.starts_with("refactor("),
268 label("cc_other", "refactor") ++ format_commit_firstline_a_cc_type(line.remove_prefix("refactor")),
269 if(line.starts_with("perf:") || line.starts_with("perf("),
270 label("cc_other", "perf") ++ format_commit_firstline_a_cc_type(line.remove_prefix("perf")),
271 if(line.starts_with("lib:") || line.starts_with("lib("),
272 label("cc_other", "lib") ++ format_commit_firstline_a_cc_type(line.remove_prefix("lib")),
273 label("cc_header", line)
274 ))))))))
275 '';
276 "format_commit_firstline_a_cc_type(rest)" = ''
277 if(rest.starts_with("(") && rest.contains(")"),
278 format_firstline_cc_scope(rest, index_of_close_paren(rest)),
279 format_firstline_a_cc(rest))
280 '';
281 "format_firstline_cc_scope(rest, index)" = ''
282 label("cc_scope", rest.substr(0, index)) ++ format_firstline_a_cc(rest.substr(index, rest.len()))
283 '';
284 "format_firstline_a_cc(rest)" = ''
285 if(rest.starts_with(":"),
286 label("muted", ":") ++ label("cc_header", rest.remove_prefix(":")),
287 label("cc_header", rest)
288 )
289 '';
290 # sorry!
291 "index_of_close_paren(line)" = ''
292 stringify(if(line.substr(1, 2) == ")", "A",
293 if(line.substr(2, 3) == ")", "AA",
294 if(line.substr(3, 4) == ")", "AAA",
295 if(line.substr(4, 5) == ")", "AAAA",
296 if(line.substr(5, 6) == ")", "AAAAA",
297 if(line.substr(6, 7) == ")", "AAAAAA",
298 if(line.substr(7, 8) == ")", "AAAAAAA",
299 if(line.substr(8, 9) == ")", "AAAAAAAA",
300 if(line.substr(9, 10) == ")","AAAAAAAAA",
301 if(line.substr(10, 11) == ")", "AAAAAAAAAA",
302 if(line.substr(11, 12) == ")", "AAAAAAAAAAA",
303 if(line.substr(12, 13) == ")", "AAAAAAAAAAAA",
304 if(line.substr(13, 14) == ")", "AAAAAAAAAAAAA",
305 if(line.substr(14, 15) == ")", "AAAAAAAAAAAAAA",
306 if(line.substr(15, 16) == ")", "AAAAAAAAAAAAAAA",
307 if(line.substr(16, 17) == ")", "AAAAAAAAAAAAAAAA",
308 if(line.substr(17, 18) == ")", "AAAAAAAAAAAAAAAAA",
309 if(line.substr(18, 19) == ")", "AAAAAAAAAAAAAAAAAA",
310 if(line.substr(19, 20) == ")", "AAAAAAAAAAAAAAAAAAA",
311 if(line.substr(20, 21) == ")", "AAAAAAAAAAAAAAAAAAAA",
312 "AAAAAAAAAAAAAAAAAAAAA"
313 ))))))))))))))))))))).len() + 1
314 '';
315
316 "format_short_signature(signature)" = "signature.name()";
317 "format_timestamp(timestamp)" = "timestamp.ago()";
318 "format_short_commit_header(commit)" = ''
319 separate(" ",
320 if(commit.current_working_copy(), label("active_marker", " ACTIVE ")),
321 if(commit.conflict(), label("conflict_marker", " CONFLICT ")),
322 format_short_change_id_with_hidden_and_divergent_info(commit),
323 format_short_signature(commit.author()),
324 label("muted", "|"),
325 if(commit.description().trim().len() > 0, label("muted", format_timestamp(commit_timestamp(commit)))),
326 commit.bookmarks(),
327 commit.tags(),
328 commit.working_copies(),
329 label("muted", "(") ++
330 format_short_commit_id(commit.commit_id()) ++
331 label("muted", ")"),
332 if(config("ui.show-cryptographic-signatures").as_boolean(),
333 format_short_cryptographic_signature(commit.signature())),
334 )
335 '';
336 };
337
338 };224 };
339 };225 };
340226
341 ssh = {227 ssh = {
342 enable = true;228 enable = true;
229 enableDefaultConfig = false;
343 extraConfig = ''230 extraConfig = ''
344 SetEnv TERM=xterm-256color231 SetEnv TERM=xterm-256color
345 '';232 '';
346 matchBlocks = rec {233 matchBlocks = rec {
234 "*" = { };
347 zenith = {235 zenith = {
348 user = "clo";236 user = "clo";
349 port = 222;237 port = 222;