fix some stuff n stuff

dotfiles/nvim/lua/plugins/telescope.lua

@@ -9,7 +9,7 @@ require("telescope").setup({
 	},
 	defaults = {
 		file_ignore_patterns = {
-			".git/",
+			"%.git/",
 			"node_modules/",
 			"target/",
 			"dist/",
@@ -18,8 +18,8 @@ require("telescope").setup({
 			"bin/",
 			"__pycache__/",
 			"venv/",
-			".direnv/",
-			".cargo/",
+			"%.direnv/",
+			"%.cargo/",
 		},
 	},
 	extensions = {

programs/git/default.nix

@@ -4,15 +4,25 @@
     userName = "Vinny Meller";
     userEmail = "[email protected]";
     extraConfig = {
+
+      # editor-related
+      core.editor = "nvim";
+      diff.tool = "vimdiff";
+      merge.tool = "vimdiff";
+      mergetool.vimdiff.path = "nvim";
+      merge.conflictstyle = "diff3";
+
+      # pushing & pulling
+      pull.rebase = true;
       push.autoSetupRemote = true;
       push.default = "simple";
-      pull.rebase = true;
-      core.editor = "nvim";
-      user.signingkey = "36CBEC89D5C8540C"; # key that goes with the email above
+      rebase.autosquash = true;
+
+      # gpg
       commit.gpgSign = true;
-      tag.gpgSign = true;
       # push.gpgSign = true;  # none of the hosted git providers support this!
-      rebase.autosquash = true;
+      tag.gpgSign = true;
+      user.signingkey = "36CBEC89D5C8540C"; # key that goes with the email above
     };
 
     aliases = {

programs/neovim/default.nix

@@ -34,7 +34,6 @@ in
       comment-nvim
       copilot-lua
       custom-vim-plugins.leetcode-nvim
-      molten-nvim
       diffview-nvim
       fidget-nvim
       flash-nvim
@@ -47,6 +46,7 @@ in
       lualine-nvim
       luasnip
       markdown-preview-nvim
+      molten-nvim
       neogit
       nui-nvim
       nvim-autopairs
@@ -73,6 +73,7 @@ in
       vim-fugitive
       vim-indent-object
       vim-matchup
+      vim-sleuth
       vim-surround
       which-key-nvim
       wilder-nvim