authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-09-30 10:06:37-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-09-30 10:06:37-07:00
log85088bdd23b7006791f3d06935fd3c0bb94c6fdb
tree1d2badbc481aee1a0ff9d73884e360bde896bcca
parent104b213ebd955d3feda046bcd8d3dea36c24f1ee

bweh2

4 files changed, 190 insertions(+), 409 deletions(-)

flake.lock+101-316
......@@ -33,138 +33,6 @@
3333 "type": "github"
3434 }
3535 },
36 "base16": {
37 "inputs": {
38 "fromYaml": "fromYaml"
39 },
40 "locked": {
41 "lastModified": 1708890466,
42 "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
43 "owner": "SenchoPens",
44 "repo": "base16.nix",
45 "rev": "665b3c6748534eb766c777298721cece9453fdae",
46 "type": "github"
47 },
48 "original": {
49 "owner": "SenchoPens",
50 "repo": "base16.nix",
51 "type": "github"
52 }
53 },
54 "base16-fish": {
55 "flake": false,
56 "locked": {
57 "lastModified": 1622559957,
58 "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
59 "owner": "tomyun",
60 "repo": "base16-fish",
61 "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
62 "type": "github"
63 },
64 "original": {
65 "owner": "tomyun",
66 "repo": "base16-fish",
67 "type": "github"
68 }
69 },
70 "base16-foot": {
71 "flake": false,
72 "locked": {
73 "lastModified": 1696725948,
74 "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
75 "owner": "tinted-theming",
76 "repo": "base16-foot",
77 "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
78 "type": "github"
79 },
80 "original": {
81 "owner": "tinted-theming",
82 "repo": "base16-foot",
83 "type": "github"
84 }
85 },
86 "base16-helix": {
87 "flake": false,
88 "locked": {
89 "lastModified": 1725860795,
90 "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
91 "owner": "tinted-theming",
92 "repo": "base16-helix",
93 "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
94 "type": "github"
95 },
96 "original": {
97 "owner": "tinted-theming",
98 "repo": "base16-helix",
99 "type": "github"
100 }
101 },
102 "base16-kitty": {
103 "flake": false,
104 "locked": {
105 "lastModified": 1665001328,
106 "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
107 "owner": "kdrag0n",
108 "repo": "base16-kitty",
109 "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
110 "type": "github"
111 },
112 "original": {
113 "owner": "kdrag0n",
114 "repo": "base16-kitty",
115 "type": "github"
116 }
117 },
118 "base16-tmux": {
119 "flake": false,
120 "locked": {
121 "lastModified": 1696725902,
122 "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
123 "owner": "tinted-theming",
124 "repo": "base16-tmux",
125 "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
126 "type": "github"
127 },
128 "original": {
129 "owner": "tinted-theming",
130 "repo": "base16-tmux",
131 "type": "github"
132 }
133 },
134 "base16-vim": {
135 "flake": false,
136 "locked": {
137 "lastModified": 1716150083,
138 "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
139 "owner": "tinted-theming",
140 "repo": "base16-vim",
141 "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
142 "type": "github"
143 },
144 "original": {
145 "owner": "tinted-theming",
146 "repo": "base16-vim",
147 "type": "github"
148 }
149 },
150 "blocklist-hosts": {
151 "inputs": {
152 "nixpkgs": "nixpkgs"
153 },
154 "locked": {
155 "lastModified": 1726953087,
156 "narHash": "sha256-jAayFk25P1OpzrUj7p4CjFbv8KbfUD0RoKMoYJlZ8zM=",
157 "owner": "StevenBlack",
158 "repo": "hosts",
159 "rev": "74500a214cfdf819ae6feb7912839e9d826b5998",
160 "type": "github"
161 },
162 "original": {
163 "owner": "StevenBlack",
164 "repo": "hosts",
165 "type": "github"
166 }
167 },
16836 "darwin": {
16937 "inputs": {
17038 "nixpkgs": [
......@@ -203,22 +71,6 @@
20371 }
20472 },
20573 "flake-compat_2": {
206 "flake": false,
207 "locked": {
208 "lastModified": 1673956053,
209 "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
210 "owner": "edolstra",
211 "repo": "flake-compat",
212 "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
213 "type": "github"
214 },
215 "original": {
216 "owner": "edolstra",
217 "repo": "flake-compat",
218 "type": "github"
219 }
220 },
221 "flake-compat_3": {
22274 "flake": false,
22375 "locked": {
22476 "lastModified": 1696426674,
......@@ -234,7 +86,7 @@
23486 "type": "github"
23587 }
23688 },
237 "flake-compat_4": {
89 "flake-compat_3": {
23890 "flake": false,
23991 "locked": {
24092 "lastModified": 1696426674,
......@@ -276,24 +128,6 @@
276128 "inputs": {
277129 "systems": "systems"
278130 },
279 "locked": {
280 "lastModified": 1726560853,
281 "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
282 "owner": "numtide",
283 "repo": "flake-utils",
284 "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
285 "type": "github"
286 },
287 "original": {
288 "owner": "numtide",
289 "repo": "flake-utils",
290 "type": "github"
291 }
292 },
293 "flake-utils_2": {
294 "inputs": {
295 "systems": "systems_2"
296 },
297131 "locked": {
298132 "lastModified": 1705309234,
299133 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
......@@ -308,19 +142,16 @@
308142 "type": "github"
309143 }
310144 },
311 "flake-utils_3": {
145 "flake-utils_2": {
312146 "inputs": {
313 "systems": [
314 "stylix",
315 "systems"
316 ]
147 "systems": "systems_3"
317148 },
318149 "locked": {
319 "lastModified": 1710146030,
320 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
150 "lastModified": 1726560853,
151 "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
321152 "owner": "numtide",
322153 "repo": "flake-utils",
323 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
154 "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
324155 "type": "github"
325156 },
326157 "original": {
......@@ -329,9 +160,9 @@
329160 "type": "github"
330161 }
331162 },
332 "flake-utils_4": {
163 "flake-utils_3": {
333164 "inputs": {
334 "systems": "systems_5"
165 "systems": "systems_4"
335166 },
336167 "locked": {
337168 "lastModified": 1705309234,
......@@ -347,9 +178,9 @@
347178 "type": "github"
348179 }
349180 },
350 "flake-utils_5": {
181 "flake-utils_4": {
351182 "inputs": {
352 "systems": "systems_6"
183 "systems": "systems_5"
353184 },
354185 "locked": {
355186 "lastModified": 1710146030,
......@@ -365,9 +196,9 @@
365196 "type": "github"
366197 }
367198 },
368 "flake-utils_6": {
199 "flake-utils_5": {
369200 "inputs": {
370 "systems": "systems_7"
201 "systems": "systems_6"
371202 },
372203 "locked": {
373204 "lastModified": 1705309234,
......@@ -385,7 +216,7 @@
385216 },
386217 "foundryvtt": {
387218 "inputs": {
388 "nixpkgs": "nixpkgs_2"
219 "nixpkgs": "nixpkgs"
389220 },
390221 "locked": {
391222 "lastModified": 1726638033,
......@@ -401,22 +232,6 @@
401232 "type": "github"
402233 }
403234 },
404 "fromYaml": {
405 "flake": false,
406 "locked": {
407 "lastModified": 1689549921,
408 "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
409 "owner": "SenchoPens",
410 "repo": "fromYaml",
411 "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
412 "type": "github"
413 },
414 "original": {
415 "owner": "SenchoPens",
416 "repo": "fromYaml",
417 "type": "github"
418 }
419 },
420235 "ghostty": {
421236 "inputs": {
422237 "nixpkgs-stable": "nixpkgs-stable",
......@@ -438,12 +253,7 @@
438253 }
439254 },
440255 "gitignore": {
441 "inputs": {
442 "nixpkgs": [
443 "zls",
444 "nixpkgs"
445 ]
446 },
256 "flake": false,
447257 "locked": {
448258 "lastModified": 1709087332,
449259 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
......@@ -458,20 +268,24 @@
458268 "type": "github"
459269 }
460270 },
461 "gnome-shell": {
462 "flake": false,
271 "gitignore_2": {
272 "inputs": {
273 "nixpkgs": [
274 "zls",
275 "nixpkgs"
276 ]
277 },
463278 "locked": {
464 "lastModified": 1713702291,
465 "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
466 "owner": "GNOME",
467 "repo": "gnome-shell",
468 "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
279 "lastModified": 1709087332,
280 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
281 "owner": "hercules-ci",
282 "repo": "gitignore.nix",
283 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
469284 "type": "github"
470285 },
471286 "original": {
472 "owner": "GNOME",
473 "ref": "46.1",
474 "repo": "gnome-shell",
287 "owner": "hercules-ci",
288 "repo": "gitignore.nix",
475289 "type": "github"
476290 }
477291 },
......@@ -496,24 +310,21 @@
496310 "type": "github"
497311 }
498312 },
499 "home-manager_2": {
313 "hosts": {
500314 "inputs": {
501 "nixpkgs": [
502 "stylix",
503 "nixpkgs"
504 ]
315 "nixpkgs": "nixpkgs_2"
505316 },
506317 "locked": {
507 "lastModified": 1724435763,
508 "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
509 "owner": "nix-community",
510 "repo": "home-manager",
511 "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
318 "lastModified": 1727457521,
319 "narHash": "sha256-2BsHujKUS3L78/BpQg3QJJxLnORHfn/wyU09zOo1T6U=",
320 "owner": "StevenBlack",
321 "repo": "hosts",
322 "rev": "2db6a9f1ce75f3da11310a1f75b675aaa1139c79",
512323 "type": "github"
513324 },
514325 "original": {
515 "owner": "nix-community",
516 "repo": "home-manager",
326 "owner": "StevenBlack",
327 "repo": "hosts",
517328 "type": "github"
518329 }
519330 },
......@@ -554,7 +365,7 @@
554365 "hyprutils": "hyprutils",
555366 "hyprwayland-scanner": "hyprwayland-scanner",
556367 "nixpkgs": "nixpkgs_3",
557 "systems": "systems_3",
368 "systems": "systems_2",
558369 "xdph": "xdph"
559370 },
560371 "locked": {
......@@ -719,6 +530,26 @@
719530 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
720531 }
721532 },
533 "nix-options-search": {
534 "inputs": {
535 "flake-utils": "flake-utils_2",
536 "gitignore": "gitignore",
537 "nixpkgs": "nixpkgs_4"
538 },
539 "locked": {
540 "lastModified": 1721325991,
541 "narHash": "sha256-eJ9nFrrbWystBX9EhHE3wou+1kqf+CjVeys12z7u3fs=",
542 "owner": "madsbv",
543 "repo": "nix-options-search",
544 "rev": "e7b9b6e4be12bfb5fb6792372f18470e3718027a",
545 "type": "github"
546 },
547 "original": {
548 "owner": "madsbv",
549 "repo": "nix-options-search",
550 "type": "github"
551 }
552 },
722553 "nix-update": {
723554 "inputs": {
724555 "flake-parts": "flake-parts",
......@@ -768,14 +599,18 @@
768599 },
769600 "nixpkgs": {
770601 "locked": {
771 "lastModified": 0,
772 "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
773 "path": "/nix/store/h60m1fwahjd2mv6gsg77ji3vb4gpj4dk-source",
774 "type": "path"
602 "lastModified": 1726447378,
603 "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
604 "owner": "nixos",
605 "repo": "nixpkgs",
606 "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
607 "type": "github"
775608 },
776609 "original": {
777 "id": "nixpkgs",
778 "type": "indirect"
610 "owner": "nixos",
611 "ref": "nixos-24.05",
612 "repo": "nixpkgs",
613 "type": "github"
779614 }
780615 },
781616 "nixpkgs-stable": {
......@@ -843,18 +678,14 @@
843678 },
844679 "nixpkgs_2": {
845680 "locked": {
846 "lastModified": 1726447378,
847 "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
848 "owner": "nixos",
849 "repo": "nixpkgs",
850 "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
851 "type": "github"
681 "lastModified": 0,
682 "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
683 "path": "/nix/store/hiasfhl8f5yy88hcfbr3s8s4bm63wsjw-source",
684 "type": "path"
852685 },
853686 "original": {
854 "owner": "nixos",
855 "ref": "nixos-24.05",
856 "repo": "nixpkgs",
857 "type": "github"
687 "id": "nixpkgs",
688 "type": "indirect"
858689 }
859690 },
860691 "nixpkgs_3": {
......@@ -875,33 +706,33 @@
875706 },
876707 "nixpkgs_4": {
877708 "locked": {
878 "lastModified": 1726755586,
879 "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
880 "owner": "NixOS",
709 "lastModified": 1727348695,
710 "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
711 "owner": "nixos",
881712 "repo": "nixpkgs",
882 "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
713 "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
883714 "type": "github"
884715 },
885716 "original": {
886 "id": "nixpkgs",
717 "owner": "nixos",
887718 "ref": "nixos-unstable",
888 "type": "indirect"
719 "repo": "nixpkgs",
720 "type": "github"
889721 }
890722 },
891723 "nixpkgs_5": {
892724 "locked": {
893 "lastModified": 1725194671,
894 "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
725 "lastModified": 1726755586,
726 "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
895727 "owner": "NixOS",
896728 "repo": "nixpkgs",
897 "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
729 "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
898730 "type": "github"
899731 },
900732 "original": {
901 "owner": "NixOS",
902 "ref": "nixpkgs-unstable",
903 "repo": "nixpkgs",
904 "type": "github"
733 "id": "nixpkgs",
734 "ref": "nixos-unstable",
735 "type": "indirect"
905736 }
906737 },
907738 "nixpkgs_6": {
......@@ -938,18 +769,17 @@
938769 },
939770 "root": {
940771 "inputs": {
941 "blocklist-hosts": "blocklist-hosts",
942772 "darwin": "darwin",
943 "flake-utils": "flake-utils",
944773 "foundryvtt": "foundryvtt",
945774 "ghostty": "ghostty",
946775 "home-manager": "home-manager",
776 "hosts": "hosts",
947777 "hyprland": "hyprland",
948778 "hyprland-plugins": "hyprland-plugins",
779 "nix-options-search": "nix-options-search",
949780 "nixos-cosmic": "nixos-cosmic",
950 "nixpkgs": "nixpkgs_4",
781 "nixpkgs": "nixpkgs_5",
951782 "nixpkgs-stable": "nixpkgs-stable_3",
952 "stylix": "stylix",
953783 "zig": "zig_2",
954784 "zls": "zls"
955785 }
......@@ -975,36 +805,6 @@
975805 "type": "github"
976806 }
977807 },
978 "stylix": {
979 "inputs": {
980 "base16": "base16",
981 "base16-fish": "base16-fish",
982 "base16-foot": "base16-foot",
983 "base16-helix": "base16-helix",
984 "base16-kitty": "base16-kitty",
985 "base16-tmux": "base16-tmux",
986 "base16-vim": "base16-vim",
987 "flake-compat": "flake-compat_2",
988 "flake-utils": "flake-utils_3",
989 "gnome-shell": "gnome-shell",
990 "home-manager": "home-manager_2",
991 "nixpkgs": "nixpkgs_5",
992 "systems": "systems_4"
993 },
994 "locked": {
995 "lastModified": 1726828291,
996 "narHash": "sha256-pGRPVVm7UXf+fx2NVpH6FFSWR9AynG6eoVlagaqH9i4=",
997 "owner": "danth",
998 "repo": "stylix",
999 "rev": "53bcceb4e46d0b3e8ae6434a7a6bcc3463092093",
1000 "type": "github"
1001 },
1002 "original": {
1003 "owner": "danth",
1004 "repo": "stylix",
1005 "type": "github"
1006 }
1007 },
1008808 "systems": {
1009809 "locked": {
1010810 "lastModified": 1681028828,
......@@ -1021,21 +821,6 @@
1021821 }
1022822 },
1023823 "systems_2": {
1024 "locked": {
1025 "lastModified": 1681028828,
1026 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
1027 "owner": "nix-systems",
1028 "repo": "default",
1029 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
1030 "type": "github"
1031 },
1032 "original": {
1033 "owner": "nix-systems",
1034 "repo": "default",
1035 "type": "github"
1036 }
1037 },
1038 "systems_3": {
1039824 "locked": {
1040825 "lastModified": 1689347949,
1041826 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
......@@ -1050,7 +835,7 @@
1050835 "type": "github"
1051836 }
1052837 },
1053 "systems_4": {
838 "systems_3": {
1054839 "locked": {
1055840 "lastModified": 1681028828,
1056841 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1065,7 +850,7 @@
1065850 "type": "github"
1066851 }
1067852 },
1068 "systems_5": {
853 "systems_4": {
1069854 "locked": {
1070855 "lastModified": 1681028828,
1071856 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1080,7 +865,7 @@
1080865 "type": "github"
1081866 }
1082867 },
1083 "systems_6": {
868 "systems_5": {
1084869 "locked": {
1085870 "lastModified": 1681028828,
1086871 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1095,7 +880,7 @@
1095880 "type": "github"
1096881 }
1097882 },
1098 "systems_7": {
883 "systems_6": {
1099884 "locked": {
1100885 "lastModified": 1681028828,
1101886 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
......@@ -1175,7 +960,7 @@
1175960 "flake-compat": [
1176961 "ghostty"
1177962 ],
1178 "flake-utils": "flake-utils_2",
963 "flake-utils": "flake-utils",
1179964 "nixpkgs": [
1180965 "ghostty",
1181966 "nixpkgs-stable"
......@@ -1197,8 +982,8 @@
1197982 },
1198983 "zig-overlay": {
1199984 "inputs": {
1200 "flake-compat": "flake-compat_4",
1201 "flake-utils": "flake-utils_6",
985 "flake-compat": "flake-compat_3",
986 "flake-utils": "flake-utils_5",
1202987 "nixpkgs": [
1203988 "zls",
1204989 "nixpkgs"
......@@ -1220,8 +1005,8 @@
12201005 },
12211006 "zig_2": {
12221007 "inputs": {
1223 "flake-compat": "flake-compat_3",
1224 "flake-utils": "flake-utils_4",
1008 "flake-compat": "flake-compat_2",
1009 "flake-utils": "flake-utils_3",
12251010 "nixpkgs": "nixpkgs_6"
12261011 },
12271012 "locked": {
......@@ -1240,8 +1025,8 @@
12401025 },
12411026 "zls": {
12421027 "inputs": {
1243 "flake-utils": "flake-utils_5",
1244 "gitignore": "gitignore",
1028 "flake-utils": "flake-utils_4",
1029 "gitignore": "gitignore_2",
12451030 "langref": "langref",
12461031 "nixpkgs": "nixpkgs_7",
12471032 "zig-overlay": "zig-overlay"
flake.nix+17-14
......@@ -13,11 +13,11 @@
1313 inputs.nixpkgs.follows = "nixpkgs";
1414 };
1515
16 stylix.url = "github:danth/stylix";
17 blocklist-hosts = {
16 hosts = {
1817 url = "github:StevenBlack/hosts";
1918 #flake = false;
2019 };
20
2121 hyprland.url = "github:hyprwm/Hyprland";
2222 hyprland-plugins = {
2323 url = "github:hyprwm/hyprland-plugins";
......@@ -25,12 +25,11 @@
2525 #flake = false;
2626 };
2727
28 flake-utils.url = "github:numtide/flake-utils";
29
3028 zig.url = "github:mitchellh/zig-overlay";
3129 zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
3230
3331 foundryvtt.url = "github:reckenrode/nix-foundryvtt";
32
3433 ghostty = {
3534 url = "git+ssh://git@github.com/ghostty-org/ghostty";
3635 };
......@@ -39,15 +38,19 @@
3938 url = "github:lilyinstarlight/nixos-cosmic";
4039 inputs.nixpkgs.follows = "nixpkgs";
4140 };
41
42 nix-options-search = {
43 url = "github:madsbv/nix-options-search";
44 };
4245 };
4346 outputs = {
4447 self,
4548 nixpkgs,
4649 nixpkgs-stable,
50 nix-options-search,
4751 home-manager,
48 stylix,
4952 darwin,
50 blocklist-hosts,
53 hosts,
5154 hyprland-plugins,
5255 zig,
5356 zls,
......@@ -58,14 +61,16 @@
5861 overlays = [
5962 inputs.zig.overlays.default
6063 ];
61
6264 inherit (nixpkgs) lib;
6365 in {
6466 nixosConfigurations = {
6567 nixos = lib.nixosSystem {
6668 modules = [
6769 {nixpkgs.overlays = overlays;}
68 nixos-cosmic.nixosModules.default
70 hosts.nixosModule
71 {
72 networking.stevenBlackHosts.enable = true;
73 }
6974 ./hosts/desktop/configuration.nix
7075 home-manager.nixosModules.home-manager
7176 {
......@@ -75,7 +80,6 @@
7580 users.nmarks = import ./hosts/desktop/home.nix;
7681 };
7782 home-manager.extraSpecialArgs = {
78 inherit stylix;
7983 inherit hyprland-plugins;
8084 inherit zls;
8185 inherit ghostty;
......@@ -84,8 +88,6 @@
8488 ];
8589 specialArgs = {
8690 inherit inputs;
87 inherit stylix;
88 inherit blocklist-hosts;
8991 };
9092 };
9193 };
......@@ -96,6 +98,10 @@
9698 {nixpkgs.overlays = overlays;}
9799 ./hosts/laptop/configuration.nix
98100 home-manager.darwinModules.home-manager
101 hosts.nixosModule
102 {
103 networking.stevenBlackHosts.enable = true;
104 }
99105 {
100106 home-manager = {
101107 useGlobalPkgs = true;
......@@ -103,7 +109,6 @@
103109 users.nmarks = import ./hosts/laptop/home.nix;
104110 };
105111 home-manager.extraSpecialArgs = {
106 inherit stylix;
107112 inherit zls;
108113 inherit ghostty;
109114 };
......@@ -112,8 +117,6 @@
112117 ];
113118 specialArgs = {
114119 inherit inputs;
115 inherit stylix;
116 inherit blocklist-hosts;
117120 inherit ghostty;
118121 };
119122 };
hosts/desktop/configuration.nix+67-68
......@@ -25,76 +25,75 @@
2525 ratbagd.enable = true;
2626 };
2727
28 systemd.timers.duckdns = {
29 wantedBy = ["timers.target"];
30 timerConfig = {
31 OnBootSec = "5m";
32 OnUnitActiveSec = "5m";
33 Unit = "duckdns.service";
34 };
35 };
36
3728 programs.noisetorch.enable = true;
3829
39 systemd.services.duckdns = {
40 enable = true;
41 script = ''echo url="https://www.duckdns.org/update?domains=pathfinder2e&token=9c1ffa47-7496-4975-ba2b-a6928b28c500&ip=" | ${pkgs.curl}/bin/curl -v -k -o ~/.duckdns/duck.log -K -'';
42 serviceConfig = {
43 Type = "oneshot";
44 User = "nmarks";
45 };
46 };
47
48 services.foundryvtt = {
49 enable = true;
50 hostName = "pathfinder2.duckdns.org";
51 proxySSL = true;
52 proxyPort = 443;
53 package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;
54 };
55
56 services.cloudflared = {
57 enable = true;
58 # user = "nmarks";
59 # tunnels = {
60 # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = {
61 # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json";
62 # default = "http_status:404";
63 # };
64 # };
65 };
66
67 services.caddy = {
68 enable = true;
69
70 # virtualHosts."10.154.1.147".extraConfig = ''
71 # tls internal
72 # reverse_proxy localhost:30000
73 # encode zstd gzip
74 # '';
75
76 # virtualHosts."10.154.1.105".extraConfig = ''
77 # tls internal
78 # reverse_proxy localhost:30000
79 # encode zstd gzip
80 # '';
81 #
82 # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
83 # reverse_proxy localhost:30000
84 # encode zstd gzip
85 # '';
86 virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
87 reverse_proxy localhost:30000
88 '';
89
90 # extraConfig = ''
91 # pathfinder2e.duckdns.org {
92 # # PROXY ALL REQUEST TO PORT 30000
93 # reverse_proxy localhost:30000
94 # encode zstd gzip
95 # }
96 # '';
97 };
30 # systemd.timers.duckdns = {
31 # wantedBy = ["timers.target"];
32 # timerConfig = {
33 # OnBootSec = "5m";
34 # OnUnitActiveSec = "5m";
35 # Unit = "duckdns.service";
36 # };
37 # };
38 # systemd.services.duckdns = {
39 # enable = true;
40 # script = ''echo url="https://www.duckdns.org/update?domains=pathfinder2e&token=9c1ffa47-7496-4975-ba2b-a6928b28c500&ip=" | ${pkgs.curl}/bin/curl -v -k -o ~/.duckdns/duck.log -K -'';
41 # serviceConfig = {
42 # Type = "oneshot";
43 # User = "nmarks";
44 # };
45 # };
46 #
47 # services.foundryvtt = {
48 # enable = true;
49 # hostName = "pathfinder2.duckdns.org";
50 # proxySSL = true;
51 # proxyPort = 443;
52 # package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;
53 # };
54 #
55 # services.cloudflared = {
56 # enable = true;
57 # # user = "nmarks";
58 # # tunnels = {
59 # # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = {
60 # # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json";
61 # # default = "http_status:404";
62 # # };
63 # # };
64 # };
65 #
66 # services.caddy = {
67 # enable = true;
68 #
69 # # virtualHosts."10.154.1.147".extraConfig = ''
70 # # tls internal
71 # # reverse_proxy localhost:30000
72 # # encode zstd gzip
73 # # '';
74 #
75 # # virtualHosts."10.154.1.105".extraConfig = ''
76 # # tls internal
77 # # reverse_proxy localhost:30000
78 # # encode zstd gzip
79 # # '';
80 # #
81 # # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
82 # # reverse_proxy localhost:30000
83 # # encode zstd gzip
84 # # '';
85 # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
86 # reverse_proxy localhost:30000
87 # '';
88 #
89 # # extraConfig = ''
90 # # pathfinder2e.duckdns.org {
91 # # # PROXY ALL REQUEST TO PORT 30000
92 # # reverse_proxy localhost:30000
93 # # encode zstd gzip
94 # # }
95 # # '';
96 # };
9897
9998 services.flatpak.enable = true;
10099
hosts/desktop/home.nix+5-11
......@@ -4,6 +4,7 @@
44 pkgs,
55 zls,
66 ghostty,
7 nix-options-search,
78 ...
89}: {
910 # wayland.windowManager.hyprland = {
......@@ -111,7 +112,6 @@
111112 dxvk_2
112113 mangohud
113114 vulkan-tools
114 asdf-vm
115115 prismlauncher
116116 # for cmpm17
117117 binwalk
......@@ -126,11 +126,6 @@
126126 sl
127127 fallout-ce
128128 fallout2-ce
129 #CSE114 (Haskell stuff)
130 stack
131 (haskell-language-server.override {supportedGhcVersions = ["94" "947"];})
132 haskell.compiler.ghc947
133 ormolu
134129 #LSP + formatters/linters
135130 lua-language-server
136131 nil
......@@ -169,7 +164,7 @@
169164
170165 programs.kitty = {
171166 enable = true;
172 theme = "Catppuccin-Mocha";
167 themeFile = "Catppuccin-Mocha";
173168 extraConfig = "font_family Iosevka NF
174169 italic_font auto
175170 bold_italic_font auto
......@@ -188,12 +183,11 @@
188183 }
189184 ];
190185 shellAliases = {
191 hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks";
192 sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks";
193 full-update = "sys-update; hm-update";
186 # hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks";
187 # sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks";
188 # full-update = "sys-update; hm-update";
194189 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
195190 };
196 shellInit = "source $HOME/.nix-profile/share/asdf-vm/asdf.fish ";
197191 };
198192
199193 programs.hyfetch = {