Merge branch 'master' of ssh://github.com/haaksmash/dotfiles

mac-files/.hammerspoon/init.lua

@@ -18,8 +18,8 @@ hotkey.bind(mash, "j", function() tiling.cycle(1) end)
 hotkey.bind(mash, "k", function() tiling.cycle(-1) end)
 hotkey.bind(mash, "space", function() tiling.promote() end)
 hotkey.bind(mash, "f", function() tiling.goToLayout("fullscreen") end)
-hotkey.bind(mash, "f", function() tiling.goToLayout("fullscreen") end)
+hotkey.bind(mash, "r", function() tiling.goToLayout("rows") end)
-hotkey.bind(mash, "r", function() tiling.goToLayout("main-vertical") end)
+hotkey.bind(mash, "t", function() tiling.goToLayout("main-vertical") end)
 hotkey.bind(mash, "c", function() tiling.goToLayout("columns") end)
 
 -----------------------------------------------

mac-files/setup_mac.sh

@@ -24,6 +24,7 @@ grab_dependencies() {
   user_command brew install direnv
 
   user_command brew install caskroom/cask/brew-cask
+  user_command brew cask install iterm2
   user_command brew cask install hammerspoon
   user_command brew cask install karabiner
   user_command brew cask install seil
@@ -34,8 +35,17 @@ user_command() {
   sudo -u $(logname) $@
 }
 
+change_shell_to_zsh() {
+  if grep -Fqx "$ZSH_PATH" /etc/shells; then
+    echo "zsh already an allowed default shell :)"
+  else
+    echo "$(which zsh)" >> /etc/shells
+  fi
+  chsh -s $(which zsh)
+}
+
 main() {
-  # abort if homebrew is already installed; we don't want to accidentaly stomp on things
+  # abort if homebrew is already installed; we don't want to accidentally stomp on things
   if type brew &> /dev/null; then
     if [[ "$1" != "--force" ]]; then
       echo "homebrew is already installed; this mac has probably been set up already!"
@@ -54,13 +64,4 @@ main() {
   echo "done setting up the mac!"
 }
 
-change_shell_to_zsh() {
-  if grep -Fqx "$ZSH_PATH" /etc/shells; then
-    echo "zsh already an allowed default shell :)"
-  else
-    echo "$(which zsh)" >> /etc/shells
-  fi
-  chsh -s $(which zsh)
-}
-
 main $@

vim-files/vimrc

@@ -12,6 +12,7 @@ Plug 'bling/vim-airline'
 Plug 'myusuf3/numbers.vim'
 Plug 'mhinz/vim-signify'
 Plug 'nathanaelkane/vim-indent-guides'
+Plug 'kien/rainbow_parentheses.vim'
 
 Plug 'danro/rename.vim'
 Plug 'pbrisbin/vim-mkdir'
@@ -49,7 +50,7 @@ Plug 'mxw/vim-jsx'
 call plug#end()
 
 filetype plugin indent on     " required
-""" end vundle
+""" end vim-plug
 
 """" PLUGIN SETTINGS
 
@@ -95,6 +96,9 @@ autocmd! BufWritePost * Neomake
 " NERDTree / netrw
 let g:netrw_liststyle = 3 " let netrw look like NERDTree
 
+" Rainbow parentheses
+autocmd VimEnter * RainbowParenthesesToggleAll
+
 " Vim-Test
 nmap <silent> <leader>t :TestNearest<CR>
 nmap <silent> <leader>T :TestFile<CR>
@@ -130,6 +134,7 @@ let mapleader=","
 set nobackup
 set noswapfile
 set pastetoggle=<F2>
+set nowrap
 
 filetype on
 filetype plugin indent on