new colors, minimal vim

4 files changed, 51 insertions, 76 deletions

diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 03e2e53..ae8ea3b 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -9,7 +9,7 @@ compton --config ~/.config/compton.conf &
 ~/scrypts/bat_check.sh &
 redshift -l 13.082680:80.270718 &
 xbacklight -set 30 & 
-feh --bg-fill ~/Pictures/wavesss.jpg &
+feh --bg-fill ~/Pictures/land.jpg &
 urxvtd &
 
 bspc monitor -d term web music files code virt chat game IX X
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 59ce2b3..ce38e7c 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -15,8 +15,6 @@ Plug 'junegunn/goyo.vim'
 Plug 'airblade/vim-gitgutter'
 Plug 'godlygeek/tabular'
 Plug 'plasticboy/vim-markdown'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
 call plug#end()
 
 set guicursor=
@@ -88,60 +86,21 @@ let g:keysound_volume = 1000
 let g:keysound_py_version = 3
 let g:keysound_theme = 'default'
 
-" symbols
-let g:Powerline_symbols = "fancy"
-let g:Powerline_dividers_override = ["\Ue0b0","\Ue0b1","\Ue0b2","\Ue0b3"]
-let g:Powerline_symbols_override = {'BRANCH': "\Ue0a0", 'LINE': "\Ue0a1", 'RO': "\Ue0a2"}
-let g:airline_powerline_fonts = 1
-let g:airline_right_alt_sep = ''
-let g:airline_right_sep = ''
-let g:airline_left_alt_sep= ''
-let g:airline_left_sep = ''
-
-" air-line
-let g:airline_powerline_fonts = 1
-
-if !exists('g:airline_symbols')
-    let g:airline_symbols = {}
-endif
-
-" unicode symbols
-let g:airline_left_sep = '»'
-let g:airline_left_sep = '▶'
-let g:airline_right_sep = '«'
-let g:airline_right_sep = '◀'
-let g:airline_symbols.linenr = '␊'
-let g:airline_symbols.linenr = '␤'
-let g:airline_symbols.linenr = '¶'
-let g:airline_symbols.branch = '⎇'
-let g:airline_symbols.paste = 'ρ'
-let g:airline_symbols.paste = 'Þ'
-let g:airline_symbols.paste = '∥'
-let g:airline_symbols.whitespace = 'Ξ'
-
-" airline symbols
-let g:airline_left_sep = ''
-let g:airline_left_alt_sep = ''
-let g:airline_right_sep = ''
-let g:airline_right_alt_sep = ''
-let g:airline_symbols.branch = ''
-let g:airline_symbols.readonly = ''
-let g:airline_symbols.linenr = ''
-
-"Airline Themes
-"let g:airline_theme='dark'
-"let g:airline_theme='badcat'
-let g:airline_theme='base16_grayscale'
-"let g:airline_theme='ravenpower'
-"let g:airline_theme='simple'
-"let g:airline_theme='term'
-"let g:airline_theme='ubaryd'
-"let g:airline_theme='laederon'
-"let g:airline_theme='kolor'
-"let g:airline_theme='deus'
-"let g:airline_theme='powerlineish'
-
 " nerdtree
 let g:NERDTreeWinPos = "right"
 map <C-n> :NERDTreeToggle<CR>
 nnoremap <c-p> :FZF<CR>
+
+"statusbar
+hi Comment cterm=italic
+hi CursorLine ctermbg=none
+set statusline=
+set statusline +=%1*\ %n\ %*            "buffer number
+set statusline +=%5*%{&ff}%*            "file format
+set statusline +=%3*%y%*                "file type
+set statusline +=%4*\ %<%F%*            "full path
+set statusline +=%2*%m%*                "modified flag
+set statusline +=%1*%=%5l%*             "current line
+set statusline +=%2*/%L%*               "total lines
+set statusline +=%1*%4v\ %*             "virtual column number
+set statusline +=%2*0x%04B\ %*          "character under cursor
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 6d55957..8f9701d 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -3,7 +3,7 @@ screenchange-reload = true
 
 [colors]
 #background = ${xrdb:color0:#222}
-background = ${xrdb:background:#0d0f14}
+background = ${xrdb:background:#060808}
 background-alt = ${xrdb:color0:#000}
 ;foreground = ${xrdb:color7:#222}
 foreground = ${xrdb:foreground:#c5c8c6}
@@ -65,7 +65,7 @@ ws-icon-7 = game;戮
 ws-icon-default = 
 
 label-focused = %name%
-label-focused-foreground = ${xrdb:color14:#ffd7b1}
+label-focused-foreground = ${xrdb:color6:#ffd7b1}
 label-focused-padding = 1
 ;label-focused-font = 10
 
diff --git a/x/.Xresources b/x/.Xresources
index 08a6c64..71e4fb8 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -35,26 +35,42 @@ URxvt*tintColor: #ffffff
 URxvt*shading: 0
 URxvt*inheritPixmap: False
 
-*background:    #0b0d12
-*foreground:    #b3b8c4
+! special
+*.foreground:   #c6c8d1
+*.background:   #0c0c0f
+*.cursorColor:  #c6c8d1
 
-*color0:        #3e4853
-*color1:        #b06a58
-*color2:        #95b47b
-*color3:        #e5c078
-*color4:        #58698c
-*color5:        #7b5e8d
-*color6:        #82a1b2
-*color7:        #cccaca
+! black
+*.color0:       #161821
+*.color8:       #6b7089
 
-*color8:        #525c67
-*color9:        #ba7e6c
-*color10:       #a9c88f
-*color11:       #f9d48c
-*color12:       #6c7da0
-*color13:       #8f72a1
-*color14:       #96b5c6
-*color15:       #e0dede
+! red
+*.color1:       #e27878
+*.color9:       #e98989
+
+! green
+*.color2:       #b4be82
+*.color10:      #c0ca8e
+
+! yellow
+*.color3:       #e2a478
+*.color11:      #e9b189
+
+! blue
+*.color4:       #84a0c6
+*.color12:      #91acd1
+
+! magenta
+*.color5:       #a093c7
+*.color13:      #ada0d3
+
+! cyan
+*.color6:       #89b8c2
+*.color14:      #95c4ce
+
+! white
+*.color7:       #c6c8d1
+*.color15:      #d2d4de
 
 ! Perls
 URxvt.perl-ext-common : default,matcher,keyboard-select,url-select,resize-font