diff --git a/home-manager/default.nix b/home-manager/default.nix
index d1aa5f8..1e99ba1 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -112,10 +112,9 @@ in
     programs.zsh = {
       enable = true;
       sessionVariables = {
-        GOPATH = "/home/fleaz/workspace/go";
         EDITOR = "vim";
         XDG_SCREENSHOTS_DIR = "/home/fleaz/screenshots/";
-        PATH = "$PATH:/home/fleaz/bin:/home/fleaz/workspace/go/bin";
+        PATH = "$PATH:/home/fleaz/bin";
         DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
       };
       oh-my-zsh = {
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index 893b536..5e89486 100644
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -17,6 +17,9 @@
       "init" = {
         defaultBranch = "main";
       };
+      "pull" = {
+        rebase = "true";
+      };
     };
 
 
@@ -36,18 +39,6 @@
         };
       };
     }
-      {
-        condition = "gitdir:~/workspace/go/src/github.com/codemonauts/";
-        contents = {
-          user = {
-            email = "felix@codemonauts.com";
-            name = "Felix Breidenstein";
-          };
-          commit = {
-            gpgSign = false;
-          };
-        };
-      }
       {
         condition = "gitdir:~/kundendaten/";
         contents = {