Merge remote-tracking branch 'Jidbo/master'
This commit is contained in:
commit
3308b30a99
9 changed files with 75 additions and 22 deletions
|
@ -1,4 +1,4 @@
|
|||
background #1D1D19
|
||||
background #1a1d1c
|
||||
foreground #F8F8F2
|
||||
cursor #F8F8F2
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -35,10 +35,10 @@ nnoremap <leader>p :Neoformat<CR>
|
|||
" lsp mappings
|
||||
imap <silent> <c-p> <Plug>(completion_trigger)
|
||||
|
||||
nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
|
||||
nnoremap <silent> gh <cmd>lua vim.lsp.buf.hover()<CR>
|
||||
nnoremap <silent> gH <cmd>lua vim.lsp.buf.code_action()<CR>
|
||||
nnoremap <silent> gD <cmd>lua vim.lsp.buf.implementation()<CR>
|
||||
nnoremap <silent> gs <cmd>lua vim.lsp.buf.signature_help()<CR>
|
||||
nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>
|
||||
nnoremap <silent> gR <cmd>lua vim.lsp.buf.rename()<CR>
|
||||
nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
|
||||
nnoremap <silent> gh <cmd>lua vim.lsp.buf.hover()<CR>
|
||||
nnoremap <silent> gH <cmd>lua vim.lsp.buf.code_action()<CR>
|
||||
nnoremap <silent> gD <cmd>lua vim.lsp.buf.implementation()<CR>
|
||||
nnoremap <silent> gs <cmd>lua vim.lsp.buf.signature_help()<CR>
|
||||
nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>
|
||||
nnoremap <silent> gR <cmd>lua vim.lsp.buf.rename()<CR>
|
||||
|
|
|
@ -3,7 +3,16 @@
|
|||
" NERD TREE SETUP
|
||||
" =========================
|
||||
|
||||
let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree
|
||||
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
|
||||
|
||||
" 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
|
||||
" =========================
|
||||
|
@ -40,7 +49,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
|
||||
" =========================
|
||||
|
@ -98,7 +110,22 @@ 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 <<EOF
|
||||
lspconfig = require "lspconfig"
|
||||
lspconfig.gopls.setup {
|
||||
cmd = {"gopls", "serve"},
|
||||
settings = {
|
||||
gopls = {
|
||||
analyses = {
|
||||
unusedparams = true,
|
||||
},
|
||||
staticcheck = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
EOF
|
||||
|
||||
set completeopt=menuone,noinsert,noselect
|
||||
set shortmess+=c
|
||||
|
@ -112,3 +139,16 @@ let g:user_emmet_leader_key='<C-i>'
|
|||
" =========================
|
||||
" autocmd Filetype tex LanguageToolSetUp
|
||||
let g:languagetool_cmd='/usr/bin/languagetool'
|
||||
|
||||
" TREESITTER
|
||||
" lua <<EOF
|
||||
" require'nvim-treesitter.configs'.setup {
|
||||
" ensure_installed = "maintained",
|
||||
" highlight = {
|
||||
" enable = true,
|
||||
" },
|
||||
" indent = {
|
||||
" enable = true
|
||||
" },
|
||||
" }
|
||||
" EOF
|
||||
|
|
|
@ -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() } }
|
||||
|
@ -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'
|
||||
|
@ -71,6 +71,10 @@ Plug 'nvim-lua/completion-nvim'
|
|||
" Autoformatter
|
||||
Plug 'sbdchd/neoformat'
|
||||
|
||||
" treesitter
|
||||
" Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
" Plug 'nvim-treesitter/playground'
|
||||
|
||||
" disable latex before loading
|
||||
let g:polyglot_disabled = ["latex"]
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
alias vi="vim"
|
||||
export SDKMAN_DIR="/your/home/directory/.sdkman"
|
||||
|
||||
# set prompt color
|
||||
PROMPT_COLOR="blue"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -74,3 +74,10 @@ then
|
|||
export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin"
|
||||
fi
|
||||
if [ -e /home/saibotk/.nix-profile/etc/profile.d/nix.sh ]; then . /home/saibotk/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
|
||||
|
||||
#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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue