diff --git a/flake.lock b/flake.lock index 94d793c..83bd9ba 100644 --- a/flake.lock +++ b/flake.lock @@ -79,7 +79,8 @@ "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "systems": "systems" + "systems": "systems", + "unstable": "unstable" } }, "systems": { @@ -96,6 +97,22 @@ "repo": "default", "type": "github" } + }, + "unstable": { + "locked": { + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 21db2a1..7debf2f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; systems.url = "github:nix-systems/default"; home-manager = { @@ -14,7 +15,14 @@ }; outputs = - { self, nixos-hardware, nixpkgs, home-manager, nix-darwin, systems }: + { self + , nixos-hardware + , nixpkgs + , home-manager + , nix-darwin + , systems + , unstable + }: let user = { name = "ari"; @@ -74,7 +82,10 @@ configuration = { ... }: { imports = [ nixos-hardware.nixosModules.framework-13-7040-amd - (import ./hosts/fwbook.nix { user = user; }) + (import ./hosts/fwbook.nix { + user = user; + unstable = unstable.legacyPackages.x86_64-linux; + }) ]; }; }; @@ -115,7 +126,10 @@ hardware = { enable = true; }; enablePrometheusExporters = true; }; - configuration = (import ./hosts/hl-bigbox1.nix { user = user; }); + configuration = (import ./hosts/hl-bigbox1.nix { + user = user; + unstable = unstable.legacyPackages.x86_64-linux; + }); }; # NIXOS Homelab - minipc1 diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 4f38b75..30318e3 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,5 +1,5 @@ -{ user, dataDir ? "/mnt/Data" }: -{ pkgs, lib, unstable, ... }: +{ user, dataDir ? "/mnt/Data", unstable }: +{ pkgs, lib, config, ... }: let zshFWBook = builtins.filterSource (p: t: true) ../configs/fwbook; zshFunctions = zshFWBook + "/functions.sh"; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index fceda3e..e2b9d23 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,5 +1,5 @@ -{ user }: -{ pkgs, lib, config, unstable, ... }: { +{ user, unstable }: +{ pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; # firmware updater services.fwupd.enable = true;