From ec913c7d067fe1a7e2437d10571a2e0eb00ef941 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Sun, 5 Mar 2023 03:03:34 +0900
Subject: fix(home/base): use local overlay for neovim fix

---
 flake.nix           |  1 -
 home/default.nix    | 12 ++++++------
 overlays/neovim.nix |  6 ++++++
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 overlays/neovim.nix

diff --git a/flake.nix b/flake.nix
index 345bc32..be553f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
     unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
     nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
     # TODO See: https://github.com/NixOS/nixpkgs/pull/214231
-    nixpkgs-neovim-fix.url = "github:raboof/nixpkgs/neovim-0.8.x-to-0.9.0";
 
     darwin.url = "github:LnL7/nix-darwin";
     darwin.inputs.nixpkgs.follows = "unstable";
diff --git a/home/default.nix b/home/default.nix
index 3004cb3..0a45fe5 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,16 +3,16 @@
 let
   # TODO See: https://github.com/neovim/neovim/pull/21711
   # TODO See: https://github.com/NixOS/nixpkgs/pull/214231
-  neovim-fix = self: super: {
-    inherit (nixpkgs-neovim-fix.legacyPackages.${super.system})
-      neovim neovim-unwrapped;
-  };
+  # neovim-fix = self: super: {
+  #   inherit (nixpkgs-neovim-fix.legacyPackages.${super.system})
+  #     neovim neovim-unwrapped;
+  # };
 in
 {
   "sefidel@alpha" = self.lib.mkHome {
     username = "sefidel";
     hostname = "alpha";
-    pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim-fix neovim.overlay ]; };
+    pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default (import ../overlays/neovim.nix) neovim.overlay ]; };
 
     extraModules = [
       ./profiles/populate.nix
@@ -33,7 +33,7 @@ in
   "sefidel@kompakt" = self.lib.mkHome {
     username = "sefidel";
     hostname = "kompakt";
-    pkgs = import unstable { system = "aarch64-linux"; overlays = with inputs; [ rust.overlays.default neovim-fix neovim.overlay ]; };
+    pkgs = import unstable { system = "aarch64-linux"; overlays = with inputs; [ rust.overlays.default (import ../overlays/neovim.nix) neovim.overlay ]; };
 
     extraModules = [
       ./profiles/populate.nix
diff --git a/overlays/neovim.nix b/overlays/neovim.nix
new file mode 100644
index 0000000..6c4b225
--- /dev/null
+++ b/overlays/neovim.nix
@@ -0,0 +1,6 @@
+self: super: {
+  # TODO See: https://github.com/NixOS/nixpkgs/pull/214231
+  neovim-unwrapped = super.neovim-unwrapped.overrideAttrs (old: {
+    patches = [ ];
+  });
+}
-- 
cgit 1.4.1