From b74638bdca3bffa7de0c5cec189460e8687bcc31 Mon Sep 17 00:00:00 2001
From: jfm <jfm@moerks.dk>
Date: Thu, 7 Jun 2018 12:59:25 +0200
Subject: [PATCH] Fixed powerline fonts - YAY Added various theming

---
 i3/.i3/config                                 |  2 +-
 .../colorschemes/shell/solarized.json         | 28 +++++++++----------
 .../powerline/themes/shell/solarized.json     |  4 ---
 urxvt/.Xresources                             |  4 +--
 vim/.vimrc                                    |  5 ++++
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/i3/.i3/config b/i3/.i3/config
index eba8665..e902df5 100644
--- a/i3/.i3/config
+++ b/i3/.i3/config
@@ -283,7 +283,7 @@ exec --no-startup-id nitrogen --restore; sleep 1; compton -b
 exec --no-startup-id nm-applet
 exec --no-startup-id xfce4-power-manager
 exec --no-startup-id pamac-tray
-exec --no-startup-id clipit
+# exec --no-startup-id clipit
 exec --no-startup-id blueman-applet
 # exec_always --no-startup-id sbxkb
 # exec --no-startup-id start_conky_maia
diff --git a/powerline/.config/powerline/colorschemes/shell/solarized.json b/powerline/.config/powerline/colorschemes/shell/solarized.json
index 16cdaf3..65ff489 100644
--- a/powerline/.config/powerline/colorschemes/shell/solarized.json
+++ b/powerline/.config/powerline/colorschemes/shell/solarized.json
@@ -2,20 +2,20 @@
 	"name": "Solarized dark for shell",
 	"groups": {
 		"mode": { "fg": "solarized:base3", "bg": "solarized:green", "attrs": ["bold"] },
-		"gitstatus":                 { "fg": "gray8",           "bg": "gray2", "attrs": [] },
-		"gitstatus_branch":          { "fg": "gray8",           "bg": "gray2", "attrs": [] },
-		"gitstatus_branch_clean":    { "fg": "green",           "bg": "gray2", "attrs": [] },
-		"gitstatus_branch_dirty":    { "fg": "gray8",           "bg": "gray2", "attrs": [] },
-		"gitstatus_branch_detached": { "fg": "mediumpurple",    "bg": "gray2", "attrs": [] },
-		"gitstatus_tag":             { "fg": "darkcyan",        "bg": "gray2", "attrs": [] },
-		"gitstatus_behind":          { "fg": "gray10",          "bg": "gray2", "attrs": [] },
-		"gitstatus_ahead":           { "fg": "gray10",          "bg": "gray2", "attrs": [] },
-		"gitstatus_staged":          { "fg": "green",           "bg": "gray2", "attrs": [] },
-		"gitstatus_unmerged":        { "fg": "brightred",       "bg": "gray2", "attrs": [] },
-		"gitstatus_changed":         { "fg": "mediumorange",    "bg": "gray2", "attrs": [] },
-		"gitstatus_untracked":       { "fg": "brightestorange", "bg": "gray2", "attrs": [] },
-		"gitstatus_stashed":         { "fg": "darkblue",        "bg": "gray2", "attrs": [] },
-		"gitstatus:divider":         { "fg": "gray8",           "bg": "gray2", "attrs": [] }
+		"gitstatus":                 { "fg": "gray8",           "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch":          { "fg": "gray8",           "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch_clean":    { "fg": "green",           "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch_dirty":    { "fg": "gray8",           "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch_detached": { "fg": "mediumpurple",    "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_tag":             { "fg": "darkcyan",        "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_behind":          { "fg": "gray10",          "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_ahead":           { "fg": "gray10",          "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_staged":          { "fg": "green",           "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_unmerged":        { "fg": "brightred",       "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_changed":         { "fg": "mediumorange",    "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_untracked":       { "fg": "brightestorange", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_stashed":         { "fg": "darkblue",        "bg": "solarized:base02", "attrs": [] },
+		"gitstatus:divider":         { "fg": "gray8",           "bg": "solarized:base02", "attrs": [] }
 
 	},
 	"mode_translations": {
diff --git a/powerline/.config/powerline/themes/shell/solarized.json b/powerline/.config/powerline/themes/shell/solarized.json
index 9eff740..b5d0048 100644
--- a/powerline/.config/powerline/themes/shell/solarized.json
+++ b/powerline/.config/powerline/themes/shell/solarized.json
@@ -9,10 +9,6 @@
 				"function": "powerline.segments.shell.cwd",
 				"priority": 10
 			},
-			{
-				"function": "powerline.segments.common.vcs.branch",
-				"priority": 40
-			},
 			{
 				"function": "powerline_gitstatus.gitstatus",
 				"priority": 10
diff --git a/urxvt/.Xresources b/urxvt/.Xresources
index 9a2d97d..9dbdacd 100644
--- a/urxvt/.Xresources
+++ b/urxvt/.Xresources
@@ -65,8 +65,8 @@ XTerm*foreground:                 #fdf6e3
 XTerm*reverseVideo:               on
 XTerm*faceName:                   Terminus:size=11:antialias=true
 XTerm*selectToClipboard:          true
-
-URxvt.font:                       9x15,xft:TerminessTTFNerdFontMono
+URxvt*font:                       xft:DejaVu Sans Mono for Powerline:size=11
+! URxvt.font:                       9x15,xft:TerminessTTFNerdFontMono
 
 ! alternative font settings with 'terminus':
 !URxvt.font:      -xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso10646-1
diff --git a/vim/.vimrc b/vim/.vimrc
index 9376b48..c051825 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -4,10 +4,14 @@ set clipboard=unnamed
 set smartindent
 set shiftwidth=2
 set tabstop=2
+set expandtab
 set number
 set autoread
 
 let g:powerline_pycmd="py3"
+let NERDTreeShowHidden=1
+let g:NERDTreeDirArrowExpandable = '▸'
+let g:NERDTreeDirArrowCollapsible = '▾'
 
 filetype indent on
 
@@ -15,5 +19,6 @@ filetype indent on
 :imap <c-s> <Esc>:w<CR>a
 nnoremap <F7> :tabp<CR>
 nnoremap <F8> :tabn<CR>
+map <C-n> :NERDTreeToggle<CR>
 
 au BufWinEnter * set number