From f07fd23ce20badbabfc9f8f0c2d3bcbf9a30a18f Mon Sep 17 00:00:00 2001
From: vibikim <vib@vibbe.xyz>
Date: Sun, 22 Nov 2020 14:38:26 +0200
Subject: [PATCH] colorschemes

---
 .Xresources   | 75 ++++++++++++++++++++++++++++++++++++++-------------
 bspwm/bspwmrc | 17 +-----------
 nvim/init.vim |  9 +++++--
 3 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/.Xresources b/.Xresources
index 7ec57e0..ec79899 100644
--- a/.Xresources
+++ b/.Xresources
@@ -38,39 +38,76 @@
 
 
 ! special
-*.foreground:   #e7d5e2
-*.background:   #0a0408
-*.cursorColor:  #e7d5e2
+!*.foreground:   #e7d5e2
+!*.background:   #0a0408
+!*.cursorColor:  #e7d5e2
 
 ! black
-*.color0:       #12080f
-*.color8:       #e2b3ab
+!*.color0:       #12080f
+!*.color8:       #e2b3ab
 
 ! red
-*.color1:       #21121d
-*.color9:       #e6c6dc
+!*.color1:       #21121d
+!*.color9:       #e6c6dc
 
 ! green
-*.color2:       #382132
-*.color10:      #cbc687
+!*.color2:       #382132
+!*.color10:      #cbc687
 
 ! yellow
-*.color3:       #57364f
-*.color11:      #e1b0a8
+!*.color3:       #57364f
+!*.color11:      #e1b0a8
 
 ! blue
-*.color4:       #7f5173
-*.color12:      #b1b6df
+!*.color4:       #7f5173
+!*.color12:      #b1b6df
 
 ! magenta
-*.color5:       #af719f
-*.color13:      #eecae3
+!*.color5:       #af719f
+!*.color13:      #eecae3
 
 ! cyan
-*.color6:       #cea4c2
-*.color14:      #65c4cd
+!*.color6:       #cea4c2
+!*.color14:      #65c4cd
 
 ! white
-*.color7:       #eddfe8
-*.color15:      #f0c1b9
+!*.color7:       #eddfe8
+!*.color15:      #f0c1b9
 
+
+! special
+*.foreground:   #c6c8d1
+*.background:   #161821
+*.cursorColor:  #c6c8d1
+
+! black
+*.color0:       #161821
+*.color8:       #6b7089
+
+! 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
diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 3aa6cb1..06a6f45 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -81,22 +81,6 @@ do
 done
 
 
-
-#bspc config normal_border_color
-#bspc config active_border_color
-#bspc config focused_border_color
-
-#bspc config presel_feedback_color
-
-#bspc config normal_sticky_border_color
-#bspc config active_sticky_border_color
-#bspc config focused_sticky_border_color
-
-#bspc config normal_private_border_color     ""
-#bspc config active_private_border_color     ""
-#bspc config focused_private_border_color    ""
-
-
 ###
 # RULES
 ###
@@ -107,6 +91,7 @@ bspc rule -a copyq		state=floating
 bspc rule -a Blueman-manager	state=floating
 bspc rule -a Arandr		state=floating
 bspc rule -a Galculator		state=floating
+bspc rule -a Nitrogen		state=floating
 bspc rule -a Screenkey		manage=off
 bspc rule -a Navigator		desktop='^1'
 bspc rule -a discord		desktop='^4'
diff --git a/nvim/init.vim b/nvim/init.vim
index c7c425b..9731732 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -10,6 +10,7 @@ set encoding=utf-8
 set number
 set termguicolors
 set splitbelow splitright
+set scrolloff=5
 
 set cursorline
 
@@ -35,16 +36,20 @@ call plug#begin('~/.local/share/nvim/plugged')
 " REMINDER - some plugins have the following external dependencies
 " hexokinase(color preview): go
 " coc(code completion): nodejs, yarn
+" vimdiscord: nvim installed from pip (python extension thingy)
+Plug 'vbe0201/vimdiscord'
 Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
 Plug 'vimwiki/vimwiki'
-Plug 'franbach/miramare'
+"Plug 'franbach/miramare'
+Plug 'cocopon/iceberg.vim'
+Plug 'patstockwell/vim-monokai-tasty'
 Plug 'antoinemadec/FixCursorHold.nvim'
 Plug 'lambdalisue/fern.vim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
 call plug#end()
 
-colorscheme miramare
+colorscheme iceberg
 
 " hexokinase
 let g:Hexokinase_refreshEvents = ['InsertLeave']