diff --git a/home-manager/common.nix b/home-manager/common.nix
index 87bdf98..de16c6b 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -37,7 +37,5 @@
       relativenumber = true;
     };
   };
-  
-  # raw files
-  home.file.".config/git/hooks".source = ./common/git/hooks;
+
 }
diff --git a/home-manager/common/git/config.nix b/home-manager/common/git/config.nix
deleted file mode 100644
index eecaa95..0000000
--- a/home-manager/common/git/config.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{config, pkgs, ...}:
-{ 
-  imports = [
-    ./common.nix
-  ];
-  programs.git = {
-    enable = true;
-    userName = "Andreas Zweili";
-    userEmail = "zweili@contria.com";
-    delta = {
-      enable = true;
-      options = {
-        navigate = true;
-        line-numbers = true;
-        syntax-theme = "GitHub";
-      };
-    };
-  };
-  home.shellAliases = {
-     management-server = "mosh --ssh=\"ssh -p 22\" localadmin@10.40.0.53 tmux a";
-  };
-  # raw config files
-  home.file.".bashrc".source = ./work_config/bashrc;
-}
diff --git a/home-manager/common/git/git.nix b/home-manager/common/git/git.nix
new file mode 100644
index 0000000..559f80c
--- /dev/null
+++ b/home-manager/common/git/git.nix
@@ -0,0 +1,17 @@
+{config, pkgs, ...}:
+{
+  programs.git = {
+    enable = true;
+    userName = "Andreas Zweili";
+    delta = {
+      enable = true;
+      options = {
+        navigate = true;
+        line-numbers = true;
+        syntax-theme = "GitHub";
+      };
+    };
+  };
+  # raw files
+  home.file.".config/git/hooks".source = ./hooks;
+}
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 296025c..80a68f7 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -1,7 +1,8 @@
 {config, pkgs, ...}:
-{ 
+{
   imports = [
     ./common.nix
+    ./common/git/git.nix
   ];
   nixpkgs.config.allowUnfree = true;
   home.packages = with pkgs; [
@@ -12,19 +13,8 @@
     vscode
     youtube-dl
   ];
-  programs.git = {
-    enable = true;
-    userName = "Andreas Zweili";
-    userEmail = "andreas@zweili.ch";
-    delta = {
-      enable = true;
-      options = {
-        navigate = true;
-        line-numbers = true;
-        syntax-theme = "GitHub";
-      };
-    };
-  };
+  programs.git.userEmail = "andreas@zweili.ch";
+
   # raw config files
   home.file.".config/qtile".source = ./desktop/qtile;
 }
diff --git a/home-manager/ubuntu.nix b/home-manager/ubuntu.nix
index e876756..78405a5 100644
--- a/home-manager/ubuntu.nix
+++ b/home-manager/ubuntu.nix
@@ -1,8 +1,12 @@
 {config, pkgs, ...}:
-{ 
+{
   imports = [
-    ./personal-desktop.nix
+    ./common.nix
+    ./common/git/git.nix
   ];
+
+  programs.git.userEmail = "andreas@zweili.ch";
+
   #programs.bash.enable = true;
   targets.genericLinux.enable = true;
 }
diff --git a/home-manager/work-wsl.nix b/home-manager/work-wsl.nix
index eecaa95..1f8e05b 100644
--- a/home-manager/work-wsl.nix
+++ b/home-manager/work-wsl.nix
@@ -1,21 +1,11 @@
 {config, pkgs, ...}:
-{ 
+{
   imports = [
     ./common.nix
+    ./common/git/git.nix
   ];
-  programs.git = {
-    enable = true;
-    userName = "Andreas Zweili";
-    userEmail = "zweili@contria.com";
-    delta = {
-      enable = true;
-      options = {
-        navigate = true;
-        line-numbers = true;
-        syntax-theme = "GitHub";
-      };
-    };
-  };
+  programs.git.userEmail = "zweili@contria.com";
+
   home.shellAliases = {
      management-server = "mosh --ssh=\"ssh -p 22\" localadmin@10.40.0.53 tmux a";
   };