Skip to content

Commit

Permalink
replace airline with custom fork
Browse files Browse the repository at this point in the history
  • Loading branch information
3ximus committed Aug 6, 2023
1 parent 2766988 commit 41a26da
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 344 deletions.
334 changes: 0 additions & 334 deletions .config/pgcli/history

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.config/ranger/tagged
.config/ranger/history
.config/pgcli/log
.config/pgcli/history
.vim/view/
konsole/bookmarks.xml*

Expand Down
2 changes: 2 additions & 0 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ set -g @fingers-pattern-1 '["].*["]' # match quoted text, useful when files path
set -g @fingers-pattern-2 "['][^']+[']" # match quoted text, useful when files path are quoted
# generic URL matcher
set -g @fingers-pattern-3 "([a-z][a-z0-9+\-.]*)://(([a-zA-Z0-9._~%!\$&()*+,;=\-]+)?:?([a-zA-Z0-9._~%!\$&()*+,;=\-]+)?@)?([a-z0-9._~%\-]+|\[[a-f0-9:.]+\]|\[v[a-f0-9][a-z0-9._~%!\$&()*+,;=:\-]+\])(:[0-9]+)?(/[a-zA-Z0-9._~%!\$&()*+,;=:@\-]+)*/?"
# pattern for jira tickets
set -g @fingers-pattern-2 "[A-Z][A-Z0-9_]*-[0-9]+"

set -g @easy-motion-prefix "Space"

Expand Down
5 changes: 2 additions & 3 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ call plug#begin()
Plug '3ximus/gruvbox'

" BASE
Plug 'vim-airline/vim-airline'
Plug '3ximus/vim-airline' " my fork switches position of the tabs and splits on tabline
Plug 'scrooloose/nerdtree', {'on':['NERDTreeToggle', 'NERDTreeFind']}
Plug '3ximus/fzf' " use my fork to allow passing g:fzf_no_term
Plug 'junegunn/fzf.vim'
Expand Down Expand Up @@ -684,7 +684,6 @@ if &rtp =~ 'vim-airline' && glob("~/.vim/plugged/vim-airline/plugin/airline.vim"
let g:airline#extensions#tabline#overflow_marker = ''
let g:airline#extensions#tabline#fnamemod = ':p:.'
let g:airline#extensions#tabline#fnamecollapse = 1
" let g:airline#extensions#tabline#show_tabs = 0
let g:airline#extensions#tabline#formatter = 'unique_tail_improved'

let g:airline#extensions#whitespace#mixed_indent_algo = 1
Expand Down Expand Up @@ -837,7 +836,7 @@ if &rtp =~ 'fzf.vim' && glob("~/.vim/plugged/fzf.vim/plugin/fzf.vim")!=#""
call GitEditFile(l:mode, l:hash, l:file)
endfunction

command! -bang FZFGitEditCommitFile call fzf#run({'source': 'git lol', 'sink': function('GitEditCommitFile'), 'options': "--prompt 'ViewFile> ' --ansi --layout=reverse-list --header ':: \e[1;33mEnter\e[m / \e[1;33mctrl-s\e[m / \e[1;33mctrl-v\e[m to open current file. \e[1;33mCtrl-Space\e[m to open file selection on that commit' --nth=1 --no-info '--bind=enter:execute@printf \"#### \"@+accept' '--bind=ctrl-v:execute@printf \">>>> \"@+accept' '--bind=ctrl-s:execute@printf \"&&&& \"@+accept' '--bind=ctrl-space:accept'", 'tmux': '-p80%,70%'})
command! -bang FZFGitEditCommitFile call fzf#run({'source': 'git lol --all', 'sink': function('GitEditCommitFile'), 'options': "--prompt 'ViewFile> ' --ansi --layout=reverse-list --header ':: \e[1;33mEnter\e[m / \e[1;33mctrl-s\e[m / \e[1;33mctrl-v\e[m to open current file. \e[1;33mCtrl-Space\e[m to open file selection on that commit' --nth=1 --no-info '--bind=enter:execute@printf \"#### \"@+accept' '--bind=ctrl-v:execute@printf \">>>> \"@+accept' '--bind=ctrl-s:execute@printf \"&&&& \"@+accept' '--bind=ctrl-space:accept'", 'tmux': '-p80%,70%'})

let g:fzf_action = {
\ 'ctrl-t': 'tab split',
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ My [modified whatsapp style](https://github.com/3ximus/gruvbox-dark-whatsapp) (n

- [Dependencies](https://github.com/3ximus/dotfiles#dependencies)
- [Installation/Cloning](https://github.com/3ximus/dotfiles#installation-and-cloning)
- [Vim](https://github.com/3ximus/dotfiles#vim)
- [Tmux](https://github.com/3ximus/dotfiles#tmux)
- `.bashrc` only contains some bash options and sources all scripts inside [.bash](https://github.com/3ximus/dotfiles/tree/master/.bash), which contains:
- [prompts](https://github.com/3ximus/dotfiles#prompts)
- [functions](https://github.com/3ximus/dotfiles/blob/master/.bash/functions.sh) and [aliases](https://github.com/3ximus/dotfiles/blob/master/.bash/aliases.sh)
Expand Down
Loading

0 comments on commit 41a26da

Please sign in to comment.