updated shell colors and other stuff
Adam Veldhousen
parent
e5da114222
commit
5113663db5
|
|
@ -43,12 +43,7 @@ colorize() {
|
|||
# $1 is foreground
|
||||
# $2 is background
|
||||
# $3 is content
|
||||
if [ $OSTYPE = 'msys' ]; then
|
||||
echo "\033[$2;$1m"
|
||||
else
|
||||
echo -e "\033[48;5;$2;38;5;$1m$3\\033[0m"
|
||||
#echo "$(tput setaf $1)$(tput setab $2)"
|
||||
fi
|
||||
}
|
||||
|
||||
parse_git_branch () {
|
||||
|
|
@ -72,11 +67,12 @@ parse_git_branch_or_tag() {
|
|||
|
||||
|
||||
build_prompt_win(){
|
||||
TIME="$(colorize 39 46)[$(date +%H:%M)]$(colorize 36 42)$RARS";
|
||||
USER="$(colorize 39 42) \u@\h $(colorize 32 41)$RARS"
|
||||
GIT="$(colorize 39 41)$(parse_git_branch_or_tag) $(colorize 31 49)"
|
||||
DIR="$(colorize 33 49) \w"
|
||||
echo "$TIME$USER$GIT$DIR"
|
||||
local TIME="$(colorize 39 46 ' [$(date +%H:%M)] ')$(colorize 36 42 $RARS)";
|
||||
local USER="$(colorize 39 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 "
|
||||
echo "$LEFT"
|
||||
}
|
||||
|
||||
build_prompt_mac(){
|
||||
|
|
@ -107,7 +103,7 @@ print_prompt(){
|
|||
# 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\$ $GRAY"
|
||||
PROMPT_COMMAND='PS1="$(build_prompt_win) \n$EMPTY\$"
|
||||
PS2="$CONTINUE> "'
|
||||
else
|
||||
PROMPT_COMMAND='PS1="$(build_prompt_mac) \n$EMPTY\$"'
|
||||
|
|
|
|||
26
cmder.xml
26
cmder.xml
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<key name="Software">
|
||||
<key name="ConEmu">
|
||||
<key name=".Vanilla" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name=".Vanilla" modified="2015-05-14 09:23:41" build="140707">
|
||||
<value name="ColorTable00" type="dword" data="00222827"/>
|
||||
<value name="ColorTable01" type="dword" data="009e5401"/>
|
||||
<value name="ColorTable02" type="dword" data="0004aa74"/>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<value name="FontAutoSize" type="hex" data="00"/>
|
||||
<value name="FontSize" type="dword" data="0000000e"/>
|
||||
<value name="FontSizeX" type="dword" data="00000000"/>
|
||||
<value name="FontSizeX2" type="dword" data="00000000"/>
|
||||
<value name="FontSizeX2" type="dword" data="0000000a"/>
|
||||
<value name="FontSizeX3" type="dword" data="00000000"/>
|
||||
<value name="FontCharSet" type="hex" data="00"/>
|
||||
<value name="Anti-aliasing" type="dword" data="00000006"/>
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
<value name="ConWnd Width" type="dword" data="02000064"/>
|
||||
<value name="ConWnd Height" type="dword" data="0200003c"/>
|
||||
<value name="Cascaded" type="hex" data="01"/>
|
||||
<value name="ConWnd X" type="dword" data="fffffffd"/>
|
||||
<value name="ConWnd X" type="dword" data="00000000"/>
|
||||
<value name="ConWnd Y" type="dword" data="fffffffd"/>
|
||||
<value name="16bit Height" type="dword" data="00000000"/>
|
||||
<value name="AutoSaveSizePos" type="hex" data="01"/>
|
||||
|
|
@ -279,12 +279,12 @@
|
|||
<value name="TaskBarOverlay" type="hex" data="01"/>
|
||||
<value name="TaskbarProgress" type="hex" data="01"/>
|
||||
<value name="TabCloseMacro" type="string" data=""/>
|
||||
<value name="TabFontFace" type="string" data="Segoe UI"/>
|
||||
<value name="TabFontFace" type="string" data="Inconsolata for Powerline"/>
|
||||
<value name="TabFontCharSet" type="dword" data="00000000"/>
|
||||
<value name="TabFontHeight" type="dword" data="00000010"/>
|
||||
<value name="TabFontHeight" type="dword" data="0000000b"/>
|
||||
<value name="SaveAllEditors" type="string" data=""/>
|
||||
<value name="ToolbarAddSpace" type="dword" data="00000000"/>
|
||||
<value name="TabConsole" type="string" data="%s - %p"/>
|
||||
<value name="TabConsole" type="string" data=" %s - %p"/>
|
||||
<value name="TabSkipWords" type="string" data="Administrator:|Администратор:"/>
|
||||
<value name="TabPanels" type="string" data="<%c> %s"/>
|
||||
<value name="TabEditor" type="string" data="<%c.%i>{%s}"/>
|
||||
|
|
@ -525,9 +525,9 @@
|
|||
<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-04-09 14:40:05" build="140707">
|
||||
<key name="Tasks" modified="2015-05-14 09:23:42" build="140707">
|
||||
<value name="Count" type="dword" data="00000003"/>
|
||||
<key name="Task1" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name="Task1" modified="2015-05-14 09:23:42" build="140707">
|
||||
<value name="Name" type="string" data="{Bash}"/>
|
||||
<value name="Hotkey" type="dword" data="0000a242"/>
|
||||
<value name="GuiArgs" type="string" data="/icon "C:\Program Files (x86)\Git\unins000.exe""/>
|
||||
|
|
@ -535,7 +535,7 @@
|
|||
<value name="Active" type="dword" data="00000000"/>
|
||||
<value name="Count" type="dword" data="00000001"/>
|
||||
</key>
|
||||
<key name="Task2" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name="Task2" modified="2015-05-14 09:23:42" build="140707">
|
||||
<value name="Name" type="string" data="{cmd}"/>
|
||||
<value name="Hotkey" type="dword" data="00000000"/>
|
||||
<value name="GuiArgs" type="string" data=" /icon "%CMDER_ROOT%\cmder.exe""/>
|
||||
|
|
@ -543,7 +543,7 @@
|
|||
<value name="Active" type="dword" data="00000000"/>
|
||||
<value name="Count" type="dword" data="00000001"/>
|
||||
</key>
|
||||
<key name="Task3" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name="Task3" modified="2015-05-14 09:23:42" build="140707">
|
||||
<value name="Name" type="string" data="{PowerShell}"/>
|
||||
<value name="Hotkey" type="dword" data="00000000"/>
|
||||
<value name="GuiArgs" type="string" data="/dir "%userprofile%""/>
|
||||
|
|
@ -552,11 +552,11 @@
|
|||
<value name="Count" type="dword" data="00000001"/>
|
||||
</key>
|
||||
</key>
|
||||
<key name="Apps" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name="Apps" modified="2015-05-14 09:23:42" build="140707">
|
||||
<value name="Count" type="dword" data="00000000"/>
|
||||
</key>
|
||||
<key name="Colors" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name="Palette1" modified="2015-04-09 14:40:05" build="140707">
|
||||
<key name="Colors" modified="2015-05-14 09:23:42" build="140707">
|
||||
<key name="Palette1" modified="2015-05-14 09:23:42" build="140707">
|
||||
<value name="Name" type="string" data="Monokai"/>
|
||||
<value name="ExtendColors" type="hex" data="00"/>
|
||||
<value name="ExtendColorIdx" type="hex" data="0e"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue