Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,21 @@
[submodule "plugins/vim-json"]
path = plugins/vim-json
url = git@github.com:elzr/vim-json
[submodule "plugins/ghcmod-vim"]
path = plugins/ghcmod-vim
url = git@github.com:eagletmt/ghcmod-vim.git
[submodule "plugins/neco-ghc"]
path = plugins/neco-ghc
url = git@github.com:eagletmt/neco-ghc.git
[submodule "plugins/vimproc"]
path = plugins/vimproc
url = git@github.com:Shougo/vimproc.vim.git
[submodule "plugins/vim-flow"]
path = plugins/vim-flow
url = git@github.com:flowtype/vim-flow.git
[submodule "plugins/elm-vim"]
path = plugins/elm-vim
url = git@github.com:ElmCast/elm-vim.git
[submodule "plugins/vim-cljfmt"]
path = plugins/vim-cljfmt
url = git@github.com:venantius/vim-cljfmt.git
7 changes: 7 additions & 0 deletions eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"env": {
"browser": true,
"node": true
Expand Down
2 changes: 1 addition & 1 deletion gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
changed = green
untracked = cyan
[core]
editor = vim
editor = MINVIM=1 vim
excludesfile = ~/.gitignore_global
[alias]
ci = commit
Expand Down
1 change: 1 addition & 0 deletions plugins/elm-vim
Submodule elm-vim added at ae5315
1 change: 1 addition & 0 deletions plugins/ghcmod-vim
Submodule ghcmod-vim added at 1d192d
1 change: 1 addition & 0 deletions plugins/neco-ghc
Submodule neco-ghc added at 7f02a9
1 change: 1 addition & 0 deletions plugins/vim-cljfmt
Submodule vim-cljfmt added at c20d61
1 change: 1 addition & 0 deletions plugins/vim-flow
Submodule vim-flow added at 3bd879
1 change: 1 addition & 0 deletions plugins/vimproc
Submodule vimproc added at 25cb83
18 changes: 17 additions & 1 deletion vimrc.after
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,15 @@ endfunction

autocmd FileType ruby call RubySettings()


function! HaskellSettings()
let g:haskellmode_completion_ghc = 0
setlocal omnifunc=necoghc#omnifunc
endfunction

autocmd FileType haskell call HaskellSettings()


"""""""""""""""
" LLT stuff "
"""""""""""""""
Expand Down Expand Up @@ -525,6 +534,7 @@ function! JsSettings()
map gH :call lookup#goToFile()<cr>

nmap gd :TernDef<cr>

nmap gD :TernDoc<cr>
nmap gr :TernRefs<cr>
endif
Expand Down Expand Up @@ -601,6 +611,10 @@ let g:syntastic_html_tidy_ignore_errors=[
"let g:syntastic_javascript_checkers = ['jsxhint']
let g:syntastic_typescript_checkers = ['tslint']

if executable('node_modules/.bin/eslint')
let g:syntastic_javascript_eslint_exec = 'node_modules/.bin/eslint'
endif

"""""""""""""""""""
" YouCompleteMe "
"""""""""""""""""""
Expand Down Expand Up @@ -1113,6 +1127,8 @@ au Syntax * RainbowParenthesesLoadRound
au Syntax * RainbowParenthesesLoadSquare
au Syntax * RainbowParenthesesLoadBraces

let g:rbpt_max = 6


""""""""""
" Gist "
Expand Down Expand Up @@ -1193,7 +1209,7 @@ let g:jsx_ext_required = 0
" vim-json "
""""""""""""""

let g:vim_json_syntax_conceal = 1
let g:vim_json_syntax_conceal = 0
au BufNewFile,BufRead *.json set filetype=json


Expand Down
1 change: 1 addition & 0 deletions vimrc.before
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ let g:UltiSnipsListSnippets = "<c-e>"
" YouCompleteMe "
"""""""""""""""""""

let g:ycm_semantic_triggers = { 'haskell': ['.', 're!import.+\('] }
let g:ycm_semantic_completion_toggle = '<c-f>'


Expand Down
5 changes: 4 additions & 1 deletion zsh/themes/lfdm.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ ZSH_THEME_GIT_PROMPT_BEHIND="%B%F{221}⬇%b%f"
ZSH_THEME_RVM_PROMPT_PREFIX="%F{167}‹"
ZSH_THEME_RVM_PROMPT_SUFFIX="›%f"

ZSH_THEME_NVM_PROMPT_PREFIX="%F{167}‹node-"
ZSH_THEME_NVM_PROMPT_SUFFIX="›%f"

username="%F{073}%n%f"
short_path="%F{107}%3~%f"

Expand Down Expand Up @@ -71,4 +74,4 @@ zle -N zle-line-finish
# Beware, single-quotes are imperative here (resolution of variable at a
# different time!) As vi_mode is dynamic it cannot be inside of double-quotes.
PROMPT='${username} ${short_path} $(git_left_prompt) ${delimiter} '
RPROMPT='${vi_mode} $(git_right_prompt) $(rvm_prompt_info) %T'
RPROMPT='${vi_mode} $(git_right_prompt) $(nvm_prompt_info) %T'
11 changes: 11 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ export PATH=$PATH:$SCALA_HOME/bin

# java
export JAVA_HOME="$HOME/tools/jdk1.7.0_80"
export JAVA8_HOME="$HOME/tools/jdk1.8.0_92"
export PATH=$PATH:$JAVA_HOME/bin

# android
export ANDROID_HOME="$HOME/Android/Sdk"
export PATH=$PATH:$HOME/Android/Sdk/tools:$HOME/Android/Sdk/platform-tools:

# mongoDB

export PATH=$PATH:$HOME/tools/mongodb/bin
Expand All @@ -58,6 +63,10 @@ export PATH="$HOME/.linuxbrew/bin:$PATH"
export MANPATH="$HOME/.linuxbrew/share/man:$MANPATH"
export INFOPATH="$HOME/.linuxbrew/share/info:$INFOPATH"

# Clojure
export PATH=$PATH:$HOME/tools/leiningen
export LEIN_JAVA_CMD=$JAVA8_HOME/bin/java

# vi mode (oh-my-zsh is overwriting something here, so we stuff it in the back)
bindkey -v
bindkey ' ' magic-space
Expand Down Expand Up @@ -92,6 +101,8 @@ export PATH=$PATH:$HOME/tools/flow/bin
export PATH=$PATH:$HOME/tools/phantomjs/bin
export PHANTOMJS_BIN=$HOME/tools/phantomjs/bin/phantomjs

export PATH=$PATH:$HOME/.local/bin
export PATH=$PATH:$HOME/.cabal/bin

export NVM_DIR="/home/lfdm/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm