diff --git a/common/users/homeModules/git.nix b/common/users/homeModules/git.nix
index 28bc43f..0913624 100644
--- a/common/users/homeModules/git.nix
+++ b/common/users/homeModules/git.nix
@@ -1,32 +1,21 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./pinned.nix
+    ./lazygit.nix
   ];
   home = {
     packages = with pkgs; [
       git
-      pinned.lazygit
       act
       gh
     ];
     file = {
-      lazygit = {
-        recursive = true;
-        source = ../../../dotfiles/lazygit;
-        target = "./.config/lazygit";
-      };
-      gh = {
+      ghcli = {
         source = ../../../dotfiles/gh/config.yml;
         target = "./.config/gh/config.yml";
       };
     };
-    shellAliases = {
-      lg = "lazygit";
-    };
-    sessionVariables = {
-      LG_CONFIG_FILE = "/home/${config.home.username}/.config/lazygit/tokyonight_night.conf";
-    };
   };
   programs = {
     git = {
diff --git a/common/users/homeModules/lazygit.nix b/common/users/homeModules/lazygit.nix
new file mode 100644
index 0000000..55005a1
--- /dev/null
+++ b/common/users/homeModules/lazygit.nix
@@ -0,0 +1,77 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home = {
+    shellAliases = {
+      lg = "lazygit";
+    };
+  };
+  stylix = {
+    targets = {
+      lazygit = {
+        enable = false;
+      };
+    };
+  };
+  programs = {
+    lazygit = {
+      enable = true;
+      package = pkgs.lazygit.overrideAttrs (
+        _: old: {
+          src = pkgs.fetchFromGitHub {
+            owner = "jesseduffield";
+            repo = old.pname;
+            rev = "3cff48437e2d831d03be9eda03818368ab7c2a26";
+            hash = "sha256-OA40EgUKwNttsoSLi/xtKuEdbK0P5IKiXUGKSOk0gfE=";
+          };
+        }
+      );
+      settings = {
+        gui = {
+          showRootItemInFileTree = false;
+          switchTabsWithPanelJumpKeys = true;
+          theme = {
+            lightTheme = false;
+            activeBorderColor = [
+              "#ff9e64"
+              "bold"
+            ];
+            inactiveBorderColor = [
+              "#27a1b9"
+            ];
+            searchingActiveBorderColor = [
+              "#ff9e64"
+              "bold"
+            ];
+            optionsTextColor = [
+              "#7aa2f7"
+            ];
+            selectedLineBgColor = [
+              "#283457"
+            ];
+            cherryPickedCommitFgColor = [
+              "#7aa2f7"
+            ];
+            cherryPickedCommitBgColor = [
+              "#bb9af7"
+            ];
+            markedBaseCommitFgColor = [
+              "#7aa2f7"
+            ];
+            markedBaseCommitBgColor = [
+              "#e0af68"
+            ];
+            unstagedChangesColor = [
+              "#db4b4b"
+            ];
+            defaultFgColor = [
+              "#c0caf5"
+            ];
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/common/users/homeModules/pinned.nix b/common/users/homeModules/pinned.nix
index 5c7693a..c3ae70c 100644
--- a/common/users/homeModules/pinned.nix
+++ b/common/users/homeModules/pinned.nix
@@ -75,13 +75,6 @@
                 ref = "refs/heads/nixpkgs-unstable";
                 rev = "05bbf675397d5366259409139039af8077d695ce";
               }) defaultOpts).gdb;
-            # lazygit >=49 has an ugly root symbol with no config to remove it
-            lazygit =
-              (import (builtins.fetchGit {
-                name = "pinned-lazygit";
-                url = "https://github.com/NixOS/nixpkgs/";
-                rev = "785eec1b92a0a4b3246f1307a9325a7e5024fef5";
-              }) defaultOpts).lazygit;
           };
         }
       )
diff --git a/dotfiles/lazygit/tokyonight_night.conf b/dotfiles/lazygit/tokyonight_night.conf
deleted file mode 100644
index 97b1f23..0000000
--- a/dotfiles/lazygit/tokyonight_night.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-gui:
-  nerdFontsVersion: "3"
-  theme:
-    activeBorderColor:
-      - "#ff9e64"
-      - "bold"
-    inactiveBorderColor:
-      - "#27a1b9"
-    searchingActiveBorderColor:
-      - "#ff9e64"
-      - "bold"
-    optionsTextColor:
-      - "#7aa2f7"
-    selectedLineBgColor:
-      - "#283457"
-    cherryPickedCommitFgColor:
-      - "#7aa2f7"
-    cherryPickedCommitBgColor:
-      - "#bb9af7"
-    markedBaseCommitFgColor:
-      - "#7aa2f7"
-    markedBaseCommitBgColor:
-      - "#e0af68"
-    unstagedChangesColor:
-      - "#db4b4b"
-    defaultFgColor:
-      - "#c0caf5"