diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix
index 2bcb52f..012eba6 100644
--- a/nixos/hosts/Tibo-NixDesk/default.nix
+++ b/nixos/hosts/Tibo-NixDesk/default.nix
@@ -31,6 +31,7 @@
 
     programs = {
       direnv.enable = true;
+      git.enable = true;
       home-manager.enable = true;
       sops.enable = true;
       ssh.enable = true;
@@ -63,7 +64,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    git
     vim-full
     w3m
     wget
diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix
index 8cbbec7..de7926c 100644
--- a/nixos/hosts/Tibo-NixTop/default.nix
+++ b/nixos/hosts/Tibo-NixTop/default.nix
@@ -37,6 +37,7 @@
 
     programs = {
       direnv.enable = true;
+      git.enable = true;
       home-manager.enable = true;
       sops.enable = true;
       ssh.enable = true;
@@ -168,7 +169,6 @@
     localBinInPath = true;
 
     systemPackages = with pkgs; [
-      git
       vim-full # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       w3m
       wget
diff --git a/nixos/modules/programs/git/default.nix b/nixos/modules/programs/git/default.nix
new file mode 100644
index 0000000..6352d37
--- /dev/null
+++ b/nixos/modules/programs/git/default.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sisyphus.programs.git;
+in {
+  options.sisyphus.programs.git.enable = lib.mkEnableOption "Git";
+
+  config.programs.git = lib.mkIf cfg.enable {
+    enable = true;
+    lfs.enable = true;
+  };
+}