diff --git a/hosts/MONSTER/home.nix b/hosts/MONSTER/home.nix
index da293c7..22558da 100644
--- a/hosts/MONSTER/home.nix
+++ b/hosts/MONSTER/home.nix
@@ -27,4 +27,30 @@
         accel_profile = "flat";
       }
     ];
+  programs.git = {
+    enable = true;
+    signing = {
+      format = "openpgp";
+      key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
+      signByDefault = true;
+    };
+    settings = {
+      user = {
+        email = "dev@theaninova.de";
+        name = "Thea Schöbl";
+      };
+      pull.rebase = true;
+      init.defaultBranch = "main";
+      merge = {
+        tool = "nvim-mergetool";
+        conflictstyle = "diff3";
+      };
+      mergetool.nvim-mergetool = {
+        cmd = # sh
+          ''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'';
+        trustExitCode = true;
+      };
+      mergetool.prompt = false;
+    };
+  };
 }
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 8f56641..10fc724 100755
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -12,7 +12,6 @@
   imports = [
     ./programs/neovide.nix
     ./programs/nixvim.nix
-    ./programs/git.nix
     ./packages
     ./programs
     ./services
diff --git a/modules/home-manager/modules/nixvim/base/syntax.nix b/modules/home-manager/modules/nixvim/base/syntax.nix
index 9978abc..75be743 100644
--- a/modules/home-manager/modules/nixvim/base/syntax.nix
+++ b/modules/home-manager/modules/nixvim/base/syntax.nix
@@ -26,6 +26,7 @@ in
         grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
         nixvimInjections = true;
       };
+      treesitter-textobjects.enable = lib.mkDefault true;
       indent-blankline = {
         enable = lib.mkDefault true;
         settings = {
diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix
deleted file mode 100644
index d7e6fcd..0000000
--- a/modules/home-manager/programs/git.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ ... }:
-{
-  programs.git = {
-    enable = true;
-    signing = {
-      format = "openpgp";
-      key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
-      signByDefault = true;
-    };
-    settings = {
-      user = {
-        email = "dev@theaninova.de";
-        name = "Thea Schöbl";
-      };
-      pull.rebase = true;
-      init.defaultBranch = "main";
-      merge = {
-        tool = "nvim-mergetool";
-        conflictstyle = "diff3";
-      };
-      mergetool.nvim-mergetool = {
-        cmd = # sh
-          ''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'';
-        trustExitCode = true;
-      };
-      mergetool.prompt = false;
-    };
-  };
-}
diff --git a/modules/home-manager/programs/nixvim.nix b/modules/home-manager/programs/nixvim.nix
index 78cbd96..be3d6a7 100644
--- a/modules/home-manager/programs/nixvim.nix
+++ b/modules/home-manager/programs/nixvim.nix
@@ -114,6 +114,9 @@
       schemastore.enable = true;
       todo-comments.enable = true;
       nvim-surround.enable = true;
+      lensline.enable = false; # Maybe?
+      ccc.enable = false; # Maybe?
+      spider.enable = false; # Maybe?
       fidget.enable = true;
       gitsigns = {
         enable = true;