Added custom fish prompt and changed font

* replaced the Droid family with Dejavu as it offers better readability and e.g. 0 and O are displayed differently

7 files changed, 31 insertions, 8 deletions

diff --git a/dmenu/.dmenurc b/dmenu/.dmenurc
index 555349e..d8a4900 100644
--- a/dmenu/.dmenurc
+++ b/dmenu/.dmenurc
@@ -1 +1 @@
-DMENU="-fn 'Droid Sans Mono-11' -nb '#222222' -nf '#605c5a' -sb '#111111' -sf '#aadb0f'"
+DMENU="-fn 'Dejavu Sans Mono-11' -nb '#222222' -nf '#605c5a' -sb '#111111' -sf '#aadb0f'"
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..b21d479
--- /dev/null
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -0,0 +1,23 @@
+function fish_prompt
+	if not set -q __fish_prompt_normal
+		set -g __fish_prompt_normal (set_color normal)
+	end
+
+	switch $USER
+		case root
+			if not set -q __fish_prompt_cwd
+				if set -q fish_color_cwd_root
+					set -g __fish_prompt_cwd (set_color $fish_color_cwd_root)
+				else
+					set -g __fish_prompt_cwd (set_color $fish_color_cwd)
+				end
+			end
+
+		case '*'
+			if not set -q __fish_prompt_cwd
+				set -g __fish_prompt_cwd (set_color $fish_color_cwd)
+			end
+	end
+
+	echo -n -s 'λ ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" ' ▸ '
+end
diff --git a/i3wm/.i3/config b/i3wm/.i3/config
index 7992b7f..722996d 100644
--- a/i3wm/.i3/config
+++ b/i3wm/.i3/config
@@ -77,7 +77,7 @@ bar {
 	status_command ~/.conky.sh
 	workspace_buttons yes
 	tray_output LVDS1
-	font pango:Droid Sans Mono 13px
+	font pango:Dejavu Sans Mono 13px
 
 	colors {
 		background #161616
@@ -90,7 +90,7 @@ bar {
 	}
 }
 
-font pango:Droid Sans Mono 13px
+font pango:Dejavu Sans Mono 13px
 hide_edge_borders both
 
 client.focused          #909737 #909737 #222222
@@ -99,7 +99,7 @@ client.unfocused        #222222 #222222 #999999
 client.urgent           #a5a5a5 #a5a5a5 #2e3436
 client.background       #161616
 
-bindsym Control+Return exec urxvtc -fn "xft:Droid\ Sans\ Mono:size=10" -title "Chicken Scheme REPL" -e csi -q
+bindsym Control+Return exec urxvtc -fn "xft:Dejavu\ Sans\ Mono:size=10" -title "Chicken Scheme REPL" -e csi -q
 bindsym $mod+Return    exec urxvtc
 bindsym $alt+Return    exec gvim
 
diff --git a/pentadactyl/.pentadactylrc b/pentadactyl/.pentadactylrc
index 9a06002..dda4cf8 100644
--- a/pentadactyl/.pentadactylrc
+++ b/pentadactyl/.pentadactylrc
@@ -12,7 +12,7 @@ hi clear
 hi s_greenfont     color:#aadb0f;
 hi s_palegreenfont color:#909737;
 hi s_grayback      background:#161616;
-hi s_normal        font-size:14px; font-family:Droid Sans Mono;
+hi s_normal        font-size:14px; font-family:Dejavu Sans Mono;
 
 hi -link=s_normal,s_grayback,s_palegreenfont Normal                                   border-top:1px solid #909737;
 hi -link=s_normal,s_grayback,s_palegreenfont StatusLine
diff --git a/pwmt/.config/zathura/zathurarc b/pwmt/.config/zathura/zathurarc
index 099a35e..6c57f83 100644
--- a/pwmt/.config/zathura/zathurarc
+++ b/pwmt/.config/zathura/zathurarc
@@ -1,4 +1,4 @@
-set  font                     "Droid Sans Mono 10.5"
+set  font                     "Dejavu Sans Mono 10.5"
 
 set  inputbar-bg              "#161616"
 set  inputbar-fg              "#909737"
diff --git a/vim/.gvimrc b/vim/.gvimrc
index 1278d59..580f404 100644
--- a/vim/.gvimrc
+++ b/vim/.gvimrc
@@ -5,4 +5,4 @@ set guioptions-=m
 set guioptions-=T
 set guioptions-=e
 
-set guifont=Droid\ Sans\ Mono\ 8
+set guifont=Dejavu\ Sans\ Mono\ 8
diff --git a/xorg/.Xresources b/xorg/.Xresources
index f896e3f..b6cbac2 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1,6 +1,6 @@
 URxvt.saveLines:             10000
 URxvt.scrollBar:             false
-URxvt.font:                  xft:Droid Sans Mono:size=8
+URxvt.font:                  xft:Dejavu Sans Mono:size=8
 URxvt.transparent:           false
 URxvt.inheritPixmap:         false
 URxvt.fading:                20