dolysis
/
psoxizsh
3
1
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Updates and more

This commit is contained in:
psox 2020-09-24 13:19:59 +00:00
parent f92bf0daa9
commit e91859c988
7 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oh-my-zsh

@ -1 +1 @@
Subproject commit f6bc949c05fd18ee557a89c92f82ff556200707d Subproject commit 93c837fec8e9fe61509b9dff9e909e84f7ebe32d

2
tmux/plugins/tpm

@ -1 +1 @@
Subproject commit 59f78857f656afd462d7bc99b31cc8cc36c1872c Subproject commit 60a36d6f7adddfb68d68349dce3081e7d5c4d4ab

16
tmux/tmux.conf
View File

@ -13,20 +13,20 @@ is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \ is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'" | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
bind -n C-h run "($is_vim && tmux send-keys C-h) \ bind -n C-M-Left run "($is_vim && tmux send-keys C-h) \
|| tmux select-pane -L" || tmux select-pane -L"
bind -n C-j run "($is_vim && tmux send-keys C-j) \ bind -n C-M-Down run "($is_vim && tmux send-keys C-j) \
|| ($is_fzf && tmux send-keys C-j) \ || ($is_fzf && tmux send-keys C-j) \
|| tmux select-pane -D" || tmux select-pane -D"
bind -n C-k run "($is_vim && tmux send-keys C-k) \ bind -n C-M-Up run "($is_vim && tmux send-keys C-k) \
|| ($is_fzf && tmux send-keys C-k) \ || ($is_fzf && tmux send-keys C-k) \
|| tmux select-pane -U" || tmux select-pane -U"
bind -n C-l run "($is_vim && tmux send-keys C-l) \ bind -n C-M-Right run "($is_vim && tmux send-keys C-l) \
|| tmux select-pane -R" || tmux select-pane -R"
bind-key -T copy-mode-vi 'C-h' select-pane -L bind-key -T copy-mode-vi 'C-M-Left' select-pane -L
bind-key -T copy-mode-vi 'C-j' select-pane -D bind-key -T copy-mode-vi 'C-M-Down' select-pane -D
bind-key -T copy-mode-vi 'C-k' select-pane -U bind-key -T copy-mode-vi 'C-M-Up' select-pane -U
bind-key -T copy-mode-vi 'C-l' select-pane -R bind-key -T copy-mode-vi 'C-M-Right' select-pane -R
set-option -g prefix C-a set-option -g prefix C-a
set-option -g set-titles on set-option -g set-titles on

16
vimrc
View File

@ -26,6 +26,10 @@ function! EditVimRcFiles()
endfor endfor
endfunction endfunction
let mapleader = ","
let g:my_color_scheme = "rainbow-contrast"
let g:coc_global_extensions=[ 'coc-highlight', 'coc-fzf-preview', 'coc-java', 'coc-sh', 'coc-sql', 'coc-xml' ]
call SourceIfExists(g:rc_files['early']) call SourceIfExists(g:rc_files['early'])
" set preferred color scheme if not set " set preferred color scheme if not set
@ -89,6 +93,9 @@ exec "set rtp=$VIMHOME," . &rtp
call SourceIfExists(g:rc_files['pre']) call SourceIfExists(g:rc_files['pre'])
call plug#begin("$VIMHOME/plugged") call plug#begin("$VIMHOME/plugged")
Plug 'rainglow/vim'
Plug 'thaerkh/vim-workspace'
Plug 'thaerkh/vim-indentguides'
Plug 'junegunn/vim-easy-align' Plug 'junegunn/vim-easy-align'
Plug 'tpope/vim-sensible' Plug 'tpope/vim-sensible'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
@ -321,6 +328,15 @@ let g:one_allow_italics=1
execute "colorscheme " . g:my_color_scheme execute "colorscheme " . g:my_color_scheme
highlight Comment term=italic cterm=italic gui=italic highlight Comment term=italic cterm=italic gui=italic
let g:airline_theme = 'base16color'
let g:indentguides_spacechar = "\u250a"
let g:indentguides_tabchar = "\u2506"
map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
set nofoldenable
set exrc set exrc
set secure set secure
set modeline set modeline

2
zsh-custom/lxd-completion-zsh

@ -1 +1 @@
Subproject commit 87d20cb0c5d5261cdc469a2d16a679f577038204 Subproject commit eaf92077179ec52a56c088cf4462967f190eabfc

2
zsh-custom/plugins/zsh-completions

@ -1 +1 @@
Subproject commit c6621bb692928333b76e2a593c66b49020389ab1 Subproject commit 454d236d3a793668b873a7b522353c68ec182cfa

2
zsh-custom/plugins/zsh-syntax-highlighting

@ -1 +1 @@
Subproject commit 2d60a47cc407117815a1d7b331ef226aa400a344 Subproject commit 62c5575848f1f0a96161243d18497c247c9f52df