modified lots of shit, mostly colors in init.vim

2 files changed, 26 insertions, 15 deletions

diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs
index d403231..b4a6951 100644
--- a/.config/XMonad/xmonad.hs
+++ b/.config/XMonad/xmonad.hs
@@ -341,11 +341,11 @@ myKeys = [
 myMouseBindings = [((altMask, 2), \w -> kill1)
          , ((altMask, 1), \w -> spawn "pcmanfm")
          , ((altMask, 3), \w -> spawn "konqueror")
-         , ((altMask, 4), \w -> prevWS)
-         , ((altMask, 5), \w -> nextWS)
-         , ((myModMask, 2), \w -> spawn myVolMute)
-         , ((myModMask, 4), \w -> spawn myVolDown)
-         , ((myModMask, 5), \w -> spawn myVolUp)
+         , ((altMask, 2), \w -> spawn myVolMute)
+         , ((altMask, 4), \w -> spawn myVolDown)
+         , ((altMask, 5), \w -> spawn myVolUp)
+         , ((myModMask, 4), \w -> prevWS)
+         , ((myModMask, 5), \w -> nextWS)
          ]
 
 -- tabs config
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 1beb3fa..ceb8412 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,11 +1,13 @@
-call plug#begin('~/local/share/nvim/plugged')
-
-" Plug 'vim-airline/vim-airline'
+call plug#begin('~/local/share/nvim/plugged') 
 Plug 'itchyny/lightline.vim'
 Plug 'alvan/vim-closetag'
 Plug 'Yggdroot/indentLine'
-Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'romgrk/doom-one.vim'
+
+" hexokinase temporarily disabled because of issues with truecolor
+" Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
+" Plug 'vim-airline/vim-airline'
 " Plug 'dracula/vim', { 'as': 'dracula' }
 " Plug 'sts10/vim-pink-moon'
 
@@ -39,17 +41,26 @@ let g:coc_global_extentions = [
   \ 'coc-html',
   \ ]
 
-" enabling the theme
-" colorscheme dracula
-
 " line numbers
-:set number
-:set nu
+set number
+set nu
+
+" colorscheme config
+colorscheme doom-one
+set termguicolors
+syntax enable
 
 " remove vim status because lightline replaces it
 set noshowmode
 
 " lightline config
+" colorscheme wombat for lightline
 let g:lightline = {
-      \ 'colorscheme': 'wombat',
+      \ 'colorscheme': 'darcula'
       \ }
+
+" hexokinase config
+let g:Hexokinase_highlighters = ['virtual']
+
+" colors and theming (copied from DT's config)
+highlight LineNr           ctermfg=1    ctermbg=none    cterm=none