From 33f9503104aa816d147a006a7ca68b03fbc7f1eb Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 17 Jan 2023 12:49:16 +0900 Subject: feat(darwin,nixos): use overlay for neovim --- home/default.nix | 4 ++-- home/profiles/base-darwin/default.nix | 2 +- home/profiles/base/default.nix | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'home') 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)) -- cgit 1.4.1