From 06b91354174d5c92ac65d19a73bc7a196bf8f08d Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Fri, 29 Nov 2024 11:35:32 -0600
Subject: [PATCH 1/4] fix typos

---
 home/modules/default.nix                         | 1 +
 home/platforms/fabian@posixlycorrect/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/home/modules/default.nix b/home/modules/default.nix
index 18f5fe6..31109a9 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -15,5 +15,6 @@
     ./zsh
     ./gpg.nix
     ./defaultDesktopPack.nix
+    ./accounts.nix
   ];
 }
diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix
index 1cfdcd0..6dc79ed 100644
--- a/home/platforms/fabian@posixlycorrect/default.nix
+++ b/home/platforms/fabian@posixlycorrect/default.nix
@@ -27,7 +27,7 @@
       zsh.enable = true;
       accounts.enable = true;
       gpg = {
-        enalbe = true;
+        enable = true;
         defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
       };
     };

From f77410de7c3e2bba46c656389f695f84fa8971a7 Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Fri, 29 Nov 2024 12:23:51 -0600
Subject: [PATCH 2/4] update zshrc

---
 home/modules/zsh/default.nix                     | 11 +++++++++--
 home/modules/zsh/zshrc.nix                       | 15 +++++++--------
 home/platforms/fabian@posixlycorrect/default.nix |  5 ++++-
 home/platforms/fabian@vps/default.nix            |  5 ++++-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/home/modules/zsh/default.nix b/home/modules/zsh/default.nix
index 6434908..5e33633 100644
--- a/home/modules/zsh/default.nix
+++ b/home/modules/zsh/default.nix
@@ -7,12 +7,19 @@
 with lib; let
   cfg = config.local.services.zsh;
 in {
-  options.local.services.zsh.enable = mkEnableOption "zsh settings";
+  options.local.services.zsh = {
+    enable = mkEnableOption "zsh settings";
+    prompt = mkOption {
+      type = types.str;
+      description = "prompt for your terminal";
+      example = literalExpression "%B[%~] \${vcs_info_msg_0_}%b";
+    };
+  };
   config = mkIf cfg.enable {
     programs.zsh = {
       enable = true;
       syntaxHighlighting.enable = true;
-      initExtra = import ./zshrc.nix pkgs;
+      initExtra = import ./zshrc.nix {inherit config lib pkgs;};
     };
   };
 }
diff --git a/home/modules/zsh/zshrc.nix b/home/modules/zsh/zshrc.nix
index 6665b14..8cadd7e 100644
--- a/home/modules/zsh/zshrc.nix
+++ b/home/modules/zsh/zshrc.nix
@@ -1,8 +1,7 @@
 {
-  maim,
-  redshift,
-  xclip,
-  ...
+  config,
+  lib,
+  pkgs
 }: ''
   # The following lines were added by compinstall
 
@@ -73,17 +72,17 @@
   return 0
   }
 
-  PROMPT='%B[%~] ''${vcs_info_msg_0_}%b'
+  PROMPT='${config.local.services.zsh.prompt}'
 
   # Aliases and binds
   alias ls='ls --color -F'
   alias l='ls --color -FhAltr'
   alias x='killall --ignore-case --user=$(whoami) --interactive'
-  alias sc='${maim}/bin/maim -s -u | ${xclip}/bin/xclip -selection clipboard -t image/png -i'
+  alias sc='${lib.getExe pkgs.maim} -s -u | ${lib.getExe pkgs.xclip} -selection clipboard -t image/png -i'
   alias tree='tree -CF'
   alias lock="betterlockscreen -l"
-  alias nightmode="${redshift}/bin/redshift -P -O 1000"
-  alias lightmode="${redshift}/bin/redshift -x="
+  alias nightmode="${lib.getExe pkgs.redshift} -P -O 1000"
+  alias lightmode="${lib.getExe pkgs.redshift} -x="
   alias inbox="echo >> $HOME/gtd/inbox"
   alias nixoide="nix repl '<nixpkgs>'"
   alias vps="ssh -A vps"
diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix
index 6dc79ed..951d305 100644
--- a/home/platforms/fabian@posixlycorrect/default.nix
+++ b/home/platforms/fabian@posixlycorrect/default.nix
@@ -24,7 +24,10 @@
     baseline.enable = true;
 
     services = {
-      zsh.enable = true;
+      zsh = {
+        enable = true;
+        prompt = "%B[%~] \${vcs_info_msg_0_}%b";
+      };
       accounts.enable = true;
       gpg = {
         enable = true;
diff --git a/home/platforms/fabian@vps/default.nix b/home/platforms/fabian@vps/default.nix
index bb5974f..d8ed967 100644
--- a/home/platforms/fabian@vps/default.nix
+++ b/home/platforms/fabian@vps/default.nix
@@ -23,7 +23,10 @@ with lib; {
     baseline.enable = true;
 
     services = {
-      zsh.enable = true;
+      zsh = {
+        enable = true;
+        prompt = "%B<%~> \${vcs_info_msg_0_}%b";
+      };
     };
 
     apps = {

From 60fa9da64cc1a688659d18181adf604606848327 Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Fri, 29 Nov 2024 12:24:10 -0600
Subject: [PATCH 3/4] enable ssh-agent

---
 home/modules/gpg.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix
index 551e078..0992701 100644
--- a/home/modules/gpg.nix
+++ b/home/modules/gpg.nix
@@ -27,6 +27,7 @@ in {
       enable = true;
       enableZshIntegration = true;
       pinentryPackage = pkgs.pinentry-emacs;
+      enableSshSupport = true;
     };
 
     accounts.email.accounts = {

From d10cf8b25f9af3797ae068839ced63ac04536c49 Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Fri, 29 Nov 2024 12:48:00 -0600
Subject: [PATCH 4/4] update gpg settings

---
 home/modules/gpg.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix
index 0992701..3dc2d30 100644
--- a/home/modules/gpg.nix
+++ b/home/modules/gpg.nix
@@ -25,9 +25,20 @@ in {
 
     services.gpg-agent = {
       enable = true;
+      
       enableZshIntegration = true;
-      pinentryPackage = pkgs.pinentry-emacs;
+      enableBashIntegration = true;
+      
+      enableExtraSocket = true;
       enableSshSupport = true;
+
+      defaultCacheTtl = 3600 * 3;
+      defaultCacheTtlSsh = 3600 * 3;
+
+      maxCacheTtl = 3600 * 6;
+      maxCacheTtlSsh = 3600 * 6;
+
+      pinentryPackage = pkgs.pinentry-emacs;
     };
 
     accounts.email.accounts = {