updated init order and shell colors for windows

9 years ago · a5fd1a0aa5
parent 5113663db5
commit a5fd1a0aa5
6 changed files with 233 additions and 35 deletions
--- a/.bash_aliases
+++ b/.bash_aliases
@ -3,6 +3,7 @@ alias cdp="cd -"
 alias ..='cd ..'
 alias pd="pushd $1"
 alias fuck='$(thefuck $(fc -ln -1))'
+alias fortune=${GOBIN}/${FORTUNE}

 # list files
 alias ll='ls --color=always -l'
--- a/.bash_functions
+++ b/.bash_functions
@ -11,7 +11,7 @@ function printmotd(){
    cat ~/motd 
  fi
  echo ""
-  fortune
+  $FORTUNE
  echo ""
 }

--- a/.dev_profile
+++ b/.dev_profile
@ -1,13 +1,19 @@
 #!/bin/bash
+
 # Setup go paths and source go bin
 if [ -d "/c/Windows" ]; then
+  if [ -d "${HOME}/tools/vim" ] ; then
+      PATH=${HOME}/Tools/vim:${PATH}
+  fi
  export WINDOWS="TRUE"
  export ANSIBLE_HOSTS="/c/ansible/hosts"
  export GOPATH="/d/Projects/Programming/Go"
  export GOROOT="/d/Programs/Go"
  export GIT_EDITOR=~/Tools/vim/gvim.exe
+  export FORTUNE=fortune.exe
  PATH=${PATH}:/c/tools/ruby193/bin
 else
+  export FORTUNE=fortune
  export ANSIBLE_HOSTS="~/.ansible/hosts"
  export GOPATH="$HOME/../Projects/go"
  export GOROOT="/usr/local/go"
@ -15,6 +21,10 @@ else
  export WINDOWS="FALSE"
 fi

+if [ -d "${HOME}/.bin" ] ; then
+    PATH=${HOME}/.bin:${PATH}
+fi
+
 if [ -d "/c/Windows" ]; then
  export BOOT2DOCKER=/c/Program\ Files/Boot2Docker\ for\ Windows/
 else
@ -49,5 +59,3 @@ shopt -s checkwinsize   # Checks window size to get proper line wrapping
 shopt -s cdspell        # Corrects minor spelling errors when cd-ing
 set -o vi               # Set prompt to vi mode
 set -o notify           # Report status of terminated background jobs immediately
-
-printmotd
--- a/.profile
+++ b/.profile
@ -1,12 +1,8 @@
 #!/bin/bash

-if [ -d "${HOME}/.bin" ] ; then
-    PATH=${HOME}/.bin:${PATH}
-fi
-
-
-if [ -d "${HOME}/tools/vim" ] ; then
-    PATH=${HOME}/Tools/vim:${PATH}
+# source development settings
+if [ -f ~/.dev_profile ]; then
+      . ~/.dev_profile
 fi

 # Load any extra aliases
@ -19,11 +15,6 @@ if [ -f ~/.bash_functions ]; then
    . ~/.bash_functions
 fi

-# source development settings
-if [ -f ~/.dev_profile ]; then
-      . ~/.dev_profile
-fi
-
 # Load pretty colors
 if [ -f ~/.shell_colors ]; then
    . ~/.shell_colors
@ -42,3 +33,5 @@ fi
 if [ -d ~/.nvm ]; then
  . ~/.nvm/nvm.sh
 fi
+
+printmotd
--- a/.shell_colors
+++ b/.shell_colors
@ -43,7 +43,12 @@ colorize() {
  # $1 is foreground
  # $2 is background
  # $3 is content
-  echo -e "\033[48;5;$2;38;5;$1m$3\\033[0m"
+  #
+  if [ $OSTYPE = 'msys' ]; then
+    echo -e "\033[48;3;$2;38;3;$1m$3\\033[0m"
+  else 
+    echo -e "\033[48;5;$2;38;5;$1m$3\\033[0m"
+  fi
 }

 parse_git_branch () {
@ -67,8 +72,8 @@ parse_git_branch_or_tag() {


 build_prompt_win(){
-  local TIME="$(colorize 39 46 ' [$(date +%H:%M)] ')$(colorize 36 42 $RARS)";
-  local USER="$(colorize 39 42 ' \u@\h ')$(colorize 32 41 $RARS)"
+  local TIME="$(colorize 38 46 ' [$(date +%H:%M)] ')$(colorize 36 42 $RARS)";
+  local USER="$(colorize 38 42 ' \u@\h ')$(colorize 32 41 $RARS)"
  local GIT="$(colorize 39 41 ' $(parse_git_branch_or_tag) ')$(colorize 31 49 $RARS)"
  local DIR="$(colorize 33 49 ' \w ')"
  local LEFT="$TIME$USER$GIT$DIR\033[0;0m "
@ -95,18 +100,13 @@ print_prompt(){
  PS1=$(printf "%*s\r%s\n$EMPTY\$$GRAY" "$($(tput cols) + ${compensate})" "$RIGHT" "$LEFT")
 }

-
-# [hh:mm] username@host (git branch || svn revision) ~/working/directory
-# $
+# looks like the following:
 # [hh:mm] username@host (git branch || svn revision) ~/working/directory
 # $
-# Pretty ugly hack for msys... need to figure out how to determine if my
-# console is 256 color capable
 if [ $OSTYPE = 'msys' ]; then
-  PROMPT_COMMAND='PS1="$(build_prompt_win) \n$EMPTY\$"
-  PS2="$CONTINUE> "'
+  PROMPT_COMMAND='PS1="$(build_prompt_win)\n\$ "'
 else
-  PROMPT_COMMAND='PS1="$(build_prompt_mac) \n$EMPTY\$"'
+  PROMPT_COMMAND='PS1="$(build_prompt_mac)\n\$ "'
 fi


--- a/cmder.xml
+++ b/cmder.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <key name="Software">
 	<key name="ConEmu">
-		<key name=".Vanilla" modified="2015-05-14 09:23:41" build="140707">
+		<key name=".Vanilla" modified="2015-05-14 10:30:10" build="150513">
 			<value name="ColorTable00" type="dword" data="00222827"/>
 			<value name="ColorTable01" type="dword" data="009e5401"/>
 			<value name="ColorTable02" type="dword" data="0004aa74"/>
@ -109,7 +109,7 @@
 			<value name="Multi.SplitHeight" type="hex" data="04"/>
 			<value name="KeyboardHooks" type="hex" data="02"/>
 			<value name="FontName" type="string" data="Literation Mono Powerline"/>
-			<value name="FontName2" type="string" data="Inconsolata for Powerline"/>
+			<value name="FontName2" type="string" data="Literation Mono Powerline"/>
 			<value name="FontAutoSize" type="hex" data="00"/>
 			<value name="FontSize" type="dword" data="0000000e"/>
 			<value name="FontSizeX" type="dword" data="00000000"/>
@ -525,38 +525,41 @@
 			<value name="DndLKey" type="hex" data="00"/>
 			<value name="DndRKey" type="hex" data="a2"/>
 			<value name="WndDragKey" type="dword" data="00121101"/>
-				<key name="Tasks" modified="2015-05-14 09:23:42" build="140707">
+				<key name="Tasks" modified="2015-05-14 10:30:10" build="150513">
 				<value name="Count" type="dword" data="00000003"/>
-						<key name="Task1" modified="2015-05-14 09:23:42" build="140707">
+						<key name="Task1" modified="2015-05-14 10:30:10" build="150513">
 					<value name="Name" type="string" data="{Bash}"/>
 					<value name="Hotkey" type="dword" data="0000a242"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;C:\Program Files (x86)\Git\unins000.exe&quot;"/>
 					<value name="Cmd1" type="string" data="&quot;C:\Program Files (x86)\Git\bin\sh.exe&quot; --login -i  -new_console:d:C:\Projects"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
+					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-						<key name="Task2" modified="2015-05-14 09:23:42" build="140707">
+						<key name="Task2" modified="2015-05-14 10:30:10" build="150513">
 					<value name="Name" type="string" data="{cmd}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
 					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
+					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-						<key name="Task3" modified="2015-05-14 09:23:42" build="140707">
+						<key name="Task3" modified="2015-05-14 10:30:10" build="150513">
 					<value name="Name" type="string" data="{PowerShell}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/dir &quot;%userprofile%&quot;"/>
 					<value name="Cmd1" type="string" data="powershell"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
+					<value name="Flags" type="dword" data="00000000"/>
 				</key>
 			</key>
-				<key name="Apps" modified="2015-05-14 09:23:42" build="140707">
+				<key name="Apps" modified="2015-05-14 10:30:10" build="150513">
 				<value name="Count" type="dword" data="00000000"/>
 			</key>
-				<key name="Colors" modified="2015-05-14 09:23:42" build="140707">
-			<key name="Palette1" modified="2015-05-14 09:23:42" build="140707">
+				<key name="Colors" modified="2015-05-14 10:30:10" build="150513">
+			<key name="Palette1" modified="2015-05-14 10:30:10" build="150513">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>
@ -599,6 +602,199 @@
 				</key>
 				<value name="Count" type="dword" data="00000001"/>
 			</key>
+			<value name="ProcessCmdStart" type="hex" data="01"/>
+			<value name="Multi.ShowSearch" type="hex" data="01"/>
+			<value name="Multi.CloseConfirmFlags" type="hex" data="04"/>
+			<value name="FontUseDpi" type="hex" data="01"/>
+			<value name="FontUseUnits" type="hex" data="00"/>
+			<value name="UseScrollLock" type="hex" data="01"/>
+			<value name="CTS.ForceLocale" type="dword" data="00000000"/>
+			<value name="StatusBar.Hide.VisL" type="hex" data="01"/>
+			<value name="StatusBar.Hide.KeyHooks" type="hex" data="01"/>
+			<value name="StatusBar.Hide.WVBack" type="hex" data="01"/>
+			<value name="StatusBar.Hide.WVDC" type="hex" data="01"/>
+			<value name="StatusBar.Hide.Zoom" type="hex" data="01"/>
+			<value name="StatusBar.Hide.Dpi" type="hex" data="01"/>
+			<value name="TabFlashChanged" type="dword" data="00000008"/>
+			<value name="TabModifiedSuffix" type="string" data="[*]"/>
+			<key name="HotKeys" modified="2015-05-14 10:30:10" build="150513">
+				<value name="KeyMacroVersion" type="hex" data="02"/>
+				<value name="Multi.Modifier" type="dword" data="00000011"/>
+				<value name="Multi.ArrowsModifier" type="dword" data="0000005b"/>
+				<value name="MinimizeRestore" type="dword" data="000011c0"/>
+				<value name="MinimizeRestore2" type="dword" data="00000000"/>
+				<value name="GlobalRestore" type="dword" data="00000000"/>
+				<value name="CdExplorerPath" type="dword" data="00000000"/>
+				<value name="ForcedFullScreen" type="dword" data="12115b0d"/>
+				<value name="SwitchGuiFocus" type="dword" data="00000000"/>
+				<value name="SetFocusGui" type="dword" data="00000000"/>
+				<value name="SetFocusChild" type="dword" data="00000000"/>
+				<value name="ChildSystemMenu" type="dword" data="000011ff"/>
+				<value name="Multi.NewConsole" type="dword" data="00000000"/>
+				<value name="Multi.NewConsoleShift" type="dword" data="00001154"/>
+				<value name="Multi.CmdKey" type="dword" data="00000000"/>
+				<value name="Multi.NewWindow" type="dword" data="00000000"/>
+				<value name="Multi.NewConsolePopup" type="dword" data="00000000"/>
+				<value name="Multi.NewConsolePopup2" type="dword" data="00000000"/>
+				<value name="Multi.NewAttach" type="dword" data="00000000"/>
+				<value name="Multi.NewSplitV" type="dword" data="00000000"/>
+				<value name="Multi.NewSplitH" type="dword" data="00000000"/>
+				<value name="Multi.SplitMaximize" type="dword" data="00005d0d"/>
+				<value name="Multi.SplitSizeVU" type="dword" data="00105d26"/>
+				<value name="Multi.SplitSizeVD" type="dword" data="00105d28"/>
+				<value name="Multi.SplitSizeHL" type="dword" data="00105d25"/>
+				<value name="Multi.SplitSizeHR" type="dword" data="00105d27"/>
+				<value name="Key.TabPane1" type="dword" data="00000000"/>
+				<value name="Key.TabPane2" type="dword" data="00000000"/>
+				<value name="Multi.SplitFocusU" type="dword" data="00005d26"/>
+				<value name="Multi.SplitFocusD" type="dword" data="00005d28"/>
+				<value name="Multi.SplitFocusL" type="dword" data="00005d25"/>
+				<value name="Multi.SplitFocusR" type="dword" data="00005d27"/>
+				<value name="Multi.Next" type="dword" data="00000000"/>
+				<value name="Multi.NextShift" type="dword" data="00000000"/>
+				<value name="Multi.Recreate" type="dword" data="00000000"/>
+				<value name="Multi.AltCon" type="dword" data="00000000"/>
+				<value name="Multi.Pause" type="dword" data="80808013"/>
+				<value name="Multi.Scroll" type="dword" data="00000000"/>
+				<value name="Multi.GroupInput" type="dword" data="00005d47"/>
+				<value name="Multi.Detach" type="dword" data="00000000"/>
+				<value name="Multi.Close" type="dword" data="00001157"/>
+				<value name="CloseTabKey" type="dword" data="00000000"/>
+				<value name="CloseGroupKey" type="dword" data="00000000"/>
+				<value name="CloseGroupPrcKey" type="dword" data="00000000"/>
+				<value name="CloseAllConKey" type="dword" data="00000000"/>
+				<value name="CloseZombiesKey" type="dword" data="00000000"/>
+				<value name="CloseExceptConKey" type="dword" data="00000000"/>
+				<value name="KillProcessKey" type="dword" data="00000000"/>
+				<value name="KillAllButShellKey" type="dword" data="00105b2e"/>
+				<value name="DuplicateRootKey" type="dword" data="00000000"/>
+				<value name="CloseConEmuKey" type="dword" data="00001273"/>
+				<value name="Multi.Rename" type="dword" data="00000000"/>
+				<value name="AffinityPriorityKey" type="dword" data="00005d41"/>
+				<value name="Multi.MoveLeft" type="dword" data="00125b25"/>
+				<value name="Multi.MoveRight" type="dword" data="00125b27"/>
+				<value name="CTS.VkBlockStart" type="dword" data="00000000"/>
+				<value name="CTS.VkTextStart" type="dword" data="00000000"/>
+				<value name="CTS.VkCopyFmt0" type="dword" data="00001143"/>
+				<value name="CTS.VkCopyFmt1" type="dword" data="00101143"/>
+				<value name="CTS.VkCopyFmt2" type="dword" data="00000000"/>
+				<value name="CTS.VkCopyAll" type="dword" data="00000000"/>
+				<value name="HighlightMouseSwitch" type="dword" data="00005d4c"/>
+				<value name="HighlightMouseSwitchX" type="dword" data="00005d58"/>
+				<value name="Multi.ShowTabsList" type="dword" data="00000000"/>
+				<value name="Multi.ShowTabsList2" type="dword" data="00000000"/>
+				<value name="ClipboardVkAllLines" type="dword" data="0000102d"/>
+				<value name="ClipboardVkFirstLine" type="dword" data="00001156"/>
+				<value name="DeleteWordToLeft" type="dword" data="00001108"/>
+				<value name="FindTextKey" type="dword" data="00005d46"/>
+				<value name="ScreenshotKey" type="dword" data="00000000"/>
+				<value name="ScreenshotFullKey" type="dword" data="00000000"/>
+				<value name="ShowStatusBarKey" type="dword" data="00000000"/>
+				<value name="ShowTabBarKey" type="dword" data="00000000"/>
+				<value name="ShowCaptionKey" type="dword" data="00000000"/>
+				<value name="AlwaysOnTopKey" type="dword" data="00000000"/>
+				<value name="TransparencyInc" type="dword" data="00000000"/>
+				<value name="TransparencyDec" type="dword" data="00000000"/>
+				<value name="Key.TabMenu" type="dword" data="00000000"/>
+				<value name="Key.TabMenu2" type="dword" data="00000000"/>
+				<value name="Key.Maximize" type="dword" data="00000000"/>
+				<value name="Key.MaximizeWidth" type="dword" data="00000000"/>
+				<value name="Key.MaximizeHeight" type="dword" data="00000000"/>
+				<value name="Key.TileToLeft" type="dword" data="00000000"/>
+				<value name="Key.TileToRight" type="dword" data="00000000"/>
+				<value name="Key.JumpPrevMonitor" type="dword" data="00000000"/>
+				<value name="Key.JumpNextMonitor" type="dword" data="00000000"/>
+				<value name="Key.FullScreen" type="dword" data="0000120d"/>
+				<value name="Key.SysMenu" type="dword" data="00000000"/>
+				<value name="Key.SysMenu2" type="dword" data="00001102"/>
+				<value name="Key.BufUp" type="dword" data="00001126"/>
+				<value name="Key.BufDn" type="dword" data="00001128"/>
+				<value name="Key.BufPgUp" type="dword" data="00001121"/>
+				<value name="Key.BufPgDn" type="dword" data="00001122"/>
+				<value name="Key.BufHfPgUp" type="dword" data="00005d21"/>
+				<value name="Key.BufHfPgDn" type="dword" data="00005d22"/>
+				<value name="Key.BufTop" type="dword" data="00005d24"/>
+				<value name="Key.BufBottom" type="dword" data="00005d23"/>
+				<value name="Key.BufCursor" type="dword" data="00005d08"/>
+				<value name="FontLargerKey" type="dword" data="00000000"/>
+				<value name="FontSmallerKey" type="dword" data="00000000"/>
+				<value name="FontOriginalKey" type="dword" data="00001104"/>
+				<value name="PasteFileKey" type="dword" data="00101146"/>
+				<value name="PastePathKey" type="dword" data="00101144"/>
+				<value name="PasteCygwinKey" type="dword" data="00005d2d"/>
+				<value name="KeyMacro01" type="dword" data="00a01231"/>
+				<value name="KeyMacro01.Text" type="string" data="Task(&quot;cmd&quot;)"/>
+				<value name="KeyMacro02" type="dword" data="00a01232"/>
+				<value name="KeyMacro02.Text" type="string" data="Task(&quot;PowerShell&quot;)"/>
+				<value name="KeyMacro03" type="dword" data="000011d0"/>
+				<value name="KeyMacro03.Text" type="string" data="FontSetSize(1,2)"/>
+				<value name="KeyMacro04" type="dword" data="0000a249"/>
+				<value name="KeyMacro04.Text" type="string" data="Split(0,0,50)"/>
+				<value name="KeyMacro05" type="dword" data="0000a253"/>
+				<value name="KeyMacro05.Text" type="string" data="Split(0, 50, 0)"/>
+				<value name="KeyMacro06" type="dword" data="00000000"/>
+				<value name="KeyMacro06.Text" type="string" data=""/>
+				<value name="KeyMacro07" type="dword" data="00000000"/>
+				<value name="KeyMacro07.Text" type="string" data=""/>
+				<value name="KeyMacro08" type="dword" data="00000000"/>
+				<value name="KeyMacro08.Text" type="string" data=""/>
+				<value name="KeyMacro09" type="dword" data="00000000"/>
+				<value name="KeyMacro09.Text" type="string" data=""/>
+				<value name="KeyMacro10" type="dword" data="00000000"/>
+				<value name="KeyMacro10.Text" type="string" data=""/>
+				<value name="KeyMacro11" type="dword" data="00000000"/>
+				<value name="KeyMacro11.Text" type="string" data=""/>
+				<value name="KeyMacro12" type="dword" data="00000000"/>
+				<value name="KeyMacro12.Text" type="string" data=""/>
+				<value name="KeyMacro13" type="dword" data="00000000"/>
+				<value name="KeyMacro13.Text" type="string" data=""/>
+				<value name="KeyMacro14" type="dword" data="00000000"/>
+				<value name="KeyMacro14.Text" type="string" data=""/>
+				<value name="KeyMacro15" type="dword" data="00000000"/>
+				<value name="KeyMacro15.Text" type="string" data=""/>
+				<value name="KeyMacro16" type="dword" data="00000000"/>
+				<value name="KeyMacro16.Text" type="string" data=""/>
+				<value name="KeyMacro17" type="dword" data="00000000"/>
+				<value name="KeyMacro17.Text" type="string" data=""/>
+				<value name="KeyMacro18" type="dword" data="00000000"/>
+				<value name="KeyMacro18.Text" type="string" data=""/>
+				<value name="KeyMacro19" type="dword" data="00000000"/>
+				<value name="KeyMacro19.Text" type="string" data=""/>
+				<value name="KeyMacro20" type="dword" data="00000000"/>
+				<value name="KeyMacro20.Text" type="string" data=""/>
+				<value name="KeyMacro21" type="dword" data="00000000"/>
+				<value name="KeyMacro21.Text" type="string" data=""/>
+				<value name="KeyMacro22" type="dword" data="00000000"/>
+				<value name="KeyMacro22.Text" type="string" data=""/>
+				<value name="KeyMacro23" type="dword" data="00000000"/>
+				<value name="KeyMacro23.Text" type="string" data=""/>
+				<value name="KeyMacro24" type="dword" data="00000000"/>
+				<value name="KeyMacro24.Text" type="string" data=""/>
+				<value name="KeyMacro25" type="dword" data="00000000"/>
+				<value name="KeyMacro25.Text" type="string" data=""/>
+				<value name="KeyMacro26" type="dword" data="00000000"/>
+				<value name="KeyMacro26.Text" type="string" data=""/>
+				<value name="KeyMacro27" type="dword" data="00000000"/>
+				<value name="KeyMacro27.Text" type="string" data=""/>
+				<value name="KeyMacro28" type="dword" data="00000000"/>
+				<value name="KeyMacro28.Text" type="string" data=""/>
+				<value name="KeyMacro29" type="dword" data="00000000"/>
+				<value name="KeyMacro29.Text" type="string" data=""/>
+				<value name="KeyMacro30" type="dword" data="00000000"/>
+				<value name="KeyMacro30.Text" type="string" data=""/>
+				<value name="KeyMacro31" type="dword" data="00000000"/>
+				<value name="KeyMacro31.Text" type="string" data=""/>
+				<value name="KeyMacro32" type="dword" data="00000000"/>
+				<value name="KeyMacro32.Text" type="string" data=""/>
+				<value name="CTS.VkBlock" type="hex" data="a4"/>
+				<value name="CTS.VkText" type="hex" data="a0"/>
+				<value name="CTS.VkAct" type="hex" data="00"/>
+				<value name="CTS.VkPrompt" type="hex" data="00"/>
+				<value name="FarGotoEditorVk" type="hex" data="a2"/>
+				<value name="DndLKey" type="hex" data="00"/>
+				<value name="DndRKey" type="hex" data="a2"/>
+				<value name="WndDragKey" type="dword" data="00121101"/>
+			</key>
 		</key>
 	</key>
 </key>