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 @@...@@ -33,138 +33,6 @@
33 "type": "github"33 "type": "github"
34 }34 }
35 },35 },
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 },
168 "darwin": {36 "darwin": {
169 "inputs": {37 "inputs": {
170 "nixpkgs": [38 "nixpkgs": [
...@@ -203,22 +71,6 @@...@@ -203,22 +71,6 @@
203 }71 }
204 },72 },
205 "flake-compat_2": {73 "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": {
222 "flake": false,74 "flake": false,
223 "locked": {75 "locked": {
224 "lastModified": 1696426674,76 "lastModified": 1696426674,
...@@ -234,7 +86,7 @@...@@ -234,7 +86,7 @@
234 "type": "github"86 "type": "github"
235 }87 }
236 },88 },
237 "flake-compat_4": {89 "flake-compat_3": {
238 "flake": false,90 "flake": false,
239 "locked": {91 "locked": {
240 "lastModified": 1696426674,92 "lastModified": 1696426674,
...@@ -276,24 +128,6 @@...@@ -276,24 +128,6 @@
276 "inputs": {128 "inputs": {
277 "systems": "systems"129 "systems": "systems"
278 },130 },
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 },
297 "locked": {131 "locked": {
298 "lastModified": 1705309234,132 "lastModified": 1705309234,
299 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",133 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
...@@ -308,19 +142,16 @@...@@ -308,19 +142,16 @@
308 "type": "github"142 "type": "github"
309 }143 }
310 },144 },
311 "flake-utils_3": {145 "flake-utils_2": {
312 "inputs": {146 "inputs": {
313 "systems": [147 "systems": "systems_3"
314 "stylix",
315 "systems"
316 ]
317 },148 },
318 "locked": {149 "locked": {
319 "lastModified": 1710146030,150 "lastModified": 1726560853,
320 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",151 "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
321 "owner": "numtide",152 "owner": "numtide",
322 "repo": "flake-utils",153 "repo": "flake-utils",
323 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",154 "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
324 "type": "github"155 "type": "github"
325 },156 },
326 "original": {157 "original": {
...@@ -329,9 +160,9 @@...@@ -329,9 +160,9 @@
329 "type": "github"160 "type": "github"
330 }161 }
331 },162 },
332 "flake-utils_4": {163 "flake-utils_3": {
333 "inputs": {164 "inputs": {
334 "systems": "systems_5"165 "systems": "systems_4"
335 },166 },
336 "locked": {167 "locked": {
337 "lastModified": 1705309234,168 "lastModified": 1705309234,
...@@ -347,9 +178,9 @@...@@ -347,9 +178,9 @@
347 "type": "github"178 "type": "github"
348 }179 }
349 },180 },
350 "flake-utils_5": {181 "flake-utils_4": {
351 "inputs": {182 "inputs": {
352 "systems": "systems_6"183 "systems": "systems_5"
353 },184 },
354 "locked": {185 "locked": {
355 "lastModified": 1710146030,186 "lastModified": 1710146030,
...@@ -365,9 +196,9 @@...@@ -365,9 +196,9 @@
365 "type": "github"196 "type": "github"
366 }197 }
367 },198 },
368 "flake-utils_6": {199 "flake-utils_5": {
369 "inputs": {200 "inputs": {
370 "systems": "systems_7"201 "systems": "systems_6"
371 },202 },
372 "locked": {203 "locked": {
373 "lastModified": 1705309234,204 "lastModified": 1705309234,
...@@ -385,7 +216,7 @@...@@ -385,7 +216,7 @@
385 },216 },
386 "foundryvtt": {217 "foundryvtt": {
387 "inputs": {218 "inputs": {
388 "nixpkgs": "nixpkgs_2"219 "nixpkgs": "nixpkgs"
389 },220 },
390 "locked": {221 "locked": {
391 "lastModified": 1726638033,222 "lastModified": 1726638033,
...@@ -401,22 +232,6 @@...@@ -401,22 +232,6 @@
401 "type": "github"232 "type": "github"
402 }233 }
403 },234 },
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 },
420 "ghostty": {235 "ghostty": {
421 "inputs": {236 "inputs": {
422 "nixpkgs-stable": "nixpkgs-stable",237 "nixpkgs-stable": "nixpkgs-stable",
...@@ -438,12 +253,7 @@...@@ -438,12 +253,7 @@
438 }253 }
439 },254 },
440 "gitignore": {255 "gitignore": {
441 "inputs": {256 "flake": false,
442 "nixpkgs": [
443 "zls",
444 "nixpkgs"
445 ]
446 },
447 "locked": {257 "locked": {
448 "lastModified": 1709087332,258 "lastModified": 1709087332,
449 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",259 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
...@@ -458,20 +268,24 @@...@@ -458,20 +268,24 @@
458 "type": "github"268 "type": "github"
459 }269 }
460 },270 },
461 "gnome-shell": {271 "gitignore_2": {
462 "flake": false,272 "inputs": {
273 "nixpkgs": [
274 "zls",
275 "nixpkgs"
276 ]
277 },
463 "locked": {278 "locked": {
464 "lastModified": 1713702291,279 "lastModified": 1709087332,
465 "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",280 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
466 "owner": "GNOME",281 "owner": "hercules-ci",
467 "repo": "gnome-shell",282 "repo": "gitignore.nix",
468 "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",283 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
469 "type": "github"284 "type": "github"
470 },285 },
471 "original": {286 "original": {
472 "owner": "GNOME",287 "owner": "hercules-ci",
473 "ref": "46.1",288 "repo": "gitignore.nix",
474 "repo": "gnome-shell",
475 "type": "github"289 "type": "github"
476 }290 }
477 },291 },
...@@ -496,24 +310,21 @@...@@ -496,24 +310,21 @@
496 "type": "github"310 "type": "github"
497 }311 }
498 },312 },
499 "home-manager_2": {313 "hosts": {
500 "inputs": {314 "inputs": {
501 "nixpkgs": [315 "nixpkgs": "nixpkgs_2"
502 "stylix",
503 "nixpkgs"
504 ]
505 },316 },
506 "locked": {317 "locked": {
507 "lastModified": 1724435763,318 "lastModified": 1727457521,
508 "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",319 "narHash": "sha256-2BsHujKUS3L78/BpQg3QJJxLnORHfn/wyU09zOo1T6U=",
509 "owner": "nix-community",320 "owner": "StevenBlack",
510 "repo": "home-manager",321 "repo": "hosts",
511 "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",322 "rev": "2db6a9f1ce75f3da11310a1f75b675aaa1139c79",
512 "type": "github"323 "type": "github"
513 },324 },
514 "original": {325 "original": {
515 "owner": "nix-community",326 "owner": "StevenBlack",
516 "repo": "home-manager",327 "repo": "hosts",
517 "type": "github"328 "type": "github"
518 }329 }
519 },330 },
...@@ -554,7 +365,7 @@...@@ -554,7 +365,7 @@
554 "hyprutils": "hyprutils",365 "hyprutils": "hyprutils",
555 "hyprwayland-scanner": "hyprwayland-scanner",366 "hyprwayland-scanner": "hyprwayland-scanner",
556 "nixpkgs": "nixpkgs_3",367 "nixpkgs": "nixpkgs_3",
557 "systems": "systems_3",368 "systems": "systems_2",
558 "xdph": "xdph"369 "xdph": "xdph"
559 },370 },
560 "locked": {371 "locked": {
...@@ -719,6 +530,26 @@...@@ -719,6 +530,26 @@
719 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"530 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
720 }531 }
721 },532 },
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 },
722 "nix-update": {553 "nix-update": {
723 "inputs": {554 "inputs": {
724 "flake-parts": "flake-parts",555 "flake-parts": "flake-parts",
...@@ -768,14 +599,18 @@...@@ -768,14 +599,18 @@
768 },599 },
769 "nixpkgs": {600 "nixpkgs": {
770 "locked": {601 "locked": {
771 "lastModified": 0,602 "lastModified": 1726447378,
772 "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",603 "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
773 "path": "/nix/store/h60m1fwahjd2mv6gsg77ji3vb4gpj4dk-source",604 "owner": "nixos",
774 "type": "path"605 "repo": "nixpkgs",
606 "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
607 "type": "github"
775 },608 },
776 "original": {609 "original": {
777 "id": "nixpkgs",610 "owner": "nixos",
778 "type": "indirect"611 "ref": "nixos-24.05",
612 "repo": "nixpkgs",
613 "type": "github"
779 }614 }
780 },615 },
781 "nixpkgs-stable": {616 "nixpkgs-stable": {
...@@ -843,18 +678,14 @@...@@ -843,18 +678,14 @@
843 },678 },
844 "nixpkgs_2": {679 "nixpkgs_2": {
845 "locked": {680 "locked": {
846 "lastModified": 1726447378,681 "lastModified": 0,
847 "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",682 "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
848 "owner": "nixos",683 "path": "/nix/store/hiasfhl8f5yy88hcfbr3s8s4bm63wsjw-source",
849 "repo": "nixpkgs",684 "type": "path"
850 "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
851 "type": "github"
852 },685 },
853 "original": {686 "original": {
854 "owner": "nixos",687 "id": "nixpkgs",
855 "ref": "nixos-24.05",688 "type": "indirect"
856 "repo": "nixpkgs",
857 "type": "github"
858 }689 }
859 },690 },
860 "nixpkgs_3": {691 "nixpkgs_3": {
...@@ -875,33 +706,33 @@...@@ -875,33 +706,33 @@
875 },706 },
876 "nixpkgs_4": {707 "nixpkgs_4": {
877 "locked": {708 "locked": {
878 "lastModified": 1726755586,709 "lastModified": 1727348695,
879 "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",710 "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
880 "owner": "NixOS",711 "owner": "nixos",
881 "repo": "nixpkgs",712 "repo": "nixpkgs",
882 "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",713 "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
883 "type": "github"714 "type": "github"
884 },715 },
885 "original": {716 "original": {
886 "id": "nixpkgs",717 "owner": "nixos",
887 "ref": "nixos-unstable",718 "ref": "nixos-unstable",
888 "type": "indirect"719 "repo": "nixpkgs",
720 "type": "github"
889 }721 }
890 },722 },
891 "nixpkgs_5": {723 "nixpkgs_5": {
892 "locked": {724 "locked": {
893 "lastModified": 1725194671,725 "lastModified": 1726755586,
894 "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",726 "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
895 "owner": "NixOS",727 "owner": "NixOS",
896 "repo": "nixpkgs",728 "repo": "nixpkgs",
897 "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",729 "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
898 "type": "github"730 "type": "github"
899 },731 },
900 "original": {732 "original": {
901 "owner": "NixOS",733 "id": "nixpkgs",
902 "ref": "nixpkgs-unstable",734 "ref": "nixos-unstable",
903 "repo": "nixpkgs",735 "type": "indirect"
904 "type": "github"
905 }736 }
906 },737 },
907 "nixpkgs_6": {738 "nixpkgs_6": {
...@@ -938,18 +769,17 @@...@@ -938,18 +769,17 @@
938 },769 },
939 "root": {770 "root": {
940 "inputs": {771 "inputs": {
941 "blocklist-hosts": "blocklist-hosts",
942 "darwin": "darwin",772 "darwin": "darwin",
943 "flake-utils": "flake-utils",
944 "foundryvtt": "foundryvtt",773 "foundryvtt": "foundryvtt",
945 "ghostty": "ghostty",774 "ghostty": "ghostty",
946 "home-manager": "home-manager",775 "home-manager": "home-manager",
776 "hosts": "hosts",
947 "hyprland": "hyprland",777 "hyprland": "hyprland",
948 "hyprland-plugins": "hyprland-plugins",778 "hyprland-plugins": "hyprland-plugins",
779 "nix-options-search": "nix-options-search",
949 "nixos-cosmic": "nixos-cosmic",780 "nixos-cosmic": "nixos-cosmic",
950 "nixpkgs": "nixpkgs_4",781 "nixpkgs": "nixpkgs_5",
951 "nixpkgs-stable": "nixpkgs-stable_3",782 "nixpkgs-stable": "nixpkgs-stable_3",
952 "stylix": "stylix",
953 "zig": "zig_2",783 "zig": "zig_2",
954 "zls": "zls"784 "zls": "zls"
955 }785 }
...@@ -975,36 +805,6 @@...@@ -975,36 +805,6 @@
975 "type": "github"805 "type": "github"
976 }806 }
977 },807 },
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 },
1008 "systems": {808 "systems": {
1009 "locked": {809 "locked": {
1010 "lastModified": 1681028828,810 "lastModified": 1681028828,
...@@ -1021,21 +821,6 @@...@@ -1021,21 +821,6 @@
1021 }821 }
1022 },822 },
1023 "systems_2": {823 "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": {
1039 "locked": {824 "locked": {
1040 "lastModified": 1689347949,825 "lastModified": 1689347949,
1041 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",826 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
...@@ -1050,7 +835,7 @@...@@ -1050,7 +835,7 @@
1050 "type": "github"835 "type": "github"
1051 }836 }
1052 },837 },
1053 "systems_4": {838 "systems_3": {
1054 "locked": {839 "locked": {
1055 "lastModified": 1681028828,840 "lastModified": 1681028828,
1056 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",841 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -1065,7 +850,7 @@...@@ -1065,7 +850,7 @@
1065 "type": "github"850 "type": "github"
1066 }851 }
1067 },852 },
1068 "systems_5": {853 "systems_4": {
1069 "locked": {854 "locked": {
1070 "lastModified": 1681028828,855 "lastModified": 1681028828,
1071 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",856 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -1080,7 +865,7 @@...@@ -1080,7 +865,7 @@
1080 "type": "github"865 "type": "github"
1081 }866 }
1082 },867 },
1083 "systems_6": {868 "systems_5": {
1084 "locked": {869 "locked": {
1085 "lastModified": 1681028828,870 "lastModified": 1681028828,
1086 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",871 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -1095,7 +880,7 @@...@@ -1095,7 +880,7 @@
1095 "type": "github"880 "type": "github"
1096 }881 }
1097 },882 },
1098 "systems_7": {883 "systems_6": {
1099 "locked": {884 "locked": {
1100 "lastModified": 1681028828,885 "lastModified": 1681028828,
1101 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",886 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
...@@ -1175,7 +960,7 @@...@@ -1175,7 +960,7 @@
1175 "flake-compat": [960 "flake-compat": [
1176 "ghostty"961 "ghostty"
1177 ],962 ],
1178 "flake-utils": "flake-utils_2",963 "flake-utils": "flake-utils",
1179 "nixpkgs": [964 "nixpkgs": [
1180 "ghostty",965 "ghostty",
1181 "nixpkgs-stable"966 "nixpkgs-stable"
...@@ -1197,8 +982,8 @@...@@ -1197,8 +982,8 @@
1197 },982 },
1198 "zig-overlay": {983 "zig-overlay": {
1199 "inputs": {984 "inputs": {
1200 "flake-compat": "flake-compat_4",985 "flake-compat": "flake-compat_3",
1201 "flake-utils": "flake-utils_6",986 "flake-utils": "flake-utils_5",
1202 "nixpkgs": [987 "nixpkgs": [
1203 "zls",988 "zls",
1204 "nixpkgs"989 "nixpkgs"
...@@ -1220,8 +1005,8 @@...@@ -1220,8 +1005,8 @@
1220 },1005 },
1221 "zig_2": {1006 "zig_2": {
1222 "inputs": {1007 "inputs": {
1223 "flake-compat": "flake-compat_3",1008 "flake-compat": "flake-compat_2",
1224 "flake-utils": "flake-utils_4",1009 "flake-utils": "flake-utils_3",
1225 "nixpkgs": "nixpkgs_6"1010 "nixpkgs": "nixpkgs_6"
1226 },1011 },
1227 "locked": {1012 "locked": {
...@@ -1240,8 +1025,8 @@...@@ -1240,8 +1025,8 @@
1240 },1025 },
1241 "zls": {1026 "zls": {
1242 "inputs": {1027 "inputs": {
1243 "flake-utils": "flake-utils_5",1028 "flake-utils": "flake-utils_4",
1244 "gitignore": "gitignore",1029 "gitignore": "gitignore_2",
1245 "langref": "langref",1030 "langref": "langref",
1246 "nixpkgs": "nixpkgs_7",1031 "nixpkgs": "nixpkgs_7",
1247 "zig-overlay": "zig-overlay"1032 "zig-overlay": "zig-overlay"
flake.nix+17-14
...@@ -13,11 +13,11 @@...@@ -13,11 +13,11 @@
13 inputs.nixpkgs.follows = "nixpkgs";13 inputs.nixpkgs.follows = "nixpkgs";
14 };14 };
1515
16 stylix.url = "github:danth/stylix";16 hosts = {
17 blocklist-hosts = {
18 url = "github:StevenBlack/hosts";17 url = "github:StevenBlack/hosts";
19 #flake = false;18 #flake = false;
20 };19 };
20
21 hyprland.url = "github:hyprwm/Hyprland";21 hyprland.url = "github:hyprwm/Hyprland";
22 hyprland-plugins = {22 hyprland-plugins = {
23 url = "github:hyprwm/hyprland-plugins";23 url = "github:hyprwm/hyprland-plugins";
...@@ -25,12 +25,11 @@...@@ -25,12 +25,11 @@
25 #flake = false;25 #flake = false;
26 };26 };
2727
28 flake-utils.url = "github:numtide/flake-utils";
29
30 zig.url = "github:mitchellh/zig-overlay";28 zig.url = "github:mitchellh/zig-overlay";
31 zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";29 zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
3230
33 foundryvtt.url = "github:reckenrode/nix-foundryvtt";31 foundryvtt.url = "github:reckenrode/nix-foundryvtt";
32
34 ghostty = {33 ghostty = {
35 url = "git+ssh://git@github.com/ghostty-org/ghostty";34 url = "git+ssh://git@github.com/ghostty-org/ghostty";
36 };35 };
...@@ -39,15 +38,19 @@...@@ -39,15 +38,19 @@
39 url = "github:lilyinstarlight/nixos-cosmic";38 url = "github:lilyinstarlight/nixos-cosmic";
40 inputs.nixpkgs.follows = "nixpkgs";39 inputs.nixpkgs.follows = "nixpkgs";
41 };40 };
41
42 nix-options-search = {
43 url = "github:madsbv/nix-options-search";
44 };
42 };45 };
43 outputs = {46 outputs = {
44 self,47 self,
45 nixpkgs,48 nixpkgs,
46 nixpkgs-stable,49 nixpkgs-stable,
50 nix-options-search,
47 home-manager,51 home-manager,
48 stylix,
49 darwin,52 darwin,
50 blocklist-hosts,53 hosts,
51 hyprland-plugins,54 hyprland-plugins,
52 zig,55 zig,
53 zls,56 zls,
...@@ -58,14 +61,16 @@...@@ -58,14 +61,16 @@
58 overlays = [61 overlays = [
59 inputs.zig.overlays.default62 inputs.zig.overlays.default
60 ];63 ];
61
62 inherit (nixpkgs) lib;64 inherit (nixpkgs) lib;
63 in {65 in {
64 nixosConfigurations = {66 nixosConfigurations = {
65 nixos = lib.nixosSystem {67 nixos = lib.nixosSystem {
66 modules = [68 modules = [
67 {nixpkgs.overlays = overlays;}69 {nixpkgs.overlays = overlays;}
68 nixos-cosmic.nixosModules.default70 hosts.nixosModule
71 {
72 networking.stevenBlackHosts.enable = true;
73 }
69 ./hosts/desktop/configuration.nix74 ./hosts/desktop/configuration.nix
70 home-manager.nixosModules.home-manager75 home-manager.nixosModules.home-manager
71 {76 {
...@@ -75,7 +80,6 @@...@@ -75,7 +80,6 @@
75 users.nmarks = import ./hosts/desktop/home.nix;80 users.nmarks = import ./hosts/desktop/home.nix;
76 };81 };
77 home-manager.extraSpecialArgs = {82 home-manager.extraSpecialArgs = {
78 inherit stylix;
79 inherit hyprland-plugins;83 inherit hyprland-plugins;
80 inherit zls;84 inherit zls;
81 inherit ghostty;85 inherit ghostty;
...@@ -84,8 +88,6 @@...@@ -84,8 +88,6 @@
84 ];88 ];
85 specialArgs = {89 specialArgs = {
86 inherit inputs;90 inherit inputs;
87 inherit stylix;
88 inherit blocklist-hosts;
89 };91 };
90 };92 };
91 };93 };
...@@ -96,6 +98,10 @@...@@ -96,6 +98,10 @@
96 {nixpkgs.overlays = overlays;}98 {nixpkgs.overlays = overlays;}
97 ./hosts/laptop/configuration.nix99 ./hosts/laptop/configuration.nix
98 home-manager.darwinModules.home-manager100 home-manager.darwinModules.home-manager
101 hosts.nixosModule
102 {
103 networking.stevenBlackHosts.enable = true;
104 }
99 {105 {
100 home-manager = {106 home-manager = {
101 useGlobalPkgs = true;107 useGlobalPkgs = true;
...@@ -103,7 +109,6 @@...@@ -103,7 +109,6 @@
103 users.nmarks = import ./hosts/laptop/home.nix;109 users.nmarks = import ./hosts/laptop/home.nix;
104 };110 };
105 home-manager.extraSpecialArgs = {111 home-manager.extraSpecialArgs = {
106 inherit stylix;
107 inherit zls;112 inherit zls;
108 inherit ghostty;113 inherit ghostty;
109 };114 };
...@@ -112,8 +117,6 @@...@@ -112,8 +117,6 @@
112 ];117 ];
113 specialArgs = {118 specialArgs = {
114 inherit inputs;119 inherit inputs;
115 inherit stylix;
116 inherit blocklist-hosts;
117 inherit ghostty;120 inherit ghostty;
118 };121 };
119 };122 };
hosts/desktop/configuration.nix+67-68
...@@ -25,76 +25,75 @@...@@ -25,76 +25,75 @@
25 ratbagd.enable = true;25 ratbagd.enable = true;
26 };26 };
2727
28 systemd.timers.duckdns = {
29 wantedBy = ["timers.target"];
30 timerConfig = {
31 OnBootSec = "5m";
32 OnUnitActiveSec = "5m";
33 Unit = "duckdns.service";
34 };
35 };
36
37 programs.noisetorch.enable = true;28 programs.noisetorch.enable = true;
3829
39 systemd.services.duckdns = {30 # systemd.timers.duckdns = {
40 enable = true;31 # wantedBy = ["timers.target"];
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 -'';32 # timerConfig = {
42 serviceConfig = {33 # OnBootSec = "5m";
43 Type = "oneshot";34 # OnUnitActiveSec = "5m";
44 User = "nmarks";35 # Unit = "duckdns.service";
45 };36 # };
46 };37 # };
4738 # systemd.services.duckdns = {
48 services.foundryvtt = {39 # enable = true;
49 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 -'';
50 hostName = "pathfinder2.duckdns.org";41 # serviceConfig = {
51 proxySSL = true;42 # Type = "oneshot";
52 proxyPort = 443;43 # User = "nmarks";
53 package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;44 # };
54 };45 # };
5546 #
56 services.cloudflared = {47 # services.foundryvtt = {
57 enable = true;48 # enable = true;
58 # user = "nmarks";49 # hostName = "pathfinder2.duckdns.org";
59 # tunnels = {50 # proxySSL = true;
60 # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = {51 # proxyPort = 443;
61 # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json";52 # package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;
62 # default = "http_status:404";53 # };
63 # };54 #
64 # };55 # services.cloudflared = {
65 };56 # enable = true;
6657 # # user = "nmarks";
67 services.caddy = {58 # # tunnels = {
68 enable = true;59 # # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = {
6960 # # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json";
70 # virtualHosts."10.154.1.147".extraConfig = ''61 # # default = "http_status:404";
71 # tls internal62 # # };
72 # reverse_proxy localhost:3000063 # # };
73 # encode zstd gzip64 # };
74 # '';65 #
7566 # services.caddy = {
76 # virtualHosts."10.154.1.105".extraConfig = ''67 # enable = true;
77 # tls internal68 #
78 # reverse_proxy localhost:3000069 # # virtualHosts."10.154.1.147".extraConfig = ''
79 # encode zstd gzip70 # # tls internal
80 # '';71 # # reverse_proxy localhost:30000
81 #72 # # encode zstd gzip
82 # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''73 # # '';
83 # reverse_proxy localhost:3000074 #
84 # encode zstd gzip75 # # virtualHosts."10.154.1.105".extraConfig = ''
85 # '';76 # # tls internal
86 virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''77 # # reverse_proxy localhost:30000
87 reverse_proxy localhost:3000078 # # encode zstd gzip
88 '';79 # # '';
8980 # #
90 # extraConfig = ''81 # # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
91 # pathfinder2e.duckdns.org {82 # # reverse_proxy localhost:30000
92 # # PROXY ALL REQUEST TO PORT 3000083 # # encode zstd gzip
93 # reverse_proxy localhost:3000084 # # '';
94 # encode zstd gzip85 # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
95 # }86 # reverse_proxy localhost:30000
96 # '';87 # '';
97 };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
99 services.flatpak.enable = true;98 services.flatpak.enable = true;
10099
hosts/desktop/home.nix+5-11
...@@ -4,6 +4,7 @@...@@ -4,6 +4,7 @@
4 pkgs,4 pkgs,
5 zls,5 zls,
6 ghostty,6 ghostty,
7 nix-options-search,
7 ...8 ...
8}: {9}: {
9 # wayland.windowManager.hyprland = {10 # wayland.windowManager.hyprland = {
...@@ -111,7 +112,6 @@...@@ -111,7 +112,6 @@
111 dxvk_2112 dxvk_2
112 mangohud113 mangohud
113 vulkan-tools114 vulkan-tools
114 asdf-vm
115 prismlauncher115 prismlauncher
116 # for cmpm17116 # for cmpm17
117 binwalk117 binwalk
...@@ -126,11 +126,6 @@...@@ -126,11 +126,6 @@
126 sl126 sl
127 fallout-ce127 fallout-ce
128 fallout2-ce128 fallout2-ce
129 #CSE114 (Haskell stuff)
130 stack
131 (haskell-language-server.override {supportedGhcVersions = ["94" "947"];})
132 haskell.compiler.ghc947
133 ormolu
134 #LSP + formatters/linters129 #LSP + formatters/linters
135 lua-language-server130 lua-language-server
136 nil131 nil
...@@ -169,7 +164,7 @@...@@ -169,7 +164,7 @@
169164
170 programs.kitty = {165 programs.kitty = {
171 enable = true;166 enable = true;
172 theme = "Catppuccin-Mocha";167 themeFile = "Catppuccin-Mocha";
173 extraConfig = "font_family Iosevka NF168 extraConfig = "font_family Iosevka NF
174 italic_font auto169 italic_font auto
175 bold_italic_font auto170 bold_italic_font auto
...@@ -188,12 +183,11 @@...@@ -188,12 +183,11 @@
188 }183 }
189 ];184 ];
190 shellAliases = {185 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";186 # 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";187 # 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";188 # full-update = "sys-update; hm-update";
194 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";189 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
195 };190 };
196 shellInit = "source $HOME/.nix-profile/share/asdf-vm/asdf.fish ";
197 };191 };
198192
199 programs.hyfetch = {193 programs.hyfetch = {