diff --git a/flake.lock b/flake.lock index e823d4e..6c98a00 100644 --- a/flake.lock +++ b/flake.lock @@ -76,6 +76,27 @@ "type": "github" } }, + "homeManager-23-11": { + "inputs": { + "nixpkgs": [ + "nixpkgs-23-11" + ] + }, + "locked": { + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1712791164, @@ -92,11 +113,29 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1712867921, + "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", "homeManager": "homeManager", - "nixpkgs": "nixpkgs" + "homeManager-23-11": "homeManager-23-11", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11" } }, "systems": { diff --git a/flake.nix b/flake.nix index 2cfe8e4..a591965 100644 --- a/flake.nix +++ b/flake.nix @@ -4,18 +4,24 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-23-11.url = "github:NixOS/nixpkgs/nixos-23.11"; homeManager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + homeManager-23-11 = { + url = "github:nix-community/home-manager/release-23.11"; + inputs.nixpkgs.follows = "nixpkgs-23-11"; + }; + NixOS-WSL = { url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, homeManager, NixOS-WSL, ...}@inputs: { + outputs = { self, nixpkgs, homeManager, NixOS-WSL, nixpkgs-23-11, homeManager-23-11, ...}@inputs: { nixosConfigurations = ( import ./hosts/hosts.nix { @@ -24,6 +30,8 @@ inherit inputs; inherit (nixpkgs) lib; inherit NixOS-WSL; + inherit nixpkgs-23-11; + inherit homeManager-23-11; } ); diff --git a/hosts/hosts.nix b/hosts/hosts.nix index 6c35951..99e7414 100644 --- a/hosts/hosts.nix +++ b/hosts/hosts.nix @@ -1,4 +1,4 @@ -{ lib, inputs, nixpkgs, homeManager, NixOS-WSL, ... }: +{ lib, inputs, nixpkgs, nixpkgs-23-11, homeManager, homeManager-23-11, NixOS-WSL, ... }: { "maxos" = lib.nixosSystem { system = "x86_64-linux"; @@ -17,11 +17,11 @@ ]; }; - "nixosWSL" = lib.nixosSystem { + "nixosWSL" = nixpkgs-23-11.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./nixosWSL/configuration.nix - homeManager.nixosModules.home-manager { + homeManager-23-11.nixosModules.home-manager { home-manager.extraSpecialArgs = { withGUI = false; gitSigningKey = "8F904A3FC7021497"; diff --git a/hosts/nixosWSL/configuration.nix b/hosts/nixosWSL/configuration.nix index 8595160..95b2baa 100644 --- a/hosts/nixosWSL/configuration.nix +++ b/hosts/nixosWSL/configuration.nix @@ -56,7 +56,7 @@ programs.gnupg.agent = { enable = true; - pinentryPackage = pkgs.pinentry-curses; + pinentryFlavor = "curses"; enableSSHSupport = true; };