From ed51e0402b79844bf5be30890a5095f907a46ef1 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Wed, 1 Jun 2022 21:10:27 +0100 Subject: Moved to Tokyonight --- vimrc | 88 +++++++++++++------------------------------------------------------ 1 file changed, 16 insertions(+), 72 deletions(-) (limited to 'vimrc') diff --git a/vimrc b/vimrc index 5eb28e3..bf89a07 100644 --- a/vimrc +++ b/vimrc @@ -47,11 +47,10 @@ Plug 'roxma/vim-tmux-clipboard' Plug 'wincent/terminus' " life improvements -Plug 'gruvbox-community/gruvbox' +Plug 'folke/tokyonight.nvim', { 'branch': 'main' } Plug 'scrooloose/nerdtree' Plug 'Chiel92/vim-autoformat' Plug 'jsfaint/gen_tags.vim' -Plug 'rbong/vim-crystalline' Plug 'godlygeek/tabular' Plug 'vimwiki/vimwiki' @@ -59,10 +58,10 @@ Plug 'vimwiki/vimwiki' Plug 'plasticboy/vim-markdown' Plug 'samsaga2/vim-z80' Plug 'tomtom/tcomment_vim' -Plug 'https://tildegit.org/sloum/gemini-vim-syntax.git' -Plug 'neovimhaskell/haskell-vim' if has('nvim-0.5') + " status line + Plug 'nvim-lualine/lualine.nvim' " general lua Plug 'nvim-lua/popup.nvim' Plug 'nvim-lua/plenary.nvim' @@ -79,6 +78,9 @@ if has('nvim-0.5') " life improvements Plug 'ojroques/nvim-bufdel' + + " learning + Plug 'folke/which-key.nvim' end if has('nvim-0.6.1') @@ -90,72 +92,24 @@ end call plug#end() if has('nvim-0.5') - -" BufKil :lua << EOF - require('bufdel').setup { - next = 'cycle', - quit = false, - } + -- BufKil + require('bufdel').setup { + next = 'cycle', + quit = false, + } + -- which-key + require("which-key").setup { } EOF end -" crystaline conf -" - -" metals status -function! MetalsStatus() abort - return get(g:, 'metals_status', '') -endfunction - -" git-gutter status -" -function! GitStatus() - let [a,m,r] = GitGutterGetHunkSummary() - return printf('+%d ~%d -%d', a, m, r) -endfunction - - -function! StatusLine(current, width) - let l:s = '' - - if a:current - let l:s .= crystalline#mode() . crystalline#right_mode_sep('') - else - let l:s .= '%#CrystallineInactive#' - endif - let l:s .= ' %<%f%h%w%m%r ' - - if a:current - let l:s .= crystalline#right_sep('', 'Fill') . ' %{fugitive#statusline()}' .' %{GitStatus()}' - endif - - let l:s .= '%=' - if a:current - let l:s .= ' %{MetalsStatus()} ' - let l:s .= crystalline#left_sep('', 'Fill') . ' %{&paste ?"PASTE ":""}%{&spell?"SPELL ":""}' - let l:s .= crystalline#left_mode_sep('') - endif - if a:width > 80 - let l:s .= ' %{&ft} [%{&fenc!=#""?&fenc:&enc}][%{&ff}] %3(%c%V%) %l/%L %P ' - else - let l:s .= ' ' - endif - - return l:s -endfunction - -let g:crystalline_enable_sep = 1 -let g:crystalline_statusline_fn = 'StatusLine' -let g:crystalline_theme = 'gruvbox' - set laststatus=2 " vim-autoformat (C-F5) " noremap :Autoformat -au BufWrite *.py,*.c,*.h,*.cpp,*.hs :Autoformat +au BufWrite *.py,*.c,*.h,*.cpp :Autoformat " enable omnicompletion set omnifunc=syntaxcomplete#Complete @@ -164,11 +118,9 @@ set omnifunc=syntaxcomplete#Complete set termguicolors set background=dark -let g:gruvbox_italic = 1 -let g:gruvbox_contrast_dark = "soft" -let g:gruvbox_guisp_fallback = "fg" +let g:tokyonight_italic_keywords = 0 -colorscheme gruvbox +colorscheme tokyonight " toggle spell check map s :set spell! spelllang=en_gb @@ -213,10 +165,6 @@ let g:vim_markdown_frontmatter = 1 let g:vim_markdown_conceal_code_blocks = 0 autocmd FileType markdown setlocal conceallevel=2 -" haskell syntax -" -let g:haskell_classic_highlighting = 1 - " git gutter to play nice with others " let g:gitgutter_sign_allow_clobber = 0 @@ -233,10 +181,6 @@ set shortmess-=F " disable preview when doing auto-complete set completeopt-=preview -" dependent on gruvbox theme -highlight link lscDiagnosticError GruvboxRedSign -highlight link lscDiagnosticWarning GruvboxYellowSign - " Set completeopt to have a better completion experience set completeopt=menuone,noinsert,noselect -- cgit v1.2.3