From a6fd6634b1b067237122d5ba98e402397fcc8f72 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Tue, 6 Mar 2018 04:46:23 -0500
Subject: [PATCH] Setup urxvt, pywal, Zsh and Neovim on laptop

---
 aliases/.pc_aliases       |  5 +++--
 aliases/zsh_aliases       |  4 ++--
 configs/X1-Carbon/i3.conf | 18 +++++++++++-------
 dotfiles/zshrc            | 16 ++++++++++++++++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/aliases/.pc_aliases b/aliases/.pc_aliases
index fe2a548..6fa85fa 100644
--- a/aliases/.pc_aliases
+++ b/aliases/.pc_aliases
@@ -18,6 +18,9 @@ if [ "$(whoami)" == "kevin" ]; then
 
 	alias pipes="pipes.sh -t 2"
 	alias bgs="nemo ~/Pictures/Backgrounds"
+
+	gvx() { urxvt --help 2>&1 | grep $1 ; } 
+	alias rur="xrdb ~/.Xresources"
 	#  }}} i3 # 
 	
 	#  coding projs {{{ # 
@@ -74,8 +77,6 @@ if [ "$(hostname)" == "NZXT" ]; then
 	alias spt="speedtest"
 	alias pg="ping -c 5 google.ca"
 	alias w7="VBoxManage startvm W7 --type headless"
-	gvx() { urxvt --help 2>&1 | grep $1 ; } 
-	alias rur="xrdb ~/.Xresources"
 	#  }}} apps  # 
 
 	#  various coding projs {{{ # 
diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases
index d13e0e2..b4f7474 100644
--- a/aliases/zsh_aliases
+++ b/aliases/zsh_aliases
@@ -37,6 +37,8 @@ alias cfg="f ~/.config"
 alias cs='printf "\033c"'
 alias hst="history"
 alias nf="neofetch"
+alias rur="xrdb ~/.Xresources"
+function gvx() { urxvt --help 2>&1 | grep $1 ; } 
 
 function cld() { colordiff -y --suppress-common-lines $1 $2 ; } 
 alias grep='grep --color=auto'
@@ -146,8 +148,6 @@ if [ "$(hostname)" = "NZXT" ]; then
 	alias spt="speedtest"
 	alias pg="ping -c 5 google.ca"
 	alias w7="VBoxManage startvm W7 --type headless"
-function 	gvx() { urxvt --help 2>&1 | grep $1 ; } 
-	alias rur="xrdb ~/.Xresources"
 	#  }}} apps  # 
 
 	#  various coding projs {{{ # 
diff --git a/configs/X1-Carbon/i3.conf b/configs/X1-Carbon/i3.conf
index 594761a..e4eaf46 100644
--- a/configs/X1-Carbon/i3.conf
+++ b/configs/X1-Carbon/i3.conf
@@ -1,17 +1,19 @@
 # applications {{{ # 
 #  startup {{{ # 
 exec redshift -O 4000 
-exec_always feh --bg-scale ~/Pictures/space-wallpaper.jpg
+# exec_always feh --bg-scale ~/Pictures/space-wallpaper.jpg
+exec_always /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/"
 exec imwheel
 # enable horizontal scrolling
 exec --no-startup-id synclient HorizTwoFingerScroll=1
 # disable touchscreen
 exec xinput disable 12
-exec terminator
+exec $def_term
 #  }}} startup # 
 
+set $def_term "rxvt-unicode"
 bindsym Mod4+e exec cd /usr/local/android-studio/bin/ && ./studio.sh
-bindsym $mod+control+Return exec terminator
+bindsym $mod+control+Return exec $def_term
 bindsym Mod4+c exec google-chrome-stable --force-device-scale-factor=1.5
 bindsym Mod4+p exec ksnapshot
 bindsym Mod4+t exec thunar
@@ -70,6 +72,8 @@ bindsym control+Shift+x kill
 #  }}} changing/focusing/moving windows # 
 
 #  container display {{{ # 
+bindsym $mod+g exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/"
+
 # enter fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
 
@@ -94,10 +98,10 @@ bindsym $mod+a focus parent
 #  workspace {{{ # 
 #  ws names {{{ # 
 set $ws1 "1 "
-bindsym $mod+F1 workspace $ws1; exec terminator
+bindsym $mod+F1 workspace $ws1; exec $def_term
 
 set $ws2 "2 "
-bindsym $mod+F2 workspace $ws2; exec terminator
+bindsym $mod+F2 workspace $ws2; exec $def_term
 
 set $ws3 "3 🌐"
 bindsym $mod+F3 workspace $ws3; exec google-chrome
@@ -110,10 +114,10 @@ bindsym Mod4+d workspace $ws6; exec discord
 set $ws7 "7 ↥"
 set $ws8 "8 📱"
 set $ws9 "9 ✎"
-bindsym $mod+F9 workspace $ws9; exec terminator
+bindsym $mod+F9 workspace $ws9; exec $def_term
 
 set $ws10 "10 "
-bindsym $mod+F10 workspace $ws10; exec terminator
+bindsym $mod+F10 workspace $ws10; exec $def_term
 #  }}} ws names # 
 
 #  ws bindings {{{ # 
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index eaee744..d602819 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -93,3 +93,19 @@ source ~/linux-config/aliases/zsh_aliases
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Both PC/Laptop {{{
+if [ "$(whoami)" = "kevin" ]; then
+	xset r rate 200 90
+	export PATH="${PATH}:${HOME}/.local/bin/"
+	(cat ~/.cache/wal/sequences &)
+fi
+# NZXT
+if [ "$(hostname)" = "NZXT" ];
+then
+	xmodmap -e "clear Lock"
+	xmodmap -e "keycode 22 = Caps_Lock"
+	xmodmap -e "keycode 66 = BackSpace"
+else
+	xrandr --dpi 150
+fi