diff --git a/home/git/default.nix b/home/git/default.nix
index 6f4434b..9f59d52 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -120,6 +120,10 @@ in
         defaultBranch = "main";
       };
 
+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
       pull = {
         # Avoid useless merge commits
         rebase = true;
diff --git a/home/vim/init.vim b/home/vim/init.vim
index ab5f648..e5e863c 100644
--- a/home/vim/init.vim
+++ b/home/vim/init.vim
@@ -82,6 +82,8 @@ 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
 " }}}
diff --git a/home/vim/plugin/settings/null-ls.vim b/home/vim/plugin/settings/null-ls.vim
index bec8124..b2102bd 100644
--- a/home/vim/plugin/settings/null-ls.vim
+++ b/home/vim/plugin/settings/null-ls.vim
@@ -38,8 +38,14 @@ 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("flake8"),
+        condition = utils.is_executable_condition("pflake8"),
     }),
     null_ls.builtins.diagnostics.mypy.with({
         -- Only used if available
diff --git a/home/vim/plugin/settings/telescope.vim b/home/vim/plugin/settings/telescope.vim
index 4731b39..fc2c5fb 100644
--- a/home/vim/plugin/settings/telescope.vim
+++ b/home/vim/plugin/settings/telescope.vim
@@ -2,6 +2,15 @@ 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,
diff --git a/overlays/default.nix b/overlays/default.nix
index 3f5a246..81692be 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,4 +1,6 @@
 {
+  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;
diff --git a/overlays/vim-plugins-overrides/default.nix b/overlays/vim-plugins-overrides/default.nix
new file mode 100644
index 0000000..36c622b
--- /dev/null
+++ b/overlays/vim-plugins-overrides/default.nix
@@ -0,0 +1,17 @@
+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=";
+      };
+    });
+  });
+}