diff --git a/home/common.nix b/home/common.nix
index 46cf0cf..e38801a 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -44,6 +44,7 @@
     extraConfig = {
       credential.helper = "cache";
       push.default = "simple";
+      push.forceIfIncludes = true;  # avoid accidental force overrides when remote is autofetched in background
       init.defaultBranch = "mainline";
       diff.tool = "vimdiff";
       merge.tool = "vimdiff";
@@ -75,6 +76,16 @@
       };
     };
   };
+  programs.lazygit = {
+    enable = true;
+    settings = {
+      git = {
+        autoFetch = false;
+        mainBranches = ["main" "master" "mainline"];
+      };
+      update.method = "never";
+    };
+  };
 
   # shell config
   programs.zsh = {
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 73ac231..1d2a5f5 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -106,7 +106,6 @@ let
       ripgrep
       fd
       gitui
-      lazygit
       pre-commit
       scriv