From 3d3ec10f9848722c4fb667bda08511831d01b68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:21:48 +0200 Subject: [PATCH 1/5] Add cygwin's mintty config --- .gitmodules | 3 --- cygwin/mintty-colors-solarized | 1 - windows_cygwin/.minttyrc | 27 +++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) delete mode 160000 cygwin/mintty-colors-solarized create mode 100644 windows_cygwin/.minttyrc diff --git a/.gitmodules b/.gitmodules index b7900e0e..08084abd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "cygwin/mintty-colors-solarized"] - path = cygwin/mintty-colors-solarized - url = https://github.com/mavnn/mintty-colors-solarized.git [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git diff --git a/cygwin/mintty-colors-solarized b/cygwin/mintty-colors-solarized deleted file mode 160000 index 11d7c05b..00000000 --- a/cygwin/mintty-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 11d7c05bf97b6c4ae6985fa94b16f6c4e7a61b94 diff --git a/windows_cygwin/.minttyrc b/windows_cygwin/.minttyrc new file mode 100644 index 00000000..553257b0 --- /dev/null +++ b/windows_cygwin/.minttyrc @@ -0,0 +1,27 @@ +BoldAsFont=-1 +Font=DejaVu Sans Mono for Powerline +FontHeight=12 +FontWeight=700 +FontIsBold=yes +Locale=en_GB +Charset=UTF-8 +ForegroundColour=131,148,150 +BackgroundColour=0,43,54 +CursorColour=220,50,47 +Black=7,54,66 +BoldBlack=0,43,54 +Red=220,50,47 +BoldRed=203,75,22 +Green=133,153,0 +BoldGreen=88,110,117 +Yellow=181,137,0 +BoldYellow=101,123,131 +Blue=38,139,210 +BoldBlue=131,148,150 +Magenta=211,54,130 +BoldMagenta=108,113,196 +Cyan=42,161,152 +BoldCyan=147,161,161 +White=238,232,213 +BoldWhite=253,246,227 +BellType=0 From e82f80209cf5d7f1be45a91c369b1c45b0e43a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:22:25 +0200 Subject: [PATCH 2/5] Replace YCM with neocomplete --- .vimrc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 8123a54d..6046b727 100755 --- a/.vimrc +++ b/.vimrc @@ -74,7 +74,7 @@ Plugin 'tpope/vim-cucumber' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' -Plugin 'Valloric/YouCompleteMe' +Plugin 'Shougo/neocomplete.vim' call vundle#end() filetype plugin indent on @@ -89,6 +89,17 @@ set background=dark highlight clear SignColumn colorscheme solarized +" plugins: neocomplete +let g:neocomplete#enable_at_startup = 1 +let g:neocomplete#enable_smart_case = 1 +"" : close popup and save indent. +inoremap =my_cr_function() +function! s:my_cr_function() + return (pumvisible() ? "\" : "" ) . "\" +endfunction +"" : completion. +inoremap pumvisible() ? "\" : "\" + " plugins: airline let g:bufferline_echo = 0 let g:airline_powerline_fonts = 1 From 1b1c192f9a12076985dbe2a1f04a811421624ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:22:40 +0200 Subject: [PATCH 3/5] install neocomplete under cygwin --- windows_cygwin/build.bat | 4 ++-- windows_cygwin/build_insider.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 6f5f5163..4692fb8f 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,8 +1,8 @@ @echo on -choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby ruby2.devkit +choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl set script_path=%~dp0 set repo_path=%script_path%\..\ diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index 7dadc6bd..e4954069 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -13,7 +13,6 @@ export NOSUDO=true export DONT_CHANGE_SHELL=true export NORUST=true export NORUBY=true -export NOVIM=true export NO_GO=true export DIR=$DOTFILES_PATH @@ -21,4 +20,5 @@ curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py python /tmp/get-pip.py $DIR/common/configure_fresh_system +ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/ From 0e1c6016872cfe1aa86c8adb3725f1ac2c5261b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:39:05 +0200 Subject: [PATCH 4/5] Explicitly install all packages on windows via choco --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 4692fb8f..33a8ac94 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl From ca99b0aa21e8c27cb51693fe0c247f1b9995b3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:39:19 +0200 Subject: [PATCH 5/5] remove YCM --- common/configure_fresh_system | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 7b5f90f0..9b13c143 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -106,13 +106,6 @@ fi if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa - cd "$DIR/.vim/bundle/YouCompleteMe/" - git submodule update --init --recursive - if [[ -z $NORUST ]]; then - ./install.py --clang-completer --omnisharp-completer - else - ./install.py --racer-completer --clang-completer --omnisharp-completer - fi fi if [[ -z $NO_GO ]]; then