Extract vim-plugins to a separate flake

flake.nix

@@ -1,20 +1,21 @@
 {
   # https://nix-community.github.io/home-manager/index.html#sec-flakes-nix-darwin-module
   inputs = {
-    auto-dark-mode.flake = false;
-    auto-dark-mode.url = "github:f-person/auto-dark-mode.nvim";
+    # auto-dark-mode.flake = false;
+    # auto-dark-mode.url = "github:f-person/auto-dark-mode.nvim";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     darwin.url = "github:LnL7/nix-darwin";
     devenv.url = "github:cachix/devenv";
     flake-utils.url = "github:numtide/flake-utils";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    vim-plugins.url = "path:flakes/vim-plugins";
   };
 
   outputs =
     { self
-    , auto-dark-mode
+    , vim-plugins
     , darwin
     , devenv
     , flake-utils
@@ -30,7 +31,7 @@
           {
             home-manager = {
               backupFileExtension = "bak";
-              extraSpecialArgs = { inherit auto-dark-mode; };
+              extraSpecialArgs = { vim-plugins-overlays = inputs.vim-plugins.overlays.${system}; };
               users.sestrella = import ./home.nix;
             };
           }

flakes/vim-plugins/flake.nix

@@ -0,0 +1,25 @@
+{
+  inputs = {
+    auto-dark-mode.flake = false;
+    auto-dark-mode.url = "github:f-person/auto-dark-mode.nvim";
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  };
+
+  outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system:
+    let pkgs = inputs.nixpkgs.legacyPackages.${system};
+    in
+    rec {
+      packages = {
+        auto-dark-mode = pkgs.vimUtils.buildVimPlugin {
+          name = "auto-dark-mode.nvim";
+          src = inputs.auto-dark-mode;
+        };
+      };
+
+      overlays.default = (final: prev: {
+        vimPlugins = prev.vimPlugins // { inherit (packages) auto-dark-mode; };
+      });
+    }
+  );
+}

home.nix

@@ -1,4 +1,4 @@
-{ auto-dark-mode, config, pkgs, ... }:
+{ config, pkgs, vim-plugins-overlays, ... }:
 
 {
   # This value determines the Home Manager release that your
@@ -67,13 +67,6 @@
   programs.starship.enable = true;
 
   nixpkgs.overlays = [
-    (final: prev: {
-      vimPlugins = prev.vimPlugins.extend (final': prev': {
-        auto-dark-mode-nvim = pkgs.vimUtils.buildVimPlugin {
-          name = "auto-dark-mode.nvim";
-          src = auto-dark-mode;
-        };
-      });
-    })
+    vim-plugins-overlays.default
   ];
 }

home/neovim/plugins/auto-dark-mode.nix

@@ -2,7 +2,7 @@
 
 [
   {
-    plugin = pkgs.vimPlugins.auto-dark-mode-nvim;
+    plugin = pkgs.vimPlugins.auto-dark-mode;
     config = builtins.readFile ./auto-dark-mode.lua;
     type = "lua";
   }