fix(nix): Switch to getting nvim nightly from nix-community/neovim-ni…

…ghtly-overlay
mrjones2014 · Feb 9, 2024 · ff85bd2 · ff85bd2
1 parent 1065d9d
commit ff85bd2
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 67 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,14 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    neovim-flake = {
-      url = "github:neovim/neovim?dir=contrib";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     arkenfox = {
       url = "github:dwarfmaster/arkenfox-nixos";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/home-manager/home.nix b/home-manager/home.nix
@@ -10,6 +10,7 @@ in {
         inherit inputs;
         inherit pkgs;
       }))
+    inputs.neovim-nightly-overlay.overlay
   ];
   home = {
     username = "mat";

diff --git a/home-manager/server.nix b/home-manager/server.nix
@@ -5,6 +5,7 @@
         inherit inputs;
         inherit pkgs;
       }))
+    inputs.neovim-nightly-overlay.overlay
   ];
   home = {
     username = "mat";

diff --git a/packages/default.nix b/packages/default.nix
@@ -1,12 +1 @@
-{ inputs, pkgs, ... }:
-let
-  inherit (pkgs) stdenv;
-  inherit (stdenv) isLinux;
-  inherit (inputs.neovim-flake) packages;
-  neovim = if isLinux then
-    packages.x86_64-linux.neovim
-  else
-    packages.aarch64-darwin.neovim;
-in {
-  neovim-nightly = pkgs.callPackage ./neovim-nightly.nix { inherit neovim; };
-}
+{ inputs, pkgs, ... }: { }
diff --git a/packages/libvterm-neovim.nix b/packages/libvterm-neovim.nix
diff --git a/packages/neovim-nightly.nix b/packages/neovim-nightly.nix