From a26bd7d49f0ef3a9d6e2bfb4b2bede1e6ead6e12 Mon Sep 17 00:00:00 2001 From: Chris Morris Date: Fri, 27 Dec 2019 15:21:00 -0500 Subject: [PATCH] updates including tmux support --- .gitmodules | 3 +++ my_configs.vim | 23 ++++++++++++++++++++++- my_plugins/vim-liquid | 1 + my_plugins/vim-polyglot | 2 +- my_plugins/vim-signify | 2 +- my_plugins/vim-snazzy | 2 +- vimrcs/basic.vim | 2 +- 7 files changed, 30 insertions(+), 5 deletions(-) create mode 160000 my_plugins/vim-liquid diff --git a/.gitmodules b/.gitmodules index aaadc871..167aed4a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ path = my_plugins/vim-vue-syntastic url = git@github.com:sekel/vim-vue-syntastic.git branch = master +[submodule "my_plugins/vim-liquid"] + path = my_plugins/vim-liquid + url = https://github.com/tpope/vim-liquid.git diff --git a/my_configs.vim b/my_configs.vim index 718eba4a..ef2e6124 100644 --- a/my_configs.vim +++ b/my_configs.vim @@ -2,9 +2,26 @@ colorscheme snazzy let g:lightline = { \ 'colorscheme': 'snazzy', \ 'active': { -\ 'left': [ [ 'mode', 'paste' ], [ 'readonly', 'absolutepath', 'modified' ] ], +\ 'component_function': { + \ 'gitbranch': 'fugitive#head' + \ }, +\ 'left': [ [ 'mode', 'paste' ], [ 'gitbranch', 'readonly', 'absolutepath', 'modified' ] ], \ } \ } +let g:fzf_colors = +\ { 'fg': ['fg', 'Normal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Comment'], + \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], + \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], + \ 'hl+': ['fg', 'Statement'], + \ 'info': ['fg', 'PreProc'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'Conditional'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'] } setlocal foldmethod=manual set number set foldlevel=99999 @@ -12,5 +29,9 @@ set shiftwidth=2 set tabstop=2 set nofoldenable set cursorline +set termguicolors +let &t_8f = "\e[38;2;%lu;%lu;%lum" +let &t_8b = "\e[48;2;%lu;%lu;%lum" map d :bufdo bd! map ` gg=G +autocmd FileType vue syntax sync fromstart diff --git a/my_plugins/vim-liquid b/my_plugins/vim-liquid new file mode 160000 index 00000000..209f77c9 --- /dev/null +++ b/my_plugins/vim-liquid @@ -0,0 +1 @@ +Subproject commit 209f77c9550a90b0b88492c93852195c171f6ebd diff --git a/my_plugins/vim-polyglot b/my_plugins/vim-polyglot index ec1c9430..fbc2af9e 160000 --- a/my_plugins/vim-polyglot +++ b/my_plugins/vim-polyglot @@ -1 +1 @@ -Subproject commit ec1c94306953b678bb36572897bd218fe6c76506 +Subproject commit fbc2af9e820d85e17cd08023f4dcc66545735d58 diff --git a/my_plugins/vim-signify b/my_plugins/vim-signify index c4eb6e14..ac23bd95 160000 --- a/my_plugins/vim-signify +++ b/my_plugins/vim-signify @@ -1 +1 @@ -Subproject commit c4eb6e1469bcb48d77e0426e9c747a6bcc7b2014 +Subproject commit ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46e diff --git a/my_plugins/vim-snazzy b/my_plugins/vim-snazzy index 88b88fe5..30b7fc88 160000 --- a/my_plugins/vim-snazzy +++ b/my_plugins/vim-snazzy @@ -1 +1 @@ -Subproject commit 88b88fe5342e1155e93d35beeb10b6e4c36d6e86 +Subproject commit 30b7fc882d94687a98243dbc9c649a4f6a356001 diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index 11d1ed81..794752d9 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -263,7 +263,7 @@ au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g set laststatus=2 " Format the status line -set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c +set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c\ TIME:\ %{strftime('%c')} """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""