diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 5c31fec..68742ee 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -10,6 +10,7 @@ channels: final: prev: { rage nixpkgs-fmt qutebrowser + nvfetcher signal-desktop neovim neovim-unwrapped diff --git a/pkgs/.shake/.shake.database b/pkgs/.shake/.shake.database new file mode 100644 index 0000000..2596193 Binary files /dev/null and b/pkgs/.shake/.shake.database differ diff --git a/pkgs/.shake/.shake.lock b/pkgs/.shake/.shake.lock new file mode 100644 index 0000000..e69de29 diff --git a/pkgs/_build/.shake.database b/pkgs/_build/.shake.database new file mode 100644 index 0000000..a4f3389 Binary files /dev/null and b/pkgs/_build/.shake.database differ diff --git a/pkgs/_build/.shake.lock b/pkgs/_build/.shake.lock new file mode 100644 index 0000000..e69de29 diff --git a/pkgs/_sources/generated.nix b/pkgs/_build/generated.nix similarity index 52% rename from pkgs/_sources/generated.nix rename to pkgs/_build/generated.nix index 71be396..21c6b59 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_build/generated.nix @@ -1,6 +1,19 @@ # This file was generated by nvfetcher, please do not modify it manually. { fetchgit, fetchurl }: { + go-fold-if-err-nil = { + pname = "go-fold-if-err-nil"; + version = "4f881c4f64d9caac1f59ebd5d14963f99db3d71a"; + src = fetchgit { + url = "https://im.badat.dev/bad/nvimgofoldiferrnil"; + rev = "4f881c4f64d9caac1f59ebd5d14963f99db3d71a"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sha256 = "0rr66y86g6g8ixg69yd6ahyzirl82gfvyv6j2w6b0zv5x0979x9v"; + }; + + }; manix = { pname = "manix"; version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; @@ -12,5 +25,6 @@ leaveDotGit = false; sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs"; }; + }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 924a230..6fd5c73 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,6 @@ final: prev: { # keep sources this first - sources = prev.callPackage (import ./_sources/generated.nix) { }; + sources = prev.callPackage (import ./sources.nix) { }; # then, call packages with `final.callPackage` + go-fold-if-err-nil = prev.callPackage ./go-fold-if-err-nil.nix { }; } diff --git a/pkgs/go-fold-if-err-nil.nix b/pkgs/go-fold-if-err-nil.nix new file mode 100644 index 0000000..e7979b6 --- /dev/null +++ b/pkgs/go-fold-if-err-nil.nix @@ -0,0 +1,6 @@ +{ lib, sources, stdenv, vimUtils, ... }: +vimUtils.buildVimPluginFrom2Nix { + inherit (sources.go-fold-if-err-nil) src version; + name = "go-fold-if-err-nil"; + meta.homepage = "https://im.badat.dev/bad/nvimgofoldiferrnil"; +} diff --git a/pkgs/sources.nix b/pkgs/sources.nix new file mode 120000 index 0000000..2bf0b7e --- /dev/null +++ b/pkgs/sources.nix @@ -0,0 +1 @@ +_build/generated.nix \ No newline at end of file diff --git a/pkgs/sources.toml b/pkgs/sources.toml index f7af168..dc05db1 100644 --- a/pkgs/sources.toml +++ b/pkgs/sources.toml @@ -1,4 +1,6 @@ -# nvfetcher.toml [manix] src.git = "https://github.com/mlvzk/manix" fetch.github = "mlvzk/manix" +[go-fold-if-err-nil] +src.git = "https://im.badat.dev/bad/nvimgofoldiferrnil" +fetch.git = "https://im.badat.dev/bad/nvimgofoldiferrnil" diff --git a/profiles/core/default.nix b/profiles/core/default.nix index a75508e..440e27d 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -40,7 +40,7 @@ in whois nixpkgs-fmt - manix + nvfetcher libqalculate ]; }; diff --git a/users/profiles/neovim/default.nix b/users/profiles/neovim/default.nix index c2e47b8..53d7961 100644 --- a/users/profiles/neovim/default.nix +++ b/users/profiles/neovim/default.nix @@ -32,6 +32,7 @@ config = "colorscheme iceberg"; } vim-sleuth + pkgs.go-fold-if-err-nil coc-json coc-go coc-html