Update Makefile to use mas properly in tmux.

See mas-cli/mas#16 (comment) for reference.

Makefile

@@ -53,6 +53,7 @@ formulae = \
 	mutt \
 	node-build \
 	postgresql \
+	reattach-to-user-namespace \
 	ruby-build \
 	sbt \
 	scala \
@@ -74,7 +75,7 @@ update: | install
 	gem update
 	npm update --global --quiet
 	vim +VundleUpdate +quitall
-	mas upgrade
+	reattach-to-user-namespace mas upgrade
 
 clean: | install
 	brew cleanup

config/fish/fishd.a45e60d94c2b

@@ -28,6 +28,7 @@ SET fish_pager_color_completion:normal
 SET fish_pager_color_description:555\x1eyellow
 SET fish_pager_color_prefix:cyan
 SET fish_pager_color_progress:cyan
+SET fish_user_paths:/usr/local/sbin\x1e/usr/local/sbin\x1e/Users/jesseatkinson/\x2erubies/2\x2e0\x2e0\x2dp648/bin
 SET fry_auto_switch:0
 SET fry_installer:ruby\x2dbuild
 SET fry_prepend_path:0

config/fish/functions/mas.fish

@@ -0,0 +1,3 @@
+function mas --description 'Make mas work in tmux'
+	reattach-to-user-namespace mas $argv
+end

tmux.conf.local

@@ -114,3 +114,8 @@ tmux_conf_new_session_prompt=true
 # this is the place to further customize tmux's configuration
 
 # set -g history-limit 10000
+
+# remap prefix from 'C-b' to 'C-a'
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix

vimrc

@@ -142,10 +142,10 @@ set splitbelow
 set splitright
 
 " Allows jumping between splits with Ctrl + movement keys.
-nnoremap <C-J> <C-W><C-J>
-nnoremap <C-K> <C-W><C-K>
-nnoremap <C-L> <C-W><C-L>
-nnoremap <C-H> <C-W><C-H>
+" nnoremap <C-J> <C-W><C-J>
+" nnoremap <C-K> <C-W><C-K>
+" nnoremap <C-L> <C-W><C-L>
+" nnoremap <C-H> <C-W><C-H>
 
 " When a file has been detected to have been changed outside of Vim and
 " it has not been changed inside of Vim, automatically read it again.
@@ -207,6 +207,9 @@ set linebreak
 " Turns line wrapping on
 set wrap
 
+" wrap lines without changing the amount of indent.
+set breakindent
+
 " Turns off physical line wrapping (ie: automatic insertion of newlines)
 set textwidth=0
 set wrapmargin=0
@@ -740,7 +743,7 @@ augroup END
 augroup ft_conf
   autocmd!
 
-  au BufNewFile,BufRead bash_profile,gitconfig set filetype=conf
+  au BufNewFile,BufRead *.conf,bash_profile,gitconfig set filetype=conf
   autocmd FileType conf setlocal foldmethod=marker
   autocmd Filetype conf setlocal foldmarker={{{,}}}
 augroup END