1diff --git a/aerc.nix b/aerc.nix
  2index 1d3b1e2e4aaa91a62fe57c310acfe7ac28b98672..3d2b4a8bb504046e05ca7134e665024a4cafbae0 100644
  3--- a/aerc.nix
  4+++ b/aerc.nix
  5@@ -17,6 +17,7 @@
  6     [statusline]
  7 
  8     [viewer]
  9+    pager=bat -p
 10 
 11     [compose]
 12 
 13diff --git a/flake.nix b/flake.nix
 14index 964c234d6d5ab2bc7ea682120c1350a7ebaaa97f..fc25ac867fd57c63ed2d2928b6975cdbda86ca1c 100644
 15--- a/flake.nix
 16+++ b/flake.nix
 17@@ -30,13 +30,10 @@         inherit pkgs;
 18 
 19         extraSpecialArgs = {
 20           inherit inputs;
 21-          git = {
 22-            name = "Gabriel A. Giovanini";
 23-            email = "g.arakakigiovanini@gridx.de";
 24-          };
 25         };
 26 
 27         modules = [
 28+          ./git-settings.nix
 29           ./home.nix
 30           ./secrets/gridx/gridx.nix
 31         ];
 32@@ -46,14 +43,12 @@         inherit pkgs;
 33 
 34         extraSpecialArgs = {
 35           inherit inputs;
 36-          git = {
 37-            name = "Gabriel A. Giovanini";
 38-            email = "mail@gabrielgio.me";
 39-          };
 40         };
 41 
 42         modules = [
 43+          ./git-settings.nix
 44           ./home.nix
 45+          ./secrets/home/home.nix
 46         ];
 47       };
 48     };
 49diff --git a/git-settings.nix b/git-settings.nix
 50new file mode 100644
 51index 0000000000000000000000000000000000000000..935143e5336012d807fb132107198512fa41a537
 52--- /dev/null
 53+++ b/git-settings.nix
 54@@ -0,0 +1,18 @@
 55+{lib, ...}:
 56+with lib; {
 57+  options.my.git = {
 58+    enable = mkEnableOption "git configuration sharing";
 59+
 60+    name = mkOption {
 61+      type = types.str;
 62+      default = "";
 63+      description = "Git user name for other modules";
 64+    };
 65+
 66+    email = mkOption {
 67+      type = types.str;
 68+      default = "";
 69+      description = "Git user email for other modules";
 70+    };
 71+  };
 72+}
 73diff --git a/jj.nix b/jj.nix
 74index c74bf17fc6907cf00c1fb9a2b238eb61d12a1e10..744249caf151cdb5b2378842bf619839054d23f6 100644
 75--- a/jj.nix
 76+++ b/jj.nix
 77@@ -1,15 +1,15 @@
 78 {
 79   pkgs,
 80   inputs,
 81-  git,
 82+  config,
 83   ...
 84 }: let
 85   tomlFormat = pkgs.formats.toml {};
 86 in {
 87   xdg.configFile."jj/config.toml".source = tomlFormat.generate "config.toml" {
 88     user = {
 89-      name = git.name;
 90-      email = git.email;
 91+      name = config.my.git.name;
 92+      email = config.my.git.email;
 93     };
 94     ui = {
 95       diff-formatter = ":git";
 96diff --git a/niri.nix b/niri.nix
 97index feeb14db1d02c4c95286b10acbe1b6b7f3d1b869..e6b4db27e2de6bb21a4643d0c58d2744ba17e07b 100644
 98--- a/niri.nix
 99+++ b/niri.nix
100@@ -231,6 +231,9 @@
101     workspace "ζ" {
102     }
103 
104+    workspace "-" {
105+    }
106+
107     workspace "6" {
108     }
109 
110@@ -243,8 +246,6 @@
111     workspace "9" {
112     }
113 
114-    workspace "-" {
115-    }
116 
117     window-rule {
118         match app-id=r#"^com\.slack\.Slack$"#
119diff --git a/secrets/gridx/aerc.nix b/secrets/gridx/aerc.nix
120index 5f99eb20d02604ed4efe12e7baa0e58341774fd5..f2e2195650ffffe4d78a829eda773d9924c03224 100644
121Binary files a/secrets/gridx/aerc.nix and b/secrets/gridx/aerc.nix differ
122diff --git a/secrets/gridx/gridx.nix b/secrets/gridx/gridx.nix
123index a21a8bedec1f37bc322af30da51667c435e8c75a..b076b2ea9f7ee95a26f0aa80127543c4e94dd849 100644
124Binary files a/secrets/gridx/gridx.nix and b/secrets/gridx/gridx.nix differ
125diff --git a/secrets/home/home.nix b/secrets/home/home.nix
126new file mode 100644
127index 0000000000000000000000000000000000000000..feb8211b7e18d094799c41a43e802d6dfdb177c8
128Binary files /dev/null and b/secrets/home/home.nix differ