diff --git a/dotfiles/default.nix b/dotfiles/default.nix index 47d503e..c4283d2 100644 --- a/dotfiles/default.nix +++ b/dotfiles/default.nix @@ -22,9 +22,6 @@ in { pkgs.watch pkgs.universal-ctags - # local packages - (pkgs.callPackage ../pkgs/smart-gen-tags { }) - # remote packages. Probably could do this better but I don't really want to # at the moment. (import (fetchTarball "https://cachix.org/api/v1/install") { }).cachix diff --git a/dotfiles/neovim.nix b/dotfiles/neovim.nix index 132d87c..e5f79f7 100644 --- a/dotfiles/neovim.nix +++ b/dotfiles/neovim.nix @@ -3,8 +3,6 @@ let similar-sort = pkgs.callPackage ../pkgs/similar-sort { }; - smart-gen-tags = pkgs.callPackage ../pkgs/smart-gen-tags { }; - sources = import ../nix/sources.nix; nixfmt = import sources.nixfmt { }; @@ -380,8 +378,7 @@ in { nnoremap fh :History nnoremap fj :BLines nnoremap fl :Lines - nnoremap fs :Ack - nnoremap ft :Tags + nnoremap ft :Ack nmap (fzf-maps-n) xmap (fzf-maps-x) @@ -393,11 +390,6 @@ in { nnoremap ec :Chmod nnoremap em :Mkdir - "" TAGS - autocmd BufWritePost * silent !${smart-gen-tags}/bin/smart-gen-tags % - - nnoremap a :Dispatch! ${smart-gen-tags}/bin/smart-gen-tags - "" TEXT OBJECTS onoremap ib :exec "normal! ggVG" onoremap iv :exec "normal! HVL" diff --git a/pkgs/smart-gen-tags/default.nix b/pkgs/smart-gen-tags/default.nix deleted file mode 100644 index 92e10e1..0000000 --- a/pkgs/smart-gen-tags/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: - -pkgs.stdenv.mkDerivation { - name = "smart-gen-tags"; - buildInputs = [ pkgs.bash pkgs.universal-ctags pkgs.git ]; - src = ./.; - - buildPhase = '' - sed '/\/usr\/bin\/env bash/aPATH=$PATH:${pkgs.git}\/bin:${pkgs.universal-ctags}\/bin' \ - < smart-gen-tags.sh \ - > smart-gen-tags - - chmod +x smart-gen-tags - ''; - - installPhase = '' - mkdir -p $out/bin - cp smart-gen-tags $out/bin/smart-gen-tags - ''; -} diff --git a/pkgs/smart-gen-tags/smart-gen-tags.sh b/pkgs/smart-gen-tags/smart-gen-tags.sh deleted file mode 100755 index 6ec54c4..0000000 --- a/pkgs/smart-gen-tags/smart-gen-tags.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -if test -n "${@:-}"; then - ctags --totals --append $@ -elif test -d .git; then - git ls-files --others --cached --modified --exclude-standard -z | xargs -0 ctags --totals -else - ctags -R . -fi