authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-05-27 22:30:34-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-05-27 22:30:34-07:00
logb9e231d72f6a18b719440657b0048dcd9699c442
tree65309f62e02f96955344926686a07730905b0504
parentb3d5a281416e3e90bccea2e2dbaf204aacb3a21c
signature Commit is signed but in an unrecognized format.

remove stylix, add lix


4 files changed, 84 insertions(+), 432 deletions(-)

flake.lock+76-395
...@@ -28,73 +28,6 @@...@@ -28,73 +28,6 @@
28 "type": "github"28 "type": "github"
29 }29 }
30 },30 },
31 "base16": {
32 "inputs": {
33 "fromYaml": "fromYaml"
34 },
35 "locked": {
36 "lastModified": 1746562888,
37 "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
38 "owner": "SenchoPens",
39 "repo": "base16.nix",
40 "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
41 "type": "github"
42 },
43 "original": {
44 "owner": "SenchoPens",
45 "repo": "base16.nix",
46 "type": "github"
47 }
48 },
49 "base16-fish": {
50 "flake": false,
51 "locked": {
52 "lastModified": 1622559957,
53 "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
54 "owner": "tomyun",
55 "repo": "base16-fish",
56 "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
57 "type": "github"
58 },
59 "original": {
60 "owner": "tomyun",
61 "repo": "base16-fish",
62 "type": "github"
63 }
64 },
65 "base16-helix": {
66 "flake": false,
67 "locked": {
68 "lastModified": 1736852337,
69 "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
70 "owner": "tinted-theming",
71 "repo": "base16-helix",
72 "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
73 "type": "github"
74 },
75 "original": {
76 "owner": "tinted-theming",
77 "repo": "base16-helix",
78 "type": "github"
79 }
80 },
81 "base16-vim": {
82 "flake": false,
83 "locked": {
84 "lastModified": 1732806396,
85 "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
86 "owner": "tinted-theming",
87 "repo": "base16-vim",
88 "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
89 "type": "github"
90 },
91 "original": {
92 "owner": "tinted-theming",
93 "repo": "base16-vim",
94 "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
95 "type": "github"
96 }
97 },
98 "darwin": {31 "darwin": {
99 "inputs": {32 "inputs": {
100 "nixpkgs": [33 "nixpkgs": [
...@@ -116,22 +49,6 @@...@@ -116,22 +49,6 @@
116 "type": "github"49 "type": "github"
117 }50 }
118 },51 },
119 "firefox-gnome-theme": {
120 "flake": false,
121 "locked": {
122 "lastModified": 1744642301,
123 "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
124 "owner": "rafaelmardojai",
125 "repo": "firefox-gnome-theme",
126 "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
127 "type": "github"
128 },
129 "original": {
130 "owner": "rafaelmardojai",
131 "repo": "firefox-gnome-theme",
132 "type": "github"
133 }
134 },
135 "flake-compat": {52 "flake-compat": {
136 "flake": false,53 "flake": false,
137 "locked": {54 "locked": {
...@@ -149,21 +66,6 @@...@@ -149,21 +66,6 @@
149 }66 }
150 },67 },
151 "flake-compat_2": {68 "flake-compat_2": {
152 "locked": {
153 "lastModified": 1733328505,
154 "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
155 "owner": "edolstra",
156 "repo": "flake-compat",
157 "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
158 "type": "github"
159 },
160 "original": {
161 "owner": "edolstra",
162 "repo": "flake-compat",
163 "type": "github"
164 }
165 },
166 "flake-compat_3": {
167 "flake": false,69 "flake": false,
168 "locked": {70 "locked": {
169 "lastModified": 1696426674,71 "lastModified": 1696426674,
...@@ -179,7 +81,7 @@...@@ -179,7 +81,7 @@
179 "type": "github"81 "type": "github"
180 }82 }
181 },83 },
182 "flake-compat_4": {84 "flake-compat_3": {
183 "flake": false,85 "flake": false,
184 "locked": {86 "locked": {
185 "lastModified": 1696426674,87 "lastModified": 1696426674,
...@@ -213,30 +115,27 @@...@@ -213,30 +115,27 @@
213 "type": "github"115 "type": "github"
214 }116 }
215 },117 },
216 "flake-parts_2": {118 "flake-utils": {
217 "inputs": {119 "inputs": {
218 "nixpkgs-lib": [120 "systems": "systems"
219 "stylix",
220 "nixpkgs"
221 ]
222 },121 },
223 "locked": {122 "locked": {
224 "lastModified": 1733312601,123 "lastModified": 1731533236,
225 "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",124 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
226 "owner": "hercules-ci",125 "owner": "numtide",
227 "repo": "flake-parts",126 "repo": "flake-utils",
228 "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",127 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
229 "type": "github"128 "type": "github"
230 },129 },
231 "original": {130 "original": {
232 "owner": "hercules-ci",131 "owner": "numtide",
233 "repo": "flake-parts",132 "repo": "flake-utils",
234 "type": "github"133 "type": "github"
235 }134 }
236 },135 },
237 "flake-utils": {136 "flake-utils_2": {
238 "inputs": {137 "inputs": {
239 "systems": "systems"138 "systems": "systems_2"
240 },139 },
241 "locked": {140 "locked": {
242 "lastModified": 1701680307,141 "lastModified": 1701680307,
...@@ -252,9 +151,9 @@...@@ -252,9 +151,9 @@
252 "type": "github"151 "type": "github"
253 }152 }
254 },153 },
255 "flake-utils_2": {154 "flake-utils_3": {
256 "inputs": {155 "inputs": {
257 "systems": "systems_2"156 "systems": "systems_3"
258 },157 },
259 "locked": {158 "locked": {
260 "lastModified": 1731533236,159 "lastModified": 1731533236,
...@@ -270,9 +169,9 @@...@@ -270,9 +169,9 @@
270 "type": "github"169 "type": "github"
271 }170 }
272 },171 },
273 "flake-utils_3": {172 "flake-utils_4": {
274 "inputs": {173 "inputs": {
275 "systems": "systems_3"174 "systems": "systems_4"
276 },175 },
277 "locked": {176 "locked": {
278 "lastModified": 1731533236,177 "lastModified": 1731533236,
...@@ -288,7 +187,7 @@...@@ -288,7 +187,7 @@
288 "type": "github"187 "type": "github"
289 }188 }
290 },189 },
291 "flake-utils_4": {190 "flake-utils_5": {
292 "inputs": {191 "inputs": {
293 "systems": "systems_6"192 "systems": "systems_6"
294 },193 },
...@@ -306,7 +205,7 @@...@@ -306,7 +205,7 @@
306 "type": "github"205 "type": "github"
307 }206 }
308 },207 },
309 "flake-utils_5": {208 "flake-utils_6": {
310 "inputs": {209 "inputs": {
311 "systems": "systems_7"210 "systems": "systems_7"
312 },211 },
...@@ -324,7 +223,7 @@...@@ -324,7 +223,7 @@
324 "type": "github"223 "type": "github"
325 }224 }
326 },225 },
327 "flake-utils_6": {226 "flake-utils_7": {
328 "inputs": {227 "inputs": {
329 "systems": "systems_8"228 "systems": "systems_8"
330 },229 },
...@@ -342,45 +241,18 @@...@@ -342,45 +241,18 @@
342 "type": "github"241 "type": "github"
343 }242 }
344 },243 },
345 "fromYaml": {244 "flakey-profile": {
346 "flake": false,
347 "locked": {245 "locked": {
348 "lastModified": 1731966426,246 "lastModified": 1712898590,
349 "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",247 "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
350 "owner": "SenchoPens",248 "owner": "lf-",
351 "repo": "fromYaml",249 "repo": "flakey-profile",
352 "rev": "106af9e2f715e2d828df706c386a685698f3223b",250 "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
353 "type": "github"251 "type": "github"
354 },252 },
355 "original": {253 "original": {
356 "owner": "SenchoPens",254 "owner": "lf-",
357 "repo": "fromYaml",255 "repo": "flakey-profile",
358 "type": "github"
359 }
360 },
361 "git-hooks": {
362 "inputs": {
363 "flake-compat": [
364 "stylix",
365 "flake-compat"
366 ],
367 "gitignore": "gitignore_2",
368 "nixpkgs": [
369 "stylix",
370 "nixpkgs"
371 ]
372 },
373 "locked": {
374 "lastModified": 1742649964,
375 "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
376 "owner": "cachix",
377 "repo": "git-hooks.nix",
378 "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
379 "type": "github"
380 },
381 "original": {
382 "owner": "cachix",
383 "repo": "git-hooks.nix",
384 "type": "github"256 "type": "github"
385 }257 }
386 },258 },
...@@ -401,28 +273,6 @@...@@ -401,28 +273,6 @@
401 }273 }
402 },274 },
403 "gitignore_2": {275 "gitignore_2": {
404 "inputs": {
405 "nixpkgs": [
406 "stylix",
407 "git-hooks",
408 "nixpkgs"
409 ]
410 },
411 "locked": {
412 "lastModified": 1709087332,
413 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
414 "owner": "hercules-ci",
415 "repo": "gitignore.nix",
416 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
417 "type": "github"
418 },
419 "original": {
420 "owner": "hercules-ci",
421 "repo": "gitignore.nix",
422 "type": "github"
423 }
424 },
425 "gitignore_3": {
426 "inputs": {276 "inputs": {
427 "nixpkgs": [277 "nixpkgs": [
428 "zls",278 "zls",
...@@ -443,23 +293,6 @@...@@ -443,23 +293,6 @@
443 "type": "github"293 "type": "github"
444 }294 }
445 },295 },
446 "gnome-shell": {
447 "flake": false,
448 "locked": {
449 "lastModified": 1744584021,
450 "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
451 "owner": "GNOME",
452 "repo": "gnome-shell",
453 "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
454 "type": "github"
455 },
456 "original": {
457 "owner": "GNOME",
458 "ref": "48.1",
459 "repo": "gnome-shell",
460 "type": "github"
461 }
462 },
463 "home-manager": {296 "home-manager": {
464 "inputs": {297 "inputs": {
465 "nixpkgs": [298 "nixpkgs": [
...@@ -481,27 +314,6 @@...@@ -481,27 +314,6 @@
481 "type": "github"314 "type": "github"
482 }315 }
483 },316 },
484 "home-manager_2": {
485 "inputs": {
486 "nixpkgs": [
487 "stylix",
488 "nixpkgs"
489 ]
490 },
491 "locked": {
492 "lastModified": 1747763032,
493 "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=",
494 "owner": "nix-community",
495 "repo": "home-manager",
496 "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353",
497 "type": "github"
498 },
499 "original": {
500 "owner": "nix-community",
501 "repo": "home-manager",
502 "type": "github"
503 }
504 },
505 "langref": {317 "langref": {
506 "flake": false,318 "flake": false,
507 "locked": {319 "locked": {
...@@ -514,6 +326,41 @@...@@ -514,6 +326,41 @@
514 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"326 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
515 }327 }
516 },328 },
329 "lix": {
330 "flake": false,
331 "locked": {
332 "lastModified": 1746827285,
333 "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
334 "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
335 "type": "tarball",
336 "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
337 },
338 "original": {
339 "type": "tarball",
340 "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
341 }
342 },
343 "lix-module": {
344 "inputs": {
345 "flake-utils": "flake-utils",
346 "flakey-profile": "flakey-profile",
347 "lix": "lix",
348 "nixpkgs": [
349 "nixpkgs"
350 ]
351 },
352 "locked": {
353 "lastModified": 1746838955,
354 "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
355 "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
356 "type": "tarball",
357 "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz"
358 },
359 "original": {
360 "type": "tarball",
361 "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
362 }
363 },
517 "mnw": {364 "mnw": {
518 "locked": {365 "locked": {
519 "lastModified": 1748278309,366 "lastModified": 1748278309,
...@@ -531,7 +378,7 @@...@@ -531,7 +378,7 @@
531 },378 },
532 "moonlight": {379 "moonlight": {
533 "inputs": {380 "inputs": {
534 "flake-utils": "flake-utils",381 "flake-utils": "flake-utils_2",
535 "nixpkgs": [382 "nixpkgs": [
536 "nixpkgs"383 "nixpkgs"
537 ]384 ]
...@@ -557,11 +404,11 @@...@@ -557,11 +404,11 @@
557 ]404 ]
558 },405 },
559 "locked": {406 "locked": {
560 "lastModified": 1747847914,407 "lastModified": 1748096601,
561 "narHash": "sha256-Ut9RZVAaKUD4A3RrXP5RhNVZ+LVy5mL4mMmiTDWaQE8=",408 "narHash": "sha256-ji/9z1pRbosyKVVAIGBazyz6PjWV8bc2Ux2RdQrVDWY=",
562 "owner": "viperML",409 "owner": "viperML",
563 "repo": "nh",410 "repo": "nh",
564 "rev": "45048d3e9f183f3f09fddf667841b7327c04ad8f",411 "rev": "1ea27e73a3dcbc9950258e9054377ee677d12b9e",
565 "type": "github"412 "type": "github"
566 },413 },
567 "original": {414 "original": {
...@@ -618,7 +465,7 @@...@@ -618,7 +465,7 @@
618 },465 },
619 "nix-options-search": {466 "nix-options-search": {
620 "inputs": {467 "inputs": {
621 "flake-utils": "flake-utils_2",468 "flake-utils": "flake-utils_3",
622 "gitignore": "gitignore",469 "gitignore": "gitignore",
623 "nixpkgs": "nixpkgs"470 "nixpkgs": "nixpkgs"
624 },471 },
...@@ -753,42 +600,16 @@...@@ -753,42 +600,16 @@
753 "type": "github"600 "type": "github"
754 }601 }
755 },602 },
756 "nur": {
757 "inputs": {
758 "flake-parts": [
759 "stylix",
760 "flake-parts"
761 ],
762 "nixpkgs": [
763 "stylix",
764 "nixpkgs"
765 ],
766 "treefmt-nix": "treefmt-nix"
767 },
768 "locked": {
769 "lastModified": 1746056780,
770 "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
771 "owner": "nix-community",
772 "repo": "NUR",
773 "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
774 "type": "github"
775 },
776 "original": {
777 "owner": "nix-community",
778 "repo": "NUR",
779 "type": "github"
780 }
781 },
782 "nvf": {603 "nvf": {
783 "inputs": {604 "inputs": {
784 "flake-parts": "flake-parts",605 "flake-parts": "flake-parts",
785 "flake-utils": "flake-utils_3",606 "flake-utils": "flake-utils_4",
786 "mnw": "mnw",607 "mnw": "mnw",
787 "nil": "nil",608 "nil": "nil",
788 "nixpkgs": [609 "nixpkgs": [
789 "nixpkgs"610 "nixpkgs"
790 ],611 ],
791 "systems": "systems_4"612 "systems": "systems_5"
792 },613 },
793 "locked": {614 "locked": {
794 "lastModified": 1748318168,615 "lastModified": 1748318168,
...@@ -821,6 +642,7 @@...@@ -821,6 +642,7 @@
821 "apple-fonts": "apple-fonts",642 "apple-fonts": "apple-fonts",
822 "darwin": "darwin",643 "darwin": "darwin",
823 "home-manager": "home-manager",644 "home-manager": "home-manager",
645 "lix-module": "lix-module",
824 "moonlight": "moonlight",646 "moonlight": "moonlight",
825 "nh": "nh",647 "nh": "nh",
826 "nix-index-database": "nix-index-database",648 "nix-index-database": "nix-index-database",
...@@ -829,7 +651,6 @@...@@ -829,7 +651,6 @@
829 "nixpkgs": "nixpkgs_2",651 "nixpkgs": "nixpkgs_2",
830 "nvf": "nvf",652 "nvf": "nvf",
831 "rust-overlay": "rust-overlay_3",653 "rust-overlay": "rust-overlay_3",
832 "stylix": "stylix",
833 "zig": "zig",654 "zig": "zig",
834 "zls": "zls"655 "zls": "zls"
835 }656 }
...@@ -981,43 +802,6 @@...@@ -981,43 +802,6 @@
981 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"802 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
982 }803 }
983 },804 },
984 "stylix": {
985 "inputs": {
986 "base16": "base16",
987 "base16-fish": "base16-fish",
988 "base16-helix": "base16-helix",
989 "base16-vim": "base16-vim",
990 "firefox-gnome-theme": "firefox-gnome-theme",
991 "flake-compat": "flake-compat_2",
992 "flake-parts": "flake-parts_2",
993 "git-hooks": "git-hooks",
994 "gnome-shell": "gnome-shell",
995 "home-manager": "home-manager_2",
996 "nixpkgs": [
997 "nixpkgs"
998 ],
999 "nur": "nur",
1000 "systems": "systems_5",
1001 "tinted-foot": "tinted-foot",
1002 "tinted-kitty": "tinted-kitty",
1003 "tinted-schemes": "tinted-schemes",
1004 "tinted-tmux": "tinted-tmux",
1005 "tinted-zed": "tinted-zed"
1006 },
1007 "locked": {
1008 "lastModified": 1747847674,
1009 "narHash": "sha256-XYVaUKQrda7WOSonewDtpvm8tENIcwWrErobUYMTMoc=",
1010 "owner": "danth",
1011 "repo": "stylix",
1012 "rev": "4ce349da56e075f7e3456b48731cbbf5ae8b1eb8",
1013 "type": "github"
1014 },
1015 "original": {
1016 "owner": "danth",
1017 "repo": "stylix",
1018 "type": "github"
1019 }
1020 },
1021 "systems": {805 "systems": {
1022 "locked": {806 "locked": {
1023 "lastModified": 1681028828,807 "lastModified": 1681028828,
...@@ -1138,113 +922,10 @@...@@ -1138,113 +922,10 @@
1138 "type": "github"922 "type": "github"
1139 }923 }
1140 },924 },
1141 "tinted-foot": {
1142 "flake": false,
1143 "locked": {
1144 "lastModified": 1726913040,
1145 "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
1146 "owner": "tinted-theming",
1147 "repo": "tinted-foot",
1148 "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
1149 "type": "github"
1150 },
1151 "original": {
1152 "owner": "tinted-theming",
1153 "repo": "tinted-foot",
1154 "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
1155 "type": "github"
1156 }
1157 },
1158 "tinted-kitty": {
1159 "flake": false,
1160 "locked": {
1161 "lastModified": 1735730497,
1162 "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
1163 "owner": "tinted-theming",
1164 "repo": "tinted-kitty",
1165 "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
1166 "type": "github"
1167 },
1168 "original": {
1169 "owner": "tinted-theming",
1170 "repo": "tinted-kitty",
1171 "type": "github"
1172 }
1173 },
1174 "tinted-schemes": {
1175 "flake": false,
1176 "locked": {
1177 "lastModified": 1744974599,
1178 "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
1179 "owner": "tinted-theming",
1180 "repo": "schemes",
1181 "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
1182 "type": "github"
1183 },
1184 "original": {
1185 "owner": "tinted-theming",
1186 "repo": "schemes",
1187 "type": "github"
1188 }
1189 },
1190 "tinted-tmux": {
1191 "flake": false,
1192 "locked": {
1193 "lastModified": 1745111349,
1194 "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
1195 "owner": "tinted-theming",
1196 "repo": "tinted-tmux",
1197 "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
1198 "type": "github"
1199 },
1200 "original": {
1201 "owner": "tinted-theming",
1202 "repo": "tinted-tmux",
1203 "type": "github"
1204 }
1205 },
1206 "tinted-zed": {
1207 "flake": false,
1208 "locked": {
1209 "lastModified": 1725758778,
1210 "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
1211 "owner": "tinted-theming",
1212 "repo": "base16-zed",
1213 "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
1214 "type": "github"
1215 },
1216 "original": {
1217 "owner": "tinted-theming",
1218 "repo": "base16-zed",
1219 "type": "github"
1220 }
1221 },
1222 "treefmt-nix": {
1223 "inputs": {
1224 "nixpkgs": [
1225 "stylix",
1226 "nur",
1227 "nixpkgs"
1228 ]
1229 },
1230 "locked": {
1231 "lastModified": 1733222881,
1232 "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
1233 "owner": "numtide",
1234 "repo": "treefmt-nix",
1235 "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
1236 "type": "github"
1237 },
1238 "original": {
1239 "owner": "numtide",
1240 "repo": "treefmt-nix",
1241 "type": "github"
1242 }
1243 },
1244 "zig": {925 "zig": {
1245 "inputs": {926 "inputs": {
1246 "flake-compat": "flake-compat_3",927 "flake-compat": "flake-compat_2",
1247 "flake-utils": "flake-utils_4",928 "flake-utils": "flake-utils_5",
1248 "nixpkgs": "nixpkgs_3"929 "nixpkgs": "nixpkgs_3"
1249 },930 },
1250 "locked": {931 "locked": {
...@@ -1263,8 +944,8 @@...@@ -1263,8 +944,8 @@
1263 },944 },
1264 "zig-overlay": {945 "zig-overlay": {
1265 "inputs": {946 "inputs": {
1266 "flake-compat": "flake-compat_4",947 "flake-compat": "flake-compat_3",
1267 "flake-utils": "flake-utils_6",948 "flake-utils": "flake-utils_7",
1268 "nixpkgs": [949 "nixpkgs": [
1269 "zls",950 "zls",
1270 "nixpkgs"951 "nixpkgs"
...@@ -1286,8 +967,8 @@...@@ -1286,8 +967,8 @@
1286 },967 },
1287 "zls": {968 "zls": {
1288 "inputs": {969 "inputs": {
1289 "flake-utils": "flake-utils_5",970 "flake-utils": "flake-utils_6",
1290 "gitignore": "gitignore_3",971 "gitignore": "gitignore_2",
1291 "langref": "langref",972 "langref": "langref",
1292 "nixpkgs": "nixpkgs_4",973 "nixpkgs": "nixpkgs_4",
1293 "zig-overlay": "zig-overlay"974 "zig-overlay": "zig-overlay"
flake.nix+6-9
...@@ -3,10 +3,10 @@...@@ -3,10 +3,10 @@
3 inputs = {3 inputs = {
4 nixpkgs.url = "nixpkgs/nixos-unstable";4 nixpkgs.url = "nixpkgs/nixos-unstable";
55
6 # lix-module = {6 lix-module = {
7 # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";7 url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
8 # inputs.nixpkgs.follows = "nixpkgs";8 inputs.nixpkgs.follows = "nixpkgs";
9 # };9 };
1010
11 home-manager.url = "github:nix-community/home-manager/master";11 home-manager.url = "github:nix-community/home-manager/master";
12 home-manager.inputs.nixpkgs.follows = "nixpkgs";12 home-manager.inputs.nixpkgs.follows = "nixpkgs";
...@@ -26,9 +26,6 @@...@@ -26,9 +26,6 @@
26 zig.url = "github:mitchellh/zig-overlay";26 zig.url = "github:mitchellh/zig-overlay";
27 zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";27 zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
2828
29 stylix.url = "github:danth/stylix";
30 stylix.inputs.nixpkgs.follows = "nixpkgs";
31
32 moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.29 moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
33 moonlight.inputs.nixpkgs.follows = "nixpkgs";30 moonlight.inputs.nixpkgs.follows = "nixpkgs";
3431
...@@ -47,7 +44,7 @@...@@ -47,7 +44,7 @@
47 {44 {
48 self,45 self,
49 nixpkgs,46 nixpkgs,
50 # lix-module,47 lix-module,
51 nixos-cosmic,48 nixos-cosmic,
52 darwin,49 darwin,
53 ...50 ...
...@@ -97,7 +94,7 @@...@@ -97,7 +94,7 @@
97 inherit94 inherit
98 overlays95 overlays
99 nixpkgs96 nixpkgs
100 # lix-module97 lix-module
101 inputs98 inputs
102 mkNeovim99 mkNeovim
103 ;100 ;
lib/mkSystem.nix+2-5
...@@ -2,7 +2,7 @@...@@ -2,7 +2,7 @@
2# particular architecture.2# particular architecture.
3{3{
4 nixpkgs,4 nixpkgs,
5 # lix-module,5 lix-module,
6 overlays,6 overlays,
7 inputs,7 inputs,
8 mkNeovim,8 mkNeovim,
...@@ -89,7 +89,7 @@ systemFunc {...@@ -89,7 +89,7 @@ systemFunc {
8989
90 # Use lix (alternative nix implementation)90 # Use lix (alternative nix implementation)
91 # https://lix.systems/add-to-config/#flake-based-configurations91 # https://lix.systems/add-to-config/#flake-based-configurations
92 # lix-module.nixosModules.default92 lix-module.nixosModules.default
93 # (getInputModule "lix-module" "default")93 # (getInputModule "lix-module" "default")
9494
95 # Modules shared between nix-darwin and NixOS95 # Modules shared between nix-darwin and NixOS
...@@ -107,9 +107,6 @@ systemFunc {...@@ -107,9 +107,6 @@ systemFunc {
107 (getInputModule "nix-index-database" "nix-index")107 (getInputModule "nix-index-database" "nix-index")
108 { programs.nix-index-database.comma.enable = true; }108 { programs.nix-index-database.comma.enable = true; }
109109
110 # Themes for all programs
111 (getInputModule "stylix" "stylix")
112
113 # Home manager110 # Home manager
114 (getInputModule "home-manager" "home-manager")111 (getInputModule "home-manager" "home-manager")
115 {112 {
modules/shared/user-system-settings.nix-23
...@@ -19,27 +19,4 @@...@@ -19,27 +19,4 @@
19 BROWSER = user.browser;19 BROWSER = user.browser;
20 };20 };
2121
22 stylix = lib.mkIf (user ? "theme" && user.theme != null) {
23 enable = false;
24 base16Scheme = "${pkgs.base16-schemes}/share/themes/${user.theme}.yaml";
25
26 fonts = lib.optionalAttrs (user ? "font") {
27 serif = {
28 package = pkgs.nerd-fonts.${user.font};
29 name = "${user.font} Nerd Font";
30 };
31 sansSerif = {
32 package = pkgs.nerd-fonts.${user.font};
33 name = "${user.font} Nerd Font";
34 };
35 monospace = {
36 package = pkgs.nerd-fonts.${user.font};
37 name = "${user.font} Nerd Font";
38 };
39 emoji = {
40 package = pkgs.twemoji-color-font;
41 name = "Twemoji Color";
42 };
43 };
44 };
45}22}