Merge branch 'master' of github.com:DelvarWorld/configs

Author: AndrewRayCode

.bashrc

@@ -861,6 +861,15 @@ function error_test() {
     fi
 }
 
+# does not work when used as $(${gr_banana})
+function gr_banana() {
+    if [[ "$AWS_ENVIRONMENT" != "" ]]; then
+        echo -e "${COLOR_LIGHT_GREEN}env${COLOR_RESET}"
+    else
+        echo -e "${COLOR_LIGHT_RED}no${COLOR_RESET}"
+    fi
+}
+
 PS1="\n\[$COLOR_YELLOW\]\u\[\$(error_test)\]@\[$COLOR_GREEN\]\w\$(${dvcs_function})\[$COLOR_RESET\] \$ "
 
 ### Added by the Heroku Toolbelt

.pryrc

@@ -1,7 +1,28 @@
 #require 'awesome_print' # Removing because bad colors and can't configure
 #AwesomePrint.pry!
 
-require 'colorize'
+puts "#{'Starting a Pry console...'.cyan}"
+
+begin
+    require 'colorize'
+    puts "#{'require'.light_red} #{"'colorize'".cyan}"
+rescue LoadError
+    puts "Warning: colorize gem not found"
+end
+
+begin
+    require 'factory_girl_console'
+    puts "#{'require'.light_red} #{"'factory_girl_console'".cyan}"
+rescue LoadError
+    puts "Warning: factory_girl_console gem not found"
+end
+
+begin
+    include Rails.application.routes.url_helpers
+    puts "#{'include'.light_yellow} #{'Rails.application.routes.url_helpers'.cyan}"
+rescue LoadError
+    puts "Warning: factory_girl_console gem not found"
+end
 
 def colorized_stack_trace( stack, base_dir )
   separator = File::SEPARATOR
@@ -49,7 +70,7 @@ _max_display_string_length = 50
 def pbcopy(input)
   str = input.to_s
   IO.popen('pbcopy', 'w') { |f| f << str }
-  truncaed = str.length > _max_display_string_length ? str[0.._max_display_string_length] + '...' : str
+  truncated = str.length > _max_display_string_length ? str[0.._max_display_string_length] + '...' : str
   puts "Copied \"#{truncated}\" to system clipboard!"
 end
 

.vimrc

@@ -118,7 +118,8 @@ set shiftround
 " this file
 setglobal relativenumber
 
-" errors in modifiable off files so silent :( vim is a gargabe joke
+" Use non-windows linebreaks. This command errors in modifiable off files, so
+" suppress errors with silent :(
 silent! set ff=unix
 
 " Ignore caase in search, unless you type any capital letters, then it

code/keybindings.json

@@ -12,8 +12,9 @@
   // First undo TERRIBLE defaults by vscode_block_travel
   // https://github.com/sashaweiss/vscode_block_travel/blob/ba6cedc998a82d054ad499c8a96dffac4ca0aef7/package.json#L45
   { "key": "shift+alt+down",        "command": "editor.action.copyLinesDownAction",
+  { "key": "shift+alt+up",        "command": "editor.action.copyLinesUpAction",
     "when": "editorTextFocus && !editorReadonly" },
-  { "key": "shift+alt+up",          "command": "editor.action.copyLinesUpAction",
+  { "key": "cmd+alt+up",          "command": "block-travel.selectUp",
                                         "when": "editorTextFocus" },
   { "key": "alt+down",              "command": "editor.action.moveLinesDownAction",
     "when": "editorTextFocus && !editorReadonly" },
@@ -26,5 +27,9 @@
   { "key": "alt+]",           "command": "block-travel.jumpDown", "when": "editorTextFocus" },
 
   { "key": "alt+shift+[",           "command": "block-travel.selectUp", "when": "editorTextFocus" },
-  { "key": "alt+shift+]",           "command": "block-travel.selectDown", "when": "editorTextFocus" }
-]
+  { "key": "alt+shift+]",           "command": "block-travel.selectDown", "when": "editorTextFocus" },
+
+  // terrible defaults for "rails run specs"
+  { "key": "shift+cmd+t",           "command": "workbench.action.reopenClosedEditor" },
+  { "key": "cmd+k cmd+f",           "command": "extension.runFileSpecs" }
+]

code/settings.json

@@ -64,5 +64,5 @@
     "indentRainbow.error_color": "",
 
     "editor.renderWhitespace": "none",
-    "workbench.panel.location": "bottom",
+    "workbench.panel.location": "bottom"
 }