feat(theme): updated the theme, prompt, and bashrc for improved colors

automotiveMastermind · Aug 19, 2016 · b875434 · b875434
1 parent 68987fa
commit b875434
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 44 deletions.
diff --git a/src/bashrc b/src/bashrc
@@ -19,16 +19,19 @@ export CLR_BRIGHT_MAGENTA='\033[1;35m'  # BRIGHT MAGENTA (PURPLE)
 export CLR_BRIGHT_CYAN='\033[1;36m'     # BRIGHT CYAN
 export CLR_BRIGHT_WHITE='\033[1;37m'    # BRIGHT WHITE
 
-export CLR_ROOT_PROMPT=$CLR_RED         # COLOR OF THE PROMPT FOR ROOT
-export CLR_STAFF_PROMPT=$CLR_BRIGHT_RED # COLOR OF THE PROMPT FOR STAFF
-export CLR_USER_PROMPT=$CLR_BRIGHT_BLUE # COLOR OF THE PROMPT FOR USERS
+export CLR_ROOT_PROMPT=$CLR_BRIGHT_RED    # COLOR OF THE PROMPT FOR ROOT
+export CLR_STAFF_PROMPT=$CLR_BRIGHT_GREEN # COLOR OF THE PROMPT FOR STAFF
+export CLR_USER_PROMPT=$CLR_BRIGHT_BLUE   # COLOR OF THE PROMPT FOR USERS
 
 # enable colors for various commands
 export TERM=xterm-256color
 export GREP_OPTIONS='--color=auto'
 export GREP_COLOR='1;32'
 export CLICOLOR=1
 
+# change ls colors to be more like original unix/linux
+export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
+
 # other system settings
 export EDITOR='nano'
 export HISTCONTROL=ignoredubs

diff --git a/src/scripts/set-prompt.sh b/src/scripts/set-prompt.sh
@@ -2,24 +2,24 @@
 source ~/.ssh/scripts/git-prompt.sh
 
 function set-prompt() {
-	# set the window title
-	echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}\007"
+    # set the window title
+    echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}\007"
 
-	# set the default color
-	local CLR_PROMPT=$CLR_USER_PROMPT
+    # set the default color
+    local CLR_PROMPT=$CLR_USER_PROMPT
 
-	# set color for root user
-	if [ `whoami` == 'root' ]; then
-		CLR_PROMPT=$CLR_ROOT_PROMPT
-	fi
-	
-	# set color for staff user (administrator)
-	if [ ! -z '`command id -Gn | grep -s -o admin`' ]; then
-	   CLR_PROMPT=$CLR_STAFF_PROMPT
-	fi
+    # set color for staff user (administrator)
+    if [ ! -z '`command id -Gn | grep -s -o admin`' ]; then
+        CLR_PROMPT=$CLR_STAFF_PROMPT
+    fi
+
+    # set color for root user
+    if [ $(id -u) -eq 0 ]; then
+        CLR_PROMPT=$CLR_ROOT_PROMPT
+    fi
 
-	# specify the two-line prompt with color-coded arrow
-	export PS1="\n\u@\h : \w\n  $(__git_ps1 '(%s)')\[${CLR_PROMPT}\] ==> \[${CLR_CLEAR}\]"
+    # specify the two-line prompt with color-coded arrow
+    export PS1="\n\u@\h : \w\n  $(__git_ps1 '(%s)')\[${CLR_PROMPT}\] ==> \[${CLR_CLEAR}\]"
 }
 
 GIT_PS1_SHOWDIRTYSTATE=true
@@ -28,4 +28,4 @@ GIT_PS1_SHOWUNTRACKEDFILES=true
 GIT_PS1_SHOWUPSTREAM="verbose"
 
 # export the prompt command
-export PROMPT_COMMAND=set-prompt
+export PROMPT_COMMAND=set-prompt
diff --git a/src/themes/terminal/Monokai.terminal b/src/themes/terminal/Monokai.terminal
@@ -13,10 +13,11 @@
 	<key>ANSIBlueColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEw
-	IDAgMC42MzUyOTQxMTc2ABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s
-	b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB
-	SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBsw
+	LjQ2MjE1MjY3NCAwLjU2ODYxNjg3MTggMQAQAYAC0hAREhNaJGNsYXNzbmFtZVgkY2xh
+	c3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0RcYVHJvb3SA
+	AQgRGiMtMjc7QUhOW2KAgoSJlJ2lqLHDxssAAAAAAAABAQAAAAAAAAAZAAAAAAAAAAAA
+	AAAAAAAAzQ==
 	</data>
 	<key>ANSIBrightBlackColor</key>
 	<data>
@@ -30,16 +31,17 @@
 	<key>ANSIBrightBlueColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEw
-	IDAgMC45OTYwNzg0MzE0ABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s
-	b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB
-	SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
+	LjQ0MTg1NjQwMTkgMC42NTI3NjY5MTM0IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
+	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
+	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
+	AAAAAAAAAM4=
 	</data>
 	<key>ANSIBrightCyanColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjQwMDAwMDAzNTggMC44NTA5ODA0NjA2IDAuOTM3MjU0OTY1MwAQAoAC0hAREhNaJGNs
+	LjM1MzU1NzIxNjQgMC44NTEwOTYxODE1IDAuOTU2MzIxMDA2MQAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -57,7 +59,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
-	LjY4MjM1Mjk2MDEgMC41MDU4ODIzODI0IDEAEAKAAtIQERITWiRjbGFzc25hbWVYJGNs
+	LjYxMjQxMDk2NjcgMC4zOTQ1MzI2NTAxIDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
 	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
 	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
 	AAAAAAAAAM4=
@@ -75,25 +77,25 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljg4NjI3NDU3NjIgMC44NTg4MjM1OTc0IDAuNDU0OTAxOTkzMwAQAoAC0hAREhNaJGNs
+	Ljg4MDQyMzAzODYgMC44NTc1MTQ3NjY2IDAuMzg5NDQ5MzA1MQAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>ANSICyanColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjIxNjIwNjQyNjEgMC41NzAzMzY5MjU4IDAuNjQ3MDY1MDMzOAAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
+	LjI0MzY3MjkwNTkgMC42NDU5MjA0Njk2IDAuNzM0MDYyMjA4ABABgALSEBESE1okY2xh
+	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
+	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
 	</data>
 	<key>ANSIGreenColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECgw
-	LjM3NTg2NDc2ODMgMC42MDM1NDcyOTczIDAuMDM0MTI3MzAxMDMAEAGAAtIQERITWiRj
+	LjQyNTgyNzQ2MDQgMC42ODYwMTQzNzgzIDAuMDM1NzQ5NTQ3NjYAEAGAAtIQERITWiRj
 	bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo
 	aXZlctEXGFRyb290gAEIERojLTI3O0FITltijY+RlqGqsrW+0NPYAAAAAAAAAQEAAAAA
 	AAAAGQAAAAAAAAAAAAAAAAAAANo=
@@ -102,7 +104,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjM4OTUyMDEzNTQgMC4yNDIzMDcxNzA3IDAuNjQzMjQzMjQzMgAQAYAC0hAREhNaJGNs
+	LjUzNjg4NDYxMDMgMC4zMzM0MDMzOTc3IDAuODkxNjUzNTA3MwAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -111,7 +113,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
-	LjU0MDIyMzgxNzYgMCAwLjE5Mzk0OTEzNzQAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
+	LjY0OTc4NTgxODkgMCAwLjIzNDMwOTAzNTcAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
 	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
 	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
 	AAAAAAAAAM4=
@@ -120,19 +122,19 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjYwNTcyMjEyODQgMC41ODc3NDIyNzg0IDAuMjQ4OTYzNDQ3MwAQAYAC0hAREhNaJGNs
+	LjcwMDAxMjM1NDUgMC42Nzg0MzgyMjYxIDAuMjg2NDE1ODMzOAAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>BackgroundColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECsw
-	LjE1Mjk0MTE4MjMgMC4xNTY4NjI3NTA2IDAuMTMzMzMzMzQwMyAwLjgAEAKAAtIQERIT
-	WiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRB
-	cmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltikJKUmaSttbjB09bbAAAAAAAAAQEA
-	AAAAAAAAGQAAAAAAAAAAAAAAAAAAAN0=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECww
+	LjE1Mjk0MTE4MjMgMC4xNTY4NjI3NTA2IDAuMTMzMzMzMzQwMyAwLjg1ABACgALSEBES
+	E1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVk
+	QXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYpGTlZqlrra5wtTX3AAAAAAAAAEB
+	AAAAAAAAABkAAAAAAAAAAAAAAAAAAADe
 	</data>
 	<key>CursorBlink</key>
 	<true/>