commit 4c337b8149256aebc57892868ec4c7b8554374de
parent 3cdd4c407416b157f7cbd35a43e7a40c65688324
Author: Jake Koroman <jakekoroman@gmail.com>
Date: Sat, 23 Mar 2024 16:36:05 -0400
cleanup nvim
Diffstat:
5 files changed, 5 insertions(+), 354 deletions(-)
diff --git a/.config/nvim/colors/GruberDarker.vim b/.config/nvim/colors/GruberDarker.vim
@@ -1,228 +0,0 @@
-" GruberDarker Theme for Vim
-"
-" Adapted from an Emacs theme:
-" https://github.com/rexim/gruber-darker-theme
-"
-" Colorscheme template: https://github.com/mhartington/oceanic-next/blob/master/colors/OceanicNext.vim
-" --------------------------------------------
-
-" {{{ Setup
- set background=dark
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
- let g:colors_name="GruberDarker"
-" }}}
-" {{{ Italics
- let g:gruber_terminal_italic = get(g:, 'gruber_terminal_italic', 0)
- let s:italic = ""
- if g:gruber_terminal_italic == 1
- let s:italic = "italic"
- endif
-"}}}
-" {{{ Bold
- let g:gruber_terminal_bold = get(g:, 'gruber_terminal_bold', 0)
- let s:bold = ""
- if g:gruber_terminal_bold == 1
- let s:bold = "bold"
- endif
-"}}}
-" {{{ Colors
- let s:gruberFG=['#e4e4ef', '253']
- let s:gruberFG1=['#f4f4ff', '254']
- let s:gruberFG2=['#f5f5ff', '240']
- let s:gruberFG3=['#65737e', '243']
- let s:gruberWhite=['#ffffff', '15']
- let s:gruberBlack=['#000000', '0']
- let s:gruberBG=['#181818', '233']
- let s:gruberBG1=['#282828', '235']
- let s:gruberBG2=['#453d41', '238']
- let s:gruberLightRed=['#c73c3f', '203']
- let s:gruberRed=['#f43841', '160']
- let s:gruberNiagara=['#96a6c8', '147']
- let s:gruberQuartz=['#95a99f', '108']
- let s:gruberGreen=['#73c936', '70']
- let s:gruberMain=['#ffdd33', '220']
- let s:gruberBrown=['#cc8c3c', '172']
- let s:gruberPurple=['#9e95c7', '98']
- let s:gruberLightBlue=['#0087d7', '32']
- let s:gruberBlue=['#0000d7', '20']
- let s:gruberGold=['#d7af00', '178']
- let s:none=['NONE', 'NONE']
-
-" {{{ Highlight function
-function! <sid>hi(group, fg, bg, attr, attrsp)
- " fg, bg, attr, attrsp
- if !empty(a:fg)
- exec "hi " . a:group . " guifg=" . a:fg[0]
- exec "hi " . a:group . " ctermfg=" . a:fg[1]
- endif
- if !empty(a:bg)
- exec "hi " . a:group . " guibg=" . a:bg[0]
- exec "hi " . a:group . " ctermbg=" . a:bg[1]
- endif
- if a:attr != ""
- exec "hi " . a:group . " gui=" . a:attr
- exec "hi " . a:group . " cterm=" . a:attr
- endif
- if !empty(a:attrsp)
- exec "hi " . a:group . " guisp=" . a:attrsp[0]
- endif
-endfunction
-" }}}
-" {{{ call <sid>:hi(group, fg, bg, gui, guisp)
-call <sid>hi('Bold', '', '', 'bold', '')
-call <sid>hi('Debug', s:gruberFG2, '', '', '')
-call <sid>hi('Directory', s:gruberLightBlue, '', '', '')
-call <sid>hi('ErrorMsg', s:gruberWhite, s:gruberRed, '', '')
-call <sid>hi('Exception', s:gruberBrown, '', '', '')
-call <sid>hi('FoldColumn', s:gruberBrown, s:gruberFG2, '', '')
-call <sid>hi('Folded', s:gruberBrown, s:gruberFG2, s:italic, '')
-call <sid>hi('IncSearch', s:gruberBlack, s:gruberFG2, 'NONE', '')
-call <sid>hi('Italic', '', '', s:italic, '')
-
-call <sid>hi('Macro', s:gruberFG, '', '', '')
-call <sid>hi('MatchParen', s:gruberBG2, s:gruberMain, '', '')
-call <sid>hi('ModeMsg', s:gruberFG2, '', '', '')
-call <sid>hi('MoreMsg', s:gruberFG2, '', '', '')
-call <sid>hi('Question', s:gruberNiagara, '', '', '')
-call <sid>hi('Search', s:gruberBlack, s:gruberMain, '', '')
-call <sid>hi('SpecialKey', s:gruberFG2, '', '', '')
-call <sid>hi('TooLong', s:gruberFG2, '', '', '')
-call <sid>hi('Underlined', s:gruberPurple, '', '', '')
-call <sid>hi('Visual', '', s:gruberBG2, '', '')
-call <sid>hi('VisualNOS', s:gruberRed, '', '', '')
-call <sid>hi('WarningMsg', s:gruberRed, '', '', '')
-call <sid>hi('WildMenu', s:gruberBlack, s:gruberMain, '', '')
-call <sid>hi('Title', s:gruberQuartz, '', '', '')
-call <sid>hi('Conceal', s:gruberFG, s:gruberBG, '', '')
-call <sid>hi('Cursor', s:gruberBG, s:gruberFG, '', '')
-call <sid>hi('NonText', s:gruberFG2, '', '', '')
-call <sid>hi('Normal', s:gruberFG, s:gruberBG, '', '')
-call <sid>hi('EndOfBuffer', s:gruberFG, s:gruberBG, '', '')
-call <sid>hi('LineNr', s:gruberFG, s:gruberBG, '', '')
-call <sid>hi('SignColumn', s:none, s:none, '', '')
-call <sid>hi('VertSplit', s:gruberFG2, s:gruberBG1, '', '')
-call <sid>hi('ColorColumn', '', s:gruberBG2, '', '')
-call <sid>hi('CursorColumn', '', s:gruberBG2, '', '')
-call <sid>hi('CursorLine', '', s:gruberBG2, 'NONE', '')
-call <sid>hi('CursorLineNr', s:gruberMain, s:gruberBG, '', '')
-call <sid>hi('PMenu', s:gruberFG, s:gruberBG1, '', '')
-call <sid>hi('PMenuSel', s:gruberFG, s:gruberBG2, '', '')
-call <sid>hi('PmenuSbar', '', s:gruberBG, '', '')
-call <sid>hi('PmenuThumb', '', s:gruberBG, '', '')
-call <sid>hi('helpExample', s:gruberMain, '', '', '')
-call <sid>hi('helpCommand', s:gruberMain, '', '', '')
-
-" Standard syntax highlighting
-call <sid>hi('Boolean', s:gruberQuartz, '', '', '')
-call <sid>hi('Character', s:gruberGreen, '', '', '')
-call <sid>hi('Comment', s:gruberBrown, '', s:italic, '')
-call <sid>hi('Conditional', s:gruberMain, '', '', '')
-call <sid>hi('Constant', s:gruberQuartz, '', '', '')
-call <sid>hi('Define', s:gruberMain, '', '', '')
-call <sid>hi('Delimiter', s:gruberFG, '', '', '')
-call <sid>hi('Float', s:gruberQuartz, '', '', '')
-call <sid>hi('Function', s:gruberNiagara, '', '', '')
-call <sid>hi('Identifier', s:gruberNiagara, '', '', '')
-call <sid>hi('Include', s:gruberMain, '', '', '')
-call <sid>hi('Keyword', s:gruberMain, '', '', '')
-call <sid>hi('Label', s:gruberFG, '', '', '')
-call <sid>hi('Number', s:gruberQuartz, '', '', '')
-call <sid>hi('Operator', s:gruberFG, '', '', '')
-call <sid>hi('PreProc', s:gruberFG1, '', '', '')
-call <sid>hi('Repeat', s:gruberMain, '', '', '')
-call <sid>hi('Special', s:gruberMain, '', '', '')
-call <sid>hi('SpecialChar', s:gruberMain, '', '', '')
-call <sid>hi('Statement', s:gruberMain, '', '', '')
-call <sid>hi('StorageClass', s:gruberMain, '', '', '')
-call <sid>hi('String', s:gruberGreen, '', '', '')
-call <sid>hi('Structure', s:gruberMain, '', '', '')
-call <sid>hi('Todo', s:gruberBG, s:gruberMain, '', '')
-call <sid>hi('Type', s:gruberQuartz, '', '', '')
-call <sid>hi('Typedef', s:gruberQuartz, '', '', '')
-
-call <sid>hi('SpellBad', '', '', 'undercurl', '')
-call <sid>hi('SpellLocal', '', '', 'undercurl', '')
-call <sid>hi('SpellCap', '', '', 'undercurl', '')
-call <sid>hi('SpellRare', '', '', 'undercurl', '')
-
-" Haskell Highlighting
-call <sid>hi('hsTypeDef', s:gruberMain, '', '', '')
-call <sid>hi('hsStructure', s:gruberMain, '', '', '')
-call <sid>hi('hsStatement', s:gruberMain, '', '', '')
-call <sid>hi('hsconditional', s:gruberMain, '', '', '')
-call <sid>hi('hsconditional', s:gruberMain, '', '', '')
-call <sid>hi('hsconditional', s:gruberMain, '', '', '')
-
-" Java Highlighting
-" TODO Fix function definitions
-call <sid>hi('javaConstant', s:gruberQuartz, '', '', '')
-call <sid>hi('javaConditional', s:gruberMain, '', '', '')
-call <sid>hi('javaOperator', s:gruberMain, '', '', '')
-call <sid>hi('javaExceptions', s:gruberMain, '', '', '')
-call <sid>hi('javaAssert', s:gruberMain, '', '', '')
-call <sid>hi('javaClassDecl', s:gruberMain, '', '', '')
-call <sid>hi('javaBraces', s:gruberFG, '', '', '')
-call <sid>hi('javaLangObject', s:gruberFG, '', '', '')
-call <sid>hi('javaType', s:gruberQuartz, '', '', '')
-
-" Python Highlighting
-call <sid>hi('pythonRepeat', s:gruberMain, '', '', '')
-call <sid>hi('pythonOperator', s:gruberMain, '', '', '')
-call <sid>hi('pythonException', s:gruberMain, '', '', '')
-
-
-call <sid>hi('markdownCode', s:gruberGreen, '', '', '')
-call <sid>hi('markdownCodeBlock', s:gruberGreen, '', '', '')
-call <sid>hi('markdownHeadingDelimiter', s:gruberNiagara, '', '', '')
-call <sid>hi('markdownItalic', s:gruberPurple, '', s:italic, '')
-call <sid>hi('markdownBold', s:gruberMain, '', s:bold, '')
-call <sid>hi('markdownCodeDelimiter', s:gruberBrown, '', s:italic, '')
-call <sid>hi('markdownError', s:gruberFG, s:gruberBG1, '', '')
-
-call <sid>hi('ALEErrorSign', s:gruberRed, s:gruberBG2, s:bold, '')
-call <sid>hi('ALEWarningSign', s:gruberMain, s:gruberBG2, s:bold, '')
-call <sid>hi('ALEInfoSign', s:gruberGreen, s:gruberBG2, s:bold, '')
-
-call <sid>hi('NERDTreeExecFile', s:gruberFG, '', '', '')
-call <sid>hi('NERDTreeDirSlash', s:gruberNiagara, '', '', '')
-call <sid>hi('NERDTreeOpenable', s:gruberNiagara, '', '', '')
-call <sid>hi('NERDTreeFile', '', s:none, '', '')
-call <sid>hi('NERDTreeFlags', s:gruberNiagara, '', '', '')
-
-call <sid>hi('vimfilerLeaf', s:gruberFG, '', '', '')
-call <sid>hi('vimfilerNormalFile', s:gruberFG, s:gruberBG1, '', '')
-call <sid>hi('vimfilerOpenedFile', s:gruberNiagara, '', '', '')
-call <sid>hi('vimfilerClosedFile', s:gruberNiagara, '', '', '')
-
-" }}}
-
-let g:terminal_color_0=s:gruberBG1[0]
-let g:terminal_color_8=s:gruberBG1[0]
-
-let g:terminal_color_1=s:gruberLightRed[0]
-let g:terminal_color_9=s:gruberLightRed[0]
-
-let g:terminal_color_2=s:gruberGreen[0]
-let g:terminal_color_10=s:gruberGreen[0]
-
-let g:terminal_color_3=s:gruberMain[0]
-let g:terminal_color_11=s:gruberMain[0]
-
-let g:terminal_color_4=s:gruberNiagara[0]
-let g:terminal_color_12=s:gruberNiagara[0]
-
-let g:terminal_color_5=s:gruberPurple[0]
-let g:terminal_color_13=s:gruberPurple[0]
-
-let g:terminal_color_6=s:gruberNiagara[0]
-let g:terminal_color_14=s:gruberNiagara[0]
-
-let g:terminal_color_7=s:gruberFG[0]
-let g:terminal_color_15=s:gruberFG[0]
-
-let g:terminal_color_background=s:gruberBG1[0]
-let g:terminal_color_foreground=s:gruberWhite[0]
-
diff --git a/.config/nvim/colors/clean.vim b/.config/nvim/colors/clean.vim
@@ -1,92 +0,0 @@
-" to get font face under cursor: :echo synIDattr(synID(line("."), col("."), 1), "name")
-
-hi clear
-syntax reset
-let g:colors_name = 'clean'
-set background=dark
-
-hi Normal guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#181818 gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi CursorColumn guifg=NONE guibg=#181818 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#181818 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#e4e4ef guibg=#181818 gui=NONE cterm=NONE
-hi DiffAdd guifg=#e4e4ef guibg=#181818 gui=reverse cterm=reverse
-hi DiffChange guifg=#e4e4ef guibg=#181818 gui=reverse cterm=reverse
-hi DiffDelete guifg=#e4e4ef guibg=#181818 gui=reverse cterm=reverse
-hi DiffText guifg=#e4e4ef guibg=#181818 gui=reverse cterm=reverse
-hi Directory guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi ErrorMsg guifg=#ffff00 guibg=#181818 gui=NONE cterm=NONE
-hi FoldColumn guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#e4e4ef guibg=#181818 gui=NONE cterm=NONE
-hi IncSearch guifg=#ffaf00 guibg=#181818 gui=reverse cterm=reverse
-hi LineNr guifg=#7a7a7a guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=#ff0000 guibg=NONE gui=bold cterm=bold
-hi ModeMsg guifg=#e4e4ef guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi Pmenu guifg=#cdaa7d guibg=#101010 gui=NONE cterm=NONE
-hi PmenuSbar guifg=#e4e4ef guibg=#101010 gui=NONE cterm=NONE
-hi PmenuSel guifg=#cd950c guibg=#1F1F1F gui=NONE cterm=NONE
-hi PmenuThumb guifg=#e4e4ef guibg=#101010 gui=NONE cterm=NONE
-hi Question guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ad7fa8 guibg=#181818 gui=reverse cterm=reverse
-hi Search guifg=#ffaf00 guibg=#181818 gui=reverse cterm=reverse
-hi SignColumn guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#e4e4ef guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
-hi SpellCap guifg=#e4e4ef guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
-hi SpellLocal guifg=#e4e4ef guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
-hi SpellRare guifg=#e4e4ef guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
-hi StatusLine guifg=#e4e4ef guibg=#181818 gui=bold,reverse cterm=bold
-hi StatusLineNC guifg=#878787 guibg=#181818 gui=reverse cterm=reverse
-hi TabLine guifg=#e4e4ef guibg=#181818 gui=reverse cterm=reverse
-hi TabLineFill guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi TabLineSel guifg=#e4e4ef guibg=#181818 gui=bold cterm=bold
-hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#e4e4ef guibg=#181818 gui=NONE cterm=NONE
-hi Visual guifg=#595959 guibg=#181818 gui=reverse cterm=reverse
-hi VisualNOS guifg=NONE guibg=#181818 gui=NONE cterm=NONE
-hi WarningMsg guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#e4e4ef guibg=#181818 gui=bold cterm=bold
-hi Comment guifg=#5e5e63 guibg=NONE gui=bold cterm=bold
-hi Constant guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#4e9a06 guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#ff0000 guibg=#181818 gui=bold,reverse cterm=bold,reverse
-hi Identifier guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#e4e4ef guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#cdaa7d guibg=NONE gui=NONE cterm=NONE
-hi Number guifg=#cdaa7d guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#cd950c guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#181818 guibg=#ffffff gui=bold,reverse cterm=bold,reverse
-hi Type guifg=#cd950c guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#e4e4ef guibg=NONE gui=underline cterm=underline
-hi CursorIM guifg=#e4e4ef guibg=#181818 gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=#181818 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#e4e4ef guibg=#181818 gui=bold cterm=bold
-
-hi vimFgBgAttrib guifg=#cdaa7D guibg=#181818 gui=NONE cterm=NONE
-hi vimHiAttrib guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-hi vimVar guifg=#cdaa7D guibg=#181818 gui=NONE cterm=NONE
-hi vimOption guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-hi vimHighlight guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-hi vimHigroup guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-hi vimGroup guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-
-hi zigVarDecl guifg=#cd950c guibg=NONE gui=NONE cterm=NONE
-hi zigMacro guifg=#cd950c guibg=NONE gui=NONE cterm=NONE
-hi zigOperator guifg=#cdaa7d guibg=NONE gui=NONE cterm=NONE
-hi zigType guifg=#cdaa7d guibg=NONE gui=NONE cterm=NONE
-hi zigPreProc guifg=#cd950c guibg=NONE gui=NONE cterm=NONE
-hi zigConstant guifg=#cdaa7d guibg=NONE gui=NONE cterm=NONE
-hi zigBoolean guifg=#cdaa7d guibg=NONE gui=NONE cterm=NONE
-hi zigBuiltinFn guifg=#f77454 guibg=#181818 gui=NONE cterm=NONE
-hi zigNull guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-
-hi shVariable guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
-hi shDerefSimple guifg=#f77454 guibg=#181818 gui=NONE cterm=NONE
-
-hi luaConstant guifg=#cdaa7d guibg=#181818 gui=NONE cterm=NONE
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
@@ -40,27 +40,3 @@ require('snippets').snippets = {
incq = "#include \"$0\"";
}
}
-
-require('marks').setup {
- -- whether to map keybinds or not. default true
- default_mappings = true,
- -- whether movements cycle back to the beginning/end of buffer. default true
- cyclic = true,
- force_write_shada = true,
- -- how often (in ms) to redraw signs/recompute mark positions.
- -- higher values will have better performance but may cause visual lag,
- -- while lower values may cause performance penalties. default 150.
- refresh_interval = 250,
- -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own
- -- sign/virttext. Bookmarks can be used to group together positions and quickly move
- -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and
- -- default virt_text is "".
- bookmark_0 = {
- sign = "⚑",
- virt_text = "hello world",
- -- explicitly prompt for a virtual line annotation when setting a bookmark from this group.
- -- defaults to false.
- annotate = false,
- },
- mappings = {}
-}
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
@@ -17,17 +17,11 @@ return require('packer').startup({
use('nvim-lua/plenary.nvim')
use('tpope/vim-commentary')
- use('mg979/vim-visual-multi')
use('rhysd/clever-f.vim')
- -- use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'})
+
use('norcalli/snippets.nvim')
- use('rbgrouleff/bclose.vim')
- use('chentoast/marks.nvim')
- -- use('chaoren/vim-wordmotion')
- use { "catppuccin/nvim", as = "catppuccin" }
use('zekzekus/menguless')
use('brenoprata10/nvim-highlight-colors')
use ('Tetralux/odin.vim')
-
end
})
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
@@ -6,6 +6,7 @@ g.netrw_keepdir = 0
g.netrw_banner = 0
g.netrw_winsize = 15
g.netrw_localcopydircmd = 'cp -r'
+
-- o.termguicolors = true
g.zig_fmt_autosave = 0
@@ -15,12 +16,12 @@ vim.cmd('set wrap!')
vim.cmd('set makeprg=./build.sh')
o.mouse = 'a'
-o.relativenumber = true
-o.number = true
+-- o.relativenumber = true
+-- o.number = true
o.expandtab = true
o.tabstop = 4
o.shiftwidth = 4
--- o.autochdir = true
+o.autochdir = true
o.guifont = "Liberation Mono:h10"
-- my super cool c indentation style
