diff --git a/.config/nvim/colors/eighties.vim b/.config/nvim/colors/eighties.vim deleted file mode 100644 index efc3ae2..0000000 --- a/.config/nvim/colors/eighties.vim +++ /dev/null @@ -1,244 +0,0 @@ -" vi:syntax=vim - -" Terminal color definitions -let s:cterm00 = "00" -let s:cterm01 = "10" -let s:cterm02 = "11" -let s:cterm03 = "08" -let s:cterm04 = "12" -let s:cterm05 = "07" -let s:cterm06 = "13" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm09 = "09" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" -let s:cterm0F = "14" - - -" Theme setup -hi clear -syntax reset -let g:colors_name = "eighties" - -" Highlighting function -" Optional variables are attributes and guisp -function! g:Base16hi(group, ctermfg, ctermbg, ...) - let l:attr = get(a:, 1, "") - let l:guisp = get(a:, 2, "") - - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . a:ctermfg - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . a:ctermbg - endif - if l:attr != "" - exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr - endif -endfunction - - -fun hi(group, ctermfg, ctermbg, attr, guisp) - call g:Base16hi(a:group, a:ctermfg, a:ctermbg, a:attr, a:guisp) -endfun - -" Vim editor colors -call hi("Normal", s:cterm05, s:cterm00, "", "") -call hi("Bold", "", "", "bold", "") -call hi("Debug", s:cterm08, "", "", "") -call hi("Directory", s:cterm0D, "", "", "") -call hi("Error", s:cterm00, s:cterm08, "", "") -call hi("ErrorMsg", s:cterm08, s:cterm00, "", "") -call hi("Exception", s:cterm08, "", "", "") -call hi("FoldColumn", s:cterm0C, s:cterm01, "", "") -call hi("Folded", s:cterm03, s:cterm01, "", "") -call hi("IncSearch", s:cterm01, s:cterm09, "none", "") -call hi("Italic", "", "", "none", "") -call hi("Macro", s:cterm08, "", "", "") -call hi("MatchParen", "", s:cterm03, "", "") -call hi("ModeMsg", s:cterm0B, "", "", "") -call hi("MoreMsg", s:cterm0B, "", "", "") -call hi("Question", s:cterm0D, "", "", "") -call hi("Search", s:cterm01, s:cterm0A, "", "") -call hi("Substitute", s:cterm01, s:cterm0A, "none", "") -call hi("SpecialKey", s:cterm03, "", "", "") -call hi("TooLong", s:cterm08, "", "", "") -call hi("Underlined", s:cterm08, "", "", "") -call hi("Visual", "", "", "", "reverse") -call hi("VisualNOS", s:cterm08, "", "", "") -call hi("WarningMsg", s:cterm08, "", "", "") -call hi("WildMenu", s:cterm08, "", "", "") -call hi("Title", s:cterm0D, "", "none", "") -call hi("Conceal", s:cterm0D, s:cterm00, "", "") -call hi("Cursor", s:cterm00, s:cterm05, "", "") -call hi("NonText", s:cterm03, "", "", "") -call hi("LineNr", s:cterm03, "", "", "") -call hi("SignColumn", s:cterm03, s:cterm01, "", "") -call hi("StatusLine", s:cterm05, 235, "none", "") -call hi("StatusLineNC", s:cterm03, s:cterm01, "none", "") -call hi("VertSplit", "", "", "none", "") -call hi("ColorColumn", "", s:cterm01, "none", "") -call hi("CursorColumn", "", s:cterm01, "none", "") -call hi("CursorLine", "", s:cterm01, "none", "") -call hi("CursorLineNr", s:cterm04, s:cterm01, "", "") -call hi("QuickFixLine", "", s:cterm01, "none", "") -call hi("PMenu", s:cterm05, s:cterm01, "none", "") -call hi("PMenuSel", s:cterm01, s:cterm05, "", "") -call hi("TabLine", s:cterm0D, 235, "none", "") -call hi("TabLineFill", s:cterm0D, 235, "none", "") -call hi("TabLineSel", s:cterm02, 235, "none", "") - -" Standard syntax highlighting -call hi("Boolean", s:cterm09, "", "", "") -call hi("Character", s:cterm08, "", "", "") -call hi("Comment", s:cterm03, "", "", "") -call hi("Conditional", s:cterm0E, "", "", "") -call hi("Constant", s:cterm09, "", "", "") -call hi("Define", s:cterm0E, "", "none", "") -call hi("Delimiter", s:cterm0F, "", "", "") -call hi("Float", s:cterm09, "", "", "") -call hi("Function", s:cterm0D, "", "", "") -call hi("Identifier", s:cterm08, "", "none", "") -call hi("Include", s:cterm0D, "", "", "") -call hi("Keyword", s:cterm0E, "", "", "") -call hi("Label", s:cterm0A, "", "", "") -call hi("Number", s:cterm09, "", "", "") -call hi("Operator", s:cterm05, "", "none", "") -call hi("PreProc", s:cterm0A, "", "", "") -call hi("Repeat", s:cterm0A, "", "", "") -call hi("Special", s:cterm0C, "", "", "") -call hi("SpecialChar", s:cterm0F, "", "", "") -call hi("Statement", s:cterm08, "", "", "") -call hi("StorageClass", s:cterm0A, "", "", "") -call hi("String", s:cterm0B, "", "", "") -call hi("Structure", s:cterm0E, "", "", "") -call hi("Tag", s:cterm0A, "", "", "") -call hi("Todo", s:cterm0A, s:cterm01, "", "") -call hi("Type", s:cterm0A, "", "none", "") -call hi("Typedef", s:cterm0A, "", "", "") - -" C highlighting -call hi("cOperator", s:cterm0C, "", "", "") -call hi("cPreCondit", s:cterm0E, "", "", "") - -" C# highlighting -call hi("csClass", s:cterm0A, "", "", "") -call hi("csAttribute", s:cterm0A, "", "", "") -call hi("csModifier", s:cterm0E, "", "", "") -call hi("csType", s:cterm08, "", "", "") -call hi("csUnspecifiedStatement", s:cterm0D, "", "", "") -call hi("csContextualStatement", s:cterm0E, "", "", "") -call hi("csNewDecleration", s:cterm08, "", "", "") - -" CSS highlighting -call hi("cssBraces", s:cterm05, "", "", "") -call hi("cssClassName", s:cterm0E, "", "", "") -call hi("cssColor", s:cterm0C, "", "", "") - -" Diff highlighting -call hi("DiffAdd", s:cterm0B, s:cterm01, "", "") -call hi("DiffChange", s:cterm03, s:cterm01, "", "") -call hi("DiffDelete", s:cterm08, s:cterm01, "", "") -call hi("DiffText", s:cterm0D, s:cterm01, "", "") -call hi("DiffAdded", s:cterm0B, s:cterm00, "", "") -call hi("DiffFile", s:cterm08, s:cterm00, "", "") -call hi("DiffNewFile", s:cterm0B, s:cterm00, "", "") -call hi("DiffLine", s:cterm0D, s:cterm00, "", "") -call hi("DiffRemoved", s:cterm08, s:cterm00, "", "") - -" Git highlighting -call hi("gitcommitOverflow", s:cterm08, "", "", "") -call hi("gitcommitSummary", s:cterm0B, "", "", "") -call hi("gitcommitComment", s:cterm03, "", "", "") -call hi("gitcommitUntracked", s:cterm03, "", "", "") -call hi("gitcommitDiscarded", s:cterm03, "", "", "") -call hi("gitcommitSelected", s:cterm03, "", "", "") -call hi("gitcommitHeader", s:cterm0E, "", "", "") -call hi("gitcommitSelectedType", s:cterm0D, "", "", "") -call hi("gitcommitUnmergedType", s:cterm0D, "", "", "") -call hi("gitcommitDiscardedType", s:cterm0D, "", "", "") -call hi("gitcommitBranch", s:cterm09, "", "bold", "") -call hi("gitcommitUntrackedFile", s:cterm0A, "", "", "") -call hi("gitcommitUnmergedFile", s:cterm08, "", "bold", "") -call hi("gitcommitDiscardedFile", s:cterm08, "", "bold", "") -call hi("gitcommitSelectedFile", s:cterm0B, "", "bold", "") - -" HTML highlighting -call hi("htmlBold", s:cterm0A, "", "", "") -call hi("htmlItalic", s:cterm0E, "", "", "") -call hi("htmlEndTag", s:cterm05, "", "", "") -call hi("htmlTag", s:cterm05, "", "", "") - -" JavaScript highlighting -call hi("javaScript", s:cterm05, "", "", "") -call hi("javaScriptBraces", s:cterm05, "", "", "") -call hi("javaScriptNumber", s:cterm09, "", "", "") - -" Mail highlighting -call hi("mailQuoted1", s:cterm0A, "", "", "") -call hi("mailQuoted2", s:cterm0B, "", "", "") -call hi("mailQuoted3", s:cterm0E, "", "", "") -call hi("mailQuoted4", s:cterm0C, "", "", "") -call hi("mailQuoted5", s:cterm0D, "", "", "") -call hi("mailQuoted6", s:cterm0A, "", "", "") -call hi("mailURL", s:cterm0D, "", "", "") -call hi("mailEmail", s:cterm0D, "", "", "") - -" Markdown highlighting -call hi("markdownCode", s:cterm0B, "", "", "") -call hi("markdownError", s:cterm05, s:cterm00, "", "") -call hi("markdownCodeBlock", s:cterm0B, "", "", "") -call hi("markdownHeadingDelimiter", s:cterm0D, "", "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:cterm05, "", "", "") -call hi("phpComparison", s:cterm05, "", "", "") -call hi("phpParent", s:cterm05, "", "", "") -call hi("phpMethodsVar", s:cterm0C, "", "", "") - -" Python highlighting -call hi("pythonOperator", s:cterm0E, "", "", "") -call hi("pythonRepeat", s:cterm0E, "", "", "") -call hi("pythonInclude", s:cterm0E, "", "", "") -call hi("pythonStatement", s:cterm0E, "", "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:cterm0D, "", "", "") -call hi("rubyConstant", s:cterm0A, "", "", "") -call hi("rubyInterpolationDelimiter", s:cterm0F, "", "", "") -call hi("rubyRegexp", s:cterm0C, "", "", "") -call hi("rubySymbol", s:cterm0B, "", "", "") -call hi("rubyStringDelimiter", s:cterm0B, "", "", "") - -" SASS highlighting -call hi("sassidChar", s:cterm08, "", "", "") -call hi("sassClassChar", s:cterm09, "", "", "") -call hi("sassInclude", s:cterm0E, "", "", "") -call hi("sassMixing", s:cterm0E, "", "", "") -call hi("sassMixinName", s:cterm0D, "", "", "") - - -" Spelling highlighting -call hi("SpellBad", "", s:cterm00, "underline", "") -call hi("SpellLocal", "", s:cterm00, "underline", "") -call hi("SpellCap", "", s:cterm00, "underline", "") -call hi("SpellRare", "", s:cterm00, "underline", "") - -" Java highlighting -call hi("javaOperator", s:cterm0D, "", "", "") - -" Telescope highlighting -call hi("TelescopeMatching", s:cterm07, "", "", "") -call hi("TelescopePreviewLine", s:cterm0A, "", "bold", "") -call hi("TelescopePromptPrefix", "", "", "none", "") -call hi("TelescopeSelection", s:cterm07, "", "bold", "") - -" Remove functions -delf hi - -" Remove color variables -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 4ad57f9..71c604a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,15 +1,17 @@ require 'paq' { - 'hrsh7th/cmp-buffer'; - 'hrsh7th/cmp-nvim-lsp'; - 'hrsh7th/nvim-cmp'; - 'neovim/nvim-lspconfig'; - 'nvim-lua/plenary.nvim'; - 'nvim-telescope/telescope.nvim' + 'RRethy/nvim-base16', + 'hrsh7th/cmp-buffer', + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/nvim-cmp', + 'neovim/nvim-lspconfig', + 'nvim-lua/plenary.nvim', + 'nvim-telescope/telescope.nvim', + { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' } } +require('colors') require('sets') require('maps') require('lsp') require('tlp') - -vim.cmd('colorscheme eighties') +require('trs') diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index d4a2dee..7c1ebcf 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -20,7 +20,8 @@ map('n', '', ':bnext') map('n', '', ':bdelete') map('n', 'f', builtin.find_files, {}) -map('n', 'd', builtin.buffers, {}) +map('n', 'd', ':Vexplore') +map('n', 'b', builtin.buffers, {}) map('n', 'g', builtin.live_grep, {}) map('', 'c', ':w! | !compiler "%"') map('', 'p', ':!opout %')