aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/init.vim75
-rw-r--r--.config/nvim/pywal/base.vim26
-rw-r--r--.config/nvim/pywal/colors.vim84
-rw-r--r--.config/nvim/pywal/pywal.vim110
4 files changed, 167 insertions, 128 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 93c2f29..cbeb2f8 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -15,13 +15,19 @@ set conceallevel=0
set mouse=a
set linebreak " set wrap but don't wrap inside words
set viminfo+='1000,n/home/loek/.local/nvim/viminfo
-set guifont=JetBrainsMono\ NF:h10
+set guifont=JetBrainsMono\ NF:h14
+let g:neovide_cursor_animation_length=0.13
+let g:neovide_cursor_vfx_mode="sonicboom"
+let g:neovide_cursor_vfx_opacity=50.0
+let g:neovide_cursor_trail_length=5.2
+let g:neovide_cursor_animation_length=0.10
let g:sneak#label = 1
let g:which_key_map = {}
let g:airline_powerline_fonts = 1
let g:minimap_highlight='Visual'
hi! link CocFloating SneakScope
cabbrev help tab help
+autocmd BufNewFile,BufRead *.jdscn set syntax=json
" if ! filereadable(expand('~/.config/nvim/autoload/plug.vim'))
" echo "Downloading junegunn/vim-plug to manage plugins..."
@@ -38,8 +44,7 @@ Plug 'tpope/vim-surround'
Plug 'Chiel92/vim-autoformat'
Plug 'itchyny/lightline.vim'
Plug 'terryma/vim-multiple-cursors'
-" Plug 'ap/vim-css-color' " color name highlighter
-Plug 'vim-scripts/colorizer' " better highlighter?
+Plug 'vim-scripts/colorizer'
Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'}
Plug 'AndrewRadev/tagalong.vim'
Plug 'tpope/vim-commentary'
@@ -49,6 +54,10 @@ Plug 'jbgutierrez/vim-better-comments'
Plug 'junegunn/goyo.vim'
Plug 'othree/eregex.vim'
Plug 'psliwka/vim-smoothie'
+Plug 'tpope/vim-fugitive'
+Plug 'airblade/vim-gitgutter'
+Plug 'wellle/targets.vim'
+Plug 'dstein64/vim-startuptime'
" language plugins
Plug 'lervag/vimtex'
@@ -62,6 +71,7 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'ryanoasis/vim-devicons' "Icons for filetypes
Plug 'junegunn/fzf.vim'
Plug '/usr/local/opt/fzf'
+Plug 'puremourning/vimspector'
" themes
Plug 'arzg/vim-colors-xcode'
@@ -90,6 +100,30 @@ nnoremap <A-k> :m -2<CR>
" leader keybindings
nnoremap <silent> <leader> :WhichKey '<space>'<CR>
+map <leader>vo <Plug>VimspectorContinue
+map <leader>vq <Plug>VimspectorStop
+map <leader>vr <Plug>VimspectorRestart
+map <leader>vp <Plug>VimspectorPause
+map <leader>vb <Plug>VimspectorToggleBreakpoint
+map <leader>vc <Plug>VimspectorToggleConditionalBreakpoint
+map <leader>vf <Plug>VimspectorAddFunctionBreakpoint
+map <leader>vn <Plug>VimspectorStepOver
+map <leader>vi <Plug>VimspectorStepInto
+map <leader>vu <Plug>VimspectorStepOut
+let g:which_key_map.v = {
+ \ 'name': '+vimspector',
+ \ 'o': 'continue',
+ \ 'q': 'stop',
+ \ 'r': 'restart',
+ \ 'p': 'pause',
+ \ 'b': 'toggle-breakpoint',
+ \ 'c': 'toggle-conditional-breakpoint',
+ \ 'f': 'add-function-breakpoint',
+ \ 'n': 'step-over',
+ \ 'i': 'step-into',
+ \ 'u': 'step-out'
+ \ }
+
map <leader>p "+p
map <leader>y "+y
let g:which_key_map.p = 'x11-paste'
@@ -101,8 +135,11 @@ let g:which_key_map.h = 'no-highlighting'
map <leader>b :Autoformat<cr>
let g:which_key_map.b = 'format-file'
-map <leader>w /\s\+$<CR>
-let g:which_key_map.w = 'trailing-whitespace'
+map <leader>s /\s\+$<CR>
+let g:which_key_map.s = 'trailing-whitespace'
+
+map <leader>w :w<CR>
+let g:which_key_map.w = 'write'
map <leader>dv :!opout <c-r>%<cr><cr>
map <leader>dc :w! <bar> !compiler <c-r>%<cr>
@@ -137,22 +174,21 @@ let g:which_key_map['.'] = {
\ 'p': 'polybar'
\ }
-colorscheme xcodedark
+colorscheme sonokai
let g:lightline = {
\ 'colorscheme': 'pywal',
- \ 'separator': { 'left': '', 'right': '' },
\ 'mode_map': {
- \ 'n' : 'NORM',
- \ 'i' : 'INS',
- \ 'R' : 'REP',
- \ 'v' : 'VIS',
- \ 'V' : 'V-L',
- \ "\<C-v>": 'V-B',
- \ 'c' : 'CMD',
- \ 's' : 'SEL',
- \ 'S' : 'S-L',
- \ "\<C-s>": 'S-B',
- \ 't': 'TERM'
+ \ 'n' : 'norm',
+ \ 'i' : 'ins',
+ \ 'R' : 'rep',
+ \ 'v' : 'vis',
+ \ 'V' : 'v-l',
+ \ "\<C-v>": 'v-b',
+ \ 'c' : 'cmd',
+ \ 's' : 'sel',
+ \ 'S' : 's-l',
+ \ "\<C-s>": 's-b',
+ \ 't': 'term'
\ },
\ 'active': {
\ 'left': [
@@ -160,8 +196,7 @@ let g:lightline = {
\ [ 'readonly', 'filename', 'modified']
\ ],
\ 'right': [
- \ [ 'lineinfo' ],
- \ [ 'filetype' ]
+ \ [ 'lineinfo' ]
\ ]
\ },
\ }
diff --git a/.config/nvim/pywal/base.vim b/.config/nvim/pywal/base.vim
index c25eede..c940f6b 100644
--- a/.config/nvim/pywal/base.vim
+++ b/.config/nvim/pywal/base.vim
@@ -1,17 +1,19 @@
+hi! SignColumn guibg=NONE ctermbg=NONE
+
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ s:color6readable, s:color6 ], [ s:color2readable, s:color2 ] ]
-let s:p.normal.right = [ [ s:color1readable, s:color1 ], [ s:color2readable, s:color2 ] ]
-let s:p.inactive.right = [ [ s:color1readable, s:color1 ], [ s:color2readable, s:color2 ] ]
-let s:p.inactive.left = [ [ s:color6readable, s:color6 ], [ s:color2readable, s:color2 ] ]
-let s:p.insert.left = [ [ s:color5readable, s:color5 ], [ s:color2readable, s:color2 ] ]
-let s:p.replace.left = [ [ s:color4readable, s:color4 ], [ s:color2readable, s:color2 ] ]
-let s:p.visual.left = [ [ s:color3readable, s:color3 ], [ s:color2readable, s:color2 ] ]
+let s:p.normal.left = [ [ s:fg, s:bg2 ], [ s:color8, s:bg ] ]
+let s:p.normal.right = [ [ s:color8, s:bg ] ]
+let s:p.inactive.left = copy(s:p.normal.left)
+let s:p.inactive.right = copy(s:p.normal.right)
+let s:p.insert.left = [ [ s:fg, s:bg4 ], [ s:fg, s:bg ] ]
+let s:p.replace.left = copy(s:p.insert.left)
+let s:p.visual.left = copy(s:p.insert.left)
let s:p.normal.middle = [ [ s:none, s:none ] ]
-let s:p.inactive.middle = [ [ s:none, s:none ] ]
-let s:p.tabline.left = [ [ s:fg, s:bg ] ]
-let s:p.tabline.tabsel = [ [ s:fg, s:bg5 ] ]
-let s:p.tabline.middle = [ [ s:none, s:none ] ]
-let s:p.tabline.right = copy(s:p.normal.right)
+let s:p.inactive.middle = copy(s:p.normal.middle)
+let s:p.tabline.left = copy(s:p.normal.middle)
+let s:p.tabline.tabsel = [ [ s:fg, s:bg4 ] ]
+let s:p.tabline.middle = copy(s:p.normal.middle)
+let s:p.tabline.right = copy(s:p.normal.middle)
let s:p.normal.error = [ [ s:test, s:test ] ]
let s:p.normal.warning = [ [ s:test, s:test ] ]
diff --git a/.config/nvim/pywal/colors.vim b/.config/nvim/pywal/colors.vim
index 564c54c..34eb514 100644
--- a/.config/nvim/pywal/colors.vim
+++ b/.config/nvim/pywal/colors.vim
@@ -1,46 +1,46 @@
-hi! Normal guibg=#312322 ctermbg=NONE
-hi! EndOfBuffer guibg=#312322 ctermbg=NONE
-hi! CocInfoFloat guibg=#624644 ctermbg=NONE
+hi! Normal guibg=#141618 ctermbg=NONE
+hi! EndOfBuffer guibg=#141618 ctermbg=NONE
+hi! CocInfoFloat guibg=#282C30 ctermbg=NONE
-let s:bg = [ '#312322', 'NONE' ]
-let s:fg = [ '#cbc8c7', 'NONE' ]
-let s:bg1 = [ '#3B2A29', 'NONE' ]
-let s:bg2 = [ '#453130', 'NONE' ]
-let s:bg3 = [ '#4E3836', 'NONE' ]
-let s:bg4 = [ '#583F3D', 'NONE' ]
-let s:bg5 = [ '#624644', 'NONE' ]
-let s:color0 = [ '#312322', 'NONE' ]
-let s:color1 = [ '#c3acaa', 'NONE' ]
-let s:color2 = [ '#8eb8fb', 'NONE' ]
-let s:color3 = [ '#f4b3aa', 'NONE' ]
-let s:color4 = [ '#c0c3ef', 'NONE' ]
-let s:color5 = [ '#e9bce1', 'NONE' ]
-let s:color6 = [ '#bed5fb', 'NONE' ]
-let s:color7 = [ '#cbc8c7', 'NONE' ]
-let s:color8 = [ '#645a59', 'NONE' ]
-let s:color9 = [ '#c3acaa', 'NONE' ]
-let s:color10 = [ '#8eb8fb', 'NONE' ]
-let s:color11 = [ '#f4b3aa', 'NONE' ]
-let s:color12 = [ '#c0c3ef', 'NONE' ]
-let s:color13 = [ '#e9bce1', 'NONE' ]
-let s:color14 = [ '#bed5fb', 'NONE' ]
-let s:color15 = [ '#cbc8c7', 'NONE' ]
-let s:color0readable = [ '#cbc8c7', 'NONE' ]
-let s:color1readable = [ '#312322', 'NONE' ]
-let s:color2readable = [ '#312322', 'NONE' ]
-let s:color3readable = [ '#312322', 'NONE' ]
-let s:color4readable = [ '#312322', 'NONE' ]
-let s:color5readable = [ '#312322', 'NONE' ]
-let s:color6readable = [ '#312322', 'NONE' ]
-let s:color7readable = [ '#312322', 'NONE' ]
-let s:color8readable = [ '#cbc8c7', 'NONE' ]
-let s:color9readable = [ '#312322', 'NONE' ]
-let s:color10readable = [ '#312322', 'NONE' ]
-let s:color11readable = [ '#312322', 'NONE' ]
-let s:color12readable = [ '#312322', 'NONE' ]
-let s:color13readable = [ '#312322', 'NONE' ]
-let s:color14readable = [ '#312322', 'NONE' ]
-let s:color15readable = [ '#312322', 'NONE' ]
+let s:bg = [ '#141618', 'NONE' ]
+let s:fg = [ '#c4c4c5', 'NONE' ]
+let s:bg1 = [ '#181A1D', 'NONE' ]
+let s:bg2 = [ '#1C1F22', 'NONE' ]
+let s:bg3 = [ '#202326', 'NONE' ]
+let s:bg4 = [ '#24282B', 'NONE' ]
+let s:bg5 = [ '#282C30', 'NONE' ]
+let s:color0 = [ '#141618', 'NONE' ]
+let s:color1 = [ '#071831', 'NONE' ]
+let s:color2 = [ '#171823', 'NONE' ]
+let s:color3 = [ '#0c2039', 'NONE' ]
+let s:color4 = [ '#1e1f2a', 'NONE' ]
+let s:color5 = [ '#212633', 'NONE' ]
+let s:color6 = [ '#2b2b34', 'NONE' ]
+let s:color7 = [ '#c4c4c5', 'NONE' ]
+let s:color8 = [ '#4e5051', 'NONE' ]
+let s:color9 = [ '#071831', 'NONE' ]
+let s:color10 = [ '#171823', 'NONE' ]
+let s:color11 = [ '#0c2039', 'NONE' ]
+let s:color12 = [ '#1e1f2a', 'NONE' ]
+let s:color13 = [ '#212633', 'NONE' ]
+let s:color14 = [ '#2b2b34', 'NONE' ]
+let s:color15 = [ '#c4c4c5', 'NONE' ]
+let s:color0readable = [ '#c4c4c5', 'NONE' ]
+let s:color1readable = [ '#c4c4c5', 'NONE' ]
+let s:color2readable = [ '#c4c4c5', 'NONE' ]
+let s:color3readable = [ '#c4c4c5', 'NONE' ]
+let s:color4readable = [ '#c4c4c5', 'NONE' ]
+let s:color5readable = [ '#c4c4c5', 'NONE' ]
+let s:color6readable = [ '#c4c4c5', 'NONE' ]
+let s:color7readable = [ '#141618', 'NONE' ]
+let s:color8readable = [ '#c4c4c5', 'NONE' ]
+let s:color9readable = [ '#c4c4c5', 'NONE' ]
+let s:color10readable = [ '#c4c4c5', 'NONE' ]
+let s:color11readable = [ '#c4c4c5', 'NONE' ]
+let s:color12readable = [ '#c4c4c5', 'NONE' ]
+let s:color13readable = [ '#c4c4c5', 'NONE' ]
+let s:color14readable = [ '#c4c4c5', 'NONE' ]
+let s:color15readable = [ '#141618', 'NONE' ]
let s:none = [ 'NONE', 'NONE' ]
let s:test = [ '#ff00ff', 'NONE' ]
diff --git a/.config/nvim/pywal/pywal.vim b/.config/nvim/pywal/pywal.vim
index ec80f31..bf35b14 100644
--- a/.config/nvim/pywal/pywal.vim
+++ b/.config/nvim/pywal/pywal.vim
@@ -1,63 +1,65 @@
-hi! Normal guibg=#312322 ctermbg=NONE
-hi! EndOfBuffer guibg=#312322 ctermbg=NONE
-hi! CocInfoFloat guibg=#624644 ctermbg=NONE
+hi! Normal guibg=#141618 ctermbg=NONE
+hi! EndOfBuffer guibg=#141618 ctermbg=NONE
+hi! CocInfoFloat guibg=#282C30 ctermbg=NONE
-let s:bg = [ '#312322', 'NONE' ]
-let s:fg = [ '#cbc8c7', 'NONE' ]
-let s:bg1 = [ '#3B2A29', 'NONE' ]
-let s:bg2 = [ '#453130', 'NONE' ]
-let s:bg3 = [ '#4E3836', 'NONE' ]
-let s:bg4 = [ '#583F3D', 'NONE' ]
-let s:bg5 = [ '#624644', 'NONE' ]
-let s:color0 = [ '#312322', 'NONE' ]
-let s:color1 = [ '#c3acaa', 'NONE' ]
-let s:color2 = [ '#8eb8fb', 'NONE' ]
-let s:color3 = [ '#f4b3aa', 'NONE' ]
-let s:color4 = [ '#c0c3ef', 'NONE' ]
-let s:color5 = [ '#e9bce1', 'NONE' ]
-let s:color6 = [ '#bed5fb', 'NONE' ]
-let s:color7 = [ '#cbc8c7', 'NONE' ]
-let s:color8 = [ '#645a59', 'NONE' ]
-let s:color9 = [ '#c3acaa', 'NONE' ]
-let s:color10 = [ '#8eb8fb', 'NONE' ]
-let s:color11 = [ '#f4b3aa', 'NONE' ]
-let s:color12 = [ '#c0c3ef', 'NONE' ]
-let s:color13 = [ '#e9bce1', 'NONE' ]
-let s:color14 = [ '#bed5fb', 'NONE' ]
-let s:color15 = [ '#cbc8c7', 'NONE' ]
-let s:color0readable = [ '#cbc8c7', 'NONE' ]
-let s:color1readable = [ '#312322', 'NONE' ]
-let s:color2readable = [ '#312322', 'NONE' ]
-let s:color3readable = [ '#312322', 'NONE' ]
-let s:color4readable = [ '#312322', 'NONE' ]
-let s:color5readable = [ '#312322', 'NONE' ]
-let s:color6readable = [ '#312322', 'NONE' ]
-let s:color7readable = [ '#312322', 'NONE' ]
-let s:color8readable = [ '#cbc8c7', 'NONE' ]
-let s:color9readable = [ '#312322', 'NONE' ]
-let s:color10readable = [ '#312322', 'NONE' ]
-let s:color11readable = [ '#312322', 'NONE' ]
-let s:color12readable = [ '#312322', 'NONE' ]
-let s:color13readable = [ '#312322', 'NONE' ]
-let s:color14readable = [ '#312322', 'NONE' ]
-let s:color15readable = [ '#312322', 'NONE' ]
+let s:bg = [ '#141618', 'NONE' ]
+let s:fg = [ '#c4c4c5', 'NONE' ]
+let s:bg1 = [ '#181A1D', 'NONE' ]
+let s:bg2 = [ '#1C1F22', 'NONE' ]
+let s:bg3 = [ '#202326', 'NONE' ]
+let s:bg4 = [ '#24282B', 'NONE' ]
+let s:bg5 = [ '#282C30', 'NONE' ]
+let s:color0 = [ '#141618', 'NONE' ]
+let s:color1 = [ '#071831', 'NONE' ]
+let s:color2 = [ '#171823', 'NONE' ]
+let s:color3 = [ '#0c2039', 'NONE' ]
+let s:color4 = [ '#1e1f2a', 'NONE' ]
+let s:color5 = [ '#212633', 'NONE' ]
+let s:color6 = [ '#2b2b34', 'NONE' ]
+let s:color7 = [ '#c4c4c5', 'NONE' ]
+let s:color8 = [ '#4e5051', 'NONE' ]
+let s:color9 = [ '#071831', 'NONE' ]
+let s:color10 = [ '#171823', 'NONE' ]
+let s:color11 = [ '#0c2039', 'NONE' ]
+let s:color12 = [ '#1e1f2a', 'NONE' ]
+let s:color13 = [ '#212633', 'NONE' ]
+let s:color14 = [ '#2b2b34', 'NONE' ]
+let s:color15 = [ '#c4c4c5', 'NONE' ]
+let s:color0readable = [ '#c4c4c5', 'NONE' ]
+let s:color1readable = [ '#c4c4c5', 'NONE' ]
+let s:color2readable = [ '#c4c4c5', 'NONE' ]
+let s:color3readable = [ '#c4c4c5', 'NONE' ]
+let s:color4readable = [ '#c4c4c5', 'NONE' ]
+let s:color5readable = [ '#c4c4c5', 'NONE' ]
+let s:color6readable = [ '#c4c4c5', 'NONE' ]
+let s:color7readable = [ '#141618', 'NONE' ]
+let s:color8readable = [ '#c4c4c5', 'NONE' ]
+let s:color9readable = [ '#c4c4c5', 'NONE' ]
+let s:color10readable = [ '#c4c4c5', 'NONE' ]
+let s:color11readable = [ '#c4c4c5', 'NONE' ]
+let s:color12readable = [ '#c4c4c5', 'NONE' ]
+let s:color13readable = [ '#c4c4c5', 'NONE' ]
+let s:color14readable = [ '#c4c4c5', 'NONE' ]
+let s:color15readable = [ '#141618', 'NONE' ]
let s:none = [ 'NONE', 'NONE' ]
let s:test = [ '#ff00ff', 'NONE' ]
+hi! SignColumn guibg=NONE ctermbg=NONE
+
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ s:color6readable, s:color6 ], [ s:color2readable, s:color2 ] ]
-let s:p.normal.right = [ [ s:color1readable, s:color1 ], [ s:color2readable, s:color2 ] ]
-let s:p.inactive.right = [ [ s:color1readable, s:color1 ], [ s:color2readable, s:color2 ] ]
-let s:p.inactive.left = [ [ s:color6readable, s:color6 ], [ s:color2readable, s:color2 ] ]
-let s:p.insert.left = [ [ s:color5readable, s:color5 ], [ s:color2readable, s:color2 ] ]
-let s:p.replace.left = [ [ s:color4readable, s:color4 ], [ s:color2readable, s:color2 ] ]
-let s:p.visual.left = [ [ s:color3readable, s:color3 ], [ s:color2readable, s:color2 ] ]
+let s:p.normal.left = [ [ s:fg, s:bg2 ], [ s:color8, s:bg ] ]
+let s:p.normal.right = [ [ s:color8, s:bg ] ]
+let s:p.inactive.left = copy(s:p.normal.left)
+let s:p.inactive.right = copy(s:p.normal.right)
+let s:p.insert.left = [ [ s:fg, s:bg4 ], [ s:fg, s:bg ] ]
+let s:p.replace.left = copy(s:p.insert.left)
+let s:p.visual.left = copy(s:p.insert.left)
let s:p.normal.middle = [ [ s:none, s:none ] ]
-let s:p.inactive.middle = [ [ s:none, s:none ] ]
-let s:p.tabline.left = [ [ s:fg, s:bg ] ]
-let s:p.tabline.tabsel = [ [ s:fg, s:bg5 ] ]
-let s:p.tabline.middle = [ [ s:none, s:none ] ]
-let s:p.tabline.right = copy(s:p.normal.right)
+let s:p.inactive.middle = copy(s:p.normal.middle)
+let s:p.tabline.left = copy(s:p.normal.middle)
+let s:p.tabline.tabsel = [ [ s:fg, s:bg4 ] ]
+let s:p.tabline.middle = copy(s:p.normal.middle)
+let s:p.tabline.right = copy(s:p.normal.middle)
let s:p.normal.error = [ [ s:test, s:test ] ]
let s:p.normal.warning = [ [ s:test, s:test ] ]