From 035ebf14e0cbc75c059bce79ed496d76d4ec8d62 Mon Sep 17 00:00:00 2001 From: NullBite Date: Wed, 3 Apr 2024 10:46:59 -0400 Subject: [PATCH] Update unstable and switch hosts back to it Revert "change all systems to 23.11 pending nixpkgs#300028" This reverts commit 8a1ec3911e29ada2d0725ff91ca613faf9c7db7e. Update flake.lock --- flake.lock | 12 ++++++------ flake.nix | 14 ++++++++++++++ hosts/nixos-wsl/configuration.nix | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 58bdd51..a85fb09 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1712016346, - "narHash": "sha256-O2nO7pD+krq+4HgkLB4VThRtAucIPfXDs/jJqCGlK1w=", + "lastModified": 1712093955, + "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", "owner": "nix-community", "repo": "home-manager", - "rev": "4be0464472675212654dedf3e021bd5f1d58b92f", + "rev": "80546b220e95a575c66c213af1b09fe255299438", "type": "github" }, "original": { @@ -418,11 +418,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1712026416, + "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "080a4a27f206d07724b88da096e27ef63401a504", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 99f1a56..9a7fa81 100644 --- a/flake.nix +++ b/flake.nix @@ -291,18 +291,24 @@ nixosConfigurations = { slab = mkSystem { + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; system = "x86_64-linux"; hostname = "slab"; stateVersion = "23.11"; }; nullbox = mkSystem { + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; system = "x86_64-linux"; hostname = "nullbox"; stateVersion = "23.11"; }; nixos-wsl = mkWSLSystem { + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; system = "x86_64-linux"; stateVersion = "23.11"; hostname = "nixos-wsl"; @@ -316,17 +322,23 @@ modules = [ { programs.zsh.enable = false; } ]; + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; }; "deck" = mkHome { system = "x86_64-linux"; stateVersion = "23.11"; username = "deck"; + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; }; "testuser" = mkHome { username = "testuser"; system = "x86_64-linux"; modules = [ ./users/testuser/home.nix ]; stateVersion = "23.11"; + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; }; "nix-on-droid" = mkHome { username = "nix-on-droid"; @@ -334,6 +346,8 @@ modules = [ ./users/nix-on-droid/home.nix ]; system = "aarch64-linux"; stateVersion = "23.11"; + nixpkgs = inputs.nixpkgs-unstable; + home-manager = inputs.home-manager-unstable; }; }; }; # end outputs diff --git a/hosts/nixos-wsl/configuration.nix b/hosts/nixos-wsl/configuration.nix index b4120df..44d0732 100644 --- a/hosts/nixos-wsl/configuration.nix +++ b/hosts/nixos-wsl/configuration.nix @@ -12,7 +12,7 @@ networking.networkmanager.enable = false; programs.gnupg.agent = { enable = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; }; fonts.packages = with pkgs; [