From 5c6d0cd0325b6f580c853e4a722e4c08c7e9a1ec Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 12 Apr 2022 10:37:40 +0200
Subject: [PATCH 1/2] overlays: remove vim-plugins-overrides

---
 overlays/default.nix                       |  2 --
 overlays/vim-plugins-overrides/default.nix | 17 -----------------
 2 files changed, 19 deletions(-)
 delete mode 100644 overlays/vim-plugins-overrides/default.nix

diff --git a/overlays/default.nix b/overlays/default.nix
index 81692beb..3f5a2461 100644
--- a/overlays/default.nix
+++ b/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;
diff --git a/overlays/vim-plugins-overrides/default.nix b/overlays/vim-plugins-overrides/default.nix
deleted file mode 100644
index 36c622b2..00000000
--- a/overlays/vim-plugins-overrides/default.nix
+++ /dev/null
@@ -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=";
-      };
-    });
-  });
-}

From 7010ba25f48103f0779dd9b9fb90387818dc70fc Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 12 Apr 2022 10:43:54 +0200
Subject: [PATCH 2/2] flake: only use subset of systems

Turns out pre-commit pulls dotnet in its closure, which is not supported
on i686...
---
 flake.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3b8c722f..d1e5d495 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,16 @@
     , pre-commit-hooks
     }:
     let
-      inherit (futils.lib) eachDefaultSystem;
+      inherit (futils.lib) eachSystem system;
+
+      mySystems = [
+        system.aarch64-darwin
+        system.aarch64-linux
+        system.x86_64-darwin
+        system.x86_64-linux
+      ];
+
+      eachMySystem = eachSystem mySystems;
 
       lib = nixpkgs.lib.extend (self: super: {
         my = import ./lib { inherit inputs; pkgs = nixpkgs; lib = self; };
@@ -100,7 +109,7 @@
         };
       };
     in
-    eachDefaultSystem
+    eachMySystem
       (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};