diff --git a/flake.lock b/flake.lock index 8abed9c..22d7393 100644 --- a/flake.lock +++ b/flake.lock @@ -305,6 +305,22 @@ "type": "github" } }, + "nixunstable": { + "locked": { + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "deploy-rs": "deploy-rs", @@ -313,6 +329,7 @@ "impermanence": "impermanence", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixunstable": "nixunstable", "sops-nix": "sops-nix", "stylix": "stylix" } diff --git a/flake.nix b/flake.nix index 9b0afef..95568a7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "Chris's system configuration"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixunstable.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; deploy-rs = { url = "github:serokell/deploy-rs"; @@ -27,10 +28,11 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, deploy-rs - , sops-nix, impermanence, stylix, nixos-hardware, ... }: + , impermanence, stylix, nixos-hardware, nixunstable, ... }: let pkgs = import nixpkgs { system = "x86_64-linux"; }; aarch64Pkgs = import nixpkgs { system = "aarch64-linux"; }; + pkgs-unstable = import nixunstable { system = "x86_64-linux"; }; deployAarch64Pkgs = import nixpkgs { system = "aarch64-linux"; overlays = [ @@ -59,7 +61,7 @@ nixosConfigurations = { smolboi = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; + specialArgs = { inherit inputs; inherit pkgs-unstable; }; modules = [ stylix.nixosModules.stylix impermanence.nixosModules.impermanence @@ -80,7 +82,7 @@ }; zeus = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; + specialArgs = { inherit inputs; inherit pkgs-unstable; }; modules = [ impermanence.nixosModules.impermanence ./systems/zeus/configuration.nix @@ -93,7 +95,7 @@ }; orangepihole = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - specialArgs = { inherit inputs; }; + specialArgs = { inherit inputs; inherit pkgs-unstable; }; modules = [ impermanence.nixosModules.impermanence ./systems/orangepihole/configuration.nix diff --git a/systems/zeus/configuration.nix b/systems/zeus/configuration.nix index 4f3ab91..c42d9b8 100644 --- a/systems/zeus/configuration.nix +++ b/systems/zeus/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, pkgs-unstable, ... }: { imports = [ # Include the results of the hardware scan. @@ -279,14 +279,14 @@ ]; }; environment = { - systemPackages = with pkgs; [ - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - dive - podman-tui - docker-compose - tcpdump - ethtool - recyclarr + systemPackages = [ + pkgs.vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + pkgs.dive + pkgs.podman-tui + pkgs.docker-compose + pkgs.tcpdump + pkgs.ethtool + pkgs-unstable.recyclarr ]; persistence."/persist" = { hideMounts = true;