diff --git a/lib/configuration.nix b/lib/configuration.nix
index cd9f900..007fa06 100644
--- a/lib/configuration.nix
+++ b/lib/configuration.nix
@@ -2,6 +2,7 @@
   imports = [
     ./modules/custom-build-vm.nix
     ./modules/custom-sops-nix.nix
+    ./modules/git.nix
     ./modules/my-users.nix
     ./modules/sddm.nix
     ./modules/unfree.nix
@@ -140,9 +141,9 @@
           with pkgs.vimPlugins;
           {
             start = [
-            vim-wayland-clipboard
-            zoxide-vim
-          ];
+              vim-wayland-clipboard
+              zoxide-vim
+            ];
           };
       };
 
@@ -150,25 +151,28 @@
       htop.enable = true;
     };
 
-    environment.systemPackages =
-      with pkgs;
-      [
-        powershell
-        neofetch
-        tldr
-        wget
-        btop
-        nvtopPackages.full
-        numbat
-        lsof
-        zoxide
-        fzf
-        sl
-        bb
-        terminal-parrot
-        rar
-        goldwarden
-      ];
+    environment = {
+      systemPackages =
+        with pkgs;
+        [
+          powershell
+          neofetch
+          tldr
+          wget
+          btop
+          nvtopPackages.full
+          numbat
+          lsof
+          zoxide
+          fzf
+          sl
+          bb
+          terminal-parrot
+          rar
+          goldwarden
+          gitflow
+        ];
+    };
 
     # Fonts
     fonts.packages =
diff --git a/lib/modules/git.nix b/lib/modules/git.nix
new file mode 100644
index 0000000..e044c93
--- /dev/null
+++ b/lib/modules/git.nix
@@ -0,0 +1,49 @@
+{ ... }:
+  let
+    defaultBranch = "main";
+  in {
+    config = {
+      programs.git.config = {
+        init = {
+          inherit defaultBranch;
+        };
+
+        gitflow = {
+          branch = {
+            master = defaultBranch;
+            develop = "dev";
+          };
+        };
+
+        alias = {
+          "ahfange" = "init";
+          "tuedezue" = "add";
+          "beschuldig" = "blame";
+          "zieh" = "pull";
+          "druck" = "push";
+          "machnah" = "clone";
+          "hol" = "fetch";
+          "zwiigab" = "branch";
+          "buechiih" = "commit";
+          "eich" = "rebase";
+          "erd" = "rebase";
+          "gahufwiifelde" = "rebase";
+          "vergliich" = "diff";
+          "tuezemme" = "merge";
+          "versorg" = "stash";
+          "markier" = "tag";
+          "pflueckoepfel" = "cherry-pick";
+          "pflueckhimbeeri" = "cherry-pick";
+          "buechuus" = "checkout";
+          "quaetsch" = "merge --squash";
+          "pfudle" = "push --force";
+          "beschuldigung" = "blame";
+          "zwiigli" = "branch";
+          "tagebuech" = "log";
+          "versteck" = "stash";
+          "zuestand" = "status";
+          "markierig" = "tag";
+        };
+      };
+    };
+  }