diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix
index 2d00d9a..02b2353 100644
--- a/home/modules/baseline.nix
+++ b/home/modules/baseline.nix
@@ -17,7 +17,6 @@ in {
       packages = with pkgs; [
         calc
         file
-        git
         htop
         killall
         man-pages
@@ -36,5 +35,11 @@ in {
         "EDITOR" = mkDefault "vim";
       };
     };
+
+    programs.git = {
+      enable = true;
+      userEmail = "fabian@posixlycorrect.com";
+      userName = "Fabian Montero";
+    };
   };
 }
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 0ac2c86..331f424 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -12,5 +12,7 @@
     ./yubikey.nix
     ./browsers.nix
     ./gui
+    ./zsh
+    ./gpg.nix
   ];
 }
diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix
new file mode 100644
index 0000000..551e078
--- /dev/null
+++ b/home/modules/gpg.nix
@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.local.services.gpg;
+in {
+  options.local.services.gpg = {
+    enable = mkEnableOption "gpg settings";
+    defaultKey = mkOption {
+      type = types.str;
+      description = "fingerprint of default public key to be used in gpg, git, email, etc.";
+      example = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
+    };
+  };
+  config = mkIf cfg.enable {
+    programs.gpg = {
+      enable = true;
+      settings = {
+        default-key = config.local.services.gpg.defaultKey;
+      };
+    };
+
+    services.gpg-agent = {
+      enable = true;
+      enableZshIntegration = true;
+      pinentryPackage = pkgs.pinentry-emacs;
+    };
+
+    accounts.email.accounts = {
+      "fabian@posixlycorrect.com" = {
+        gpg = {
+          encryptByDefault = true;
+          signByDefault = true;
+          key = config.local.services.gpg.defaultKey;
+        };
+      };
+    };
+
+    programs.git = {
+      signing = {
+        key = config.local.services.gpg.defaultKey;
+        signByDefault = true;
+      };
+    };
+  };
+}
diff --git a/home/modules/terminal/default.nix b/home/modules/terminal/default.nix
index 1914821..693be1e 100644
--- a/home/modules/terminal/default.nix
+++ b/home/modules/terminal/default.nix
@@ -34,35 +34,6 @@ in {
       };
     };
 
-    programs.zsh = {
-      enable = true;
-      syntaxHighlighting.enable = true;
-      initExtra = import ./zshrc.nix pkgs;
-    };
-
-    programs.git = {
-      enable = true;
-      userEmail = "fabian@posixlycorrect.com";
-      userName = "Fabian Montero";
-      #signing = {
-      #  key = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
-      #  signByDefault = true;
-      #};
-    };
-
-    programs.gpg = {
-      enable = true;
-      #settings = {
-      #  default-key = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
-      #};
-    };
-
-    services.gpg-agent = {
-      enable = true;
-      enableZshIntegration = true;
-      pinentryPackage = pkgs.pinentry-emacs;
-    };
-
     accounts.email.accounts = {
       "fabian@posixlycorrect.com" = {
         address = "fabian@posixlycorrect.com";
@@ -70,12 +41,6 @@ in {
         realName = "fabian";
         primary = true;
         flavor = "fastmail.com";
-
-        gpg = {
-          encryptByDefault = true;
-          signByDefault = true;
-          key = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
-        };
       };
     };
   };
diff --git a/home/modules/zsh/default.nix b/home/modules/zsh/default.nix
new file mode 100644
index 0000000..6434908
--- /dev/null
+++ b/home/modules/zsh/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.local.services.zsh;
+in {
+  options.local.services.zsh.enable = mkEnableOption "zsh settings";
+  config = mkIf cfg.enable {
+    programs.zsh = {
+      enable = true;
+      syntaxHighlighting.enable = true;
+      initExtra = import ./zshrc.nix pkgs;
+    };
+  };
+}
diff --git a/home/modules/terminal/zshrc.nix b/home/modules/zsh/zshrc.nix
similarity index 98%
rename from home/modules/terminal/zshrc.nix
rename to home/modules/zsh/zshrc.nix
index 2bcee01..6665b14 100644
--- a/home/modules/terminal/zshrc.nix
+++ b/home/modules/zsh/zshrc.nix
@@ -83,7 +83,7 @@
   alias tree='tree -CF'
   alias lock="betterlockscreen -l"
   alias nightmode="${redshift}/bin/redshift -P -O 1000"
-  alias lightmode="${redshift}/bin/redshift -P -O 6500"
+  alias lightmode="${redshift}/bin/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 6d16ec3..2a14e08 100644
--- a/home/platforms/fabian@posixlycorrect/default.nix
+++ b/home/platforms/fabian@posixlycorrect/default.nix
@@ -43,6 +43,14 @@
     };
   };
 
+  local.services = {
+    zsh.enable = true;
+    gpg = {
+      enalbe = true;
+      defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
+    };
+  };
+
   home = {
     stateVersion = "21.11"; # No tocar esto
     username = "fabian";