From e45ea0c6d66d908ceea44224e5b8a07fe6e4b3e9 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Fri, 4 Nov 2022 11:17:43 +0100
Subject: [PATCH] Remove askpass for ssh, use cli instead

---
 home/home.nix              | 1 +
 home/programs/keychain.nix | 4 ++--
 readme.rst                 | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index bc34143..ae6a6f1 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -64,6 +64,7 @@ in {
       DOCKER_CONFIG = "${config.xdg.configHome}/docker";
 
       # Program specific vars
+      SSH_ASKPASS = ""; # Unset tool to ask for password, I prefer the cli
       BORG_PASSCOMMAND = "${pkgs.libsecret}/bin/secret-tool lookup account borg-passphrase";
       LSCOLORS = "HxGxDxDxbxDxDxababcxcx";
       LS_COLORS = "di=1;37:ln=1;36:so=1;33:pi=1;33:ex=31:bd=1;33:cd=1;33:su=30;41:sg=30;41:tw=32:ow=32";
diff --git a/home/programs/keychain.nix b/home/programs/keychain.nix
index 049324c..90ecb77 100644
--- a/home/programs/keychain.nix
+++ b/home/programs/keychain.nix
@@ -1,10 +1,10 @@
 { config, pkgs, ownLib }:
 
 {
-  enable = if ownLib.onHikari {} then false else true;
+  enable = true;
   keys = if ownLib.onHikari {} then ["id_ed25519"] else ["id_rsa" "id_ed25519"];
   enableBashIntegration = false;
   enableFishIntegration = false;
-  enableZshIntegration = if ownLib.onHikari {} then false else true;
+  enableZshIntegration = true;
   enableXsessionIntegration = false;
 }
diff --git a/readme.rst b/readme.rst
index a7a8b9b..6d6cad4 100644
--- a/readme.rst
+++ b/readme.rst
@@ -109,8 +109,6 @@ Todos
 
 MacBook:
 
-* Provide (remove) proper input for keychain (gpg)
-
 * Provide script to update system
 
 Migration: