Using keychain looks fixed the problems, but makes 2x slower shell ex…

…ecutions
kachick · Aug 10, 2023 · e966da7 · e966da7
1 parent b1f640b
commit e966da7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/home-manager/bash.nix b/home-manager/bash.nix
@@ -6,6 +6,7 @@
   programs.zoxide.enableBashIntegration = true;
   programs.fzf.enableBashIntegration = true;
   programs.rtx.enableBashIntegration = true;
+  programs.keychain.enableBashIntegration = true;
 
   # Used only in bash - https://unix.stackexchange.com/a/689403
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/readline.nix

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
@@ -7,6 +7,7 @@
   programs.zoxide.enableFishIntegration = true;
   programs.fzf.enableFishIntegration = true;
   programs.rtx.enableFishIntegration = true;
+  programs.keychain.enableFishIntegration = true;
 
   xdg.configFile."fish/fish_variables".source = ../home/.config/fish/fish_variables;
   xdg.configFile."fish/functions/fish_prompt.fish".source = ../home/.config/fish/functions/fish_prompt.fish;

diff --git a/home-manager/packages.nix b/home-manager/packages.nix
@@ -97,7 +97,9 @@
       # https://github.com/nix-community/home-manager/blob/a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04/modules/services/ssh-agent.nix#L37
       openssh
 
-      gnome3.gnome-keyring
+      # gnome3.gnome-keyring
+
+      keychain
     ]
   ) ++ (lib.optionals stdenv.isDarwin
     [

diff --git a/home-manager/ssh.nix b/home-manager/ssh.nix
@@ -14,11 +14,18 @@ in
   # https://github.com/nix-community/home-manager/blob/master/modules/services/ssh-agent.nix
   services.ssh-agent.enable = if pkgs.stdenv.isLinux then true else false;
 
-  # https://github.com/nix-community/home-manager/blob/master/modules/services/gnome-keyring.nix
-  services.gnome-keyring = {
-    enable = if pkgs.stdenv.isLinux then true else false;
+  # # https://github.com/nix-community/home-manager/blob/master/modules/services/gnome-keyring.nix
+  # services.gnome-keyring = {
+  #   enable = if pkgs.stdenv.isLinux then true else false;
 
-    components = [ "ssh" "secrets" "pkcs11" ];
+  #   components = [ "ssh" "secrets" "pkcs11" ];
+  # };
+
+  # https://github.com/nix-community/home-manager/blob/master/modules/programs/keychain.nix
+  programs.keychain = {
+    enable = true;
+    # https://github.com/nix-community/home-manager/blob/a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04/modules/programs/keychain.nix#L35
+    keys = [ "id_ed25519" ];
   };
 
   # These hosts are taken from the public resources of each provider.

diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
@@ -6,6 +6,7 @@
   programs.zoxide.enableZshIntegration = true;
   programs.fzf.enableZshIntegration = true;
   programs.rtx.enableZshIntegration = true;
+  programs.keychain.enableZshIntegration = true;
 
   # https://nixos.wiki/wiki/Zsh
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/zsh.nix