authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-21 13:04:42-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-21 13:04:42-07:00
logde9d49308441a1d7b70843cb8449dc8aea61f346
treefd10bd4da8c47caa07f4ab49c3a2a579fe34dad3
parent0f3e214767ad8e0f6af145dd1b8aa7d8ecb1e6ca
signature Commit is signed but in an unrecognized format.

stylix working

19 files changed, 437 insertions(+), 550 deletions(-)

flake.lock+360-447
......@@ -1,56 +1,69 @@
11{
22 "nodes": {
3 "aquamarine": {
3 "base16": {
44 "inputs": {
5 "hyprutils": [
6 "hyprland",
7 "hyprutils"
8 ],
9 "hyprwayland-scanner": [
10 "hyprland",
11 "hyprwayland-scanner"
12 ],
13 "nixpkgs": [
14 "hyprland",
15 "nixpkgs"
16 ],
17 "systems": [
18 "hyprland",
19 "systems"
20 ]
5 "fromYaml": "fromYaml"
216 },
227 "locked": {
23 "lastModified": 1744289235,
24 "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
25 "owner": "hyprwm",
26 "repo": "aquamarine",
27 "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
8 "lastModified": 1732200724,
9 "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
10 "owner": "SenchoPens",
11 "repo": "base16.nix",
12 "rev": "153d52373b0fb2d343592871009a286ec8837aec",
2813 "type": "github"
2914 },
3015 "original": {
31 "owner": "hyprwm",
32 "repo": "aquamarine",
16 "owner": "SenchoPens",
17 "repo": "base16.nix",
3318 "type": "github"
3419 }
3520 },
36 "chinese-fonts-overlay": {
37 "inputs": {
38 "nixpkgs": [
39 "nixpkgs"
40 ]
21 "base16-fish": {
22 "flake": false,
23 "locked": {
24 "lastModified": 1622559957,
25 "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
26 "owner": "tomyun",
27 "repo": "base16-fish",
28 "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
29 "type": "github"
4130 },
31 "original": {
32 "owner": "tomyun",
33 "repo": "base16-fish",
34 "type": "github"
35 }
36 },
37 "base16-helix": {
38 "flake": false,
4239 "locked": {
43 "lastModified": 1735891296,
44 "narHash": "sha256-xmyzX5JXC1JQNVNhI8AnbivcID2AJoCQXlSKxRxsMt0=",
45 "owner": "brsvh",
46 "repo": "chinese-fonts-overlay",
47 "rev": "748d91262ab205d069d5a40275f079ed70b71994",
40 "lastModified": 1736852337,
41 "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
42 "owner": "tinted-theming",
43 "repo": "base16-helix",
44 "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
4845 "type": "github"
4946 },
5047 "original": {
51 "owner": "brsvh",
52 "ref": "main",
53 "repo": "chinese-fonts-overlay",
48 "owner": "tinted-theming",
49 "repo": "base16-helix",
50 "type": "github"
51 }
52 },
53 "base16-vim": {
54 "flake": false,
55 "locked": {
56 "lastModified": 1732806396,
57 "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
58 "owner": "tinted-theming",
59 "repo": "base16-vim",
60 "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
61 "type": "github"
62 },
63 "original": {
64 "owner": "tinted-theming",
65 "repo": "base16-vim",
66 "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
5467 "type": "github"
5568 }
5669 },
......@@ -75,23 +88,23 @@
7588 "type": "github"
7689 }
7790 },
78 "flake-compat": {
91 "firefox-gnome-theme": {
7992 "flake": false,
8093 "locked": {
81 "lastModified": 1696426674,
82 "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
83 "owner": "edolstra",
84 "repo": "flake-compat",
85 "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
94 "lastModified": 1743774811,
95 "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
96 "owner": "rafaelmardojai",
97 "repo": "firefox-gnome-theme",
98 "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
8699 "type": "github"
87100 },
88101 "original": {
89 "owner": "edolstra",
90 "repo": "flake-compat",
102 "owner": "rafaelmardojai",
103 "repo": "firefox-gnome-theme",
91104 "type": "github"
92105 }
93106 },
94 "flake-compat_2": {
107 "flake-compat": {
95108 "flake": false,
96109 "locked": {
97110 "lastModified": 1717312683,
......@@ -107,6 +120,21 @@
107120 "type": "github"
108121 }
109122 },
123 "flake-compat_2": {
124 "locked": {
125 "lastModified": 1733328505,
126 "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
127 "owner": "edolstra",
128 "repo": "flake-compat",
129 "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
130 "type": "github"
131 },
132 "original": {
133 "owner": "edolstra",
134 "repo": "flake-compat",
135 "type": "github"
136 }
137 },
110138 "flake-compat_3": {
111139 "flake": false,
112140 "locked": {
......@@ -139,9 +167,31 @@
139167 "type": "github"
140168 }
141169 },
170 "flake-parts": {
171 "inputs": {
172 "nixpkgs-lib": [
173 "stylix",
174 "nur",
175 "nixpkgs"
176 ]
177 },
178 "locked": {
179 "lastModified": 1733312601,
180 "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
181 "owner": "hercules-ci",
182 "repo": "flake-parts",
183 "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
184 "type": "github"
185 },
186 "original": {
187 "owner": "hercules-ci",
188 "repo": "flake-parts",
189 "type": "github"
190 }
191 },
142192 "flake-utils": {
143193 "inputs": {
144 "systems": "systems_2"
194 "systems": "systems"
145195 },
146196 "locked": {
147197 "lastModified": 1701680307,
......@@ -159,7 +209,7 @@
159209 },
160210 "flake-utils_2": {
161211 "inputs": {
162 "systems": "systems_3"
212 "systems": "systems_2"
163213 },
164214 "locked": {
165215 "lastModified": 1731533236,
......@@ -176,6 +226,27 @@
176226 }
177227 },
178228 "flake-utils_3": {
229 "inputs": {
230 "systems": [
231 "stylix",
232 "systems"
233 ]
234 },
235 "locked": {
236 "lastModified": 1731533236,
237 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
238 "owner": "numtide",
239 "repo": "flake-utils",
240 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
241 "type": "github"
242 },
243 "original": {
244 "owner": "numtide",
245 "repo": "flake-utils",
246 "type": "github"
247 }
248 },
249 "flake-utils_4": {
179250 "inputs": {
180251 "systems": "systems_4"
181252 },
......@@ -193,7 +264,7 @@
193264 "type": "github"
194265 }
195266 },
196 "flake-utils_4": {
267 "flake-utils_5": {
197268 "inputs": {
198269 "systems": "systems_5"
199270 },
......@@ -211,7 +282,7 @@
211282 "type": "github"
212283 }
213284 },
214 "flake-utils_5": {
285 "flake-utils_6": {
215286 "inputs": {
216287 "systems": "systems_6"
217288 },
......@@ -229,29 +300,49 @@
229300 "type": "github"
230301 }
231302 },
232 "gitignore": {
303 "fromYaml": {
304 "flake": false,
305 "locked": {
306 "lastModified": 1731966426,
307 "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
308 "owner": "SenchoPens",
309 "repo": "fromYaml",
310 "rev": "106af9e2f715e2d828df706c386a685698f3223b",
311 "type": "github"
312 },
313 "original": {
314 "owner": "SenchoPens",
315 "repo": "fromYaml",
316 "type": "github"
317 }
318 },
319 "git-hooks": {
233320 "inputs": {
321 "flake-compat": [
322 "stylix",
323 "flake-compat"
324 ],
325 "gitignore": "gitignore_2",
234326 "nixpkgs": [
235 "hyprland",
236 "pre-commit-hooks",
327 "stylix",
237328 "nixpkgs"
238329 ]
239330 },
240331 "locked": {
241 "lastModified": 1709087332,
242 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
243 "owner": "hercules-ci",
244 "repo": "gitignore.nix",
245 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
332 "lastModified": 1742649964,
333 "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
334 "owner": "cachix",
335 "repo": "git-hooks.nix",
336 "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
246337 "type": "github"
247338 },
248339 "original": {
249 "owner": "hercules-ci",
250 "repo": "gitignore.nix",
340 "owner": "cachix",
341 "repo": "git-hooks.nix",
251342 "type": "github"
252343 }
253344 },
254 "gitignore_2": {
345 "gitignore": {
255346 "flake": false,
256347 "locked": {
257348 "lastModified": 1709087332,
......@@ -267,10 +358,11 @@
267358 "type": "github"
268359 }
269360 },
270 "gitignore_3": {
361 "gitignore_2": {
271362 "inputs": {
272363 "nixpkgs": [
273 "zls",
364 "stylix",
365 "git-hooks",
274366 "nixpkgs"
275367 ]
276368 },
......@@ -288,331 +380,83 @@
288380 "type": "github"
289381 }
290382 },
291 "home-manager": {
292 "inputs": {
293 "nixpkgs": [
294 "nixpkgs"
295 ]
296 },
297 "locked": {
298 "lastModified": 1745128386,
299 "narHash": "sha256-xnNxL9lZC5Ez8AxTgHZZu8pYSNM34+5GD5jGSs8Vq4M=",
300 "owner": "nix-community",
301 "repo": "home-manager",
302 "rev": "f98314bb064cf8f8446c44afbadaaad2505875a7",
303 "type": "github"
304 },
305 "original": {
306 "owner": "nix-community",
307 "ref": "master",
308 "repo": "home-manager",
309 "type": "github"
310 }
311 },
312 "hosts": {
313 "inputs": {
314 "nixpkgs": "nixpkgs"
315 },
316 "locked": {
317 "lastModified": 1744900124,
318 "narHash": "sha256-2l+0DOQkro1XqokQCQYJVy0RLULxLvRdfd+KLvx2E+I=",
319 "owner": "StevenBlack",
320 "repo": "hosts",
321 "rev": "8c73d7423883d1e9992eb74aabc17f0780b65c8b",
322 "type": "github"
323 },
324 "original": {
325 "owner": "StevenBlack",
326 "repo": "hosts",
327 "type": "github"
328 }
329 },
330 "hyprcursor": {
331 "inputs": {
332 "hyprlang": [
333 "hyprland",
334 "hyprlang"
335 ],
336 "nixpkgs": [
337 "hyprland",
338 "nixpkgs"
339 ],
340 "systems": [
341 "hyprland",
342 "systems"
343 ]
344 },
345 "locked": {
346 "lastModified": 1742215578,
347 "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
348 "owner": "hyprwm",
349 "repo": "hyprcursor",
350 "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
351 "type": "github"
352 },
353 "original": {
354 "owner": "hyprwm",
355 "repo": "hyprcursor",
356 "type": "github"
357 }
358 },
359 "hyprgraphics": {
360 "inputs": {
361 "hyprutils": [
362 "hyprland",
363 "hyprutils"
364 ],
365 "nixpkgs": [
366 "hyprland",
367 "nixpkgs"
368 ],
369 "systems": [
370 "hyprland",
371 "systems"
372 ]
373 },
374 "locked": {
375 "lastModified": 1743953322,
376 "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
377 "owner": "hyprwm",
378 "repo": "hyprgraphics",
379 "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
380 "type": "github"
381 },
382 "original": {
383 "owner": "hyprwm",
384 "repo": "hyprgraphics",
385 "type": "github"
386 }
387 },
388 "hyprland": {
389 "inputs": {
390 "aquamarine": "aquamarine",
391 "hyprcursor": "hyprcursor",
392 "hyprgraphics": "hyprgraphics",
393 "hyprland-protocols": "hyprland-protocols",
394 "hyprland-qtutils": "hyprland-qtutils",
395 "hyprlang": "hyprlang",
396 "hyprutils": "hyprutils",
397 "hyprwayland-scanner": "hyprwayland-scanner",
398 "nixpkgs": "nixpkgs_2",
399 "pre-commit-hooks": "pre-commit-hooks",
400 "systems": "systems",
401 "xdph": "xdph"
402 },
403 "locked": {
404 "lastModified": 1745164468,
405 "narHash": "sha256-JOza51SDXsdHIuIR40wdFTzjZdSIq8RwFpCacDNURgk=",
406 "owner": "hyprwm",
407 "repo": "Hyprland",
408 "rev": "9b4060f09be06250e859b27d6dd3ded5349f5546",
409 "type": "github"
410 },
411 "original": {
412 "owner": "hyprwm",
413 "repo": "Hyprland",
414 "type": "github"
415 }
416 },
417 "hyprland-plugins": {
418 "inputs": {
419 "hyprland": [
420 "hyprland"
421 ],
422 "nixpkgs": [
423 "hyprland-plugins",
424 "hyprland",
425 "nixpkgs"
426 ],
427 "systems": [
428 "hyprland-plugins",
429 "hyprland",
430 "systems"
431 ]
432 },
433 "locked": {
434 "lastModified": 1745156469,
435 "narHash": "sha256-3PK27C3XcPoOkEIQnaPi3cdvh7XjIGqkcQ6MeZMvy2E=",
436 "owner": "hyprwm",
437 "repo": "hyprland-plugins",
438 "rev": "faa4e782753ab994333666b7e686b038d420c22f",
439 "type": "github"
440 },
441 "original": {
442 "owner": "hyprwm",
443 "repo": "hyprland-plugins",
444 "type": "github"
445 }
446 },
447 "hyprland-protocols": {
448 "inputs": {
449 "nixpkgs": [
450 "hyprland",
451 "nixpkgs"
452 ],
453 "systems": [
454 "hyprland",
455 "systems"
456 ]
457 },
458 "locked": {
459 "lastModified": 1743714874,
460 "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
461 "owner": "hyprwm",
462 "repo": "hyprland-protocols",
463 "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
464 "type": "github"
465 },
466 "original": {
467 "owner": "hyprwm",
468 "repo": "hyprland-protocols",
469 "type": "github"
470 }
471 },
472 "hyprland-qt-support": {
383 "gitignore_3": {
473384 "inputs": {
474 "hyprlang": [
475 "hyprland",
476 "hyprland-qtutils",
477 "hyprlang"
478 ],
479385 "nixpkgs": [
480 "hyprland",
481 "hyprland-qtutils",
482 "nixpkgs"
483 ],
484 "systems": [
485 "hyprland",
486 "hyprland-qtutils",
487 "systems"
488 ]
489 },
490 "locked": {
491 "lastModified": 1737634706,
492 "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
493 "owner": "hyprwm",
494 "repo": "hyprland-qt-support",
495 "rev": "8810df502cdee755993cb803eba7b23f189db795",
496 "type": "github"
497 },
498 "original": {
499 "owner": "hyprwm",
500 "repo": "hyprland-qt-support",
501 "type": "github"
502 }
503 },
504 "hyprland-qtutils": {
505 "inputs": {
506 "hyprland-qt-support": "hyprland-qt-support",
507 "hyprlang": [
508 "hyprland",
509 "hyprlang"
510 ],
511 "hyprutils": [
512 "hyprland",
513 "hyprland-qtutils",
514 "hyprlang",
515 "hyprutils"
516 ],
517 "nixpkgs": [
518 "hyprland",
386 "zls",
519387 "nixpkgs"
520 ],
521 "systems": [
522 "hyprland",
523 "systems"
524388 ]
525389 },
526390 "locked": {
527 "lastModified": 1739048983,
528 "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
529 "owner": "hyprwm",
530 "repo": "hyprland-qtutils",
531 "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
391 "lastModified": 1709087332,
392 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
393 "owner": "hercules-ci",
394 "repo": "gitignore.nix",
395 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
532396 "type": "github"
533397 },
534398 "original": {
535 "owner": "hyprwm",
536 "repo": "hyprland-qtutils",
399 "owner": "hercules-ci",
400 "repo": "gitignore.nix",
537401 "type": "github"
538402 }
539403 },
540 "hyprlang": {
541 "inputs": {
542 "hyprutils": [
543 "hyprland",
544 "hyprutils"
545 ],
546 "nixpkgs": [
547 "hyprland",
548 "nixpkgs"
549 ],
550 "systems": [
551 "hyprland",
552 "systems"
553 ]
554 },
404 "gnome-shell": {
405 "flake": false,
555406 "locked": {
556 "lastModified": 1744468525,
557 "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
558 "owner": "hyprwm",
559 "repo": "hyprlang",
560 "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
407 "lastModified": 1732369855,
408 "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
409 "owner": "GNOME",
410 "repo": "gnome-shell",
411 "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
561412 "type": "github"
562413 },
563414 "original": {
564 "owner": "hyprwm",
565 "repo": "hyprlang",
415 "owner": "GNOME",
416 "ref": "47.2",
417 "repo": "gnome-shell",
566418 "type": "github"
567419 }
568420 },
569 "hyprutils": {
421 "home-manager": {
570422 "inputs": {
571423 "nixpkgs": [
572 "hyprland",
573424 "nixpkgs"
574 ],
575 "systems": [
576 "hyprland",
577 "systems"
578425 ]
579426 },
580427 "locked": {
581 "lastModified": 1743950287,
582 "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
583 "owner": "hyprwm",
584 "repo": "hyprutils",
585 "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
428 "lastModified": 1745128386,
429 "narHash": "sha256-xnNxL9lZC5Ez8AxTgHZZu8pYSNM34+5GD5jGSs8Vq4M=",
430 "owner": "nix-community",
431 "repo": "home-manager",
432 "rev": "f98314bb064cf8f8446c44afbadaaad2505875a7",
586433 "type": "github"
587434 },
588435 "original": {
589 "owner": "hyprwm",
590 "repo": "hyprutils",
436 "owner": "nix-community",
437 "ref": "master",
438 "repo": "home-manager",
591439 "type": "github"
592440 }
593441 },
594 "hyprwayland-scanner": {
442 "home-manager_2": {
595443 "inputs": {
596444 "nixpkgs": [
597 "hyprland",
445 "stylix",
598446 "nixpkgs"
599 ],
600 "systems": [
601 "hyprland",
602 "systems"
603447 ]
604448 },
605449 "locked": {
606 "lastModified": 1739870480,
607 "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
608 "owner": "hyprwm",
609 "repo": "hyprwayland-scanner",
610 "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
450 "lastModified": 1744637364,
451 "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=",
452 "owner": "nix-community",
453 "repo": "home-manager",
454 "rev": "337541447773985f825512afd0f9821a975186be",
611455 "type": "github"
612456 },
613457 "original": {
614 "owner": "hyprwm",
615 "repo": "hyprwayland-scanner",
458 "owner": "nix-community",
459 "repo": "home-manager",
616460 "type": "github"
617461 }
618462 },
......@@ -692,8 +536,8 @@
692536 "nix-options-search": {
693537 "inputs": {
694538 "flake-utils": "flake-utils_2",
695 "gitignore": "gitignore_2",
696 "nixpkgs": "nixpkgs_3"
539 "gitignore": "gitignore",
540 "nixpkgs": "nixpkgs"
697541 },
698542 "locked": {
699543 "lastModified": 1743876182,
......@@ -711,7 +555,7 @@
711555 },
712556 "nixos-cosmic": {
713557 "inputs": {
714 "flake-compat": "flake-compat_2",
558 "flake-compat": "flake-compat",
715559 "nixpkgs": [
716560 "nixpkgs"
717561 ],
......@@ -734,14 +578,18 @@
734578 },
735579 "nixpkgs": {
736580 "locked": {
737 "lastModified": 0,
738 "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
739 "path": "/nix/store/inbabfz8n7fxflkis0a05zcli4a1q2bp-source",
740 "type": "path"
581 "lastModified": 1736012469,
582 "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
583 "owner": "nixos",
584 "repo": "nixpkgs",
585 "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
586 "type": "github"
741587 },
742588 "original": {
743 "id": "nixpkgs",
744 "type": "indirect"
589 "owner": "nixos",
590 "ref": "nixos-unstable",
591 "repo": "nixpkgs",
592 "type": "github"
745593 }
746594 },
747595 "nixpkgs-stable": {
......@@ -776,38 +624,6 @@
776624 }
777625 },
778626 "nixpkgs_2": {
779 "locked": {
780 "lastModified": 1744932701,
781 "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
782 "owner": "NixOS",
783 "repo": "nixpkgs",
784 "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
785 "type": "github"
786 },
787 "original": {
788 "owner": "NixOS",
789 "ref": "nixos-unstable",
790 "repo": "nixpkgs",
791 "type": "github"
792 }
793 },
794 "nixpkgs_3": {
795 "locked": {
796 "lastModified": 1736012469,
797 "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
798 "owner": "nixos",
799 "repo": "nixpkgs",
800 "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
801 "type": "github"
802 },
803 "original": {
804 "owner": "nixos",
805 "ref": "nixos-unstable",
806 "repo": "nixpkgs",
807 "type": "github"
808 }
809 },
810 "nixpkgs_4": {
811627 "locked": {
812628 "lastModified": 1744932701,
813629 "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
......@@ -822,7 +638,7 @@
822638 "type": "indirect"
823639 }
824640 },
825 "nixpkgs_5": {
641 "nixpkgs_3": {
826642 "locked": {
827643 "lastModified": 1708161998,
828644 "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
......@@ -838,7 +654,7 @@
838654 "type": "github"
839655 }
840656 },
841 "nixpkgs_6": {
657 "nixpkgs_4": {
842658 "locked": {
843659 "lastModified": 1717696253,
844660 "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
......@@ -854,45 +670,42 @@
854670 "type": "github"
855671 }
856672 },
857 "pre-commit-hooks": {
673 "nur": {
858674 "inputs": {
859 "flake-compat": "flake-compat",
860 "gitignore": "gitignore",
675 "flake-parts": "flake-parts",
861676 "nixpkgs": [
862 "hyprland",
677 "stylix",
863678 "nixpkgs"
864 ]
679 ],
680 "treefmt-nix": "treefmt-nix"
865681 },
866682 "locked": {
867 "lastModified": 1742649964,
868 "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
869 "owner": "cachix",
870 "repo": "git-hooks.nix",
871 "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
683 "lastModified": 1743884191,
684 "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
685 "owner": "nix-community",
686 "repo": "NUR",
687 "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
872688 "type": "github"
873689 },
874690 "original": {
875 "owner": "cachix",
876 "repo": "git-hooks.nix",
691 "owner": "nix-community",
692 "repo": "NUR",
877693 "type": "github"
878694 }
879695 },
880696 "root": {
881697 "inputs": {
882 "chinese-fonts-overlay": "chinese-fonts-overlay",
883698 "darwin": "darwin",
884699 "home-manager": "home-manager",
885 "hosts": "hosts",
886 "hyprland": "hyprland",
887 "hyprland-plugins": "hyprland-plugins",
888700 "moonlight": "moonlight",
889701 "nh": "nh",
890702 "nix-index-database": "nix-index-database",
891703 "nix-options-search": "nix-options-search",
892704 "nixos-cosmic": "nixos-cosmic",
893 "nixpkgs": "nixpkgs_4",
705 "nixpkgs": "nixpkgs_2",
894706 "nixpkgs-stable": "nixpkgs-stable_2",
895707 "rust-overlay": "rust-overlay_2",
708 "stylix": "stylix",
896709 "zig": "zig",
897710 "zls": "zls"
898711 }
......@@ -938,18 +751,55 @@
938751 "type": "github"
939752 }
940753 },
754 "stylix": {
755 "inputs": {
756 "base16": "base16",
757 "base16-fish": "base16-fish",
758 "base16-helix": "base16-helix",
759 "base16-vim": "base16-vim",
760 "firefox-gnome-theme": "firefox-gnome-theme",
761 "flake-compat": "flake-compat_2",
762 "flake-utils": "flake-utils_3",
763 "git-hooks": "git-hooks",
764 "gnome-shell": "gnome-shell",
765 "home-manager": "home-manager_2",
766 "nixpkgs": [
767 "nixpkgs"
768 ],
769 "nur": "nur",
770 "systems": "systems_3",
771 "tinted-foot": "tinted-foot",
772 "tinted-kitty": "tinted-kitty",
773 "tinted-schemes": "tinted-schemes",
774 "tinted-tmux": "tinted-tmux",
775 "tinted-zed": "tinted-zed"
776 },
777 "locked": {
778 "lastModified": 1745197327,
779 "narHash": "sha256-67BDvZBfS+IGM/onh7FgjSo1B+oeh6tewDCFvwrDzvs=",
780 "owner": "danth",
781 "repo": "stylix",
782 "rev": "039e938b29ce870ba326be1d60ae6d7c0a58f84e",
783 "type": "github"
784 },
785 "original": {
786 "owner": "danth",
787 "repo": "stylix",
788 "type": "github"
789 }
790 },
941791 "systems": {
942792 "locked": {
943 "lastModified": 1689347949,
944 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
793 "lastModified": 1681028828,
794 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
945795 "owner": "nix-systems",
946 "repo": "default-linux",
947 "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
796 "repo": "default",
797 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
948798 "type": "github"
949799 },
950800 "original": {
951801 "owner": "nix-systems",
952 "repo": "default-linux",
802 "repo": "default",
953803 "type": "github"
954804 }
955805 },
......@@ -1028,52 +878,115 @@
1028878 "type": "github"
1029879 }
1030880 },
1031 "xdph": {
881 "tinted-foot": {
882 "flake": false,
883 "locked": {
884 "lastModified": 1726913040,
885 "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
886 "owner": "tinted-theming",
887 "repo": "tinted-foot",
888 "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
889 "type": "github"
890 },
891 "original": {
892 "owner": "tinted-theming",
893 "repo": "tinted-foot",
894 "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
895 "type": "github"
896 }
897 },
898 "tinted-kitty": {
899 "flake": false,
900 "locked": {
901 "lastModified": 1716423189,
902 "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
903 "owner": "tinted-theming",
904 "repo": "tinted-kitty",
905 "rev": "eb39e141db14baef052893285df9f266df041ff8",
906 "type": "github"
907 },
908 "original": {
909 "owner": "tinted-theming",
910 "repo": "tinted-kitty",
911 "rev": "eb39e141db14baef052893285df9f266df041ff8",
912 "type": "github"
913 }
914 },
915 "tinted-schemes": {
916 "flake": false,
917 "locked": {
918 "lastModified": 1742851696,
919 "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
920 "owner": "tinted-theming",
921 "repo": "schemes",
922 "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
923 "type": "github"
924 },
925 "original": {
926 "owner": "tinted-theming",
927 "repo": "schemes",
928 "type": "github"
929 }
930 },
931 "tinted-tmux": {
932 "flake": false,
933 "locked": {
934 "lastModified": 1743296873,
935 "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
936 "owner": "tinted-theming",
937 "repo": "tinted-tmux",
938 "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
939 "type": "github"
940 },
941 "original": {
942 "owner": "tinted-theming",
943 "repo": "tinted-tmux",
944 "type": "github"
945 }
946 },
947 "tinted-zed": {
948 "flake": false,
949 "locked": {
950 "lastModified": 1725758778,
951 "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
952 "owner": "tinted-theming",
953 "repo": "base16-zed",
954 "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
955 "type": "github"
956 },
957 "original": {
958 "owner": "tinted-theming",
959 "repo": "base16-zed",
960 "type": "github"
961 }
962 },
963 "treefmt-nix": {
1032964 "inputs": {
1033 "hyprland-protocols": [
1034 "hyprland",
1035 "hyprland-protocols"
1036 ],
1037 "hyprlang": [
1038 "hyprland",
1039 "hyprlang"
1040 ],
1041 "hyprutils": [
1042 "hyprland",
1043 "hyprutils"
1044 ],
1045 "hyprwayland-scanner": [
1046 "hyprland",
1047 "hyprwayland-scanner"
1048 ],
1049965 "nixpkgs": [
1050 "hyprland",
966 "stylix",
967 "nur",
1051968 "nixpkgs"
1052 ],
1053 "systems": [
1054 "hyprland",
1055 "systems"
1056969 ]
1057970 },
1058971 "locked": {
1059 "lastModified": 1744644585,
1060 "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
1061 "owner": "hyprwm",
1062 "repo": "xdg-desktop-portal-hyprland",
1063 "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
972 "lastModified": 1733222881,
973 "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
974 "owner": "numtide",
975 "repo": "treefmt-nix",
976 "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
1064977 "type": "github"
1065978 },
1066979 "original": {
1067 "owner": "hyprwm",
1068 "repo": "xdg-desktop-portal-hyprland",
980 "owner": "numtide",
981 "repo": "treefmt-nix",
1069982 "type": "github"
1070983 }
1071984 },
1072985 "zig": {
1073986 "inputs": {
1074987 "flake-compat": "flake-compat_3",
1075 "flake-utils": "flake-utils_3",
1076 "nixpkgs": "nixpkgs_5"
988 "flake-utils": "flake-utils_4",
989 "nixpkgs": "nixpkgs_3"
1077990 },
1078991 "locked": {
1079992 "lastModified": 1744978344,
......@@ -1092,7 +1005,7 @@
10921005 "zig-overlay": {
10931006 "inputs": {
10941007 "flake-compat": "flake-compat_4",
1095 "flake-utils": "flake-utils_5",
1008 "flake-utils": "flake-utils_6",
10961009 "nixpkgs": [
10971010 "zls",
10981011 "nixpkgs"
......@@ -1114,10 +1027,10 @@
11141027 },
11151028 "zls": {
11161029 "inputs": {
1117 "flake-utils": "flake-utils_4",
1030 "flake-utils": "flake-utils_5",
11181031 "gitignore": "gitignore_3",
11191032 "langref": "langref",
1120 "nixpkgs": "nixpkgs_6",
1033 "nixpkgs": "nixpkgs_4",
11211034 "zig-overlay": "zig-overlay"
11221035 },
11231036 "locked": {
flake.nix+23-19
......@@ -18,21 +18,14 @@
1818 inputs.nixpkgs.follows = "nixpkgs";
1919 };
2020
21 hosts = {
22 url = "github:StevenBlack/hosts";
23 #flake = false;
24 };
25
26 hyprland.url = "github:hyprwm/Hyprland";
27 hyprland-plugins = {
28 url = "github:hyprwm/hyprland-plugins";
29 inputs.hyprland.follows = "hyprland";
30 #flake = false;
31 };
32
3321 zig.url = "github:mitchellh/zig-overlay";
3422 zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
3523
24 stylix = {
25 url = "github:danth/stylix";
26 inputs.nixpkgs.follows = "nixpkgs";
27 };
28
3629 moonlight = {
3730 url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
3831 inputs.nixpkgs.follows = "nixpkgs";
......@@ -52,11 +45,6 @@
5245
5346 nix-index-database.url = "github:nix-community/nix-index-database";
5447 nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
55
56 chinese-fonts-overlay = {
57 url = "github:brsvh/chinese-fonts-overlay/main";
58 inputs.nixpkgs.follows = "nixpkgs";
59 };
6048 };
6149 outputs = {
6250 nixpkgs,
......@@ -68,8 +56,20 @@
6856 overlays = [
6957 inputs.zig.overlays.default
7058 inputs.rust-overlay.overlays.default
71 inputs.chinese-fonts-overlay.overlays.default
7259 inputs.nh.overlays.default
60 #Signal desktop decided to break bc of being outdated on macos :(
61 (
62 final: prev: {
63 signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (old: {
64 version = "7.51.0";
65
66 src = prev.fetchurl {
67 url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-7.51.0.dmg";
68 hash = "sha256-dUcBvKbGVsEUxOSv8u/jjuvYjHar2+zbv+/ZRS85w1w=";
69 };
70 });
71 }
72 )
7373 ];
7474
7575 # ----- USER SETTINGS ----- #
......@@ -78,13 +78,17 @@
7878 name = "Natalie"; # name/identifier
7979 email = "nmarks413@gmail.com"; # email (used for certain configurations)
8080 dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
81 theme = "catpuccin-mocha"; #name of theme that stylix will use
8182 browser = "firefox"; # Default browser; must select one from ./user/app/browser/
8283 term = "ghostty"; # Default terminal command;
83 font = "iosevka Nerd Font"; # Selected font
84 font = "iosevka"; # Selected font
8485 editor = "neovim"; # Default editor;
8586 spawnEditor = "exec" + term + " -e " + editor;
8687 timeZone = "America/Los_Angeles";
8788 sexuality = "bisexual";
89
90 darwinHost = "laptop";
91 nixosHost = "desktop";
8892 };
8993
9094 mkSystem = import ./lib/mkSystem.nix {
hosts/desktop/configuration.nix-3
......@@ -1,7 +1,4 @@
11{
2 self,
3 inputs,
4 config,
52 pkgs,
63 userSettings,
74 ...
hosts/laptop/configuration.nix+5-18
......@@ -1,25 +1,12 @@
1{
2 inputs,
3 config,
4 pkgs,
5 lib,
6 userSettings,
7 ...
8}: {
1{pkgs, ...}: {
92 imports = [
10 # ../../modules/macos/icons.nix
113 ../../modules/macos/homebrew.nix
124 ];
135
14 environment.systemPackages = with pkgs;
15 [
16 neovim
17 pinentry_mac
18 ]
19 ++ callPackage ../shared/packages.nix {};
20
21 # Use a custom configuration.nix location.
22 #environment.darwinConfig = "$HOME/.dotfiles/hosts/laptop";
6 environment.systemPackages = with pkgs; [
7 neovim
8 pinentry_mac
9 ];
2310
2411 # Create /etc/zshrc that loads the nix-darwin environment.
2512 programs = {
hosts/laptop/home.nix+1-2
......@@ -4,7 +4,6 @@
44 pkgs,
55 lib,
66 userSettings,
7 systemSettings,
87 ...
98}: {
109 programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib userSettings;};
......@@ -15,7 +14,7 @@
1514 # shell = pkgs.fish;
1615 stateVersion = "23.05"; # Please read the comment before changing.
1716
18 # packages = pkgs.callPackage ../shared/packages.nix {};
17 packages = pkgs.callPackage ../shared/packages.nix {};
1918
2019 sessionPath = [
2120 "$HOME/.emacs.d/bin"
hosts/laptop/icons/.DS_Store deleted
Binary files a/hosts/laptop/icons/.DS_Store and /dev/null differ
hosts/laptop/icons/Zen_icons/Zen Browser - Dark Mono.icns deleted
Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Dark Mono.icns and /dev/null differ
hosts/laptop/icons/Zen_icons/Zen Browser - Dark.icns deleted
Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Dark.icns and /dev/null differ
hosts/laptop/icons/Zen_icons/Zen Browser - Inverted.icns deleted
Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Inverted.icns and /dev/null differ
hosts/laptop/icons/Zen_icons/Zen Browser - Light Mono.icns deleted
Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Light Mono.icns and /dev/null differ
hosts/laptop/icons/Zen_icons/Zen Browser - Light.icns deleted
Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Light.icns and /dev/null differ
hosts/laptop/icons/Zen_icons/firefox.icns deleted
Binary files a/hosts/laptop/icons/Zen_icons/firefox.icns and /dev/null differ
hosts/shared/home-programs.nix-23
......@@ -1,8 +1,5 @@
11{
2 inputs,
3 config,
42 pkgs,
5 lib,
63 userSettings,
74 ...
85}: {
......@@ -32,20 +29,6 @@
3229 bat = {
3330 enable = true;
3431 extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
35 config = {
36 theme = "catpuccin";
37 };
38 themes = {
39 catpuccin = {
40 src = pkgs.fetchFromGitHub {
41 owner = "catppuccin";
42 repo = "bat";
43 hash = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=";
44 rev = "699f60fc8ec434574ca7451b444b880430319941";
45 };
46 file = "themes/Catppuccin Mocha.tmTheme";
47 };
48 };
4932 };
5033
5134 hyfetch = {
......@@ -59,13 +42,7 @@
5942 };
6043 color_align = {
6144 mode = "horizontal";
62 # custom_colors = [];
63 # fore_back = null;
6445 };
65 distro = "nixos";
66 pride_month_shown = [
67 ];
68 pride_month_disable = false;
6946 };
7047 };
7148
lib/mkSystem.nix+16-13
......@@ -10,27 +10,21 @@
1010 darwin ? false,
1111 extraModules ? [],
1212}: let
13 # userSettings = rec {
14 # username = "nmarks"; # username
15 # name = "Natalie"; # name/identifier
16 # email = "nmarks413@gmail.com"; # email (used for certain configurations)
17 # dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
18 # browser = "firefox"; # Default browser; must select one from ./user/app/browser/
19 # term = "ghostty"; # Default terminal command;
20 # font = "iosevka Nerd Font"; # Selected font
21 # editor = "neovim"; # Default editor;
22 # spawnEditor = "exec" + term + "- e " + editor;
23 # };
2413 nixindex =
2514 if darwin
2615 then inputs.nix-index-database.darwinModules.nix-index
2716 else inputs.nix-index-database.nixosModules.nix-index;
2817
18 stylix =
19 if darwin
20 then inputs.stylix.darwinModules.stylix
21 else inputs.stylix.nixosModules.stylix;
22
2923 systemSettings = rec {
3024 host =
3125 if darwin
32 then "laptop"
33 else "desktop";
26 then userSettings.darwinHost
27 else userSettings.nixosHost;
3428
3529 # The config files for this system.
3630
......@@ -71,9 +65,17 @@ in
7165 ../modules/shared/extras.nix
7266 ../modules/shared/nix.nix
7367
68 # Link to config.nix
7469 hostConfig
70
71 #Set up nix-index and enable comma for easy one-shot command use
72 #https://github.com/nix-community/comma
7573 nixindex
7674 {programs.nix-index-database.comma.enable = true;}
75
76 #style programs
77 stylix
78
7779 hmModules.home-manager
7880 {
7981 home-manager = {
......@@ -99,5 +101,6 @@ in
99101 };
100102 }
101103 ]
104 #Add extra modules depending on system
102105 ++ extraModules;
103106 }
modules/macos/homebrew.nix+1-11
......@@ -1,10 +1,4 @@
1{
2 inputs,
3 config,
4 lib,
5 pkgs,
6 ...
7}: {
1_: {
82 # Use homebrew to install casks and Mac App Store apps
93 homebrew = {
104 enable = true;
......@@ -15,10 +9,6 @@
159 upgrade = true;
1610 };
1711
18 # taps = [
19 # "legcord/legcord"
20 # ];
21
2212 brews = [
2313 "imagemagick"
2414 "opam"
modules/nixos/nvidia.nix-1
......@@ -1,5 +1,4 @@
11{
2 lib,
32 pkgs,
43 config,
54 ...
modules/nixos/services.nix+1-6
......@@ -1,9 +1,4 @@
1{
2 lib,
3 pkgs,
4 config,
5 ...
6}: {
1{pkgs, ...}: {
72 services = {
83 avahi = {
94 enable = true;
modules/shared/extras.nix+29-2
......@@ -1,7 +1,5 @@
11{
22 pkgs,
3 config,
4 inputs,
53 userSettings,
64 ...
75}: {
......@@ -26,4 +24,33 @@
2624 TERMINAL = userSettings.term;
2725 BROWSER = userSettings.browser;
2826 };
27
28 stylix = {
29 enable = true;
30 base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml";
31
32 # pkgs.fetchurl {
33 # url = "https://raw.githubusercontent.com/tinted-theming/schemes/refs/heads/spec-0.11/base16/catppuccin-mocha.yaml";
34 # hash = "sha256-+/adkhwuW/3jCJ3/EWxyz99u13yuTk9Fqqy0YZ4KPPY=";
35 # };
36
37 fonts = {
38 serif = {
39 package = pkgs.nerd-fonts.${userSettings.font};
40 name = "Iosevka Nerd Font";
41 };
42 sansSerif = {
43 package = pkgs.nerd-fonts.${userSettings.font};
44 name = "Iosevka Nerd Font";
45 };
46 monospace = {
47 package = pkgs.nerd-fonts.${userSettings.font};
48 name = "Iosevka Nerd Font";
49 };
50 emoji = {
51 package = pkgs.twemoji-color-font;
52 name = "Twemoji Color";
53 };
54 };
55 };
2956}
modules/shared/nix.nix+1-5
......@@ -1,8 +1,4 @@
1{
2 config,
3 inputs,
4 ...
5}: {
1{inputs, ...}: {
62 nixpkgs.config = {
73 allowUnfree = true;
84 };