From fa68f3bfc29bcda74244d900c67c69a09586b206 Mon Sep 17 00:00:00 2001 From: LFDM <1986gh@gmail.com> Date: Tue, 31 Oct 2017 13:44:09 +0100 Subject: [PATCH 1/5] Update plugins --- .gitmodules | 18 ++++++++++++++++++ plugins/elm-vim | 1 + plugins/ghcmod-vim | 1 + plugins/neco-ghc | 1 + plugins/vim-cljfmt | 1 + plugins/vim-flow | 1 + plugins/vimproc | 1 + 7 files changed, 24 insertions(+) create mode 160000 plugins/elm-vim create mode 160000 plugins/ghcmod-vim create mode 160000 plugins/neco-ghc create mode 160000 plugins/vim-cljfmt create mode 160000 plugins/vim-flow create mode 160000 plugins/vimproc diff --git a/.gitmodules b/.gitmodules index ed3a3d9..e40a008 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/plugins/elm-vim b/plugins/elm-vim new file mode 160000 index 0000000..ae53153 --- /dev/null +++ b/plugins/elm-vim @@ -0,0 +1 @@ +Subproject commit ae5315396cd0f3958750f10a5f3ad9d34d33f40d diff --git a/plugins/ghcmod-vim b/plugins/ghcmod-vim new file mode 160000 index 0000000..1d192d1 --- /dev/null +++ b/plugins/ghcmod-vim @@ -0,0 +1 @@ +Subproject commit 1d192d13d68ab59f9f46497a0909bf24a7b7dfff diff --git a/plugins/neco-ghc b/plugins/neco-ghc new file mode 160000 index 0000000..7f02a9c --- /dev/null +++ b/plugins/neco-ghc @@ -0,0 +1 @@ +Subproject commit 7f02a9c25fb272a87d2be092826e2cd3094c620d diff --git a/plugins/vim-cljfmt b/plugins/vim-cljfmt new file mode 160000 index 0000000..c20d61c --- /dev/null +++ b/plugins/vim-cljfmt @@ -0,0 +1 @@ +Subproject commit c20d61ca147ef2dda7c8b82670bcae0473e90120 diff --git a/plugins/vim-flow b/plugins/vim-flow new file mode 160000 index 0000000..3bd879d --- /dev/null +++ b/plugins/vim-flow @@ -0,0 +1 @@ +Subproject commit 3bd879dd7060f13a78e9238669c2e1731e098607 diff --git a/plugins/vimproc b/plugins/vimproc new file mode 160000 index 0000000..25cb83f --- /dev/null +++ b/plugins/vimproc @@ -0,0 +1 @@ +Subproject commit 25cb83f24edec4aec1e9f1329302235e7a7a7fe0 From d512a7ec9d3aee4473b64a227e0f043fd48c843f Mon Sep 17 00:00:00 2001 From: LFDM <1986gh@gmail.com> Date: Tue, 31 Oct 2017 13:44:22 +0100 Subject: [PATCH 2/5] Update gitconfig --- gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index 2e98057..ed50bbb 100644 --- a/gitconfig +++ b/gitconfig @@ -10,7 +10,7 @@ changed = green untracked = cyan [core] - editor = vim + editor = MINVIM=1 vim excludesfile = ~/.gitignore_global [alias] ci = commit From 03b1729a6356c4f2d0e8adb7ccbe10e4582d2052 Mon Sep 17 00:00:00 2001 From: LFDM <1986gh@gmail.com> Date: Tue, 31 Oct 2017 13:44:32 +0100 Subject: [PATCH 3/5] Update standard eslintrc (obsolete?) --- eslintrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eslintrc b/eslintrc index 6c7103b..618d199 100644 --- a/eslintrc +++ b/eslintrc @@ -1,5 +1,12 @@ { "parser": "babel-eslint", + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module", + "ecmaFeatures": { + "jsx": true + } + }, "env": { "browser": true, "node": true From b2022e6cd2ec07f98b06b49f29ec1df288f4902d Mon Sep 17 00:00:00 2001 From: LFDM <1986gh@gmail.com> Date: Tue, 31 Oct 2017 13:44:43 +0100 Subject: [PATCH 4/5] Update vimrcs --- vimrc.after | 18 +++++++++++++++++- vimrc.before | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/vimrc.after b/vimrc.after index c785f1f..1afc40b 100644 --- a/vimrc.after +++ b/vimrc.after @@ -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 " """"""""""""""" @@ -525,6 +534,7 @@ function! JsSettings() map gH :call lookup#goToFile() nmap gd :TernDef + nmap gD :TernDoc nmap gr :TernRefs endif @@ -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 " """"""""""""""""""" @@ -1113,6 +1127,8 @@ au Syntax * RainbowParenthesesLoadRound au Syntax * RainbowParenthesesLoadSquare au Syntax * RainbowParenthesesLoadBraces +let g:rbpt_max = 6 + """""""""" " Gist " @@ -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 diff --git a/vimrc.before b/vimrc.before index 81b9370..9da1f7d 100644 --- a/vimrc.before +++ b/vimrc.before @@ -52,6 +52,7 @@ let g:UltiSnipsListSnippets = "" " YouCompleteMe " """"""""""""""""""" +let g:ycm_semantic_triggers = { 'haskell': ['.', 're!import.+\('] } let g:ycm_semantic_completion_toggle = '' From be6ae47207dd92a65cdb4f0bd20dde409fa8592c Mon Sep 17 00:00:00 2001 From: LFDM <1986gh@gmail.com> Date: Tue, 31 Oct 2017 13:45:05 +0100 Subject: [PATCH 5/5] Update zshrc --- zsh/themes/lfdm.zsh-theme | 5 ++++- zshrc | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/zsh/themes/lfdm.zsh-theme b/zsh/themes/lfdm.zsh-theme index 1743439..0cfa982 100644 --- a/zsh/themes/lfdm.zsh-theme +++ b/zsh/themes/lfdm.zsh-theme @@ -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" @@ -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' diff --git a/zshrc b/zshrc index 811ba02..8c672e9 100644 --- a/zshrc +++ b/zshrc @@ -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 @@ -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 @@ -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