diff --git a/.gitignore b/.gitignore index 7b81ecc..c506122 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ # temp files for sublime and emacs *~ #*# +.*~ .divshot-cache \ No newline at end of file diff --git a/config/.bash_profile b/config/.bash_profile index ec8bb50..e71a87f 100644 --- a/config/.bash_profile +++ b/config/.bash_profile @@ -1,3 +1,4 @@ [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function +eval "$(rbenv init -)" diff --git a/config/.bashrc b/config/.bashrc index 9a7ec83..c7b7d95 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -9,6 +9,7 @@ source ~/Code/progkb/config/git-completion.bash source ~/Code/progkb/config/git-prompt.sh export PS1='\W$(__git_ps1 " (%s)") \$ ' +export SHELL="/bin/bash" #export PS1='[\u@h \W$(__git_ps1 " (%s)")]\$ ' #aliases diff --git a/config/.emacs b/config/.emacs index 4fb962c..e967f19 100644 --- a/config/.emacs +++ b/config/.emacs @@ -264,3 +264,7 @@ ;; (replace-regexp-in-string "\\[[0-9]+[GK]" "" output))) (setenv "NODE_NO_READLINE" "1") + +(setq backup-directory-alist `((".*" . ,temporary-file-directory))) +(setq auto-save-file-name-transforms `((".*" ,temporary-file-directory t))) +(setq create-lockfiles nil) diff --git a/config/com.googlecode.iterm2.plist b/config/com.googlecode.iterm2.plist index d59f4d5..3f6b289 100644 --- a/config/com.googlecode.iterm2.plist +++ b/config/com.googlecode.iterm2.plist @@ -31024,18 +31024,10 @@ MaxVertically - NSColorPanelMode - 5 - NSColorPickerPageableNameListDefaults - 1Emacs - NSFontPanelAttributes - 1, 4 NSNavLastRootDirectory ~/Code/progkb/config NSNavPanelExpandedSizeForOpenMode - {854, 542} - NSNavPanelExpandedStateForSaveMode - + {712, 459} NSQuotedKeystrokeBinding NSRepeatCountBinding @@ -31053,35 +31045,16 @@ BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF hAErATGG - 198 + 302 NSTableView Hidden Columns KeyBingingTable NSTableView Sort Ordering KeyBingingTable - NSToolbar Configuration Terminal Toolbar - - TB Display Mode - 1 - TB Icon Size Mode - 2 - TB Is Shown - 0 - TB Size Mode - 1 - - NSWindow Frame NSColorPanel - 307 274 214 309 0 0 1440 878 - NSWindow Frame NSFontPanel - 885 459 445 270 0 0 1440 900 NSWindow Frame Preferences - 331 56 924 485 0 0 1440 900 - NSWindow Frame SUStatusFrame - 528 578 384 129 0 0 1440 878 + 269 119 924 485 0 0 1280 800 NSWindow Frame iTerm Window 0 - 0 5 1603 867 0 0 1440 878 - NSWindow Frame iTerm Window 1 - 129 3 1290 872 0 0 1440 878 + 1571 199 1280 762 1280 0 1920 1057 NeverWarnAboutShortLivedSessions_2BE411A6-B7F7-4BF9-9139-8090109EFBB0 New Bookmarks @@ -31633,11 +31606,11 @@ Name Default Non Ascii Font - Monaco 12 + Monaco 10 Non-ASCII Anti Aliased Normal Font - Monaco 15 + Monaco 13 Option Key Sends 2 Prompt Before Closing 2 @@ -31813,9 +31786,9 @@ NoSyncTimeOfLastPromo - 453220340.29624498 + 479061068.08699298 NoSyncTimeOfLastPromoDownload - 465303097.14880598 + 479915670.16584098 OnlyWhenMoreTabs OpenArrangementAtStartup @@ -31862,7 +31835,7 @@ PrefsCustomFolder - /Users/isaac/Code/progkb/config + /Users/iezer/Code/progkb/config PromptOnQuit QuitWhenAllWindowsClosed @@ -31874,11 +31847,11 @@ SUEnableAutomaticChecks SUFeedURL - http://iterm2.com/appcasts/testing.xml + https://iterm2.com/appcasts/testing.xml SUHasLaunchedBefore SULastCheckTime - 2015-10-06T15:02:22Z + 2016-03-18T20:48:16Z SavePasteHistory ShowBookmarkName @@ -31924,6 +31897,6 @@ findRegex_iTerm iTerm Version - 2.1.1 + 2.1.4