neovim: fix broken overlay

See nix-community/neovim-nightly-overlay#533
sandydoo · Jun 19, 2024 · 261ff27 · 261ff27
1 parent 4078395
commit 261ff27
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,6 +10,7 @@
     vscode-server.url = "github:nix-community/nixos-vscode-server";
     vscode-server.inputs.nixpkgs.follows = "nixpkgs";
     neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
+    neovim-nightly.inputs.nixpkgs.follows = "nix-unstable";
   };
 
   outputs = { self, nixpkgs, nix-unstable, home-manager, darwin, nix-darwin, vscode-server, ... }@inputs:
@@ -36,6 +37,9 @@
             system = "aarch64-linux";
             config.allowUnfree = true;
             config.allowBroken = true;
+            overlays = [
+              inputs.neovim-nightly.overlays.default
+            ];
           };
         };
       };

diff --git a/modules/common.nix b/modules/common.nix
@@ -89,12 +89,11 @@
   nixpkgs.overlays = [
     (import "${inputs.self}/overlays")
     (final: prev: { latest = unstable; })
-    inputs.neovim-nightly.overlays.default
   ];
 
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
-  home-manager.extraSpecialArgs = { inherit inputs; };
+  home-manager.extraSpecialArgs = { inherit inputs; inherit unstable; };
   home-manager.users.sandydoo = import "${inputs.self}/users/sandydoo/home.nix";
 
   users.mutableUsers = false;

diff --git a/users/sandydoo/home.nix b/users/sandydoo/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ pkgs, lib, inputs, unstable, ... }:
 
 with lib.hm.gvariant;
 
@@ -11,7 +11,7 @@ with lib.hm.gvariant;
 
   home.packages = with pkgs; [
     # Editors
-    neovim
+    unstable.neovim
     kakoune
     helix