removed Console2. Updated paths. Point gitconfig at vim executable

pull/1/merge
Adam Veldhousen 2015-01-06 08:52:11 -06:00
parent fa9df3a504
commit 34e6f415b6
No known key found for this signature in database
GPG Key ID: A1927C43E8474A6E
9 changed files with 15 additions and 110 deletions

14
.bashrc
View File

@ -1,13 +1,14 @@
#!/bin/bash #!/bin/bash
if [ -d "${HOME}/tools/vim" ] ; then
PATH=${HOME}/tools/vim:${PATH}
fi
if [ -d "${HOME}/.bin" ] ; then if [ -d "${HOME}/.bin" ] ; then
PATH=${HOME}/.bin:${PATH} PATH=${HOME}/.bin:${PATH}
fi fi
if [ -d "${HOME}/tools/vim" ] ; then
PATH=${HOME}/Tools/vim:${PATH}
fi
# source development settings # source development settings
if [ -f ~/.dev_profile ]; then if [ -f ~/.dev_profile ]; then
. ~/.dev_profile . ~/.dev_profile
@ -29,6 +30,11 @@ if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases . ~/.bash_aliases
fi fi
# enable programmable completion features
if [ -f /etc/git_completion ]; then
. /etc/git_completion
fi
# enable programmable completion features # enable programmable completion features
if [ -f /etc/bash_completion ]; then if [ -f /etc/bash_completion ]; then
. /etc/bash_completion . /etc/bash_completion

View File

@ -12,8 +12,10 @@ fi
export GOBIN=${GOPATH}/bin export GOBIN=${GOPATH}/bin
PATH=${PATH}:${GOBIN} PATH=${PATH}:${GOBIN}
export GIT_EDITOR=vim.exe
# see environ manfile # see environ manfile
export EDITOR=vim # Default Editor export EDITOR=gvim # Default Editor
export VISUAL=$EDITOR # Visual not really used differently from EDITOR anymore export VISUAL=$EDITOR # Visual not really used differently from EDITOR anymore
export LESS='-iMR' # Case insensite search, verbose prompting and raw output export LESS='-iMR' # Case insensite search, verbose prompting and raw output
export PAGER=less # Used to display text / man files export PAGER=less # Used to display text / man files

View File

@ -80,8 +80,8 @@
# Make `git rebase` safer on OS X # Make `git rebase` safer on OS X
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false trustctime = false
autocrlf = input autocrlf = true
editor = vim -f editor = "EDITOR"
[color] [color]
# Use colors in Git commands that are capable of colored output when # Use colors in Git commands that are capable of colored output when

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,103 +0,0 @@
<?xml version="1.0"?>
<settings>
<console change_refresh="10" refresh="100" rows="30" columns="80" buffer_rows="9999" buffer_columns="0" shell="&quot;C:\Program Files (x86)\Git\bin\sh.exe&quot; --login -i" init_dir="C:\Projects" start_hidden="0" save_size="0">
<colors>
<color id="0" r="0" g="0" b="0"/>
<color id="1" r="0" g="0" b="128"/>
<color id="2" r="0" g="150" b="0"/>
<color id="3" r="0" g="150" b="150"/>
<color id="4" r="170" g="25" b="25"/>
<color id="5" r="128" g="0" b="128"/>
<color id="6" r="128" g="128" b="0"/>
<color id="7" r="192" g="192" b="192"/>
<color id="8" r="128" g="128" b="128"/>
<color id="9" r="0" g="100" b="255"/>
<color id="10" r="0" g="255" b="0"/>
<color id="11" r="0" g="255" b="255"/>
<color id="12" r="255" g="50" b="50"/>
<color id="13" r="255" g="0" b="255"/>
<color id="14" r="255" g="255" b="0"/>
<color id="15" r="255" g="255" b="255"/>
</colors>
</console>
<appearance>
<font name="Inconsolata for Powerline" size="10" bold="0" italic="0" smoothing="0">
<color use="0" r="0" g="0" b="0"/>
</font>
<window title="Console" icon="" use_tab_icon="1" use_console_title="0" show_cmd="0" show_cmd_tabs="0" use_tab_title="1" trim_tab_titles="20" trim_tab_titles_right="0"/>
<controls show_menu="1" show_toolbar="0" show_statusbar="0" show_tabs="1" hide_single_tab="1" show_scrollbars="1" flat_scrollbars="0" tabs_on_bottom="0"/>
<styles caption="1" resizable="1" taskbar_button="1" border="1" inside_border="2" tray_icon="1">
<selection_color r="255" g="255" b="255"/>
</styles>
<position x="-1" y="-1" dock="-1" snap="0" z_order="0" save_position="0"/>
<transparency type="0" active_alpha="255" inactive_alpha="255" r="0" g="0" b="0"/>
</appearance>
<behavior>
<copy_paste copy_on_select="1" clear_on_copy="1" no_wrap="1" trim_spaces="1" copy_newline_char="0" sensitive_copy="1"/>
<scroll page_scroll_rows="0"/>
<tab_highlight flashes="3" stay_highligted="1"/>
</behavior>
<hotkeys use_scroll_lock="1">
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="83" command="settings"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="112" command="help"/>
<hotkey ctrl="0" shift="0" alt="1" extended="0" code="115" command="exit"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="84" command="newtab1"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="113" command="newtab2"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="114" command="newtab3"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="115" command="newtab4"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="116" command="newtab5"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="117" command="newtab6"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="118" command="newtab7"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="119" command="newtab8"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="120" command="newtab9"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="121" command="newtab10"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="49" command="switchtab1"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="50" command="switchtab2"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="51" command="switchtab3"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="52" command="switchtab4"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="53" command="switchtab5"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="54" command="switchtab6"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="55" command="switchtab7"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="56" command="switchtab8"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="57" command="switchtab9"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="48" command="switchtab10"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="9" command="nexttab"/>
<hotkey ctrl="1" shift="1" alt="0" extended="0" code="9" command="prevtab"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="87" command="closetab"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="82" command="renametab"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="67" command="copy"/>
<hotkey ctrl="1" shift="0" alt="0" extended="1" code="46" command="clear_selection"/>
<hotkey ctrl="1" shift="0" alt="0" extended="0" code="86" command="paste"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="stopscroll"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollrowup"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollrowdown"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollpageup"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollpagedown"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollcolleft"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollcolright"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollpageleft"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="scrollpageright"/>
<hotkey ctrl="1" shift="1" alt="0" extended="0" code="112" command="dumpbuffer"/>
<hotkey ctrl="0" shift="0" alt="0" extended="0" code="0" command="activate"/>
</hotkeys>
<mouse>
<actions>
<action ctrl="0" shift="0" alt="0" button="1" name="copy"/>
<action ctrl="0" shift="1" alt="0" button="1" name="select"/>
<action ctrl="0" shift="0" alt="0" button="3" name="paste"/>
<action ctrl="1" shift="0" alt="0" button="1" name="drag"/>
<action ctrl="0" shift="0" alt="0" button="2" name="menu"/>
</actions>
</mouse>
<tabs>
<tab title="Git Bash" icon="C:\Program Files (x86)\Git\etc\git.ico" use_default_icon="0">
<console shell="&quot;C:\Program Files (x86)\Git\bin\sh.exe&quot; --login -i" init_dir="C:\Projects" run_as_user="0" user=""/>
<cursor style="11" r="255" g="255" b="255"/>
<background type="0" r="0" g="0" b="0">
<image file="" relative="0" extend="0" position="0">
<tint opacity="0" r="0" g="0" b="0"/>
</image>
</background>
</tab>
</tabs>
</settings>