diff options
| -rw-r--r-- | config/vim/pluggins.vim | 18 | ||||
| -rw-r--r-- | config/vim/vimrc | 17 | ||||
| -rw-r--r-- | config/zsh/aliases.zsh | 31 |
3 files changed, 30 insertions, 36 deletions
diff --git a/config/vim/pluggins.vim b/config/vim/pluggins.vim index 0915f42..8bd1cf0 100644 --- a/config/vim/pluggins.vim +++ b/config/vim/pluggins.vim @@ -3,7 +3,7 @@ """""""""""""""" call plug#begin($XDG_DATA_HOME . '/vim/plugged') - Plug 'ctrlpvim/ctrlp.vim' " Ctrl-P similar to vsc + Plug 'junegunn/fzf.vim' " file name/tags fuzzy finder (depends on fzf) Plug 'tpope/vim-eunuch' " basic unix command in vim Plug 'tomtom/tcomment_vim' " mininal commenter Plug 'itchyny/lightline.vim' " minimal status bar @@ -14,8 +14,6 @@ call plug#begin($XDG_DATA_HOME . '/vim/plugged') Plug 'ludovicchabant/vim-gutentags' " generate tags in project root Plug 'junegunn/goyo.vim' " generate tags in project root - " Plug 'easymotion/vim-easymotion' " TODO very intresting - " Plug 'mhinz/vim-rfc' " RFC download/syntax/tags Plug 'skammer/vim-css-color' " markdown preview in browser @@ -27,20 +25,20 @@ call plug#begin($XDG_DATA_HOME . '/vim/plugged') Plug 'ziglang/zig.vim' " zig Plug 'nikvdp/ejs-syntax' " ejs - " s19 at home - Plug 'cacharle/vim-42header' " 42 header - " themes " Plug 'joshdick/onedark.vim' " onedark Plug 'dracula/vim', {'as': 'vim'} " dracula Plug 'altercation/vim-colors-solarized' " solarized " intresting but not used - " Plug 'sheerun/vim-polyglot' " better syntax highlight - " Plug 'unblevable/quick-scope' " highlight first char to jump to word - " Plug 'jez/vim-superman' " man pages in vim (too slow) Plug 'vim-scripts/rfc-syntax' " rfc - " Plug 'tacahiroy/ctrlp-funky' " extension to search function + + " my plugins Plug 'cacharle/c_formatter_42.vim' Plug 'cacharle/doxy42.vim' + + " s19 at home + Plug 'cacharle/vim-42header' " 42 header + + " Plug 'ctrlpvim/ctrlp.vim' " Ctrl-P similar to vsc call plug#end() diff --git a/config/vim/vimrc b/config/vim/vimrc index 3aca22c..8b1aa53 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -142,10 +142,6 @@ inoremap <ESC> <C-C> inoremap kj <ESC> " remove visual mode keybinding noremap Q <nop> -" command line in history mode -noremap : q:i -noremap / q/i -noremap ? q?i " search with very magic nnoremap / /\v nnoremap ? ?\v @@ -273,9 +269,10 @@ augroup END " pluggins " """""""""""" -" ctrlp {{{ " directory to ignore when searching in file tree set wildignore=*/doc/*,*/tmp/*,*.o,*.so,*.a,*.swp,*.zip,*/node_modules/*,*/vendor/*,.bundle/*,bin/*,.git/*,*.pyc + +" ctrlp {{{ " ctrlp ignore all stuff in the .gitignore let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard'] let g:ctrlp_working_path_mode = 'rw' @@ -284,6 +281,11 @@ let g:ctrlp_mruf_case_sensitive = 0 nnoremap <leader>p :CtrlPTag<CR> " }}} +" fzf.vim {{{ +nnoremap <C-p> :Files<CR> +nnoremap <leader>p :Tags<CR> +" }}} + " quick-scope {{{ " let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] " }}} @@ -295,11 +297,6 @@ nnoremap <leader>p :CtrlPTag<CR> " autocmd Filetype man unmap <buffer> q: hmmmm?? " }}} -" ctrlp-funky {{{ -" let g:ctrlp_funky_syntax_highlight = 1 -" nnoremap <C-f> :CtrlPFunky<CR> -" }}} - " eazy-align {{{ xmap ga <Plug>(EasyAlign) nmap ga <Plug>(EasyAlign) diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index ff036f2..15d5894 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -75,7 +75,7 @@ gpa() { } gpaf() { branch="$1" - [ -z "$1" ] && branch=master + [ -z "$branch" ] && branch=$(git branch | grep '^\* .*$' | cut -d ' ' -f 2) git remote | xargs -I{} git push -f {} "$branch" } @@ -94,27 +94,16 @@ alias ....='cd ../../..' alias norminette='ruby ~/git/norminette/norminette.rb' alias norm='norminette' -getrfc() { - curl "https://ietf.org/rfc/rfc$1.txt" > "$HOME/rfc/rfc$1.txt" -} - # bluetooth alias bt='bluetoothctl' alias bton='echo power on | bluetoothctl' alias btoff='echo power off | bluetoothctl' -# pdf selector -# alias pdf-open="zathura \$(echo $HOME/Documents/*.pdf | tr ' ' '\\n' | dmenu)" - alias cagob='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo build' alias cagor='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo run' # wifi -wificonnect() { - nmcli device wifi connect "$1" password "$2" -} - -# alias mutt='neomutt' +wificonnect() { nmcli device wifi connect "$1" password "$2" ; } alias ytdl='youtube-dl --output "%(title)s.%(ext)s"' alias ytdlp='youtube-dl --audio-format mp3 -i --output "%(playlist_index)s-%(title)s.%(ext)s"' @@ -124,8 +113,18 @@ alias qmvdest='qmv --format=do' alias xclip='xclip -selection clipboard' -pacman_url() { - pacman -Si "$1" | grep URL | tr -s ' ' | cut -d ' ' -f 3 -} +pacman_url() { pacman -Si "$1" | grep URL | tr -s ' ' | cut -d ' ' -f 3 ; } alias filter-valgrind="sed -e 's/==[0-9]*==/==/' -e 's/0x[0-9A-F]*//'" + +rc() { + filepath="$(find "$HOME/git/dotfiles" -type f -not -path '*.git/*' | fzf)" && + "$EDITOR" "$filepath" + filename="$(basename "$filepath")" + [ "$filename" = .zshrc ] || + [ "$filename" = aliases.zshrc ] || + [ "$filename" = zprofile ] && + . "$ZDOTDIR/.zshrc" +} + +vf() { f="$(fzf || exit 1)" && "$EDITOR" "$f" ; } |