diff --git a/common/hm/noctalia/noctalia.nix b/common/hm/noctalia/noctalia.nix index fdcea22..86915df 100644 --- a/common/hm/noctalia/noctalia.nix +++ b/common/hm/noctalia/noctalia.nix @@ -1,9 +1,9 @@ { - inputs, - osConfig, config, - pkgs, lib, + osConfig, + pkgs, + unstable, ... }: let @@ -13,7 +13,7 @@ in lib.mkIf (cfg.desktop.enable && (cfg.desktop.shell == "noctalia")) { programs.noctalia = { enable = true; - package = inputs.unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.noctalia; + package = unstable.noctalia; systemd.enable = lib.mkDefault true; settings = { weather = lib.mapAttrs (n: v: lib.mkDefault v) { diff --git a/common/os/services/displayManager.nix b/common/os/services/displayManager.nix index 0c9c2f3..ba4a269 100644 --- a/common/os/services/displayManager.nix +++ b/common/os/services/displayManager.nix @@ -1,8 +1,8 @@ { - inputs, config, - pkgs, lib, + pkgs, + unstable, ... }: let @@ -16,7 +16,7 @@ in }; services.displayManager.noctalia-greeter = { enable = lib.mkDefault true; - package = inputs.unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.noctalia-greeter; + package = unstable.noctalia-greeter; settings.cursor = with config.catppuccin; lib.mkIf enable { diff --git a/flake.lock b/flake.lock index 82520b6..a15193e 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1788229478, - "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=", + "lastModified": 1789430117, + "narHash": "sha256-t+U1mijItLJ64xZOifpfQ17kpAL73nU7pDI48ScacVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1", + "rev": "cda90fd8838825c689fde9d3f3b4e937937790df", "type": "github" }, "original": { @@ -436,11 +436,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1789403066, - "narHash": "sha256-+k0cjXFFbKV8tZY+ypaE3ILEufDxaDtwqcGZXJPHNtE=", + "lastModified": 1789673090, + "narHash": "sha256-N3WqVo+2XB9dt6tVKsfNjpRJjQbg75GXsEPbT3cbUrY=", "ref": "refs/heads/main", - "rev": "aeb6143d1c501b1397221c682d7050a4395c806a", - "revCount": 61, + "rev": "287cc940a29bc7b1940720d8787ef30643055caa", + "revCount": 63, "type": "git", "url": "https://knot.moppu.dev/did:plc:hv3kvjufxykn2w4mriztfkhj/" }, @@ -456,11 +456,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1789344154, - "narHash": "sha256-cwRBONt2p2aVU7ItMXKqa6tIDKOErqkQKDR0WVHD3eI=", + "lastModified": 1789603491, + "narHash": "sha256-DEPYsLQGJxAJSGAYGt3MzAknlJFKjeyAPm+TBunSJK8=", "ref": "refs/heads/main", - "rev": "eff47aebab7ea25128aba1c83fd447c46ba65aa4", - "revCount": 189, + "rev": "d62b823f49d861a133616702ab055a074b5e66b8", + "revCount": 192, "type": "git", "url": "https://codeberg.org/bananad3v/niri-nix" }, @@ -494,11 +494,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1789308908, - "narHash": "sha256-rKf+kiqygvn1DjpNRlHVkbXnABLGpd/N6Gg+t2POEQM=", + "lastModified": 1789498232, + "narHash": "sha256-77MjtAjEiPCRH/CtChSU6IHclKkgQ3pI7s3c7N7iiiQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "66d04a7d72e25a6c74307bab33a91924d124755d", + "rev": "02fdd8e7586110d6aa79d94f388756a3479091b6", "type": "github" }, "original": { @@ -514,11 +514,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1789360421, - "narHash": "sha256-w3BTWJmfkrLKrrG5FS4LPElLoRmmRoWttWwjJUlpoGA=", + "lastModified": 1789619711, + "narHash": "sha256-Bf9+6h25eiMNa6IYHbFUXsBCT6qgWFeHdtNWD10cZt8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "72a02f71884c54d6123261fd420b1f7d068ee3e7", + "rev": "ec99d7ee14ad01f15347c228184a6805c143a4db", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1789360006, - "narHash": "sha256-qdXKYk7gEuUIuOCQ/KuMIJyx4EriuALzaI+eK4vBK0I=", + "lastModified": 1789619231, + "narHash": "sha256-RayC+RGOQpMH9uvPzQ3sLJqwCtZHhVsBN2rDcU/hHtE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "47789e27b5a7a147c6f4c70d5e40ac5636417ab4", + "rev": "7b52f3fb0853c36e0b28778bceb9791dc016e39c", "type": "github" }, "original": { @@ -589,11 +589,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1789356821, - "narHash": "sha256-SeRElgFQ/y459z/wFaQckqRj3R1sYdVFiSXD9iZmd+Y=", + "lastModified": 1789616279, + "narHash": "sha256-8gCxEl+OJ7oM/XBLiQi0q9xtB9+t/Zw0iSZR674A+jI=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "d50c355c30ddae1e07109d7777ccc6b0e9f3022f", + "rev": "ae529e4b34f0a2cb30422be4627db3af4dcaf6ae", "type": "github" }, "original": { @@ -604,11 +604,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1789344334, - "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", + "lastModified": 1789542786, + "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", + "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a", "type": "github" }, "original": { @@ -620,11 +620,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", + "lastModified": 1789546076, + "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1789286504, - "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", + "lastModified": 1789546076, + "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "github" }, "original": { @@ -710,11 +710,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1788179007, - "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "type": "github" }, "original": { @@ -787,11 +787,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", + "lastModified": 1789546076, + "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "github" }, "original": { @@ -854,11 +854,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1789389682, - "narHash": "sha256-n5lAaFSofJDpBrzRks4H9moBNAOAyQ0GMnlYWSQl8uo=", + "lastModified": 1789611680, + "narHash": "sha256-obiNV+juEjUYDDusgYQukjLyoVsJJPmYppmjvIEfkSg=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "2856ec3b1b384f243770240261a11831de51a923", + "rev": "8c52cb71b5bcafbf67bfb8e659f1fc45f882a008", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1788914643, - "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", + "lastModified": 1789623319, + "narHash": "sha256-kmlp8rPrvrXn58YiaANHKSWUijtUc7pwgerIywosOIM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "13616fff713a9f94055c66f15687ebdc17a335df", + "rev": "16954c1c360c3dc4d4b3b3e64df59f7e89452cb1", "type": "github" }, "original": { @@ -1219,11 +1219,11 @@ "tailwindcss-animated-src": "tailwindcss-animated-src" }, "locked": { - "lastModified": 1789389423, - "narHash": "sha256-kQZTl70PRaSJ0ZBco0tqOFnsrcLl1XekVrLMG21l48U=", + "lastModified": 1789564286, + "narHash": "sha256-TZaXuk0dWWivECwLcAu7i5aC6A//gE9rIY05jw1O6OA=", "ref": "refs/heads/master", - "rev": "f53890e1e1a53561e21261eceee03f87010bb3a1", - "revCount": 3999, + "rev": "8be03b2aef56a8909039adfd0c28c9e1159d5d04", + "revCount": 3216, "type": "git", "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" }, @@ -1255,11 +1255,11 @@ }, "unstable": { "locked": { - "lastModified": 1789286504, - "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", + "lastModified": 1789546076, + "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1789387191, - "narHash": "sha256-UWMvwIlLV3zF2Mkwus17NfLyBzwBsR/5pHFxrWWGyaA=", + "lastModified": 1789584125, + "narHash": "sha256-C9BpLH4dNggam12nz/Fx/M0Vlbw8WcT/cpOc37DPQAA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6a281d7c09c0ed6450c5c948ee9a387390285317", + "rev": "a12d482485d877cc066516ea256b435b209a1a8c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 503d54f..18d39f6 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,13 @@ systemCfg = ./hosts/${host}/os; in { - specialArgs = { inherit inputs otherHosts; }; + specialArgs = { + inherit inputs otherHosts; + unstable = import inputs.unstable { + inherit (self.nixosConfigurations.${host}.pkgs.stdenv.hostPlatform) system; + config.allowUnfree = true; + }; + }; modules = [ inputs.aagl.nixosModules.default inputs.catppuccin.nixosModules.catppuccin diff --git a/hosts/kaoru/os/hardware-configuration.nix b/hosts/kaoru/os/hardware-configuration.nix index 092545d..049265d 100644 --- a/hosts/kaoru/os/hardware-configuration.nix +++ b/hosts/kaoru/os/hardware-configuration.nix @@ -1,8 +1,8 @@ { - inputs, config, - pkgs, lib, + pkgs, + unstable, ... }: { @@ -116,7 +116,7 @@ open = true; nvidiaSettings = true; package = - (inputs.unstable.legacyPackages.x86_64-linux.linuxKernel.packagesFor config.boot.kernelPackages.kernel) + (unstable.linuxKernel.packagesFor config.boot.kernelPackages.kernel) .nvidiaPackages.latest; prime = { # Sync and Offload cannot be enabled at the same time! diff --git a/hosts/lala/os/netbird.nix b/hosts/lala/os/netbird.nix index a906383..83f685b 100644 --- a/hosts/lala/os/netbird.nix +++ b/hosts/lala/os/netbird.nix @@ -1,12 +1,11 @@ { - inputs, - pkgs, config, lib, + pkgs, + unstable, ... }: let - unstable = inputs.unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; domain = "moppu.dev"; netbirdDomain = "netbird.${domain}"; netbirdUrl = "https://${netbirdDomain}"; diff --git a/hosts/tsumugi/os/immich.nix b/hosts/tsumugi/os/immich.nix index 225dd90..4e784da 100644 --- a/hosts/tsumugi/os/immich.nix +++ b/hosts/tsumugi/os/immich.nix @@ -1,12 +1,11 @@ { - inputs, config, - pkgs, lib, + pkgs, + unstable, ... }: let - unstable = inputs.unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; cfg = config.services.immich; in lib.mkMerge [ diff --git a/hosts/yuhata/home/home.nix b/hosts/yuhata/home/home.nix index 3a1a26f..d3d5374 100644 --- a/hosts/yuhata/home/home.nix +++ b/hosts/yuhata/home/home.nix @@ -2,6 +2,7 @@ osConfig, config, pkgs, + unstable, inputs, lib, ... @@ -12,6 +13,7 @@ bs-manager via qmk + unstable.bambu-studio (limo.override { withUnrar = true; }) veadotube (heroic.override { diff --git a/hosts/yuhata/os/configuration.nix b/hosts/yuhata/os/configuration.nix index 8663793..e42c902 100644 --- a/hosts/yuhata/os/configuration.nix +++ b/hosts/yuhata/os/configuration.nix @@ -20,7 +20,10 @@ flavor = "mocha"; accent = "lavender"; }; - nix.monitored.enable = true; + nix = { + monitored.enable = true; + settings.cores = 12; + }; networking.hostName = "yuhata"; system.stateVersion = "25.05"; sidonia = { diff --git a/hosts/yuhata/os/hardware-configuration.nix b/hosts/yuhata/os/hardware-configuration.nix index f79cad8..356c471 100644 --- a/hosts/yuhata/os/hardware-configuration.nix +++ b/hosts/yuhata/os/hardware-configuration.nix @@ -2,7 +2,7 @@ config, lib, pkgs, - inputs, + unstable, ... }: @@ -87,7 +87,7 @@ open = true; nvidiaSettings = true; package = - (inputs.unstable.legacyPackages.x86_64-linux.linuxKernel.packagesFor config.boot.kernelPackages.kernel) + (unstable.linuxKernel.packagesFor config.boot.kernelPackages.kernel) .nvidiaPackages.latest; }; diff --git a/nixosModules/netbird.nix b/nixosModules/netbird.nix index c889fe2..e5dfb06 100644 --- a/nixosModules/netbird.nix +++ b/nixosModules/netbird.nix @@ -1,8 +1,9 @@ { config, - pkgs, - lib, inputs, + lib, + pkgs, + unstable, ... }: let @@ -18,7 +19,7 @@ in config = lib.mkIf (cfg.oneTimeKey != null) { services.netbird = { useRoutingFeatures = lib.mkDefault "both"; - package = lib.mkDefault inputs.unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.netbird; + package = lib.mkDefault unstable.netbird; clients = { sidonia = { port = lib.mkDefault 51820;