joshtronic/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:joshtronic/dotfiles

Browse source
This commit is contained in:
Josh Sherman 2016-11-22 16:43:05 -06:00
commit 53e6e6d9bd
2 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Karabiner/private.xml
View file

@ -72,29 +72,16 @@
</autogen>
</item>
<vkopenurldef>
<name>KeyCode::VK_OPEN_URL_APP_Slack</name>
<url type="file">/Applications/Slack.app</url>
<name>KeyCode::VK_OPEN_URL_APP_Franz</name>
<url type="file">/Applications/Franz.app</url>
</vkopenurldef>
<item>
<name>Right Command + 3 => Launch or Focus Slack</name>
<name>Right Command + 3 => Launch or Focus Franz</name>
<identifier>rightCommand3</identifier>
<autogen>
--KeyToKey--
KeyCode::3, ModifierFlag::COMMAND_R,
KeyCode::VK_OPEN_URL_APP_Slack
</autogen>
</item>
<vkopenurldef>
<name>KeyCode::VK_OPEN_URL_APP_Messages</name>
<url type="file">/Applications/Messages.app</url>
</vkopenurldef>
<item>
<name>Right Command + 4 => Launch or Focus Messages</name>
<identifier>rightCommand4</identifier>
<autogen>
--KeyToKey--
KeyCode::4, ModifierFlag::COMMAND_R,
KeyCode::VK_OPEN_URL_APP_Messages
KeyCode::VK_OPEN_URL_APP_Franz
</autogen>
</item>
<vkopenurldef>
@ -102,7 +89,7 @@
<url type="file">/Applications/Spotify.app</url>
</vkopenurldef>
<item>
<name>Right Command + 5 => Launch or Focus Spotify</name>
<name>Right Command + 4 => Launch or Focus Spotify</name>
<identifier>rightCommand5</identifier>
<autogen>
--KeyToKey--

25
vim/vimrc
View file

@ -45,19 +45,15 @@ set undolevels=1000
set wildmenu
set wildmode=list:longest
" TODO: Should clean this shit up
" Sets up our filetypes
autocmd BufRead,BufNewFile *.cnf,*.conf,*gitconfig setf dosini
autocmd BufNewFile,BufRead *.dust,*.dustjs,*.tl set filetype=dustjs
autocmd BufNewFile,BufRead *.less set filetype=less
autocmd BufNewFile,BufRead nginx.conf set filetype=nginx
autocmd BufNewFile,BufRead *.yaml,*.yml,*gemrc setf yaml
autocmd BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache
autocmd BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=mustache
autocmd BufNewFile,BufRead *.cnf,*.conf,*gitconfig setf dosini
autocmd BufNewFile,BufRead *.dust,*.dustjs,*.tl setf dustjs
autocmd BufNewFile,BufRead *.less setf less
autocmd BufNewFile,BufRead nginx.conf setf nginx
autocmd BufNewFile,BufRead *.yaml,*.yml,*gemrc setf yaml
autocmd BufNewFile,BufRead *.handlebars setf html.handlebars syntax=mustache
autocmd FileType javascript,dustjs,html.handlebars,css,scss setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType go setlocal noexpandtab
autocmd FileType go setlocal noexpandtab
autocmd BufWritePost ~/.tmux.conf silent! tmux source-file ~/.tmux.conf
@ -123,18 +119,11 @@ augroup ExtraWhitespace
autocmd InsertLeave * match ExtraWhiteSpace /\s\+$/
augroup END
" TODO: Can't get this to place nice with the extra whitespace grout
" augroup LongTooLong
" autocmd BufEnter * highlight LineTooLong ctermbg=DarkRed ctermfg=white
" autocmd BufEnter * match LineTooLong /\%121v.*/
" augroup END
let g:bufferline_echo = 0
autocmd VimEnter *
\ let &statusline='%{bufferline#refresh_status()}'
\ .bufferline#get_status_string()
" TODO: Confirm this shit
set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}
set statusline+=%*