feat(darwin,nixos): use overlay for neovim

5 files changed, 5 insertions, 16 deletions

diff --git a/flake.nix b/flake.nix
index 16e7045..8964769 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,12 +31,9 @@
 
       homeConfigurations = import ./home inputs;
 
-      packages.x86_64-linux = (import ./packages/linux.nix inputs)
-        // self.lib.nixosConfigurationsAsPackages.x86_64-linux
+      packages.x86_64-linux = self.lib.nixosConfigurationsAsPackages.x86_64-linux
         // self.lib.homeConfigurationsAsPackages.x86_64-linux;
 
-      packages.aarch64-darwin = import ./packages/darwin.nix inputs;
-
       checks = self.packages;
 
       lib = import ./lib inputs;
diff --git a/home/default.nix b/home/default.nix
index 89cf8e1..30ab75f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,7 +4,7 @@
   "zach@alpha" = self.lib.mkHome {
     username = "zach";
     hostname = "alpha";
-    pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay rust.overlays.default ]; };
+    pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay rust.overlays.default neovim.overlay ]; };
 
     extraModules = [
       ./profiles/populate.nix
@@ -22,7 +22,7 @@
   "o32@kompakt" = self.lib.mkHome {
     username = "o32";
     hostname = "kompakt";
-    pkgs = import unstable { system = "aarch64-darwin"; overlays = with inputs; [ rust.overlays.default ]; };
+    pkgs = import unstable { system = "aarch64-darwin"; overlays = with inputs; [ rust.overlays.default neovim.overlay ]; };
 
     extraModules = [
       ./profiles/populate.nix
diff --git a/home/profiles/base-darwin/default.nix b/home/profiles/base-darwin/default.nix
index 3aa915b..d03b689 100644
--- a/home/profiles/base-darwin/default.nix
+++ b/home/profiles/base-darwin/default.nix
@@ -40,7 +40,7 @@ in
       pkgs.tree
       pkgs.pinentry_mac
 
-      neovim
+      pkgs.neovim
       pkgs.nodejs-16_x
 
       # Common build tools
diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix
index fdd524c..e1e895e 100644
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -3,8 +3,6 @@ let
   cfg = config.profiles.base;
 
   neotheme = config.neotheme;
-
-  inherit (self.packages.x86_64-linux) neovim;
 in
 {
   imports = [
@@ -96,8 +94,7 @@ in
       pkgs.procs
       pkgs.sops
       pkgs.tree
-      # Don't manage neovim
-      neovim
+      pkgs.neovim
 
       # Common build tools
       (pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default))
diff --git a/packages/linux.nix b/packages/linux.nix
deleted file mode 100644
index 0f6e9ec..0000000
--- a/packages/linux.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ self, neovim, ... } @ inputs:
-
-{
-  "neovim" = neovim.packages.x86_64-linux.neovim;
-}