diff --git a/hosts/gerg-desktop/git.nix b/hosts/gerg-desktop/git.nix
new file mode 100644
index 0000000..7da76b6
--- /dev/null
+++ b/hosts/gerg-desktop/git.nix
@@ -0,0 +1,27 @@
+_: {
+  pkgs,
+  config,
+  ...
+}: {
+  programs.git = {
+    enable = true;
+    package = pkgs.gitMinimal;
+    config = {
+      user = {
+        name = "Gerg-L";
+        email = "GregLeyda@proton.me";
+        signingkey = "~/.ssh/id_ed25519.pub";
+      };
+      init = {
+        defaultBranch = "master";
+      };
+      push = {
+        autoSetupRemote = true;
+      };
+      advice.addIgnoredFile = false;
+      core.hooksPath = ".githooks";
+      gpg.format = "ssh";
+    };
+  };
+  _file = ./git.nix;
+}
diff --git a/modules/git.nix b/modules/git.nix
deleted file mode 100644
index 5a1f14b..0000000
--- a/modules/git.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-_: {
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
-  options.local.git.disable = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-  };
-
-  config = lib.mkIf (! config.local.git.disable) {
-    programs.git = {
-      enable = true;
-      package = pkgs.gitMinimal;
-      config = {
-        user = {
-          name = "Gerg-L";
-          email = "GregLeyda@proton.me";
-        };
-        init = {
-          defaultBranch = "master";
-        };
-        push = {
-          autoSetupRemote = true;
-        };
-        advice.addIgnoredFile = false;
-        core.hooksPath = ".githooks";
-      };
-    };
-  };
-  _file = ./git.nix;
-}