From 1426c83ce6951e0edca9d1c630eb522e1078c7b5 Mon Sep 17 00:00:00 2001
From: Gerg-L <88247690+Gerg-L@users.noreply.github.com>
Date: Sun, 14 Jul 2024 03:47:21 +0000
Subject: [PATCH] gerg: switch to new repo (#338)

* gerg: switch to new repo

* modules/default: fix buildPlug
---
 flake.lock          | 37 ++++++++++++++++---------------------
 flake.nix           |  5 +----
 modules/default.nix | 12 ++++++------
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index e9a2680..338affd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,6 +67,21 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1720927281,
+        "narHash": "sha256-4Z2FtCuL0lT+sM2gb1JMcXOUkeYrWeYZjjs1HuVTlOs=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "302b18ddb8498aa9a7e0c01f7026e49d545e6898",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -88,26 +103,6 @@
         "type": "github"
       }
     },
-    "neovim-wrapper": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1720909720,
-        "narHash": "sha256-ei4ap9Y076Livf7HNi0DeCG3FNfuKfnrmjqMkF4UbLs=",
-        "owner": "Gerg-L",
-        "repo": "neovim-wrapper",
-        "rev": "bdcac428162888855b84fb703b29db76c1de6e73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "neovim-wrapper",
-        "type": "github"
-      }
-    },
     "nil": {
       "inputs": {
         "flake-utils": [
@@ -1801,7 +1796,7 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
-        "neovim-wrapper": "neovim-wrapper",
+        "mnw": "mnw",
         "nil": "nil",
         "nixpkgs": "nixpkgs",
         "nmd": "nmd",
diff --git a/flake.nix b/flake.nix
index 325e93c..7dfc7c7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,10 +81,7 @@
     systems.url = "github:nix-systems/default";
 
     # Alternate neovim-wrapper
-    neovim-wrapper = {
-      url = "github:Gerg-L/neovim-wrapper";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    mnw.url = "github:Gerg-L/mnw";
 
     # For generating documentation website
     nmd = {
diff --git a/modules/default.nix b/modules/default.nix
index a500175..6ab6790 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -36,11 +36,11 @@ inputs: {
   buildPlug = {pname, ...} @ attrs: let
     src = getAttr ("plugin-" + pname) inputs;
   in
-    pkgs.runCommand pname {
-      inherit src;
-      version = src.shortRev or src.shortDirtyRev or "dirty";
-    }
-    // attrs
+    pkgs.runCommand pname ({
+        inherit src;
+        version = src.shortRev or src.shortDirtyRev or "dirty";
+      }
+      // attrs)
     ''
       mkdir -p $out
       cp -r . $out
@@ -98,7 +98,7 @@ inputs: {
 
   # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
   # generate a wrapped Neovim package.
-  neovim-wrapped = inputs.neovim-wrapper.legacyPackages.${pkgs.stdenv.system}.neovimWrapper {
+  neovim-wrapped = inputs.mnw.lib.wrap pkgs {
     neovim = vimOptions.package;
     plugins = concatLists [builtStartPlugins builtOptPlugins];
     appName = "nvf";