Prechádzať zdrojové kódy

added xtabline and undotree

Chris 5 rokov pred
rodič
commit
79327f6f26

+ 6 - 3
coc-settings.json

@@ -42,7 +42,7 @@
   "python.linting.enabled": true,
   "python.linting.pylintEnabled": true,
   "python.formatting.provider": "black",
-  "python.formatting.blackPath": "~/.local/bin/black",
+  // "python.formatting.blackPath": "~/.local/bin/black",
   // "python.linting.pylintPath": "~/.miniconda/envs/neovim/bin/pylint",
   "python.condaPath": "~/.miniconda/bin/conda",
   "python.sortImports.path": "~/.miniconda/envs/neovim/bin/isort",
@@ -62,7 +62,7 @@
   "explorer.width": 30,
   "explorer.icon.enableNerdfont": true,
   "explorer.previewAction.onHover": false,
-  "explorer.icon.enableVimDevicons": false,
+  "explorer.icon.enableVimDevicons": true,
   "explorer.keyMappings": {
     "<cr>": ["expandable?", "expand", "open"],
     "v": "open:vsplit"
@@ -75,7 +75,10 @@
       "filetypes": ["sh"],
       "ignoredRootPaths": ["~"]
     }
-  }
+  },
+
+  //coc-emoji
+  "coc.source.emoji.filetypes": ["markdown"]
 
   // TODO b:coc_suggest_disable=1 GOYO
   // TODO add to paths.vim g:coc_node_path

+ 8 - 0
general/functions.vim

@@ -3,6 +3,14 @@ augroup auto_spellcheck
   autocmd BufNewFile,BufRead *.md setlocal spell
 augroup END
 
+function! OpenLiveServer()
+ echo 'live server is on'
+ silent !live-server % &
+endfunction
+
+command Serve :call OpenLiveServer()
+nnoremap <silent>bs :call OpenLiveServer()<CR>
+
 " Remove trailing whitespaces automatically before save
 " augroup strip_ws
 "   autocmd BufWritePre * call utils#stripTrailingWhitespaces()

+ 7 - 6
init.vim

@@ -38,20 +38,21 @@ else
   source $HOME/.config/nvim/plug-config/closetags.vim
   source $HOME/.config/nvim/plug-config/floaterm.vim
   source $HOME/.config/nvim/plug-config/vista.vim
+  source $HOME/.config/nvim/plug-config/xtabline.vim
+  source $HOME/.config/nvim/plug-config/polyglot.vim
   luafile $HOME/.config/nvim/lua/plug-colorizer.lua
 endif
 
-" Experimental
-
 if !empty(glob("~/.config/nvim/paths.vim"))
   source $HOME/.config/nvim/paths.vim
 endif
-let g:polyglot_disabled = ['csv']
+
+" Experimental
+
 
 " Python
 " https://realpython.com/python-debugging-pdb/ " breakpoint syntax is really cool
 " also look into profiling as well
-let g:python_highlight_all=1
 
-let g:vimspector_base_dir=expand( '$HOME/.config/nvim/vimspector-config' )
-let g:vimspector_enable_mappings='HUMAN'
+" let g:vimspector_base_dir=expand( '$HOME/.config/nvim/vimspector-config' )
+" let g:vimspector_enable_mappings='HUMAN'

+ 19 - 1
keys/which-key.vim

@@ -37,7 +37,7 @@ let g:which_key_map['h'] = [ '<C-W>s'                     , 'split below']
 let g:which_key_map['q'] = [ 'q'                          , 'quit' ]
 let g:which_key_map['r'] = [ ':RnvimrToggle'              , 'ranger' ]
 let g:which_key_map['S'] = [ ':SSave'                     , 'save session' ]
-let g:which_key_map['T'] = [ ':Rg'                        , 'search text' ]
+let g:which_key_map['u'] = [ ':UndotreeToggle'            , 'undo tree']
 let g:which_key_map['v'] = [ '<C-W>v'                     , 'split right']
 let g:which_key_map['W'] = [ 'w'                          , 'write' ]
 let g:which_key_map['z'] = [ 'Goyo'                       , 'zen' ]
@@ -184,6 +184,24 @@ let g:which_key_map.t = {
       \ 's' : [':FloatermNew ncdu'                              , 'ncdu'],
       \ }
 
+" T is for terminal
+let g:which_key_map.T = {
+      \ 'name' : '+tabline' ,
+      \ 'b' : [':XTabListBuffers'         , 'list buffers'],
+      \ 'd' : [':XTabCloseBuffer'         , 'close buffer'],
+      \ 'D' : [':XTabDeleteTab'           , 'close tab'],
+      \ 'h' : [':XTabHideBuffer'          , 'hide buffer'],
+      \ 'i' : [':XTabInfo'                , 'info'],
+      \ 'l' : [':XTabLock'                , 'lock tab'],
+      \ 'm' : [':XTabMode'                , 'toggle mode'],
+      \ 'n' : [':tabNext'                 , 'next tab'],
+      \ 'N' : [':XTabMoveBufferNext'      , 'buffer->'],
+      \ 't' : [':tabnew'                  , 'new tab'],
+      \ 'p' : [':tabprevious'             , 'prev tab'],
+      \ 'P' : [':XTabMoveBufferPrev'      , '<-buffer'],
+      \ 'x' : [':XTabPinBuffer'           , 'pin buffer'],
+      \ }
+
 " w is for wiki
 let g:which_key_map.w = {
       \ 'name' : '+wiki' ,

+ 3 - 0
plug-config/polyglot.vim

@@ -0,0 +1,3 @@
+let g:polyglot_disabled = ['csv']
+
+let g:python_highlight_all=1

+ 25 - 0
plug-config/xtabline.vim

@@ -0,0 +1,25 @@
+let g:xtabline_settings = {}
+let g:xtabline_settings.enable_mappings = 0
+let g:xtabline_settings.tabline_modes = ['buffers', 'tabs']
+let g:xtabline_settings.enable_persistance = 0
+" let g:xtabline_settings.last_open_first = 1
+
+
+let g:xtabline_settings.icons = {
+      \'pin': '📌',
+      \'star': '',
+      \'book': '📖',
+      \'lock': '🔒',
+      \'hammer': '🔨',
+      \'tick': '✔',
+      \'cross': '✖',
+      \'warning': '⚠',
+      \'menu': '☰',
+      \'apple': '🍎',
+      \'linux': '🐧',
+      \'windows': '⌘',
+      \'git': '',
+      \'palette': '🎨',
+      \'lens': '🔍',
+      \'flag': '🏁',
+      \}

+ 7 - 7
themes/airline.vim

@@ -1,11 +1,11 @@
 " enable tabline
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#tabline#left_sep = ''
-let g:airline#extensions#tabline#left_alt_sep = ''
-let g:airline#extensions#tabline#right_sep = ''
-let g:airline#extensions#tabline#right_alt_sep = ''
-let airline#extensions#tabline#show_splits = 0
-let airline#extensions#tabline#tabs_label = ''
+" let g:airline#extensions#tabline#enabled = 1
+" let g:airline#extensions#tabline#left_sep = ''
+" let g:airline#extensions#tabline#left_alt_sep = ''
+" let g:airline#extensions#tabline#right_sep = ''
+" let g:airline#extensions#tabline#right_alt_sep = ''
+" let airline#extensions#tabline#show_splits = 0
+" let airline#extensions#tabline#tabs_label = ''
 
 " Disable tabline close button
 let g:airline#extensions#tabline#show_close_button = 0

+ 5 - 0
vim-plug/plugins.vim

@@ -98,7 +98,12 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'metakirby5/codi.vim'
     " Vim Wiki
     " Plug 'https://github.com/vimwiki/vimwiki.git'
+    " Debugging
     Plug 'puremourning/vimspector'
+    " Better tabline
+    Plug 'mg979/vim-xtabline'
+    Plug 'mbbill/undotree'
+    Plug 'RRethy/vim-illuminate'
   endif