From b2e57dc4d4ef7dc8bc658d20de86c1c0a1c70490 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 12 Feb 2026 17:38:40 -0800 Subject: [PATCH] feat(natalie): switch back to cosmic --- flake.lock | 228 +++++++++++++++--------- flake.nix | 5 +- lib/mkSystem.nix | 1 + users/natalie/desktop/configuration.nix | 17 +- users/natalie/desktop/home.nix | 4 +- users/natalie/home/vicinae.nix | 10 +- 6 files changed, 176 insertions(+), 89 deletions(-) diff --git a/flake.lock b/flake.lock index aec6f4a0d6d11f57dad53d887ac3f5b2f44a33ef..3b6136ded72c615c428ffdb20eb0e3f2809b9eab 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1767903972, - "narHash": "sha256-SvWSEUjrYBYMWuBjAuojqzeb/jIqhMgJs3HuhmJc2Lc=", + "lastModified": 1770842388, + "narHash": "sha256-MsJGx3VqumkoV8F1SYE/Ats738vC8CAA/K31eUR/cks=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "c1924b3257f203016d91b3cae1fd2b0d0f94953b", + "rev": "7a6a0f7ad4195b792d8c59caf03e877a535ecd4b", "type": "github" }, "original": { @@ -25,9 +25,7 @@ }, "apple-fonts": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "ny": "ny", "sf-arabic": "sf-arabic", "sf-armenian": "sf-armenian", @@ -38,15 +36,15 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1758228441, - "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=", - "owner": "Lyndeno", + "lastModified": 1770758542, + "narHash": "sha256-MhtCW601b9tAMP20FBToytRSUMoThtefJ3/7kCThwsE=", + "owner": "nmarks413", "repo": "apple-fonts.nix", - "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72", + "rev": "96173002252e90bac2a1f863d709508220cb5db7", "type": "github" }, "original": { - "owner": "Lyndeno", + "owner": "nmarks413", "repo": "apple-fonts.nix", "type": "github" } @@ -58,11 +56,11 @@ ] }, "locked": { - "lastModified": 1767718503, - "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", + "lastModified": 1770736414, + "narHash": "sha256-x5xdJgUxNflO9j2sJHIHnPujDy6eAWJPCMQml5y9XB4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", + "rev": "7c952d9a524ffbbd5b5edca38fe6d943499585cc", "type": "github" }, "original": { @@ -80,11 +78,11 @@ ] }, "locked": { - "lastModified": 1764011051, - "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", + "lastModified": 1768818222, + "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", "owner": "numtide", "repo": "devshell", - "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", + "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", "type": "github" }, "original": { @@ -149,11 +147,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -199,27 +197,27 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -236,7 +234,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -296,11 +294,11 @@ ] }, "locked": { - "lastModified": 1767930051, - "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", + "lastModified": 1770818644, + "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=", "owner": "nix-community", "repo": "home-manager", - "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", + "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7", "type": "github" }, "original": { @@ -324,11 +322,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1769981889, + "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", "type": "github" }, "original": { @@ -344,11 +342,11 @@ ] }, "locked": { - "lastModified": 1765916709, - "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=", + "lastModified": 1770835386, + "narHash": "sha256-Yp0ooU66hXjGq0cAG9WwhmLCfqCVzRxGXx7+nggPlqI=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce", + "rev": "6e0829e81d363e4ebb7c3f04601a50853f752c99", "type": "github" }, "original": { @@ -365,15 +363,16 @@ ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } @@ -385,11 +384,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -402,14 +401,14 @@ "inputs": { "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765642879, - "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=", + "lastModified": 1768731915, + "narHash": "sha256-5lMgfTfLpsqMMlbRbaQ0jZMsh764IocBsM3cbR0QvPU=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e", + "rev": "f8f48b94dd931eff54e17d2185ef310c02bfa0bb", "type": "github" }, "original": { @@ -419,6 +418,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1762977756, "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", @@ -434,13 +449,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1770812194, + "narHash": "sha256-OH+lkaIKAvPXR3nITO7iYZwew2nW9Y7Xxq0yfM/UcUU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "8482c7ded03bae7550f3d69884f1e611e3bd19e8", "type": "github" }, "original": { @@ -449,7 +464,23 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -465,7 +496,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -493,11 +524,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767905953, - "narHash": "sha256-Bv2aFymqUptre+n5JxR0FFxhD1ZTu13IyQtOvUNDPRg=", + "lastModified": 1770813256, + "narHash": "sha256-G6np3C9Zz0ddUevUOox4mPZqclbV3xSyHuhRR0Dzk4g=", "owner": "notashelf", "repo": "nvf", - "rev": "328e096c8bb70cd3aa5da9ebec934b06f5a7869e", + "rev": "bd265fee7e9655e2898e6f6b76267eb832b0f3c9", "type": "github" }, "original": { @@ -527,9 +558,10 @@ "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nvf": "nvf", "rust-overlay": "rust-overlay", + "vicinae": "vicinae", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -542,11 +574,11 @@ ] }, "locked": { - "lastModified": 1767926800, - "narHash": "sha256-x0n73J6ufD/EhDlVdcoAmF0OQHZ+b0a2cKDc8RZyt+o=", + "lastModified": 1770865833, + "narHash": "sha256-oiARqnlvaW6pVGheVi4ye6voqCwhg5hCcGish2ZvQzI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "499e9eed88ff9494b6604205b42847e847dfeb91", + "rev": "c8cfbe26238638e2f3a2c0ae7e8d240f5e4ded85", "type": "github" }, "original": { @@ -582,7 +614,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=", + "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -630,7 +662,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=", + "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -729,6 +761,40 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "vicinae": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" + }, + "locked": { + "lastModified": 1770848661, + "narHash": "sha256-UseItagXTZy3RL5PQU7qh0fzpvJKDV1lEYpfbKo/riA=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "10c98516b63bbb790a63b0ed84724352f32bc08d", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -736,11 +802,11 @@ ] }, "locked": { - "lastModified": 1767618227, - "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", + "lastModified": 1770438797, + "narHash": "sha256-pwnQTmZswF6bu2/Ie7ajOo8w6rXQwVI954S9WX1UG3w=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "1586e49b3908b058e221f11d843eb46392dba17b", + "rev": "d396599774bdbafeb86c122dc2c422c7084ea390", "type": "github" }, "original": { @@ -753,14 +819,14 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1767919086, - "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=", + "lastModified": 1770598090, + "narHash": "sha256-k+82IDgTd9o5sxHIqGlvfwseKln3Ejx1edGtDltuPXo=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b", + "rev": "142495696982c88edddc8e17e4da90d8164acadf", "type": "github" }, "original": { @@ -797,7 +863,7 @@ "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "langref": "langref", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index ae62ec0b2fb114a63a437dd8b200ecef0757ad5a..1679d6231b52b25bdc4506d2765c07b133ef1a78 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,7 @@ rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; - apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; - apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; + apple-fonts.url = "github:nmarks413/apple-fonts.nix"; nvf.url = "github:notashelf/nvf"; nvf.inputs.nixpkgs.follows = "nixpkgs"; @@ -35,6 +34,8 @@ }; + vicinae.url = "github:vicinaehq/vicinae"; + nix-options-search.url = "github:madsbv/nix-options-search"; nix-index-database.url = "github:nix-community/nix-index-database"; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 9e3a13c459d7382e0c7d888d249f7ccb23a00fff..e8f6a0ce18544893f6ecffe87e6e86b065885c44 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -76,6 +76,7 @@ let ) inputs.nvf.homeManagerModules.default inputs.android-nixpkgs.hmModule + inputs.vicinae.homeManagerModules.default ]; in systemFunc { diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix index c424d6c49a7b44181886f4f7318da9eb3266b02d..68f5d35069b919ea9778973afa0381f96fca74a3 100644 --- a/users/natalie/desktop/configuration.nix +++ b/users/natalie/desktop/configuration.nix @@ -94,10 +94,23 @@ enable = true; xdgOpenUsePortal = true; config = { - common.default = [ "gtk" ]; + common = { + default = [ + "cosmic" + "gtk" + ]; + + "org.freedesktop.impl.portal.Secret" = [ + "gnome-keyring" + ]; + }; + }; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-cosmic + ]; }; virtualisation = { waydroid.enable = true; diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index cf6d38ac1ff4064795a753843cb0db6cfd1a3145..85b09dff5eb6236e9cec14f09e711a0d5a70cd02 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -26,12 +26,11 @@ steam-run vulkan-tools rusty-path-of-building - wineWowPackages.stable + wineWow64Packages.stable winetricks (prismlauncher.override { gamemodeSupport = true; }) umu-launcher limo - nexusmods-app-unfree protontricks (pkgs.callPackage ../../../packages/exiled_exchange_2 { }) awakened_poe_trade @@ -55,7 +54,6 @@ mpv wireguard-tools signal-desktop - inputs.zls.packages.x86_64-linux.zls rust-bin.stable.latest.default inputs.zen-browser.packages.x86_64-linux.default ]; diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index 301a7a6583d68cd7e2fb2b7921400e2726e15e43..132ed839a7ca552bb1923bc5f6dbbe537c05cf3e 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -1,7 +1,15 @@ { inputs, pkgs, ... }: { - programs.vicinae = { + services.vicinae = { enable = true; + systemd = { + enable = true; + autoStart = true; + environment = { + USE_LAYER_SHELL = 0; + }; + + }; settings = { faviconService = "twenty"; # twenty | google | none font.size = 11; -- 2.54.0