Skip to content

Instantly share code, notes, and snippets.

@Kazark
Last active September 5, 2017 15:06
Show Gist options
  • Save Kazark/1f58a89ee81c0c2620e3 to your computer and use it in GitHub Desktop.
Save Kazark/1f58a89ee81c0c2620e3 to your computer and use it in GitHub Desktop.
" GistID: 1f58a89ee81c0c2620e3
set nocompatible " be iMproved, required
filetype off " required
" set the runtime path to include Vundle and initialize
if has("win32")
set runtimepath+=~/vimfiles/bundle/Vundle.vim
call vundle#begin('~/vimfiles/bundle')
else
set runtimepath+=~/.vim/bundle/Vundle.vim
call vundle#begin('~/.vim/bundle')
endif
" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
" Git
Plugin 'tpope/vim-fugitive'
Plugin 'mattn/webapi-vim'
Plugin 'mattn/gist-vim'
Plugin 'arkwright/vim-manhunt'
Plugin 'rhysd/conflict-marker.vim'
" Search
Plugin 'wincent/ferret'
Plugin 'tpope/vim-abolish'
Plugin 'kien/ctrlp.vim'
Plugin 'szw/vim-g'
" Auto-editing
Plugin 'tpope/vim-endwise'
Plugin 'scrooloose/syntastic'
Plugin 'tpope/vim-repeat'
" Movements
Plugin 'rhysd/clever-f.vim'
Plugin 'terryma/vim-expand-region'
Plugin 'vim-scripts/matchit.zip'
Plugin 'tpope/vim-surround'
Plugin 'wellle/targets.vim'
Plugin 'jeetsukumaran/vim-indentwise'
" Language/format
Plugin 'Kazark/vim-log4x'
Plugin 'idris-hackers/idris-vim'
Plugin 'derekelkins/agda-vim'
Plugin 'eagletmt/ghcmod-vim'
Plugin 'fsharp/vim-fsharp'
Plugin 'elzr/vim-json'
Plugin 'elmcast/elm-vim'
Plugin 'raichoo/purescript-vim'
Plugin 'frigoeu/psc-ide-vim' "PureScript
Plugin 'zah/nim.vim'
Plugin 'PProvost/vim-ps1'
" For GHCMod
Plugin 'Shougo/vimproc.vim'
" Colorschemes
Plugin 'nanotech/jellybeans.vim'
Plugin 'reedes/vim-colors-pencil'
Plugin 'noahfrederick/vim-hemisu'
Plugin 'jonathanfilip/vim-lucius'
Plugin 'trevorrjohn/vim-obsidian'
Plugin 'whatyouhide/vim-gotham.git'
Plugin 'christophermca/meta5'
Plugin 'romainl/Apprentice'
Plugin 'jacoborus/tender.vim'
" UI
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
Plugin 'Kazark/vim-SimpleSmoothScroll'
Plugin 'scrooloose/nerdtree'
Plugin 'kazark/vim-http-client'
Plugin 'kazark/vim-linqpad'
Plugin 'tpope/vim-dispatch'
" Text
Plugin 'reedes/vim-pencil'
" Ergonomics
Plugin 'Kazark/vim-leading-not-control'
" Mine/General
Plugin 'kazark/vim-kazarc'
" All of your Plugins must be added before the following line
call vundle#end() " required
filetype plugin indent on " required
" To ignore plugin indent changes, instead use:
"filetype plugin on
"
" Brief help
" :PluginList - lists configured plugins
" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate
" :PluginSearch foo - searches for foo; append `!` to refresh local cache
" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
"
" see :h vundle for more details or wiki for FAQ
" Put your non-Plugin stuff after this line
"
"
function MyDiff()
let opt = '-a --binary '
if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif
if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif
let arg1 = v:fname_in
if arg1 =~ ' ' | let arg1 = '"' . arg1 . '"' | endif
let arg2 = v:fname_new
if arg2 =~ ' ' | let arg2 = '"' . arg2 . '"' | endif
let arg3 = v:fname_out
if arg3 =~ ' ' | let arg3 = '"' . arg3 . '"' | endif
silent execute '!"C:\Program Files\Git\usr\bin\diff.exe" ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3
if exists('l:shxq_sav')
let &shellxquote=l:shxq_sav
endif
endfunction
" https://github.com/Maximus5/ConEmu/issues/641#issuecomment-212843103
inoremap <Char-0x07F> <BS>
nnoremap <Char-0x07F> <BS>
cnoremap <Char-0x07F> <BS>
set diffexpr=MyDiff()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment