home/modules/default.nix

@@ -15,6 +15,5 @@
     ./zsh
     ./gpg.nix
     ./defaultDesktopPack.nix
-    ./accounts.nix
   ];
 }

home/modules/gpg.nix

@@ -25,19 +25,7 @@ in {
 
     services.gpg-agent = {
       enable = true;
-      
       enableZshIntegration = true;
-      enableBashIntegration = true;
-      
-      enableExtraSocket = true;
-      enableSshSupport = true;
-
-      defaultCacheTtl = 3600 * 3;
-      defaultCacheTtlSsh = 3600 * 3;
-
-      maxCacheTtl = 3600 * 6;
-      maxCacheTtlSsh = 3600 * 6;
-
       pinentryPackage = pkgs.pinentry-emacs;
     };
 

home/modules/zsh/default.nix

@@ -7,19 +7,12 @@
 with lib; let
   cfg = config.local.services.zsh;
 in {
-  options.local.services.zsh = {
+  options.local.services.zsh.enable = mkEnableOption "zsh settings";
-    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 {inherit config lib pkgs;};
+      initExtra = import ./zshrc.nix pkgs;
     };
   };
 }

home/modules/zsh/zshrc.nix

@@ -1,7 +1,8 @@
 {
-  config,
+  maim,
-  lib,
+  redshift,
-  pkgs
+  xclip,
+  ...
 }: ''
   # The following lines were added by compinstall
 
@@ -72,17 +73,17 @@
   return 0
   }
 
-  PROMPT='${config.local.services.zsh.prompt}'
+  PROMPT='%B[%~] ''${vcs_info_msg_0_}%b'
 
   # Aliases and binds
   alias ls='ls --color -F'
   alias l='ls --color -FhAltr'
   alias x='killall --ignore-case --user=$(whoami) --interactive'
-  alias sc='${lib.getExe pkgs.maim} -s -u | ${lib.getExe pkgs.xclip} -selection clipboard -t image/png -i'
+  alias sc='${maim}/bin/maim -s -u | ${xclip}/bin/xclip -selection clipboard -t image/png -i'
   alias tree='tree -CF'
   alias lock="betterlockscreen -l"
-  alias nightmode="${lib.getExe pkgs.redshift} -P -O 1000"
+  alias nightmode="${redshift}/bin/redshift -P -O 1000"
-  alias lightmode="${lib.getExe pkgs.redshift} -x="
+  alias lightmode="${redshift}/bin/redshift -x="
   alias inbox="echo >> $HOME/gtd/inbox"
   alias nixoide="nix repl '<nixpkgs>'"
   alias vps="ssh -A vps"

home/platforms/fabian@posixlycorrect/default.nix

@@ -24,13 +24,10 @@
     baseline.enable = true;
 
     services = {
-      zsh = {
+      zsh.enable = true;
-        enable = true;
-        prompt = "%B[%~] \${vcs_info_msg_0_}%b";
-      };
       accounts.enable = true;
       gpg = {
-        enable = true;
+        enalbe = true;
         defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
       };
     };

home/platforms/fabian@vps/default.nix

@@ -23,10 +23,7 @@ with lib; {
     baseline.enable = true;
 
     services = {
-      zsh = {
+      zsh.enable = true;
-        enable = true;
-        prompt = "%B<%~> \${vcs_info_msg_0_}%b";
-      };
     };
 
     apps = {