diff --git a/flake.lock b/flake.lock index c7c9d928c..91dd6b2ed 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,31 @@ { "nodes": { + "edge-nixpkgs": { + "locked": { + "lastModified": 1710377395, + "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "db001797591bf76f7b8d4c4ed3b49233391e0c97", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -25,11 +41,11 @@ ] }, "locked": { - "lastModified": 1710062421, - "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", + "lastModified": 1710423955, + "narHash": "sha256-6N/65EqYVqCaz5SVoPMx2HgA+DJZAlw5lW+U9VHSSbE=", "owner": "nix-community", "repo": "home-manager", - "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", + "rev": "587719494ed18a184c98c4d55dde9469af4446bf", "type": "github" }, "original": { @@ -41,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -57,6 +73,7 @@ }, "root": { "inputs": { + "edge-nixpkgs": "edge-nixpkgs", "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index 1d537a66f..2e4c268b2 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ # How to update the revision # - `nix flake update --commit-lock-file` # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake-update.html nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + edge-nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; # https://github.com/nix-community/home-manager/blob/master/docs/nix-flakes.adoc home-manager = { @@ -15,10 +16,11 @@ }; }; - outputs = { self, nixpkgs, home-manager, flake-utils }: + outputs = { self, nixpkgs, home-manager, flake-utils, edge-nixpkgs }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; + edge-pkgs = edge-nixpkgs.legacyPackages.${system}; in rec { devShells.default = with pkgs; @@ -52,6 +54,9 @@ modules = [ ./home-manager/kachick.nix ]; + extraSpecialArgs = { + inherit edge-pkgs; + }; }; github-actions = home-manager.lib.homeManagerConfiguration { @@ -62,6 +67,9 @@ ./home-manager/kachick.nix { home.username = "runner"; } ]; + extraSpecialArgs = { + inherit edge-pkgs; + }; }; user = home-manager.lib.homeManagerConfiguration { @@ -73,6 +81,9 @@ home.username = "user"; } ]; + extraSpecialArgs = { + inherit edge-pkgs; + }; }; }; diff --git a/home-manager/README.md b/home-manager/README.md index 35c537740..b7fa65816 100644 --- a/home-manager/README.md +++ b/home-manager/README.md @@ -20,16 +20,9 @@ Read ## I cannot find dot files in the macOS Finder diff --git a/home-manager/gpg.nix b/home-manager/gpg.nix index ba39fe1cb..43c030639 100644 --- a/home-manager/gpg.nix +++ b/home-manager/gpg.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, edge-pkgs, ... }: # ## FAQ - GPG @@ -30,7 +30,9 @@ defaultCacheTtl = 60480000; # 700 days maxCacheTtl = 60480000; # 700 days - pinentryFlavor = "tty"; + # https://github.com/NixOS/nixpkgs/pull/294937 + # https://github.com/nix-community/home-manager/pull/4895 + pinentryPackage = edge-pkgs.pinentry-tty; }; # https://github.com/nix-community/home-manager/blob/master/modules/programs/gpg.nix