4 files changed, 62 insertions, 51 deletions
diff --git a/hm/default.nix b/hm/default.nix
index 673fb9b..893d7e4 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -1,7 +1,6 @@
 {nixvim, ...}: {
   imports = [
     ../modules/hm
-    ./git
     ./gpg
     ./gtk
     ./hyfetch
@@ -34,6 +33,7 @@
     etesync-dav.enable = true;
     firefox.enable = true;
     foot.enable = true;
+    git.enable = true;
     jameica.enable = true;
     kdeconnect.enable = true;
     mail.enable = true;
diff --git a/hm/git/default.nix b/hm/git/default.nix
deleted file mode 100644
index 68c03ff..0000000
--- a/hm/git/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{pkgs, ...}: {
-  programs.git = {
-    enable = true;
-    package = pkgs.gitFull;
-    userName = "Silas Schöffel";
-    userEmail = "sils@sils.li";
-    delta = {
-      enable = true;
-      options = {
-        decorations = {
-          commit-decoration-style = "bold purple box ul";
-          file-decoration-style = "none";
-          file-style = "bold red ul";
-        };
-        features = "decorations";
-        whitespace-error-style = "22 reverse";
-      };
-    };
-    signing = {
-      key = "467B7D129EA73AC9";
-      signByDefault = true;
-    };
-    extraConfig = {
-      core = {
-        autocrlf = "input";
-      };
-      safe = {
-        directory = "/etc/nixos";
-      };
-      push = {
-        autoSetupRemote = true;
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      commit = {
-        verbose = true;
-      };
-      sendemail = {
-        smtpserver = "server1.vhack.eu";
-        smtpuser = "sils@sils.li";
-        smtpencryption = "ssl";
-        smtpserverport = "465";
-      };
-    };
-    aliases = {
-      recommit = "commit --file=.git/COMMIT_EDITMSG --edit";
-    };
-  };
-}
diff --git a/modules/hm/sils/default.nix b/modules/hm/sils/default.nix
index 8fbf363..a10ed4e 100644
--- a/modules/hm/sils/default.nix
+++ b/modules/hm/sils/default.nix
@@ -5,6 +5,7 @@
     ./etesync-dav.nix
     ./firefox
     ./foot.nix
+    ./git.nix
     ./jameica.nix
     ./kdeconnect.nix
     ./mail.nix
diff --git a/modules/hm/sils/git.nix b/modules/hm/sils/git.nix
new file mode 100644
index 0000000..5bd4dd2
--- /dev/null
+++ b/modules/hm/sils/git.nix
@@ -0,0 +1,60 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.sils.git;
+in {
+  options.sils.git.enable = lib.mkEnableOption "sils git config";
+  config = lib.mkIf cfg.enable {
+    programs.git = {
+      enable = true;
+      package = pkgs.gitFull;
+      userName = "Silas Schöffel";
+      userEmail = "sils@sils.li";
+      delta = {
+        enable = true;
+        options = {
+          decorations = {
+            commit-decoration-style = "bold purple box ul";
+            file-decoration-style = "none";
+            file-style = "bold red ul";
+          };
+          features = "decorations";
+          whitespace-error-style = "22 reverse";
+        };
+      };
+      signing = {
+        key = "467B7D129EA73AC9";
+        signByDefault = true;
+      };
+      extraConfig = {
+        core = {
+          autocrlf = "input";
+        };
+        safe = {
+          directory = "/etc/nixos";
+        };
+        push = {
+          autoSetupRemote = true;
+        };
+        init = {
+          defaultBranch = "main";
+        };
+        commit = {
+          verbose = true;
+        };
+        sendemail = {
+          smtpserver = "server1.vhack.eu";
+          smtpuser = "sils@sils.li";
+          smtpencryption = "ssl";
+          smtpserverport = "465";
+        };
+      };
+      aliases = {
+        recommit = "commit --file=.git/COMMIT_EDITMSG --edit";
+      };
+    };
+  };
+}