Merge pull request #29 from cyplo/cygwin

Autocompletion and colours for Cygwin
This commit is contained in:
Cyryl Płotnicki 2016-08-21 20:01:46 +02:00 committed by GitHub
commit 2f2b7431f3
7 changed files with 42 additions and 15 deletions

3
.gitmodules vendored
View file

@ -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"] [submodule ".oh-my-zsh"]
path = .oh-my-zsh path = .oh-my-zsh
url = git://github.com/robbyrussell/oh-my-zsh.git url = git://github.com/robbyrussell/oh-my-zsh.git

13
.vimrc
View file

@ -74,7 +74,7 @@ Plugin 'tpope/vim-cucumber'
Plugin 'airblade/vim-gitgutter.git' Plugin 'airblade/vim-gitgutter.git'
Plugin 'godlygeek/tabular' Plugin 'godlygeek/tabular'
Plugin 'plasticboy/vim-markdown' Plugin 'plasticboy/vim-markdown'
Plugin 'Valloric/YouCompleteMe' Plugin 'Shougo/neocomplete.vim'
call vundle#end() call vundle#end()
filetype plugin indent on filetype plugin indent on
@ -89,6 +89,17 @@ set background=dark
highlight clear SignColumn highlight clear SignColumn
colorscheme solarized colorscheme solarized
" plugins: neocomplete
let g:neocomplete#enable_at_startup = 1
let g:neocomplete#enable_smart_case = 1
"" <CR>: close popup and save indent.
inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
function! s:my_cr_function()
return (pumvisible() ? "\<C-y>" : "" ) . "\<CR>"
endfunction
"" <TAB>: completion.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
" plugins: airline " plugins: airline
let g:bufferline_echo = 0 let g:bufferline_echo = 0
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1

View file

@ -106,13 +106,6 @@ fi
if [[ -z $NOVIM ]]; then if [[ -z $NOVIM ]]; then
echo "\n" | vim +PluginInstall +qa 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 fi
if [[ -z $NO_GO ]]; then if [[ -z $NO_GO ]]; then

@ -1 +0,0 @@
Subproject commit 11d7c05bf97b6c4ae6985fa94b16f6c4e7a61b94

27
windows_cygwin/.minttyrc Normal file
View file

@ -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

View file

@ -1,8 +1,8 @@
@echo on @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 --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 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 script_path=%~dp0
set repo_path=%script_path%\..\ set repo_path=%script_path%\..\

View file

@ -13,7 +13,6 @@ export NOSUDO=true
export DONT_CHANGE_SHELL=true export DONT_CHANGE_SHELL=true
export NORUST=true export NORUST=true
export NORUBY=true export NORUBY=true
export NOVIM=true
export NO_GO=true export NO_GO=true
export DIR=$DOTFILES_PATH 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 python /tmp/get-pip.py
$DIR/common/configure_fresh_system $DIR/common/configure_fresh_system
ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/