diff --git a/flake.lock b/flake.lock
index 06e2659..3c9a117 100644
--- a/flake.lock
+++ b/flake.lock
@@ -185,11 +185,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1679818858,
-        "narHash": "sha256-Z7yiuHOytUeIHFdsRwjYQhPeyPzyHgoIeVDy8RHMNWc=",
+        "lastModified": 1679944603,
+        "narHash": "sha256-qOWcYMfov8QMfksN5gBmJv9Yko7mQ4nT3pZxhrxQj/Y=",
         "owner": "nifoc",
         "repo": "nix-overlay",
-        "rev": "7fd936214b55cdd0b6509f4340cde238becf8387",
+        "rev": "b6d9105e489c944f12b85be608c8277d29bfb7b8",
         "type": "github"
       },
       "original": {
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 7ff9479..f01a055 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -87,10 +87,10 @@
         };
       in
       ''
+        vim.loader.enable()
         vim.opt.runtimepath:append("${treesitter-parsers}")
 
         require('nifoc.nix')
-        require('impatient')
         require('configuration.init')
       '';
 
@@ -99,9 +99,6 @@
         customPlugins = import ./plugins.nix { inherit pkgs; };
       in
       (with customPlugins; [
-        # Fixes
-        impatient-nvim
-
         # Utils
         popup-nvim
         plenary-nvim
@@ -403,27 +400,19 @@
     recursive = true;
   };
 
-  home = {
-    activation.neovimActivation = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-      echo -n 'Removing luacache files: '
-      $DRY_RUN_CMD rm -f $HOME/.cache/nvim/luacache*
-      echo 'Done'
-    '';
-
-    file =
-      let
-        nvim-spell-directory = "${config.xdg.configHome}/nvim/spell";
-      in
-      {
-        "${nvim-spell-directory}/de.utf-8.spl".source = builtins.fetchurl {
-          url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.spl";
-          sha256 = "73c7107ea339856cdbe921deb92a45939c4de6eb9c07261da1b9dd19f683a3d1";
-        };
-
-        "${nvim-spell-directory}/de.utf-8.sug".source = builtins.fetchurl {
-          url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.sug";
-          sha256 = "13d0ecf92863d89ef60cd4a8a5eb2a5a13a0e8f9ba8d1c6abe47aba85714a948";
-        };
+  home.file =
+    let
+      nvim-spell-directory = "${config.xdg.configHome}/nvim/spell";
+    in
+    {
+      "${nvim-spell-directory}/de.utf-8.spl".source = builtins.fetchurl {
+        url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.spl";
+        sha256 = "73c7107ea339856cdbe921deb92a45939c4de6eb9c07261da1b9dd19f683a3d1";
       };
-  };
+
+      "${nvim-spell-directory}/de.utf-8.sug".source = builtins.fetchurl {
+        url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.sug";
+        sha256 = "13d0ecf92863d89ef60cd4a8a5eb2a5a13a0e8f9ba8d1c6abe47aba85714a948";
+      };
+    };
 }
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index 0d3fced..76f8e80 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -1,17 +1,6 @@
 # This file has been auto-generated
 { pkgs, ... }:
 rec {
-  impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
-    pname = "impatient.nvim";
-    version = "2022-12-28";
-    src = pkgs.fetchFromGitHub {
-      owner = "lewis6991";
-      repo = "impatient.nvim";
-      rev = "c90e273f7b8c50a02f956c24ce4804a47f18162e";
-      sha256 = "1cd1l55lax3938ym0kpwz0gpzmfi8rxq8rgl3l8vhq9frlaqyn53";
-      fetchSubmodules = false;
-    };
-  };
   popup-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "popup.nvim";
     version = "2021-11-18";
@@ -124,12 +113,12 @@ rec {
   };
   nvim-ts-rainbow2 = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow2";
-    version = "2023-03-26";
+    version = "2023-03-27";
     src = pkgs.fetchFromGitHub {
       owner = "HiPhish";
       repo = "nvim-ts-rainbow2";
-      rev = "aa0247e5109e53a2cca1cf1edba4a4defad43181";
-      sha256 = "0lchn9axiw45iwcvbqlmm7lqrlfcbvhhw45320chppgykxyq855f";
+      rev = "51d835d411df45b14b9531789eff0c590cabf018";
+      sha256 = "0c8cy8bcmbn7lrr7ld9l5iss4k6hccn4m1mp25zx3blmwz0xi01d";
       fetchSubmodules = false;
     };
   };
@@ -303,12 +292,12 @@ rec {
   };
   LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "LuaSnip";
-    version = "2023-03-22";
+    version = "2023-03-27";
     src = pkgs.fetchFromGitHub {
       owner = "L3MON4D3";
       repo = "LuaSnip";
-      rev = "025886915e7a1442019f467e0ae2847a7cf6bf1a";
-      sha256 = "0pn6r25pk0hm5zw3dnjf811b3n0hrbrf0v9mna02i8bbni6xmnlj";
+      rev = "bc8ec05022743d3f08bda7a76c6bb5e9a9024581";
+      sha256 = "0iicqy737w0zqgdx5hw2cdnzw7qks5scmnr0s8ssvqyw3zzym7b9";
       fetchSubmodules = false;
     };
   };
@@ -483,8 +472,8 @@ rec {
     src = pkgs.fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "ed4e95c89f96019688463f30a3ee218ed3682bd3";
-      sha256 = "1kpfx8bmb6rmf6wicmlh3psn7y84d4myzqbk3bxi7kdgw0cs7zys";
+      rev = "b7acf822a62ddc743e8129061c0d2adb32a6b810";
+      sha256 = "13pyag877n1cnrck49350q0x66766mcb9wd9ymvs72xqhj526g7b";
       fetchSubmodules = false;
     };
   };
diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml
index d91e34c..383f30c 100644
--- a/home/programs/nvim/plugins.yaml
+++ b/home/programs/nvim/plugins.yaml
@@ -1,7 +1,4 @@
 ---
-# Fixes
-- src: lewis6991/impatient.nvim
-
 # Utils
 - src: nvim-lua/popup.nvim
 - src: nvim-lua/plenary.nvim