Skip to content

Commit

Permalink
WUT
Browse files Browse the repository at this point in the history
  • Loading branch information
mikker committed Oct 19, 2015
1 parent 2a47d5d commit f51e36d
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 10 deletions.
4 changes: 4 additions & 0 deletions gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,7 @@
prompt = false

; vim: set ft=gitconfig
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
2 changes: 1 addition & 1 deletion gvimrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif

" Font
if has('mac')
set guifont=Inconsolata:h20
set guifont=InputMono\ Thin:h16
elseif has('unix')
set guifont=Droid\ Sans\ Mono\ 10
endif
Expand Down
30 changes: 25 additions & 5 deletions vim/UltiSnips/javascript.snippets
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ React.createClass({
})
endsnippet
snippet comp
class ${1:Component} extends React.Component {
class ${1:Name} extends Component {
static propTypes = {
$2
}

render () {
return (
$0
Expand All @@ -81,10 +85,8 @@ snippet ccomp "React component"
import React, { Component, PropTypes } from 'react'

export default class ${1:Name} extends Component {
static get propTypes () {
return {
$2
}
static propTypes = {
$2
}

render () {
Expand All @@ -99,3 +101,21 @@ new Promise((resolve, reject) => {
$0
})
endsnippet
snippet rcomp "React component for react-rails"
(window => {
const { Component, PropTypes } = React

class ${1:Name} extends Component {
static propTypes = {
$2
}
render () {
return (
${3:<div>$0</div>}
)
}
}

window.$1 = $1
})(window)
endsnippet
12 changes: 8 additions & 4 deletions vim/plugins.vim
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Plug 'mustache/vim-mustache-handlebars'
Plug 'mxw/vim-jsx'
Plug 'othree/html5.vim'
Plug 'pangloss/vim-javascript'
Plug 'facebook/vim-flow', {'for': 'javascript'}
Plug 'puppetlabs/puppet-syntax-vim'
Plug 'slim-template/vim-slim'
Plug 'vim-ruby/vim-ruby'
Expand All @@ -86,6 +87,8 @@ Plug 'vyshane/vydark-vim-color'
Plug 'w0ng/vim-hybrid'
Plug 'wimstefan/Lightning'
Plug 'romainl/Disciple'
Plug 'whatyouhide/vim-gotham'
Plug 'KabbAmine/yowish.vim'

" clojure
Plug 'guns/vim-clojure-static', { 'for': 'clojure' }
Expand All @@ -96,19 +99,20 @@ Plug 'tpope/vim-leiningen', { 'for': 'clojure' }
Plug 'tpope/vim-sexp-mappings-for-regular-people', { 'for': 'clojure' }




Plug 'git@github.com:mikker/vim-rerunner'
Plug 'junegunn/goyo.vim'
Plug 'junegunn/vim-journal'
Plug 'junegunn/limelight.vim'
Plug 'chrisbra/unicode.vim'
Plug 'scrooloose/syntastic'

" Plug 'scrooloose/syntastic'
Plug 'benekastah/neomake'

Plug 'vim-scripts/BufClose.vim'
Plug 'grassdog/tagman.vim'
Plug 'tpope/vim-flagship'
" Plug 'tpope/vim-flagship'
Plug 'elmcast/elm-vim'
Plug 'sjl/gundo.vim'

call plug#end()

20 changes: 20 additions & 0 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,17 @@ nnoremap <f10> :Goyo<cr>
" c-c in visual mode acts like <esc>
xnoremap <c-c> <esc>
inoremap <c-c> <esc>
" Readline-style key bindings in command-line
cnoremap <C-A> <Home>
silent! exe "set <S-Left>=\<Esc>b"
silent! exe "set <S-Right>=\<Esc>f"

nmap <leader>ev :e $MYVIMRC<cr>
nmap <leader>sv :so $MYVIMRC<cr>
nmap <leader>ep :e <c-r>=g:plugins_file_path<cr><cr>
" }}}
" {{{ Functions and commands

Expand Down Expand Up @@ -255,6 +260,9 @@ augroup vimrcEx
au BufLeave *.{css,scss,sass} exe "normal! mS"
au BufLeave *.{js,coffee} exe "normal! mJ"
au BufLeave *.{rb} exe "normal! mC"

au BufWritePost ~/.vim/plugins.vim so ~/.vim/plugins.vim
au BufWritePost ~/.vimrc so ~/.vimrc
augroup END

" }}}
Expand Down Expand Up @@ -324,3 +332,15 @@ command! Marked call s:openMarked()
" expand G to Git in commandmode
cnoreabbrev G Git

fun! s:searchNotes()
:CtrlP ~/Dropbox/Notes
endfun
command! Notes call s:searchNotes()

let g:flow#autoclose = 1
autocmd! BufWritePost * Neomake
let g:jsx_ext_required = 0 " Allow JSX in normal JS files

iab <expr> ddate strftime("%Y-%m-%d")
iab <expr> ttime strftime("%H:%M")

0 comments on commit f51e36d

Please sign in to comment.