From dcc5b92e5f550cc10500feffd2723097af6d2999 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 7 Jun 2023 08:19:17 +0100
Subject: [PATCH] Stop asking for keychain at startup, don't mess with nvim
 repo state in Makefile

---
 Makefile              | 1 -
 home/env/keychain.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4f44e616..0578ae19 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ SUBMODULES := $(CONFIG_DIR)/nvim
 .PHONY: default clean nixos home /etc/nixos/config
 
 default: $(SUBMODULES)
-	git -C ./nvim pull --ff-only
 	command -v nix > /dev/null || exit 1
 	[ -e /etc/nixos/ ] && make nixos || make home
 	bat cache --build
diff --git a/home/env/keychain.nix b/home/env/keychain.nix
index aed8f11e..2428d440 100644
--- a/home/env/keychain.nix
+++ b/home/env/keychain.nix
@@ -1,7 +1,7 @@
 {...}: {
   programs.keychain = {
     enable = true;
-    extraFlags = ["--quiet" "--ignore-missing"];
+    extraFlags = ["--quiet" "--noask" "--ignore-missing"];
     keys = ["id_rsa" "id_ed25519"];
     enableXsessionIntegration = true;
   };