diff --git a/flake.lock b/flake.lock index 77a285c..172aa60 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1753369162, - "narHash": "sha256-pSAsUVueht3WyyFJ3K+QJKWqFZNbyvsXijHOAHApeLk=", + "lastModified": 1756476223, + "narHash": "sha256-6/t+3UyXzncCLsqq2rg5Ci8XhUpF9lQmyHu8A+aMcGo=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "1361d269fe10c527528264185567a053252e22b0", + "rev": "a31bbcc1bf41baa9fca1028221068377bba8cd2e", "type": "github" }, "original": { @@ -63,16 +63,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1753461463, - "narHash": "sha256-kGc7pRH0diLzKmOHsEFA8sZ9NJpgT+tqxAMsuqNd5Po=", + "lastModified": 1756059815, + "narHash": "sha256-UALOxoXoFIHbwKzcqbqCAqw5cC0MJEehLaWSet5vxfE=", "owner": "Homebrew", "repo": "brew", - "rev": "4d14be89e99a45181c18e96a5f19a5b43343cc0f", + "rev": "02947ea4edbdef5fcce9ee57fa289547f4d096c9", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.5.13", + "ref": "4.6.7", "repo": "brew", "type": "github" } @@ -86,11 +86,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755444192, - "narHash": "sha256-9eVUtk3ces32aJpHnsrO49UJNvMKNMxlV7NeNSAADLo=", + "lastModified": 1756606761, + "narHash": "sha256-lcHMwq0LVcS1mP9o0pq00Von8PsXMsFPPo3ZXGWa7DU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "958ba486ee73019e3820b9ebd97a38660f736f40", + "rev": "9e9e58125b4ba190658235106858f9733b25a1b4", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1755275010, - "narHash": "sha256-lEApCoWUEWh0Ifc3k1JdVjpMtFFXeL2gG1qvBnoRc2I=", + "lastModified": 1755825449, + "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7220b01d679e93ede8d7b25d6f392855b81dd475", + "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1755519972, - "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", + "lastModified": 1756733629, + "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", "owner": "nix-community", "repo": "disko", - "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", + "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", "type": "github" }, "original": { @@ -503,11 +503,11 @@ ] }, "locked": { - "lastModified": 1755313937, - "narHash": "sha256-pQb7bNcolxYGRiylUCrTddiF+qW2wsUiM9+eRIDUrVU=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a749f4790a14f7168be67cdf6e548ef1c944e10", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1755442500, - "narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=", + "lastModified": 1756734952, + "narHash": "sha256-H6jmduj4QIncLPAPODPSG/8ry9lpr1kRq6fYytU52qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3", + "rev": "29ab63bbb3d9eee4a491f7ce701b189becd34068", "type": "github" }, "original": { @@ -539,11 +539,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1755480455, - "narHash": "sha256-cIMlCE5M5Zq1DjfS9mV4AepUv/hn9nrFj0klK7C784c=", + "lastModified": 1756765009, + "narHash": "sha256-S+1wO+FU3F16oajoL9EC247nilW43a2uP4xA7Wbou1Q=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "e1e54f7a14ae909bfefc1f0928c1f70fbfb31c84", + "rev": "f9926314171dc3254715a87a534c09c7d77c04f2", "type": "github" }, "original": { @@ -555,11 +555,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1755480844, - "narHash": "sha256-4Uz2TZckTG5dh2CPCj577BsmrGIEV8Ji3o/B8nv1tVE=", + "lastModified": 1756764042, + "narHash": "sha256-61qDXw6dK2OwBJzoi1F+EX26Iik4uYeQ0gFQkFJCmis=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "be6e3ae8531ba128ec039d057f76078b1a1513be", + "rev": "ebc12a06f7499c2dbd0c2b42ff0c4a3238075b01", "type": "github" }, "original": { @@ -592,11 +592,11 @@ ] }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1756201372, + "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1756638688, + "narHash": "sha256-ddxbPTnIchM6tgxb6fRrCvytlPE2KLifckTnde/irVQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "e7b8679cba79f4167199f018b05c82169249f654", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1754250993, - "narHash": "sha256-MEin+qoQKtFC1b0f4tnQ+Z82BQWSCgh6Ef7rpmH9gig=", + "lastModified": 1756398546, + "narHash": "sha256-n4GVDLhKu65XFraJuCzap2AaZji4xhPaZMTJ8aQdD3s=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "314d057294e79bc2596972126b84c6f9f144499a", + "rev": "3aa475996cb3bc1ecefa88c99c466e6f0bc17431", "type": "github" }, "original": { @@ -765,11 +765,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1756612744, + "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1755396877, - "narHash": "sha256-92gZRDz3zEsodraI0ZxPzZrpjSqc2qjxTW9HOflzKFw=", + "lastModified": 1756692643, + "narHash": "sha256-SVos3AYuLvF6bD8Y0b6EiLABoEaiAOa4M/fTCBe0FV8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0cf076c0bafbe7cbd33a3b7377ed24827674e8be", + "rev": "2f1d16db96f1ce8ee3c893ea9dc49c0035846988", "type": "github" }, "original": { @@ -803,11 +803,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1755154580, - "narHash": "sha256-ADGapM7FrEgA3tDSYADtfy2EPeAmBzbL3pFvXNhD0D0=", + "lastModified": 1755942173, + "narHash": "sha256-wSjUhxwartHibNyGrVudc0Zmsv/qgUTL6rBeETl4UTE=", "owner": "olafkfreund", "repo": "nix-ai-help", - "rev": "e71204cb39358ad1dc4c09202c3a17ede541c2d9", + "rev": "056c3ddc1601b1a8c4d6b1d5cf0ba2d35b8206ee", "type": "github" }, "original": { @@ -823,11 +823,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1755124568, - "narHash": "sha256-8fXTYruAwE6OiIz/99P5qknQYag7ZX985pNT+jhIIrU=", + "lastModified": 1756110286, + "narHash": "sha256-NE0HwcQCQTgM+HuYqmiemPf/5e+3fjwowceAyJj+ikU=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "2f873fc3ef373e59cd3a7dad4087685fc8ce02ca", + "rev": "b99bf9bf7445416fe55da09034fc4a6cd733805c", "type": "github" }, "original": { @@ -838,11 +838,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756750488, + "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", "type": "github" }, "original": { @@ -963,11 +963,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1755274400, - "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", + "lastModified": 1756617294, + "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", + "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8", "type": "github" }, "original": { @@ -979,11 +979,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -1011,11 +1011,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -1059,11 +1059,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -1122,11 +1122,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1756125398, + "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1755446520, - "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", + "lastModified": 1755960406, + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "type": "github" }, "original": { @@ -1320,11 +1320,11 @@ ] }, "locked": { - "lastModified": 1755311859, - "narHash": "sha256-NspGtm0ZpihxlFD628pvh5ZEhL/Q6/Z9XBpe3n6ZtEw=", + "lastModified": 1756434910, + "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "07619500e5937cc4669f24fec355d18a8fec0165", + "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", "type": "github" }, "original": { @@ -1541,11 +1541,11 @@ ] }, "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index 49fa9af..379e647 100755 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -168,6 +168,8 @@ in gnome.enable = lib.mkForce false; }; + gnome.gnome-keyring.enable = true; + dbus.enable = true; ddccontrol.enable = false; blueman.enable = true; @@ -277,6 +279,8 @@ in }; security = { + # Enable gnome keyring for password storage + pam.services.sddm.enableGnomeKeyring = true; polkit.enable = true; # configure sudo diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 7b2f856..57ba915 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -8,14 +8,13 @@ nix = { settings = { substituters = [ - "nas-cache:5ibTWOXJYlKBaoNtdDEPmvdLPtfnbwf9jvdnfwi5dUs=" "https://cache.mjallen.dev/nas-cache" "https://nixos-raspberrypi.cachix.org" "https://nix-community.cachix.org" "https://cache.nixos.org/" ]; trusted-public-keys = [ - + "nas-cache:5ibTWOXJYlKBaoNtdDEPmvdLPtfnbwf9jvdnfwi5dUs=" "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; @@ -43,6 +42,7 @@ # ... "libsoup-2.74.3" "libxml2-2.13.8" + "qtwebengine-5.15.19" ]; }; }; diff --git a/modules/nixos/services/protonmail-bridge/default.nix b/modules/nixos/services/protonmail-bridge/default.nix index ef08890..9c9416d 100644 --- a/modules/nixos/services/protonmail-bridge/default.nix +++ b/modules/nixos/services/protonmail-bridge/default.nix @@ -52,10 +52,6 @@ in after = [ "gpg-agent.service" ]; }; - # Enable gnome keyring for password storage - security.pam.services.login.enableGnomeKeyring = true; - services.gnome.gnome-keyring.enable = true; - # Configure gpg-agent programs.gnupg.agent = { enable = true; diff --git a/modules/nixos/services/wyoming/default.nix b/modules/nixos/services/wyoming/default.nix index 7f67c51..a305714 100755 --- a/modules/nixos/services/wyoming/default.nix +++ b/modules/nixos/services/wyoming/default.nix @@ -2,6 +2,7 @@ config, lib, namespace, + pkgs, ... }: with lib; @@ -22,10 +23,13 @@ in uri = "tcp://0.0.0.0:10300"; }; - piper.servers.hass-piper = { - enable = true; - voice = "en-us-ryan-high"; - uri = "tcp://0.0.0.0:10200"; + piper = { + package = pkgs.stable.wyoming-piper; + servers.hass-piper = { + enable = true; + voice = "en-us-ryan-high"; + uri = "tcp://0.0.0.0:10200"; + }; }; }; };