From cc2229de68948d2b9ca385e4ed29594ab3116208 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Nov 2018 02:47:03 +0100 Subject: tv gitrepos: add hc --- tv/2configs/gitrepos.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv') diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 62c90d4..a89d130 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -76,6 +76,7 @@ let { }; } // mapAttrs (_: recursiveUpdate { cgit.section = "3. Haskell libraries"; }) { blessings = {}; + hc = {}; mime = {}; quipper = {}; scanner = {}; -- cgit v1.2.3 From dbd9c0427dcbcea5fd3828b45527a4d3f131d45c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Nov 2018 13:34:31 +0100 Subject: tv hc: init at 1.0.0 --- tv/5pkgs/simple/hc.nix | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tv/5pkgs/simple/hc.nix (limited to 'tv') diff --git a/tv/5pkgs/simple/hc.nix b/tv/5pkgs/simple/hc.nix new file mode 100644 index 0000000..4d325e1 --- /dev/null +++ b/tv/5pkgs/simple/hc.nix @@ -0,0 +1,37 @@ +{ coreutils, fetchgit, findutils, gawk, gnugrep, makeWrapper, qrencode, stdenv, texlive, utillinux, zbar }: + +stdenv.mkDerivation rec { + name = "hc-${meta.version}"; + + src = fetchgit { + url = "https://cgit.krebsco.de/hc"; + rev = "refs/tags/v${meta.version}"; + sha256 = "09349gja22p0j3xs082kp0fnaaada14bafszn4r3q7rg1id2slfb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = null; + + installPhase = '' + mkdir -p $out/bin + + cp $src/bin/hc $out/bin/hc + + wrapProgram $out/bin/hc \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils + findutils + gawk + gnugrep + qrencode + texlive.combined.scheme-full + utillinux + zbar + ]} + ''; + + meta = { + version = "1.0.0"; + }; +} -- cgit v1.2.3 From 6ce79c8fba116045902607f3ada9c4264ed1634c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Nov 2018 20:55:04 +0100 Subject: ejabberd: replaced by upstream --- tv/3modules/ejabberd/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'tv') diff --git a/tv/3modules/ejabberd/config.nix b/tv/3modules/ejabberd/config.nix index 68bcfa3..a0631e2 100644 --- a/tv/3modules/ejabberd/config.nix +++ b/tv/3modules/ejabberd/config.nix @@ -87,7 +87,6 @@ in /* yaml */ '' mod_configure: {} mod_disco: {} mod_echo: {} - mod_irc: {} mod_bosh: {} mod_last: {} mod_offline: -- cgit v1.2.3 From b2c7b3b95d753926bbf350fb52df8723fce7368b Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 15 Nov 2018 10:43:28 +0100 Subject: tv vim: add fzf --- tv/2configs/vim.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 2ac7f75..544fe94 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -14,6 +14,16 @@ let { }; extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [ + # cannot use pkgs.vimPlugins.fzf-vim as it's missing :Rg + (pkgs.vimUtils.buildVimPlugin { + name = "junegunn"; + src = pkgs.fetchgit { + url = git://github.com/junegunn/fzf.vim; + rev = "ad1833ecbc9153b6e34a4292dc089a58c4bcb8dc"; + sha256 = "1z2q71q6l9hq9fqfqpj1svhyk4yk1bzw1ljhksx4bnpz8gkfbx2m"; + }; + }) + pkgs.vimPlugins.fzfWrapper pkgs.vimPlugins.undotree pkgs.vimPlugins.vim-elixir (pkgs.vimUtils.buildVimPlugin { @@ -309,6 +319,11 @@ let { paths = [ (pkgs.writeDashBin "vim" '' set -efu + export FZF_DEFAULT_COMMAND='${pkgs.ripgrep}/bin/rg --files' + export PATH=$PATH:${makeBinPath [ + pkgs.fzf + pkgs.ripgrep + ]} (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString need-dirs}) exec ${pkgs.vim}/bin/vim "$@" '') @@ -385,5 +400,9 @@ let { noremap [c | noremap! [c noremap [d | noremap! [d vnoremap u + + " fzf + nnoremap q :Files + nnoremap w :Rg ''; } -- cgit v1.2.3 From 7915dd3e1fd34ee698f25b6acdafa4626d0c30eb Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 15 Nov 2018 10:45:22 +0100 Subject: tv vim: M-a edits alternate buffer --- tv/2configs/vim.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 544fe94..469ae3e 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -404,5 +404,9 @@ let { " fzf nnoremap q :Files nnoremap w :Rg + + " edit alternate buffer + " For some reason neither putting 6 nor ^ works here... + nnoremap a  ''; } -- cgit v1.2.3 From 2b6a4e00d9d42dac7680a91ec796f3aaba1335ce Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 16 Nov 2018 17:06:20 +0100 Subject: tv vim: set timeoutlen=0 --- tv/2configs/vim.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 469ae3e..a63d802 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -348,6 +348,7 @@ let { set shortmess+=I set showcmd set showmatch + set timeoutlen=0 set ttimeoutlen=0 set undodir=${dirs.undodir} set undofile -- cgit v1.2.3 From b719e5ebce5d69f7fe66510b34b51f8ea7aee5e1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 16 Nov 2018 17:18:07 +0100 Subject: tv vim: neaten fzf plugin --- tv/2configs/vim.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index a63d802..e51f077 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -16,9 +16,9 @@ let { extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [ # cannot use pkgs.vimPlugins.fzf-vim as it's missing :Rg (pkgs.vimUtils.buildVimPlugin { - name = "junegunn"; + name = "fzf-2018-11-14"; src = pkgs.fetchgit { - url = git://github.com/junegunn/fzf.vim; + url = https://github.com/junegunn/fzf.vim; rev = "ad1833ecbc9153b6e34a4292dc089a58c4bcb8dc"; sha256 = "1z2q71q6l9hq9fqfqpj1svhyk4yk1bzw1ljhksx4bnpz8gkfbx2m"; }; -- cgit v1.2.3 From 8978d5b8523eb6d75139ff92dec5bfdbaf3507d6 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 16 Nov 2018 17:19:13 +0100 Subject: tv vim elixir: b916c00 -> 0a847f0 --- tv/2configs/vim.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index e51f077..a5641f0 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -25,7 +25,14 @@ let { }) pkgs.vimPlugins.fzfWrapper pkgs.vimPlugins.undotree - pkgs.vimPlugins.vim-elixir + (pkgs.vimUtils.buildVimPlugin { + name = "vim-elixir-2018-08-17"; + src = pkgs.fetchgit { + url = https://github.com/elixir-editors/vim-elixir; + rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b"; + sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04"; + }; + }) (pkgs.vimUtils.buildVimPlugin { name = "vim-syntax-jq"; src = pkgs.fetchgit { -- cgit v1.2.3