8 files changed, 28 insertions, 13 deletions

diff --git a/aerc.nix b/aerc.nix
index 1d3b1e2..3d2b4a8 100644
--- a/aerc.nix
+++ b/aerc.nix
@@ -17,6 +17,7 @@
     [statusline]
 
     [viewer]
+    pager=bat -p
 
     [compose]
 
diff --git a/flake.nix b/flake.nix
index 964c234..fc25ac8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,13 +30,10 @@
 
         extraSpecialArgs = {
           inherit inputs;
-          git = {
-            name = "Gabriel A. Giovanini";
-            email = "g.arakakigiovanini@gridx.de";
-          };
         };
 
         modules = [
+          ./git-settings.nix
           ./home.nix
           ./secrets/gridx/gridx.nix
         ];
@@ -46,14 +43,12 @@
 
         extraSpecialArgs = {
           inherit inputs;
-          git = {
-            name = "Gabriel A. Giovanini";
-            email = "mail@gabrielgio.me";
-          };
         };
 
         modules = [
+          ./git-settings.nix
           ./home.nix
+          ./secrets/home/home.nix
         ];
       };
     };
diff --git a/git-settings.nix b/git-settings.nix
new file mode 100644
index 0000000..935143e
--- /dev/null
+++ b/git-settings.nix
@@ -0,0 +1,18 @@
+{lib, ...}:
+with lib; {
+  options.my.git = {
+    enable = mkEnableOption "git configuration sharing";
+
+    name = mkOption {
+      type = types.str;
+      default = "";
+      description = "Git user name for other modules";
+    };
+
+    email = mkOption {
+      type = types.str;
+      default = "";
+      description = "Git user email for other modules";
+    };
+  };
+}
diff --git a/jj.nix b/jj.nix
index c74bf17..744249c 100644
--- a/jj.nix
+++ b/jj.nix
@@ -1,15 +1,15 @@
 {
   pkgs,
   inputs,
-  git,
+  config,
   ...
 }: let
   tomlFormat = pkgs.formats.toml {};
 in {
   xdg.configFile."jj/config.toml".source = tomlFormat.generate "config.toml" {
     user = {
-      name = git.name;
-      email = git.email;
+      name = config.my.git.name;
+      email = config.my.git.email;
     };
     ui = {
       diff-formatter = ":git";
diff --git a/niri.nix b/niri.nix
index feeb14d..e6b4db2 100644
--- a/niri.nix
+++ b/niri.nix
@@ -231,6 +231,9 @@
     workspace "ζ" {
     }
 
+    workspace "-" {
+    }
+
     workspace "6" {
     }
 
@@ -243,8 +246,6 @@
     workspace "9" {
     }
 
-    workspace "-" {
-    }
 
     window-rule {
         match app-id=r#"^com\.slack\.Slack$"#
diff --git a/secrets/gridx/aerc.nix b/secrets/gridx/aerc.nix
index 5f99eb2..f2e2195 100644
--- a/secrets/gridx/aerc.nix
+++ b/secrets/gridx/aerc.nix
diff --git a/secrets/gridx/gridx.nix b/secrets/gridx/gridx.nix
index a21a8be..b076b2e 100644
--- a/secrets/gridx/gridx.nix
+++ b/secrets/gridx/gridx.nix
diff --git a/secrets/home/home.nix b/secrets/home/home.nix
new file mode 100644
index 0000000..feb8211
--- /dev/null
+++ b/secrets/home/home.nix