diff --git a/flake.lock b/flake.lock index cdb710b..c627132 100755 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "disko": { "inputs": { - "nixpkgs": ["nixpkgs"] + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1730751873, @@ -39,7 +41,11 @@ }, "fenix": { "inputs": { - "nixpkgs": ["nixpkgs-f2k", "nixpkgs-fmt", "nixpkgs"], + "nixpkgs": [ + "nixpkgs-f2k", + "nixpkgs-fmt", + "nixpkgs" + ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -193,7 +199,9 @@ }, "home-manager": { "inputs": { - "nixpkgs": ["nixpkgs"] + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1730837930, @@ -245,7 +253,9 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": ["nixpkgs"] + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1730944043, @@ -280,7 +290,9 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "nixpkgs": ["nixpkgs"] + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1730453870, @@ -337,7 +349,10 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_3", - "nixpkgs": ["nixpkgs-f2k", "nixpkgs"] + "nixpkgs": [ + "nixpkgs-f2k", + "nixpkgs" + ] }, "locked": { "lastModified": 1721822211, @@ -382,6 +397,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1732817615, + "narHash": "sha256-OxBtFh60ooClrIZyKEJyUsPngfBunnZVY7LfsoZPm9M=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fa7db5bea155321f36140fcd11a514247cd0757d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1730602179, "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", @@ -488,6 +519,7 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-f2k": "nixpkgs-f2k", + "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", "sops-nix": "sops-nix", "wezterm-flake": "wezterm-flake" @@ -512,7 +544,10 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": ["wezterm-flake", "nixpkgs"] + "nixpkgs": [ + "wezterm-flake", + "nixpkgs" + ] }, "locked": { "lastModified": 1729477859, @@ -531,7 +566,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1730883027, @@ -598,7 +633,9 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": ["nixpkgs"], + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay", "zlib": "zlib" }, diff --git a/flake.nix b/flake.nix index 8329c29..fefb60a 100755 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixos-wsl = { url = "github:nix-community/nixos-wsl"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 55f3421..366c12e 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -29,7 +29,7 @@ in { overlays = [ outputs.overlays.additions outputs.overlays.modifications - outputs.overlays.unstable-packages + outputs.overlays.stable-packages outputs.overlays.nur outputs.overlays.nix-vscode-extensions ]; diff --git a/hosts/common/home.nix b/hosts/common/home.nix index 326a6ae..b8d9c99 100644 --- a/hosts/common/home.nix +++ b/hosts/common/home.nix @@ -20,7 +20,7 @@ overlays = [ outputs.overlays.additions outputs.overlays.modifications - outputs.overlays.unstable-packages + outputs.overlays.stable-packages outputs.overlays.nur outputs.overlays.nix-vscode-extensions ]; diff --git a/overlays/default.nix b/overlays/default.nix index 0064cfd..41c0394 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,10 +10,10 @@ }; }; - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { + # When applied, the stable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.stable' + stable-packages = final: _prev: { + stable = import inputs.nixpkgs-stable { system = final.system; config.allowUnfree = true; };