update tmux and vim
This commit is contained in:
parent
fa71de6291
commit
ebd4bc0bad
2 changed files with 56 additions and 14 deletions
27
.tmux.conf
27
.tmux.conf
|
|
@ -14,6 +14,7 @@ bind-key l select-pane -R
|
|||
bind-key C-n next-window
|
||||
bind-key C-p previous-window
|
||||
set -g set-titles off
|
||||
set -g mouse on
|
||||
set -g default-terminal xterm-256color
|
||||
setw -g mode-keys vi
|
||||
new -d
|
||||
|
|
@ -30,17 +31,31 @@ bind | split-window -h
|
|||
bind - split-window -v
|
||||
|
||||
# Status Bar
|
||||
set -g status-bg black
|
||||
#set -g status-bg black
|
||||
set -g status-fg white
|
||||
set -g status-interval 1
|
||||
set -g status-left '#[fg=green]#H#[default]'
|
||||
set -g status-left-length 20
|
||||
set -g status-right '#[fg=green]#(~/src/tpom/tpom) #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default]'
|
||||
#set -g status-left '#[fg=green]#H#[default]'
|
||||
#set -g status-left-length 20
|
||||
#set -g status-right '#[fg=green]#(~/src/tpom/tpom) #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default]'
|
||||
set -g status-justify centre # center align window list
|
||||
set -g status-fg white
|
||||
set -g status-bg default
|
||||
|
||||
# default window title colors
|
||||
set-window-option -g window-status-fg white
|
||||
set-window-option -g window-status-bg default
|
||||
set-window-option -g window-status-attr dim
|
||||
|
||||
# active window title colors
|
||||
set-window-option -g window-status-current-fg cyan
|
||||
set-window-option -g window-status-current-bg default
|
||||
set-window-option -g window-status-current-attr bright
|
||||
set -g status-left '#[fg=green][ #H ][ '
|
||||
set -g status-right '#[fg=green]][ #[fg=blue]%Y-%m-%d #[fg=white]%I:%M #[fg=green]]'
|
||||
|
||||
# Notifying if other windows has activities
|
||||
setw -g monitor-activity on
|
||||
set -g visual-activity on
|
||||
|
||||
# Highlighting the active window in status bar
|
||||
setw -g window-status-current-bg red
|
||||
|
||||
#setw -g window-status-current-bg red
|
||||
|
|
|
|||
43
.vimrc
43
.vimrc
|
|
@ -1,4 +1,4 @@
|
|||
" ___ _ _ _
|
||||
" ___ _ _ _
|
||||
" | _ ) __ _ _ _ __ _| |_( )___ __ _(_)_ __ _ _ __
|
||||
" | _ \/ _` | '_/ _` | / //(_-< \ V / | ' \| '_/ _|
|
||||
" |___/\__,_|_| \__,_|_\_\ /__/ (_)_/|_|_|_|_|_| \__|
|
||||
|
|
@ -109,8 +109,9 @@ Plug 'tpope/vim-unimpaired'
|
|||
"Plug 'Valloric/YouCompleteMe'
|
||||
Plug 'Shougo/deoplete.nvim'
|
||||
Plug 'zchee/deoplete-clang'
|
||||
Plug 'zchee/deoplete-go', {'do': 'make'}
|
||||
Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}}
|
||||
Plug 'zchee/deoplete-jedi'
|
||||
Plug 'davidhalter/jedi-vim'
|
||||
Plug 'b4winckler/vim-angry'
|
||||
Plug 'tristen/vim-sparkup'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
|
|
@ -162,6 +163,13 @@ Plug 'autozimu/LanguageClient-neovim', {
|
|||
\ }
|
||||
|
||||
Plug 'ambv/black'
|
||||
Plug 'kana/vim-textobj-user'
|
||||
Plug 'bps/vim-textobj-python'
|
||||
Plug 'dhruvasagar/vim-zoom'
|
||||
|
||||
Plug 'derekwyatt/vim-scala'
|
||||
Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
|
||||
Plug 'gabrielelana/vim-markdown'
|
||||
|
||||
call plug#end()
|
||||
|
||||
|
|
@ -228,12 +236,19 @@ call deoplete#custom#source('buffer', 'rank', 1)
|
|||
let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so'
|
||||
let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang'
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
let g:deoplete#sources = {}
|
||||
let g:deoplete#sources.scala = ['buffer', 'tags', 'omni']
|
||||
let g:deoplete#omni#input_patterns = {}
|
||||
let g:deoplete#omni#input_patterns.scala = ['[^. *\t0-9]\.\w*',': [A-Z]\w', '[\[\t\( ][A-Za-z]\w*']
|
||||
" * Vim general/Unknown
|
||||
let python_highlight_all = 1
|
||||
let g:Tb_MaxSize=0
|
||||
let g:Tb_MapCTabSwitchBufs = 1
|
||||
let g:UseGooglePythonSettings = 0
|
||||
|
||||
" * Jedi
|
||||
let g:jedi#goto_command="gd"
|
||||
|
||||
" * Eclim
|
||||
let g:EclimCompletionMethod = 'omnifunc'
|
||||
|
||||
|
|
@ -244,15 +259,16 @@ let g:syntastic_always_populate_loc_list = 1
|
|||
let g:syntastic_auto_loc_list = 2
|
||||
let g:syntastic_loc_list_height = 10
|
||||
" E111 = Spaces should be multiples of 4. I use 2.
|
||||
"
|
||||
|
||||
" * ALE
|
||||
let g:airline#extensions#ale#enabled = 1
|
||||
let g:ale_set_highlights = 0
|
||||
|
||||
" * LanguageServer
|
||||
let g:LanguageClient_serverCommands = {
|
||||
\ 'python': ['pyls'],
|
||||
\ }
|
||||
"let g:LanguageClient_serverCommands = {
|
||||
"\ 'python': ['pyls'],
|
||||
"\ }
|
||||
let g:LanguageClient_diagnosticsDisplay = {
|
||||
\1: {'name': 'Error', 'texthl': 'ALEError', 'signText': 'E>', 'signTexthl': 'ALEErrorSign',},
|
||||
\2: {"name": "Warning", "texthl": "ALEWarning", "signText": "W>", "signTexthl": "ALEWarningSign",},
|
||||
|
|
@ -333,6 +349,12 @@ let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
|
|||
"let g:miniBufExplModSelTarget = 1
|
||||
"let g:miniBufExplForceSyntaxEnable = 1
|
||||
|
||||
" Markdown
|
||||
let g:markdown_enable_folding = 1
|
||||
let g:markdown_enable_mappings = 0
|
||||
let g:markdown_enable_spell_checking = 0
|
||||
let g:markdown_enable_input_abbreviations = 0
|
||||
|
||||
" * CommandT
|
||||
let g:CommandTMaxFiles = 1000
|
||||
let g:CommandTMaxDepth = 7
|
||||
|
|
@ -391,7 +413,7 @@ let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
|
|||
|
||||
" * Vim-Go
|
||||
let g:go_fmt_command = "goimports"
|
||||
let g:go_auto_type_info = 1
|
||||
"let g:go_auto_type_info = 1
|
||||
let g:go_updatetime = 300
|
||||
"let g:go_bin_path = "$HOME/.go/bin"
|
||||
|
||||
|
|
@ -411,6 +433,7 @@ set statusline+=%{fugitive#statusline()}\ \
|
|||
set statusline+=%c, "cursor column
|
||||
set statusline+=%l/%L "cursor line/total lines
|
||||
set statusline+=\ %P "percent through file
|
||||
set statusline+=%{zoom#statusline()}\
|
||||
|
||||
" ** SMALL FUNCTIONS THAT DON'T FIT AS PLUGINS ***
|
||||
|
||||
|
|
@ -433,9 +456,10 @@ command LoadSession :source ~/.vim_last_session
|
|||
command ScratchOpen :e scp://barak@barakmich.com//home/barak/notes/scratch
|
||||
|
||||
" Sudo-make-me-a-sandwich write. For when I forget to be root.
|
||||
" command Wdammit :w !sudo tee > /dev/null %
|
||||
"command Wdammit :w !sudo tee > /dev/null %
|
||||
command Wdammit :w suda://%
|
||||
|
||||
|
||||
" I can never remember markdown fully. Open me a cheatsheet
|
||||
command MarkdownCheatsheet :rightb vsplit ~/.vim/markdown_cheatsheet.md
|
||||
|
||||
|
|
@ -619,7 +643,7 @@ nmap P o<Esc>p
|
|||
" Line-based movement is cute, but it's tricky for files with lines that wrap.
|
||||
" Attune more to what you see on the screen instead of where the lines actually
|
||||
" are.
|
||||
nnoremap j gj
|
||||
nnoremap <silent> j gj
|
||||
nnoremap k gk
|
||||
xnoremap j gj
|
||||
xnoremap k gk
|
||||
|
|
@ -661,6 +685,9 @@ inoremap <C-e> <C-O>$
|
|||
"tnoremap <C-h> <C-\><C-n><C-w>h
|
||||
"endif
|
||||
|
||||
" Make it easier to clear highlighting, with no functionality penalty
|
||||
nnoremap <CR> :noh<CR><CR>
|
||||
|
||||
" Better fold mappings
|
||||
nnoremap <silent> <Space> @=(foldlevel('.')?'za':'l')<CR>
|
||||
vnoremap <Space> zf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue