summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-10-18 12:54:58 +0200
committerlassulus <lass@blue.r>2018-10-18 12:54:58 +0200
commitb1bee255eecb3da9afeedabe4366103d270821b7 (patch)
treebb3565e3c20865f6a55ee0e0a43da909d0aa133b
parent031a832b5c378cc86385fcd37a1252e75d876fbc (diff)
parent58200bf7075eeef5ab1979f1da6729fa7bbf41dd (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/2configs/gitrepos.nix2
-rw-r--r--tv/2configs/vim.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index a8cbe0f1c..62c90d4e9 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -153,7 +153,7 @@ let {
public = false;
hooks = hooks // {
post-receive = /* sh */ ''
- (${hooks.post-receive or ""})
+ (${hooks.post-receive or ":"})
${cgit-clear-cache}/bin/cgit-clear-cache
'';
};
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 400d179d0..2ac7f7518 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -15,6 +15,7 @@ let {
extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
pkgs.vimPlugins.undotree
+ pkgs.vimPlugins.vim-elixir
(pkgs.vimUtils.buildVimPlugin {
name = "vim-syntax-jq";
src = pkgs.fetchgit {