diff --git a/colorschemes/main.conf b/colorschemes/main.conf index 63291cd..4db3367 100644 --- a/colorschemes/main.conf +++ b/colorschemes/main.conf @@ -3,8 +3,8 @@ background #000505 selection_foreground #441580 selection_background #01B282 cursor #e0d0ff -color0 #00000e -color8 #32323e +color0 #212132 +color8 #424253 color1 #c80064 color9 #640032 color2 #00c864 diff --git a/config/dotwryn.env.vim b/config/dotwryn.env.vim index 85672c9..a7cc06e 100644 --- a/config/dotwryn.env.vim +++ b/config/dotwryn.env.vim @@ -2,8 +2,6 @@ let $DOTWRYN=expand("$HOME/.wryn") let $WRYNVIMPATH=expand("$DOTWRYN/vim") let $WRYNVIMRC=expand("$WRYNVIMPATH/rc.vim") -let $BASHRC=expand("$HOME/.bashrc") -let $ZSHRC=expand("$HOME/.zshrc") " }}} " -- Leader bindings -------------------------------------------- {{{ @@ -12,16 +10,3 @@ let mapleader = "\\" nmap let maplocalleader = "\" " }}} - -" -- Colorscheme Settings --------------------------------------- {{{ -" favorites : tigrana-256-dark, codedark, lilydjwg_dark, up, skittles_autumn, -" ........... vice, lanox, nightsky, made_of_code, moss, skittles_berry, pf_earth -" -" customs : snow -let $COLORSCHEME="default" -" }}} - -" -- Web Browser Settings --------------------------------------- {{{ -" set the webbrowser locally -"let $WEBBROWSER="" -" }}} diff --git a/config/scwrypts.vundle.zsh b/config/scwrypts.vundle.zsh index 1baa000..2e67dae 100644 --- a/config/scwrypts.vundle.zsh +++ b/config/scwrypts.vundle.zsh @@ -2,12 +2,13 @@ # Scwrypts Build Definitions # - VUNDLE_BUILD__ale() {} VUNDLE_BUILD__nerdtree() {} +VUNDLE_BUILD__vim-dim() {} VUNDLE_BUILD__vim-fugitive() {} VUNDLE_BUILD__vim-go() {} VUNDLE_BUILD__vim-surround() {} VUNDLE_BUILD__vim-hexokinase() { make hexokinase; } + VUNDLE_BUILD__youcompleteme() { ./install.py --all; } diff --git a/vim/color.vim b/vim/color.vim index 27a6c77..9f404e1 100644 --- a/vim/color.vim +++ b/vim/color.vim @@ -1,8 +1,12 @@ -silent! colorscheme $COLORSCHEME +set termguicolors +let &t_8f="\[38;2;%lu;%lu;%lum" +let &t_8b="\[48;2;%lu;%lu;%lum" set t_Co=256 +colorscheme dim + highlight Normal guibg=NONE ctermbg=NONE -highlight SpellBad ctermbg=NONE ctermfg=red -highlight LineNr ctermfg=yellow -highlight SignColumn guibg=NONE ctermbg=NONE +highlight SpellBad guibg=NONE guifg=red ctermbg=NONE ctermfg=red +highlight LineNr guibg=NONE guifg=purple ctermbg=NONE ctermfg=yellow +highlight SignColumn guibg=NONE ctermbg=NONE diff --git a/vim/formatting.vim b/vim/formatting.vim index 57def4b..d9745cf 100644 --- a/vim/formatting.vim +++ b/vim/formatting.vim @@ -74,7 +74,7 @@ augroup file_specific_command_overrides autocmd FileType tex nnoremap eb :! scwrypts -n latex/build-pdf -- %:p autocmd FileType tex nnoremap ef :! scwrypts -n latex/cleanup -- %:p - autocmd FileType markdown nnoremap ec :! $WEBBROWSER %:p + autocmd FileType markdown nnoremap ec :!xdg-open %:p autocmd FileType go nnoremap ec :!clearq:?GoRun autocmd FileType go nnoremap ef (go-imports) diff --git a/vim/vundle.vim b/vim/vundle.vim index a379fd2..e8e317d 100644 --- a/vim/vundle.vim +++ b/vim/vundle.vim @@ -7,15 +7,14 @@ call vundle#begin() Plugin 'VundleVim/Vundle.vim' " --- installed plugins ----------------------------------------------- " {{{ - Plugin 'tpope/vim-surround' - Plugin 'tpope/vim-fugitive' - Plugin 'scrooloose/nerdtree' Plugin 'fatih/vim-go' + Plugin 'jeffkreeftmeijer/vim-dim' + Plugin 'rrethy/vim-hexokinase' + Plugin 'scrooloose/nerdtree' + Plugin 'tpope/vim-fugitive' + Plugin 'tpope/vim-surround' + Plugin 'valloric/youcompleteme' Plugin 'w0rp/ale' - - Plugin 'valloric/youcompleteme', {'oninstall': 'python3 install.py --all', 'onupdate': 'python3 install.py --all'} - - Plugin 'rrethy/vim-hexokinase', {'oninstall': 'make hexokinase', 'onupdate': 'make hexokinase'} " }}} " --------------------------------------------------------------------- call vundle#end() @@ -24,9 +23,20 @@ filetype plugin indent on " --- plugin configuration -------------------------------------------- " {{{ +" fatih/vim-go +let g:go_imports_autosave = 0 +let g:go_def_mapping_enabled = 0 +let g:go_fmt_fail_silently = 1 +let g:go_def_reuse_buffer = 1 +let g:go_textobj_enabled = 0 + + +" rrethy/vim-hexokinase +let g:Hexokinase_highlighters = ['foregroundfull'] + " scrooloose/nerdtree nnoremap :NERDTreeToggle % -let g:NERDTreeNodeDelimiter = "\u00a0" " -- Was seeing ^G character, and this should fix that +let g:NERDTreeNodeDelimiter = "\u00a0" " -- fixes ^G character " Valloric/YouCompleteMe @@ -61,13 +71,5 @@ let g:ale_sign_column_always = 1 nmap ae (ale_next) nmap ar (ale_previous) - -" fatih/vim-go -let g:go_imports_autosave = 0 -let g:go_def_mapping_enabled = 0 -let g:go_fmt_fail_silently = 1 -let g:go_def_reuse_buffer = 1 -let g:go_textobj_enabled = 0 - " }}} " ---------------------------------------------------------------------