From ccf3fa2f4ae23f48ba8aa27409e51a7347cbfabb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 19 May 2025 20:17:58 +1000 Subject: [PATCH] flake: bump stable to 25.05 required because of home-manager zsh changes --- flake.lock | 26 +++++++++++++------------- flake.nix | 12 ++++++------ modules/system/home-manager-stable.nix | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 2c606b0..5bdfdc7 100644 --- a/flake.lock +++ b/flake.lock @@ -387,23 +387,23 @@ "type": "github" } }, - "home-manager-vicuna": { + "home-manager-stable_2": { "inputs": { "nixpkgs": [ - "nixpkgs-vicuna" + "nixpkgs-stable" ] }, "locked": { - "lastModified": 1747331121, - "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -601,18 +601,18 @@ "type": "github" } }, - "nixpkgs-vicuna": { + "nixpkgs-stable_2": { "locked": { - "lastModified": 1747635552, - "narHash": "sha256-2wAd20JLiHzcqSt7MGza4hN4rdV/c6Ed/13gN7HZJ9U=", + "lastModified": 1747647032, + "narHash": "sha256-gkWAK0I1k2Y0y8KOvXC6S0uBaduOguLs1Pxn5DpWwYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74b4de8529c4ce6f17b80c97728fddd627097809", + "rev": "dae513c187abfe679f67b99a6e256fbe8c3f79d0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "nixpkgs", "type": "github" } @@ -712,12 +712,12 @@ "catppuccin-palette": "catppuccin-palette", "fast-syntax-highlighting": "fast-syntax-highlighting", "home-manager": "home-manager_3", - "home-manager-vicuna": "home-manager-vicuna", + "home-manager-stable": "home-manager-stable_2", "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_3", - "nixpkgs-vicuna": "nixpkgs-vicuna", + "nixpkgs-stable": "nixpkgs-stable_2", "nvim-treesitter": "nvim-treesitter", "pure": "pure", "spicetify-nix": "spicetify-nix", diff --git a/flake.nix b/flake.nix index 207c094..bbcf402 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,9 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs-vicuna.url = "github:NixOS/nixpkgs/release-24.11"; - home-manager-vicuna.url = "github:nix-community/home-manager/release-24.11"; - home-manager-vicuna.inputs.nixpkgs.follows = "nixpkgs-vicuna"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/release-25.05"; + home-manager-stable.url = "github:nix-community/home-manager/release-25.05"; + home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; @@ -39,7 +39,7 @@ wine-discord-ipc-bridge = { url = "github:0e4ef622/wine-discord-ipc-bridge"; flake = false; }; }; - outputs = { self, agenix, catppuccin, nixpkgs, nixpkgs-vicuna, ... } @ inputs: + outputs = { self, agenix, catppuccin, nixpkgs, nixpkgs-stable, ... } @ inputs: let overlays = (import ./overlays) ++ [(final: prev: { @@ -74,8 +74,8 @@ in { nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" []; - nixosConfigurations."dandelion" = mkSystem nixpkgs-vicuna "dandelion" "aarch64-linux" []; - nixosConfigurations."hazel" = mkSystem nixpkgs-vicuna "hazel" "x86_64-linux" []; + nixosConfigurations."dandelion" = mkSystem nixpkgs-stable "dandelion" "aarch64-linux" []; + nixosConfigurations."hazel" = mkSystem nixpkgs-stable "hazel" "x86_64-linux" []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" []; packages."x86_64-linux" = diff --git a/modules/system/home-manager-stable.nix b/modules/system/home-manager-stable.nix index 6f9f9cc..43842d7 100644 --- a/modules/system/home-manager-stable.nix +++ b/modules/system/home-manager-stable.nix @@ -1,6 +1,6 @@ { config, inputs, modules, ... }: { imports = [ - inputs.home-manager-vicuna.nixosModules.home-manager + inputs.home-manager-stable.nixosModules.home-manager ]; home-manager = { useGlobalPkgs = true;