From b1e02001c78ba17d8bdeed7441cc9d8e69780d32 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Mon, 31 May 2021 18:26:32 +0200 Subject: [PATCH 01/10] add go language server --- nvim/pluginoptions.vim | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index 1ac6ac3..f50a945 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -99,6 +99,21 @@ lua require'lspconfig'.tsserver.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.intelephense.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.vuels.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.pyls.setup{ on_attach=require'completion'.on_attach } +lua require'lspconfig'.texlab.setup{ on_attach=require'completion'.on_attach } +lua < Date: Mon, 31 May 2021 18:27:06 +0200 Subject: [PATCH 02/10] add more vim wiki customizations --- nvim/pluginoptions.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index f50a945..a3eb2d2 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -40,7 +40,10 @@ let g:fzf_buffers_jump = 1 " VIMWIKI SETUP " ========================= -let g:vimwiki_list = [{'path': '~/.wiki/'}] +let g:vimwiki_list = [{'path': '~/.notes/', + \ 'syntax': 'markdown', 'ext': '.md'}] +let g:vimwiki_hl_headers = 1 +let g:vimwiki_listsyms = ' X' " VIMTEX SETUP " ========================= From 56295363ffbb3997c6bfd66eb044fc456610b8a5 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 5 Sep 2021 21:39:13 +0200 Subject: [PATCH 03/10] change kitty background config --- kitty/colors.conf | 2 +- kitty/kitty.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kitty/colors.conf b/kitty/colors.conf index 603a977..005a182 100644 --- a/kitty/colors.conf +++ b/kitty/colors.conf @@ -1,4 +1,4 @@ -background #1D1D19 +background #1a1d1c foreground #F8F8F2 cursor #F8F8F2 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 36c8c7d..54cdca3 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -92,7 +92,7 @@ map ctrl+shift+page_up scroll_page_up map ctrl+shift+page_down scroll_page_down map ctrl+shift+h show_scrollback -map f11 toggle_fullscreen +map f11 toggle_fullscreen map ctrl+shift+enter new_window map ctrl+shift+n new_os_window From 33e42a2846c287213a549abbf09f1d8fdf348dec Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 5 Sep 2021 21:40:28 +0200 Subject: [PATCH 04/10] switch to own fork of color scheme --- nvim/plugins.vim | 2 +- vim/vimrc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nvim/plugins.vim b/nvim/plugins.vim index a7c24eb..5879611 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -53,7 +53,7 @@ Plug 'airblade/vim-gitgutter' " =================== " Plastic colorscheme -Plug 'aonemd/kuroi.vim' +Plug 'jidbo/kuroi.vim' " Color higlighting Plug 'norcalli/nvim-colorizer.lua' diff --git a/vim/vimrc b/vim/vimrc index 2eb4366..8d1e4d8 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -36,7 +36,7 @@ Plug 'airblade/vim-gitgutter' " COLORS " Plastic colorscheme -Plug 'aonemd/kuroi.vim' +Plug 'jidbo/kuroi.vim' " powerline Plug 'vim-airline/vim-airline' @@ -58,6 +58,7 @@ filetype plugin indent on " required " syntax syntax on colorscheme kuroi +set t_Co=256 set background=dark let mapleader=" " hi MatchParen cterm=bold ctermbg=NONE ctermfg=red From 66653b815f7a6cdc82b2e6b796142d2452bc2329 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 5 Sep 2021 21:40:47 +0200 Subject: [PATCH 05/10] adjust taskbar background color --- shell/tmux.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/tmux.conf b/shell/tmux.conf index c0c1ea6..b71ac96 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -49,7 +49,7 @@ set-window-option -g clock-mode-colour green set-window-option -g window-status-bell-style fg=color0,bg=red # default statusbar colors -set -g status-bg black +set -g status-bg "#1a1d1c" # term color # set -g default-terminal "screen-256color" @@ -59,13 +59,13 @@ set -g status-bg black set -g status-right '#[fg=#51000f]#[bg=#51000f]#[fg=#ffffff] %H:%M %d-%b ' # left status -set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=#1D1D19]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, #[fg=colour7]🔍 ,} ' +set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=#1a1d1c]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, #[fg=colour7]🔍 ,} ' # current window status -set -g window-status-current-format "#[fg=#1D1D19]#[bg=#51000f]#[fg=colour7]#[bg=#51000f] #I #[fg=colour7] #W #[fg=#51000f]#[bg=#1D1D19]" +set -g window-status-current-format "#[fg=#1a1d1c]#[bg=#51000f]#[fg=colour7]#[bg=#51000f] #I #[fg=colour7] #W #[fg=#51000f]#[bg=#1a1d1c]" # normal window status -set -g window-status-format "#[fg=colour244]#[bg=#1D1D19]#I #[fg=colour240] #W" +set -g window-status-format "#[fg=colour244]#[bg=#1a1d1c]#I #[fg=colour240] #W" # escape time set-option -sg escape-time 10 From 906acb265848a570a8ea84721f2056bcbb793da4 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 5 Sep 2021 21:42:20 +0200 Subject: [PATCH 06/10] switch to different version of nerdtree also add devicons for nerdtree --- nvim/pluginoptions.vim | 2 +- nvim/plugins.vim | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index a3eb2d2..4cd5df0 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -3,7 +3,7 @@ " NERD TREE SETUP " ========================= -let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree +let NERDTreeIgnore=['\.pyc$', '\~$', '__pycache__'] "ignore files in NERDTree " AIRLINE SETUP " ========================= diff --git a/nvim/plugins.vim b/nvim/plugins.vim index 5879611..d948669 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -6,9 +6,6 @@ call plug#begin('~/.config/nvim/bundle') " Editor config Plug 'editorconfig/editorconfig-vim' -" comment plugin -Plug 'tpope/vim-commentary' - " brackets management Plug 'tpope/vim-surround' @@ -31,7 +28,10 @@ Plug 'junegunn/goyo.vim' " =================== " nerd-tree -Plug 'scrooloose/nerdtree' +Plug 'preservim/nerdtree' + +" Icons +Plug 'ryanoasis/vim-devicons' " fzf plugin Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } From d9f1170230d557a4947528b4f32359360d310205 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 5 Sep 2021 21:42:53 +0200 Subject: [PATCH 07/10] add nvim treesitter --- nvim/mappings.vim | 14 +++++++------- nvim/pluginoptions.vim | 15 ++++++++++++++- nvim/plugins.vim | 4 ++++ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/nvim/mappings.vim b/nvim/mappings.vim index edfb182..6b2519f 100644 --- a/nvim/mappings.vim +++ b/nvim/mappings.vim @@ -35,10 +35,10 @@ nnoremap p :Neoformat " lsp mappings imap (completion_trigger) -nnoremap gd lua vim.lsp.buf.definition() -nnoremap gh lua vim.lsp.buf.hover() -nnoremap gH lua vim.lsp.buf.code_action() -nnoremap gD lua vim.lsp.buf.implementation() -nnoremap gs lua vim.lsp.buf.signature_help() -nnoremap gr lua vim.lsp.buf.references() -nnoremap gR lua vim.lsp.buf.rename() +nnoremap gd lua vim.lsp.buf.definition() +nnoremap gh lua vim.lsp.buf.hover() +nnoremap gH lua vim.lsp.buf.code_action() +nnoremap gD lua vim.lsp.buf.implementation() +nnoremap gs lua vim.lsp.buf.signature_help() +nnoremap gr lua vim.lsp.buf.references() +nnoremap gR lua vim.lsp.buf.rename() diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index 4cd5df0..92c7bfe 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -101,7 +101,7 @@ let g:goyo_linenr = 0 lua require'lspconfig'.tsserver.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.intelephense.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.vuels.setup{ on_attach=require'completion'.on_attach } -lua require'lspconfig'.pyls.setup{ on_attach=require'completion'.on_attach } +lua require'lspconfig'.pylsp.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.texlab.setup{ on_attach=require'completion'.on_attach } lua < Date: Sun, 5 Sep 2021 21:46:13 +0200 Subject: [PATCH 08/10] add config for sdkman and nvm --- shell/localcommands.example | 1 + shell/zshrc | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/shell/localcommands.example b/shell/localcommands.example index 9ae7837..53f80dd 100644 --- a/shell/localcommands.example +++ b/shell/localcommands.example @@ -1,4 +1,5 @@ alias vi="vim" +export SDKMAN_DIR="/your/home/directory/.sdkman" # set prompt color PROMPT_COLOR="blue" diff --git a/shell/zshrc b/shell/zshrc index 27cac17..ad2446f 100644 --- a/shell/zshrc +++ b/shell/zshrc @@ -70,3 +70,10 @@ if _has ruby; then export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" fi + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +[[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ]] && source "$SDKMAN_DIR/bin/sdkman-init.sh" + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion From 533ff2c2598242a7ec9bb47249d53e14ca15a474 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 5 Sep 2021 22:28:02 +0200 Subject: [PATCH 09/10] set nerdtree colors --- nvim/pluginoptions.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index 92c7bfe..4cde02e 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -4,6 +4,13 @@ " ========================= let NERDTreeIgnore=['\.pyc$', '\~$', '__pycache__'] "ignore files in NERDTree +let NERDTreeChDirMode=2 +highlight Directory guifg=#D1D5DB ctermfg=blue +highlight NERDTreeHelp guifg=#4B5563 ctermfg=gray +highlight NERDTreeCWD guifg=#9CA3AF ctermfg=gray +highlight NERDTreeFlags guifg=#4B5563 ctermfg=green +highlight NERDTreeExecFile guifg=#DC2626 ctermfg=green + " AIRLINE SETUP " ========================= From 0b47d281953109286f4cdfe5f3208edce6a98340 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Mon, 6 Sep 2021 13:45:22 +0200 Subject: [PATCH 10/10] auto close nerdtree if last window --- nvim/pluginoptions.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index 4cde02e..54dbfff 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -11,6 +11,8 @@ highlight NERDTreeCWD guifg=#9CA3AF ctermfg=gray highlight NERDTreeFlags guifg=#4B5563 ctermfg=green highlight NERDTreeExecFile guifg=#DC2626 ctermfg=green +" Exit Vim if NERDTree is the only window remaining in the only tab. +autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif " AIRLINE SETUP " =========================