gerg: switch to new repo (#338)

* gerg: switch to new repo

* modules/default: fix buildPlug
This commit is contained in:
Gerg-L 2024-07-14 03:47:21 +00:00 committed by GitHub
parent f6a058d1ed
commit 1426c83ce6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 31 deletions

View file

@ -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",

View file

@ -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 = {

View file

@ -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";