authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-02-12 17:38:40-08:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-02-12 17:38:40-08:00
logb2e57dc4d4ef7dc8bc658d20de86c1c0a1c70490
tree5ee251ae051633e4734445fd7558790b26f2dc51
parent9317835503b227f31ea879d8e2b17a87c5ead948
signature Commit is signed but in an unrecognized format.

feat(natalie): switch back to cosmic

6 files changed, 160 insertions(+), 73 deletions(-)

flake.lock+131-65
......@@ -9,11 +9,11 @@
99 ]
1010 },
1111 "locked": {
12 "lastModified": 1767903972,
13 "narHash": "sha256-SvWSEUjrYBYMWuBjAuojqzeb/jIqhMgJs3HuhmJc2Lc=",
12 "lastModified": 1770842388,
13 "narHash": "sha256-MsJGx3VqumkoV8F1SYE/Ats738vC8CAA/K31eUR/cks=",
1414 "owner": "tadfisher",
1515 "repo": "android-nixpkgs",
16 "rev": "c1924b3257f203016d91b3cae1fd2b0d0f94953b",
16 "rev": "7a6a0f7ad4195b792d8c59caf03e877a535ecd4b",
1717 "type": "github"
1818 },
1919 "original": {
......@@ -25,9 +25,7 @@
2525 },
2626 "apple-fonts": {
2727 "inputs": {
28 "nixpkgs": [
29 "nixpkgs"
30 ],
28 "nixpkgs": "nixpkgs",
3129 "ny": "ny",
3230 "sf-arabic": "sf-arabic",
3331 "sf-armenian": "sf-armenian",
......@@ -38,15 +36,15 @@
3836 "sf-pro": "sf-pro"
3937 },
4038 "locked": {
41 "lastModified": 1758228441,
42 "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=",
43 "owner": "Lyndeno",
39 "lastModified": 1770758542,
40 "narHash": "sha256-MhtCW601b9tAMP20FBToytRSUMoThtefJ3/7kCThwsE=",
41 "owner": "nmarks413",
4442 "repo": "apple-fonts.nix",
45 "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72",
43 "rev": "96173002252e90bac2a1f863d709508220cb5db7",
4644 "type": "github"
4745 },
4846 "original": {
49 "owner": "Lyndeno",
47 "owner": "nmarks413",
5048 "repo": "apple-fonts.nix",
5149 "type": "github"
5250 }
......@@ -58,11 +56,11 @@
5856 ]
5957 },
6058 "locked": {
61 "lastModified": 1767718503,
62 "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=",
59 "lastModified": 1770736414,
60 "narHash": "sha256-x5xdJgUxNflO9j2sJHIHnPujDy6eAWJPCMQml5y9XB4=",
6361 "owner": "lnl7",
6462 "repo": "nix-darwin",
65 "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1",
63 "rev": "7c952d9a524ffbbd5b5edca38fe6d943499585cc",
6664 "type": "github"
6765 },
6866 "original": {
......@@ -80,11 +78,11 @@
8078 ]
8179 },
8280 "locked": {
83 "lastModified": 1764011051,
84 "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=",
81 "lastModified": 1768818222,
82 "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
8583 "owner": "numtide",
8684 "repo": "devshell",
87 "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071",
85 "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
8886 "type": "github"
8987 },
9088 "original": {
......@@ -149,11 +147,11 @@
149147 ]
150148 },
151149 "locked": {
152 "lastModified": 1760948891,
153 "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
150 "lastModified": 1768135262,
151 "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
154152 "owner": "hercules-ci",
155153 "repo": "flake-parts",
156 "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
154 "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
157155 "type": "github"
158156 },
159157 "original": {
......@@ -200,7 +198,7 @@
200198 },
201199 "flake-utils_3": {
202200 "inputs": {
203 "systems": "systems_4"
201 "systems": "systems_5"
204202 },
205203 "locked": {
206204 "lastModified": 1705309234,
......@@ -218,7 +216,7 @@
218216 },
219217 "flake-utils_4": {
220218 "inputs": {
221 "systems": "systems_5"
219 "systems": "systems_6"
222220 },
223221 "locked": {
224222 "lastModified": 1710146030,
......@@ -236,7 +234,7 @@
236234 },
237235 "flake-utils_5": {
238236 "inputs": {
239 "systems": "systems_6"
237 "systems": "systems_7"
240238 },
241239 "locked": {
242240 "lastModified": 1705309234,
......@@ -296,11 +294,11 @@
296294 ]
297295 },
298296 "locked": {
299 "lastModified": 1767930051,
300 "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=",
297 "lastModified": 1770818644,
298 "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=",
301299 "owner": "nix-community",
302300 "repo": "home-manager",
303 "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb",
301 "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7",
304302 "type": "github"
305303 },
306304 "original": {
......@@ -324,11 +322,11 @@
324322 },
325323 "mnw": {
326324 "locked": {
327 "lastModified": 1758834834,
328 "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
325 "lastModified": 1769981889,
326 "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=",
329327 "owner": "Gerg-L",
330328 "repo": "mnw",
331 "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
329 "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf",
332330 "type": "github"
333331 },
334332 "original": {
......@@ -344,11 +342,11 @@
344342 ]
345343 },
346344 "locked": {
347 "lastModified": 1765916709,
348 "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=",
345 "lastModified": 1770835386,
346 "narHash": "sha256-Yp0ooU66hXjGq0cAG9WwhmLCfqCVzRxGXx7+nggPlqI=",
349347 "owner": "moonlight-mod",
350348 "repo": "moonlight",
351 "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce",
349 "rev": "6e0829e81d363e4ebb7c3f04601a50853f752c99",
352350 "type": "github"
353351 },
354352 "original": {
......@@ -365,15 +363,16 @@
365363 ]
366364 },
367365 "locked": {
368 "lastModified": 1765720983,
369 "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
366 "lastModified": 1768214250,
367 "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
370368 "owner": "feel-co",
371369 "repo": "ndg",
372 "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
370 "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
373371 "type": "github"
374372 },
375373 "original": {
376374 "owner": "feel-co",
375 "ref": "refs/tags/v2.6.0",
377376 "repo": "ndg",
378377 "type": "github"
379378 }
......@@ -385,11 +384,11 @@
385384 ]
386385 },
387386 "locked": {
388 "lastModified": 1765267181,
389 "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
387 "lastModified": 1770315571,
388 "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=",
390389 "owner": "nix-community",
391390 "repo": "nix-index-database",
392 "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
391 "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb",
393392 "type": "github"
394393 },
395394 "original": {
......@@ -402,14 +401,14 @@
402401 "inputs": {
403402 "flake-utils": "flake-utils_2",
404403 "gitignore": "gitignore",
405 "nixpkgs": "nixpkgs"
404 "nixpkgs": "nixpkgs_2"
406405 },
407406 "locked": {
408 "lastModified": 1765642879,
409 "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=",
407 "lastModified": 1768731915,
408 "narHash": "sha256-5lMgfTfLpsqMMlbRbaQ0jZMsh764IocBsM3cbR0QvPU=",
410409 "owner": "madsbv",
411410 "repo": "nix-options-search",
412 "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e",
411 "rev": "f8f48b94dd931eff54e17d2185ef310c02bfa0bb",
413412 "type": "github"
414413 },
415414 "original": {
......@@ -419,6 +418,22 @@
419418 }
420419 },
421420 "nixpkgs": {
421 "locked": {
422 "lastModified": 1770562336,
423 "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
424 "owner": "nixos",
425 "repo": "nixpkgs",
426 "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
427 "type": "github"
428 },
429 "original": {
430 "owner": "nixos",
431 "ref": "nixos-unstable",
432 "repo": "nixpkgs",
433 "type": "github"
434 }
435 },
436 "nixpkgs_2": {
422437 "locked": {
423438 "lastModified": 1762977756,
424439 "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
......@@ -434,13 +449,13 @@
434449 "type": "github"
435450 }
436451 },
437 "nixpkgs_2": {
452 "nixpkgs_3": {
438453 "locked": {
439 "lastModified": 1767364772,
440 "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
454 "lastModified": 1770812194,
455 "narHash": "sha256-OH+lkaIKAvPXR3nITO7iYZwew2nW9Y7Xxq0yfM/UcUU=",
441456 "owner": "NixOS",
442457 "repo": "nixpkgs",
443 "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
458 "rev": "8482c7ded03bae7550f3d69884f1e611e3bd19e8",
444459 "type": "github"
445460 },
446461 "original": {
......@@ -449,7 +464,23 @@
449464 "type": "indirect"
450465 }
451466 },
452 "nixpkgs_3": {
467 "nixpkgs_4": {
468 "locked": {
469 "lastModified": 1762111121,
470 "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
471 "owner": "NixOS",
472 "repo": "nixpkgs",
473 "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
474 "type": "github"
475 },
476 "original": {
477 "owner": "NixOS",
478 "ref": "nixos-unstable",
479 "repo": "nixpkgs",
480 "type": "github"
481 }
482 },
483 "nixpkgs_5": {
453484 "locked": {
454485 "lastModified": 1708161998,
455486 "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
......@@ -465,7 +496,7 @@
465496 "type": "github"
466497 }
467498 },
468 "nixpkgs_4": {
499 "nixpkgs_6": {
469500 "locked": {
470501 "lastModified": 1717696253,
471502 "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
......@@ -493,11 +524,11 @@
493524 "systems": "systems_3"
494525 },
495526 "locked": {
496 "lastModified": 1767905953,
497 "narHash": "sha256-Bv2aFymqUptre+n5JxR0FFxhD1ZTu13IyQtOvUNDPRg=",
527 "lastModified": 1770813256,
528 "narHash": "sha256-G6np3C9Zz0ddUevUOox4mPZqclbV3xSyHuhRR0Dzk4g=",
498529 "owner": "notashelf",
499530 "repo": "nvf",
500 "rev": "328e096c8bb70cd3aa5da9ebec934b06f5a7869e",
531 "rev": "bd265fee7e9655e2898e6f6b76267eb832b0f3c9",
501532 "type": "github"
502533 },
503534 "original": {
......@@ -527,9 +558,10 @@
527558 "moonlight": "moonlight",
528559 "nix-index-database": "nix-index-database",
529560 "nix-options-search": "nix-options-search",
530 "nixpkgs": "nixpkgs_2",
561 "nixpkgs": "nixpkgs_3",
531562 "nvf": "nvf",
532563 "rust-overlay": "rust-overlay",
564 "vicinae": "vicinae",
533565 "zen-browser": "zen-browser",
534566 "zig": "zig",
535567 "zls": "zls"
......@@ -542,11 +574,11 @@
542574 ]
543575 },
544576 "locked": {
545 "lastModified": 1767926800,
546 "narHash": "sha256-x0n73J6ufD/EhDlVdcoAmF0OQHZ+b0a2cKDc8RZyt+o=",
577 "lastModified": 1770865833,
578 "narHash": "sha256-oiARqnlvaW6pVGheVi4ye6voqCwhg5hCcGish2ZvQzI=",
547579 "owner": "oxalica",
548580 "repo": "rust-overlay",
549 "rev": "499e9eed88ff9494b6604205b42847e847dfeb91",
581 "rev": "c8cfbe26238638e2f3a2c0ae7e8d240f5e4ded85",
550582 "type": "github"
551583 },
552584 "original": {
......@@ -582,7 +614,7 @@
582614 "sf-compact": {
583615 "flake": false,
584616 "locked": {
585 "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=",
617 "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=",
586618 "type": "file",
587619 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
588620 },
......@@ -630,7 +662,7 @@
630662 "sf-pro": {
631663 "flake": false,
632664 "locked": {
633 "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=",
665 "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=",
634666 "type": "file",
635667 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
636668 },
......@@ -729,6 +761,40 @@
729761 "type": "github"
730762 }
731763 },
764 "systems_7": {
765 "locked": {
766 "lastModified": 1681028828,
767 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
768 "owner": "nix-systems",
769 "repo": "default",
770 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
771 "type": "github"
772 },
773 "original": {
774 "owner": "nix-systems",
775 "repo": "default",
776 "type": "github"
777 }
778 },
779 "vicinae": {
780 "inputs": {
781 "nixpkgs": "nixpkgs_4",
782 "systems": "systems_4"
783 },
784 "locked": {
785 "lastModified": 1770848661,
786 "narHash": "sha256-UseItagXTZy3RL5PQU7qh0fzpvJKDV1lEYpfbKo/riA=",
787 "owner": "vicinaehq",
788 "repo": "vicinae",
789 "rev": "10c98516b63bbb790a63b0ed84724352f32bc08d",
790 "type": "github"
791 },
792 "original": {
793 "owner": "vicinaehq",
794 "repo": "vicinae",
795 "type": "github"
796 }
797 },
732798 "zen-browser": {
733799 "inputs": {
734800 "nixpkgs": [
......@@ -736,11 +802,11 @@
736802 ]
737803 },
738804 "locked": {
739 "lastModified": 1767618227,
740 "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=",
805 "lastModified": 1770438797,
806 "narHash": "sha256-pwnQTmZswF6bu2/Ie7ajOo8w6rXQwVI954S9WX1UG3w=",
741807 "owner": "youwen5",
742808 "repo": "zen-browser-flake",
743 "rev": "1586e49b3908b058e221f11d843eb46392dba17b",
809 "rev": "d396599774bdbafeb86c122dc2c422c7084ea390",
744810 "type": "github"
745811 },
746812 "original": {
......@@ -753,14 +819,14 @@
753819 "inputs": {
754820 "flake-compat": "flake-compat_2",
755821 "flake-utils": "flake-utils_3",
756 "nixpkgs": "nixpkgs_3"
822 "nixpkgs": "nixpkgs_5"
757823 },
758824 "locked": {
759 "lastModified": 1767919086,
760 "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=",
825 "lastModified": 1770598090,
826 "narHash": "sha256-k+82IDgTd9o5sxHIqGlvfwseKln3Ejx1edGtDltuPXo=",
761827 "owner": "mitchellh",
762828 "repo": "zig-overlay",
763 "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b",
829 "rev": "142495696982c88edddc8e17e4da90d8164acadf",
764830 "type": "github"
765831 },
766832 "original": {
......@@ -797,7 +863,7 @@
797863 "flake-utils": "flake-utils_4",
798864 "gitignore": "gitignore_2",
799865 "langref": "langref",
800 "nixpkgs": "nixpkgs_4",
866 "nixpkgs": "nixpkgs_6",
801867 "zig-overlay": "zig-overlay"
802868 },
803869 "locked": {
flake.nix+3-2
......@@ -9,8 +9,7 @@
99 rust-overlay.url = "github:oxalica/rust-overlay";
1010 rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
1111
12 apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
13 apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
12 apple-fonts.url = "github:nmarks413/apple-fonts.nix";
1413
1514 nvf.url = "github:notashelf/nvf";
1615 nvf.inputs.nixpkgs.follows = "nixpkgs";
......@@ -35,6 +34,8 @@
3534
3635 };
3736
37 vicinae.url = "github:vicinaehq/vicinae";
38
3839 nix-options-search.url = "github:madsbv/nix-options-search";
3940
4041 nix-index-database.url = "github:nix-community/nix-index-database";
lib/mkSystem.nix+1
......@@ -76,6 +76,7 @@ let
7676 )
7777 inputs.nvf.homeManagerModules.default
7878 inputs.android-nixpkgs.hmModule
79 inputs.vicinae.homeManagerModules.default
7980 ];
8081in
8182systemFunc {
users/natalie/desktop/configuration.nix+15-2
......@@ -94,10 +94,23 @@
9494 enable = true;
9595 xdgOpenUsePortal = true;
9696 config = {
97 common.default = [ "gtk" ];
97 common = {
98 default = [
99 "cosmic"
100 "gtk"
101 ];
102
103 "org.freedesktop.impl.portal.Secret" = [
104 "gnome-keyring"
105 ];
106 };
107
98108 };
99109
100 extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
110 extraPortals = with pkgs; [
111 xdg-desktop-portal-gtk
112 xdg-desktop-portal-cosmic
113 ];
101114 };
102115 virtualisation = {
103116 waydroid.enable = true;
users/natalie/desktop/home.nix+1-3
......@@ -26,12 +26,11 @@
2626 steam-run
2727 vulkan-tools
2828 rusty-path-of-building
29 wineWowPackages.stable
29 wineWow64Packages.stable
3030 winetricks
3131 (prismlauncher.override { gamemodeSupport = true; })
3232 umu-launcher
3333 limo
34 nexusmods-app-unfree
3534 protontricks
3635 (pkgs.callPackage ../../../packages/exiled_exchange_2 { })
3736 awakened_poe_trade
......@@ -55,7 +54,6 @@
5554 mpv
5655 wireguard-tools
5756 signal-desktop
58 inputs.zls.packages.x86_64-linux.zls
5957 rust-bin.stable.latest.default
6058 inputs.zen-browser.packages.x86_64-linux.default
6159 ];
users/natalie/home/vicinae.nix+9-1
......@@ -1,7 +1,15 @@
11{ inputs, pkgs, ... }:
22{
3 programs.vicinae = {
3 services.vicinae = {
44 enable = true;
5 systemd = {
6 enable = true;
7 autoStart = true;
8 environment = {
9 USE_LAYER_SHELL = 0;
10 };
11
12 };
513 settings = {
614 faviconService = "twenty"; # twenty | google | none
715 font.size = 11;