home/git/default.nix

@@ -120,10 +120,6 @@ in
         defaultBranch = "main";
       };
 
-      merge = {
-        conflictStyle = "zdiff3";
-      };
-
       pull = {
         # Avoid useless merge commits
         rebase = true;

home/vim/init.vim

@@ -82,8 +82,6 @@ set background=dark
 let g:gruvbox_plugin_hi_groups=1
 " Include filetype integration
 let g:gruvbox_filetype_hi_groups=1
-" 24 bit colors
-set termguicolors
 " Use my preferred colorscheme
 colorscheme gruvbox8
 " }}}

home/vim/plugin/settings/null-ls.vim

@@ -38,14 +38,8 @@ null_ls.register({
 -- Python
 null_ls.register({
     null_ls.builtins.diagnostics.flake8.with({
-        -- Only used if available, but prefer pflake8 if available
-        condition = function()
-            return utils.is_executable("flake8") and not utils.is_executable("pflake8")
-        end,
-    }),
-    null_ls.builtins.diagnostics.pyproject_flake8.with({
         -- Only used if available
-        condition = utils.is_executable_condition("pflake8"),
+        condition = utils.is_executable_condition("flake8"),
     }),
     null_ls.builtins.diagnostics.mypy.with({
         -- Only used if available

home/vim/plugin/settings/telescope.vim

@@ -2,15 +2,6 @@ lua << EOF
 local telescope = require("telescope")
 
 telescope.setup({
-    defaults = {
-        mappings = {
-            i = {
-                ["<C-h>"] = "which_key",
-                -- I want the normal readline mappings rather than scrolling
-                ["<C-u>"] = false,
-            }
-        }
-    },
     extensions = {
         fzf = {
             fuzzy = true,

overlays/default.nix

@@ -1,6 +1,4 @@
 {
-  null-ls-update = import ./vim-plugins-overrides;
-
   sabnzbd-fix-missing-packages = import ./sabnzbd-fix-missing-dependencies;
 
   transgui-fix-duplicate-status = import ./transgui-fix-duplicate-status;

overlays/vim-plugins-overrides/default.nix

@@ -1,17 +0,0 @@
-final: prev:
-let
-in
-{
-  # FIXME: update null-ls
-  vimPlugins = prev.vimPlugins.extend (self: super: {
-    null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
-      version = "2022-03-11";
-      src = final.fetchFromGitHub {
-        owner = "jose-elias-alvarez";
-        repo = "null-ls.nvim";
-        rev = "1ee1da4970b3c94bed0d0250a353bff633901cd1";
-        sha256 = "sha256-db9d2djNUCZzxIkycUn8Kcu4TS33w55eWxUn2OzcLas=";
-      };
-    });
-  });
-}