Mac updates galore

Patch up my new structure to support Macs as well
Add Firefox for Mac overlay
Combine Python version definitions
Toy around with Vim settings

home/vim.nix

@@ -75,12 +75,12 @@ let g:ctrlp_working_path_mode = 'arc'
 let g:ctrlp_switch_buffer = 0
 let g:ctrlp_cmd = 'CtrlPMixed'
 let g:ctrlp_show_hidden = 1
-"let g:ctrlp_user_command = {
-"	\'types': {
-"		\1: ['.git', '${pkgs.git}/bin/git ls-files --cached --exclude-standard --others' ],
-"	\},
-"	\'fallback': '${pkgs.findutils}/bin/find . -type f | ${pkgs.gnugrep}/bin/grep -v -e "\.tox/" -e "\.git/"'
-"\}
+let g:ctrlp_user_command = {
+	\'types': {
+		\1: ['.git', '${pkgs.git}/bin/git ls-files --cached --exclude-standard --others' ],
+	\},
+	\'fallback': '${pkgs.findutils}/bin/find . -type f | ${pkgs.gnugrep}/bin/grep -v -e "\.tox/" -e "\.git/"',
+\}
 " let g:ctrpl_match_func = { 'match': 'pymatcher#PyMatch' }
 
 " Settings for NerdTree