From 00296b6d4f742f612a6ff38a670b7394171c5b97 Mon Sep 17 00:00:00 2001 From: Bad Date: Fri, 27 Aug 2021 14:43:53 +0200 Subject: [PATCH] Add go fold if err nil vim plugin --- overlays/overrides.nix | 1 + pkgs/.shake/.shake.database | Bin 0 -> 1073 bytes pkgs/.shake/.shake.lock | 0 pkgs/_build/.shake.database | Bin 0 -> 3510 bytes pkgs/_build/.shake.lock | 0 pkgs/{_sources => _build}/generated.nix | 14 ++++++++++++++ pkgs/default.nix | 3 ++- pkgs/go-fold-if-err-nil.nix | 6 ++++++ pkgs/sources.nix | 1 + pkgs/sources.toml | 4 +++- profiles/core/default.nix | 2 +- users/profiles/neovim/default.nix | 1 + 12 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 pkgs/.shake/.shake.database create mode 100644 pkgs/.shake/.shake.lock create mode 100644 pkgs/_build/.shake.database create mode 100644 pkgs/_build/.shake.lock rename pkgs/{_sources => _build}/generated.nix (52%) create mode 100644 pkgs/go-fold-if-err-nil.nix create mode 120000 pkgs/sources.nix 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 0000000000000000000000000000000000000000..259619352d32f7cae5a8adc3c190c3c2f68e82e9 GIT binary patch literal 1073 zcmbW0%}&BV5XWmI9yECJYzP-Yv!%5_F;QdXLk$U9N|c*vn$b4YF4^5;x%xQ1hi~B7 z2k}G#m zQMNG?kP32&>?344KSFXPK|uhj?`c!ILA+MvMat7Z~#VW(8Lf)G** zFF?$z)+zqVNbod;f9mm|e`{s)X~oTG^mnWBU{wyQrSeJc3Y~O;#gS@-&+eE{=5`+6 zM@Cu0QCbF(^BHna+Afk+@EOi+mhmB8t8&vrwv-JVb)N`(t^cl!d0X#<(M30^ zl6D9xNA11kM$I>Mb4Pc`C6XRl*IGcy#6p`f1kKzbbZhY*F-O(?z}ABR{QKAJ3~@Fh z(gr{8!Q4w_)uqIY0-B1|fP{lzwZsjhtqG;qU5`vGc#%W{t7`%5Gd~I^F+3~}ijFOd z&QB^_^W*!wii$=2jK>->-Z4C>6WZ~`Rc}{ML)PD#hvI#hn}RRW2>|vp;26?bz!Myt z6$8pRUifHR!NIoybKIlweG!n0TJ0RcY7=Z&g;30^#gZ!JwSrPA2}MPNo{)bEI5Vn$ zN^XYmBh!m*?#z#6obTyA3BCL2Rx;hvsP1<_dRVtDea&=#5922w0vuNdJOn^G*Nmce zxSY$mEz!^|JrXSv=b)GKW4Gl5cHmjAO(^wUuP4F2Pdb5sQ-W&?Fe$)n{&0FhwpCR! zWm}Og&D3>MvP&8|K(CoZc zwpGJ6q=H=3Rbm&3lqYiLX6=J?;3g&s-P}8wF5kYM9=cgYZf+LfV5d*Vi1XM{1QQsW zj2^J5z8N`BsiLH+;wX;lCXS+|mZCS)u1h_&;Mj2*D_07;ijnWer3B)tC0d*X@|TbQ z#JiSz25|j1t@8ZS`xQu*(5A%3yHbE;&OwH!xf$Si7Fm0AmwopGi#JYBeR6bH@)!8` zXL-Ku>n#HP`J){3=V3l3G;{+WImX?)OfIA*$S|M5WoC-!JJdr(*~T2BvY0NOrzD=( z1HNay(J@+qh3^maNB2U4%i?*9koKAv__+9?VUOrBsRnqX-#HOB^+HKOFOHL6wvIit zJiCVvE2Ocvake?m9Q>u?OAQYLJg%_Ca#~`Eehhl=0x}w}{ujnAbx?aPQw{C^uf4Ba zmW*=Zs%F8W#%|Z{mh)!UvP}6(u^5&eN%veDO9gA!)1;} z^ZS=+CH`Y$Wwd;L0_JHJyE$a-QSS)6!2*dRQ#LyjA>DTr2^(a&9IA_PBgo{&sf)WG z*i3v-3KJQ9V5M-JT(NbGmcqEp$rAnDsc#0QfEOQ@0v5nJV2*nnzIgj@8y(lPat`qc z)gxkwuos431xvSX?0*hVnoKLU>-%4^S3!ko!pjs-TBZov0qc9of%Y8y#!DF)&;bNK ekg!D;@E_6)xN}IEAsorBbu@wf`rjKXh<^YVccv8p literal 0 HcmV?d00001 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