From c580225be681c9953bc78bb53f4144a774440a5e Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Sun, 5 Mar 2023 02:31:39 +0900
Subject: fix(home/base): temporary fix for neovim master builds

---
 flake.lock       | 17 +++++++++++++++++
 flake.nix        |  2 ++
 home/default.nix | 14 ++++++++++----
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0351610..76fee28 100644
--- a/flake.lock
+++ b/flake.lock
@@ -162,6 +162,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-neovim-fix": {
+      "locked": {
+        "lastModified": 1676391559,
+        "narHash": "sha256-LuGZfkD48fqN5sripUgHPCkPhaPXbJSyXqZEiuZv7Ek=",
+        "owner": "raboof",
+        "repo": "nixpkgs",
+        "rev": "ce1f75fa714629d38564959d5b38bb78bbce5a0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raboof",
+        "ref": "neovim-0.8.x-to-0.9.0",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1677560965,
@@ -187,6 +203,7 @@
         "impermanence": "impermanence",
         "neovim": "neovim",
         "nixpkgs-2211": "nixpkgs-2211",
+        "nixpkgs-neovim-fix": "nixpkgs-neovim-fix",
         "rust": "rust",
         "sops-nix": "sops-nix",
         "unstable": "unstable",
diff --git a/flake.nix b/flake.nix
index 3d5c638..345bc32 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,8 @@
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     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 567883b..3004cb3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,12 +1,18 @@
-{ self, unstable, ... } @ inputs:
+{ self, unstable, nixpkgs-neovim-fix, ... } @ inputs:
 
-{
+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;
+  };
+in
+{
   "sefidel@alpha" = self.lib.mkHome {
     username = "sefidel";
     hostname = "alpha";
-    pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default /*neovim.overlay*/ ]; };
+    pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default neovim-fix neovim.overlay ]; };
 
     extraModules = [
       ./profiles/populate.nix
@@ -27,7 +33,7 @@
   "sefidel@kompakt" = self.lib.mkHome {
     username = "sefidel";
     hostname = "kompakt";
-    pkgs = import unstable { system = "aarch64-linux"; overlays = with inputs; [ rust.overlays.default /*neovim.overlay*/ ]; };
+    pkgs = import unstable { system = "aarch64-linux"; overlays = with inputs; [ rust.overlays.default neovim-fix neovim.overlay ]; };
 
     extraModules = [
       ./profiles/populate.nix
-- 
cgit 1.4.1