diff options
| author | Soispha <soispha@vhack.eu> | 2024-03-24 16:33:41 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-03-24 16:37:14 +0100 |
| commit | 9ce56f0d31299c27f6f22234b7904acd87412643 (patch) | |
| tree | 27f6d12d8ea672fb6222bd4b7e8b83d1bf03754a | |
| parent | refactor(flake): Use an attrs for including open prs (diff) | |
| download | nixos-config-9ce56f0d31299c27f6f22234b7904acd87412643.tar.gz nixos-config-9ce56f0d31299c27f6f22234b7904acd87412643.zip | |
fix(hm/conf/gpg): Add my nixpkgs fork to ensure a working gpg-agent
| -rw-r--r-- | flake.lock | 17 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | hm/default.nix | 2 | ||||
| -rw-r--r-- | hm/soispha/conf/gpg/default.nix | 9 |
4 files changed, 31 insertions, 6 deletions
diff --git a/flake.lock b/flake.lock index 1ff164e6..3e380f53 100644 --- a/flake.lock +++ b/flake.lock @@ -501,6 +501,22 @@ "type": "github" } }, + "nixpkgs-onlykey": { + "locked": { + "lastModified": 1711293085, + "narHash": "sha256-KhDQnSH2cZNiw8QUvcaTmz/xRR0TdsAGz1S5yvCSbls=", + "owner": "soispha", + "repo": "nixpkgs", + "rev": "646bd95c3171855926db1ee06b2c16ea901cba78", + "type": "github" + }, + "original": { + "owner": "soispha", + "ref": "fix-onlykey-agent", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1704290814, @@ -679,6 +695,7 @@ "nixVim": "nixVim", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", + "nixpkgs-onlykey": "nixpkgs-onlykey", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-tfc": "nixpkgs-tfc", "poetry2nix": "poetry2nix", diff --git a/flake.nix b/flake.nix index f56b5e21..1a0e295c 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # open nixpkgs prs nixpkgs-tfc.url = "github:soispha/nixpkgs/add-termfilechooser"; + nixpkgs-onlykey.url = "github:soispha/nixpkgs/fix-onlykey-agent"; # inputs for following systems = { @@ -239,6 +240,7 @@ self, nixpkgs, nixpkgs-tfc, + nixpkgs-onlykey, # modules home-manager, nixos-generators, @@ -276,6 +278,7 @@ nixpkgs_open_prs = { inherit nixpkgs-tfc + nixpkgs-onlykey ; }; outputs = import ./flake { @@ -288,7 +291,7 @@ nixpkgs_as_input nixpkgs_open_prs # modules - + home-manager nixVim nixos-generators @@ -300,12 +303,12 @@ lanzaboote nix-index-database # external dependencies - + treefmt-nix user_js templates # my binaries - + shell_library river_init_lesser yambar_memory diff --git a/hm/default.nix b/hm/default.nix index 605c1fab..b0311261 100644 --- a/hm/default.nix +++ b/hm/default.nix @@ -1,6 +1,7 @@ { pkgs, sysLib, + nixpkgs_open_prs, # extra information system, # bins @@ -22,6 +23,7 @@ extraSpecialArgs = { inherit pkgs + nixpkgs_open_prs sysLib # extra information diff --git a/hm/soispha/conf/gpg/default.nix b/hm/soispha/conf/gpg/default.nix index 60c2ef2a..4926e55b 100644 --- a/hm/soispha/conf/gpg/default.nix +++ b/hm/soispha/conf/gpg/default.nix @@ -3,14 +3,17 @@ nixosConfig, sysLib, pkgs, + nixpkgs_open_prs, + system, ... }: let + pkgs_onlykey = nixpkgs_open_prs.nixpkgs-onlykey.legacyPackages."${system}"; agent-program = sysLib.writeShellScript { name = "onlykey-gpg-agent"; src = ./agent-program.sh; - dependencies = with pkgs; [ - python3 - onlykey-agent + dependencies = [ + pkgs.python3 + pkgs_onlykey.onlykey-agent ]; }; |