From 2a728e984959c2478910428eeccecce47c1fe447 Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Mon, 19 Feb 2024 14:49:55 +0100 Subject: [PATCH] chore(shell,vim): remove unused stuff --- files/shell/.shellrc.alias | 19 ------------------- files/vim/.vimrc | 10 ++++++---- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/files/shell/.shellrc.alias b/files/shell/.shellrc.alias index c742f03..1d77be5 100644 --- a/files/shell/.shellrc.alias +++ b/files/shell/.shellrc.alias @@ -1,22 +1,3 @@ -### fzf(1) -export FZF_DEFAULT_OPTS='--layout=reverse' - -# use vim fzf if no global fzf is found -[[ -d ~/.vim/plugged/fzf ]] && [[ -x $(which fzf 2> /dev/null) ]] || export PATH=$PATH:$HOME/.vim/plugged/fzf/bin - -# interactive git grep -alias gg=': | fzf --ansi --disabled --query "${*:-}" \ - --bind "start:reload:git grep {q}" \ - --bind "change:reload:sleep 0.1; git grep {q} || true" \ - --bind "enter:become(hx {1} +{2})" \ - --delimiter :' - -alias rgi=': | fzf --ansi --disabled --query "${*:-}" \ - --bind "start:reload:rga {q}" \ - --bind "change:reload:sleep 0.1; rga {q} || true" \ - --bind "enter:become(xdg-open {1})" \ - --delimiter :' - ### System Utility alias cdt='mkdir /tmp/$(cat /proc/sys/kernel/random/uuid); cd $_' alias cpu='watch -n.1 "grep \"^[c]pu MHz\" /proc/cpuinfo"' diff --git a/files/vim/.vimrc b/files/vim/.vimrc index 8c8b997..5c11b0f 100644 --- a/files/vim/.vimrc +++ b/files/vim/.vimrc @@ -19,8 +19,8 @@ call plug#begin() Plug 'jiangmiao/auto-pairs' " pair completion Plug 'mhinz/vim-signify' " show lines changed in git(1) Plug 'tpope/vim-commentary' " DWIM comments -Plug 'sheerun/vim-polyglot' " language packs (highlighting, indent) +" file search Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' @@ -80,6 +80,9 @@ set list set listchars=tab:──\ ,extends:›,precedes:‹,nbsp:·,trail:· " show chars for whitespaces set fillchars+=vert:\ " don't draw verticle split +" openbsd style +autocmd FileType c setlocal tabstop=8 shiftwidth=4 noexpandtab + " show trailing whitespaces in red highlight ExtraWhitespace ctermbg=red guibg=red match ExtraWhitespace /\s\+\%#\@0) if has("linux") map :GGrep -else - " for some reason, openbsd doesnt like fzf live commands - map :GGrep +else " openbsd + map :GGrep endif " kill whitespaces fast and efficient