Update stuff for st

config/i3/configWork

@@ -43,7 +43,8 @@ floating_modifier $mod
 # start a terminal
 # bindsym $mod+Return exec xfce4-terminal
 # bindsym $mod+Return exec konsole
-bindsym $mod+Return exec termite
+# bindsym $mod+Return exec termite
+bindsym $mod+Return exec /usr/local/bin/st
 
 # kill focused window
 bindsym $mod+q kill

config/oh-my-zsh/aliases.zsh

@@ -33,7 +33,7 @@ alias mkdir='mkdir -p'
 alias perms='wp rewrite flush'
 
 #Clear terminal and screenfetch
-alias cls='clear; screenfetch'
+alias cls='clear; neofetch'
 
 #An alias for my standard less configuration
 #I don't set it to lessc because sometimes I don't use this config and I always forget how to ignore an alias

config/oh-my-zsh/functions.zsh

@@ -47,7 +47,12 @@ function createLetter(){
 function ptheme() {
 	public_html=${PWD%/public_html*}/public_html
 	if [ -d $public_html ]; then
-		theme=$(dirname $(wp --path="$public_html" theme path $(wp --path="$public_html" theme list | grep "parent" | awk '{print $1}')))
+		if [ -d $public_html/wp ]; then
+			wpPath=$public_html/wp;
+		else
+			wpPath=$public_html;
+		fi
+		theme=$(dirname $(wp --path="$wpPath" theme path $(wp --path="$wpPath" theme list | grep "parent" | awk '{print $1}')))
 		if [ -d $theme ]; then
 			if [ -d "$theme" ]; then
 				cd $theme
@@ -66,7 +71,12 @@ function ptheme() {
 function theme() {
 	public_html=${PWD%/public_html*}/public_html
 	if [ -d $public_html ]; then
-		theme=$(dirname $(wp --path="$public_html" theme path $(wp --path="$public_html" theme list | grep "active" | grep -v "inactive" | awk '{print $1}')))
+		if [ -d $public_html/wp ]; then
+			wpPath=$public_html/wp;
+		else
+			wpPath=$public_html;
+		fi
+		theme=$(dirname $(wp --path="$wpPath" theme path $(wp --path="$wpPath" theme list | grep "active" | grep -v "inactive" | awk '{print $1}')))
 		if [ -d $theme ]; then
 			cd $theme
 		else
@@ -81,7 +91,12 @@ function theme() {
 function js() {
 	public_html=${PWD%/public_html*}/public_html
 	if [ -d $public_html ]; then
-		theme=$(dirname $(wp --path="$public_html" theme path $(wp --path="$public_html" theme list | grep "active" | grep -v "inactive" | awk '{print $1}')))
+		if [ -d $public_html/wp ]; then
+			wpPath=$public_html/wp;
+		else
+			wpPath=$public_html;
+		fi
+		theme=$(dirname $(wp --path="$wpPath" theme path $(wp --path="$wpPath" theme list | grep "active" | grep -v "inactive" | awk '{print $1}')))
 		if [ -d $theme ]; then
 			if [ -d "$theme/js" ]; then
 				cd "$theme/js"
@@ -101,7 +116,12 @@ function js() {
 function css() {
 	public_html=${PWD%/public_html*}/public_html
 	if [ -d $public_html ]; then
-		theme=$(dirname $(wp --path="$public_html" theme path $(wp --path="$public_html" theme list | grep "active" | grep -v "inactive" | awk '{print $1}')))
+		if [ -d $public_html/wp ]; then
+			wpPath=$public_html/wp;
+		else
+			wpPath=$public_html;
+		fi
+		theme=$(dirname $(wp --path="$wpPath" theme path $(wp --path="$wpPath" theme list | grep "active" | grep -v "inactive" | awk '{print $1}')))
 		if [ -d $theme ]; then
 			if [ -d "$theme/css" ]; then
 				cd "$theme/css"
@@ -121,7 +141,12 @@ function css() {
 function plugins() {
 	public_html=${PWD%/public_html*}/public_html
 	if [ -d $public_html ]; then
-		cd $(wp --path="$public_html" plugin path)
+		if [ -d $public_html/wp ]; then
+			wpPath=$public_html/wp;
+		else
+			wpPath=$public_html;
+		fi
+		cd $(wp --path="$wpPath" plugin path)
 	else
 		echo " Can't find public_html folder."
 	fi
@@ -131,7 +156,12 @@ function plugins() {
 function themes() {
 	public_html=${PWD%/public_html*}/public_html
 	if [ -d $public_html ]; then
-		cd $(wp --path="$public_html" theme path)
+		if [ -d $public_html/wp ]; then
+			wpPath=$public_html/wp;
+		else
+			wpPath=$public_html;
+		fi
+		cd $(wp --path="$wpPath" theme path)
 	else
 		echo " Can't find public_html folder."
 	fi

config/oh-my-zsh/promptconfig.zsh

@@ -10,6 +10,7 @@ function my_dir(){
 	magentoSiteIcon=" "
 	dropboxIcon=""
 	seperator="  "
+	seperatorDual="  "
 	root="$seperator"
 	# Gets the path.
 	local current_path="$(print -P "%~")"
@@ -35,7 +36,7 @@ function my_dir(){
 			current_path=$(echo $current_path | sed -r -e "s/wp\-content\//wpc\//")
 			
 			if [[ $(tput cols) -lt 100 ]]; then
-				current_path=$(echo $current_path | sed -r -e "s/wpc\/themes\///")
+				current_path=$(echo $current_path | sed -r -e "s/wpc\/themes\//\//")
 			fi
 
 		elif [[ -e "$ph/bin/magento" ]]; then #If magento
@@ -53,6 +54,9 @@ function my_dir(){
 	# Set the root
 	current_path=$(echo $current_path | sed -r -e "s/^\//$root/g")
 	
+	# Set the dual seperator
+	current_path=$(echo $current_path | sed -r -e "s/\/\//$seperatorDual/g")
+
 	# Set the seperator
 	current_path=$(echo $current_path | sed -r -e "s/\//$seperator/g")
 

config/vim

@@ -1 +1 @@
-Subproject commit 3856ba8c89731e3a59ef5fccd8f91909cf7157c2
+Subproject commit 3a15cd29a13ef48013ba78904cad5286eb66ed26

zprofile

@@ -1,5 +1,5 @@
 export LANG="en_GB.UTF-8"
-export TERMINAL=/usr/bin/termite
+export TERMINAL=/usr/local/bin/st
 export TERM=xterm-256color
 export PATH=~/.bin:$PATH:/opt/lampp/bin:.
 export EDITOR='vim'