diff --git a/flake.nix b/flake.nix
index d1e5d495..3b8c722f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,16 +65,7 @@
     , pre-commit-hooks
     }:
     let
-      inherit (futils.lib) eachSystem system;
-
-      mySystems = [
-        system.aarch64-darwin
-        system.aarch64-linux
-        system.x86_64-darwin
-        system.x86_64-linux
-      ];
-
-      eachMySystem = eachSystem mySystems;
+      inherit (futils.lib) eachDefaultSystem;
 
       lib = nixpkgs.lib.extend (self: super: {
         my = import ./lib { inherit inputs; pkgs = nixpkgs; lib = self; };
@@ -109,7 +100,7 @@
         };
       };
     in
-    eachMySystem
+    eachDefaultSystem
       (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
diff --git a/overlays/default.nix b/overlays/default.nix
index 3f5a2461..81692beb 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 00000000..36c622b2
--- /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=";
+      };
+    });
+  });
+}