From: Jannik ZANDER Date: Sat, 9 Jul 2016 18:41:52 +0000 (+0200) Subject: Msys2 here X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=760e1c9e4ed27374676e7819c41bd0f18e680928;p=dotfiles.git Msys2 here --- diff --git a/.bashrc b/.bashrc index 0afaa65..3551ddf 100644 --- a/.bashrc +++ b/.bashrc @@ -8,4 +8,8 @@ for file in ${HOME}/.config/bash/*; do [ -f "$file" ] && . "$file"; done; -[ -f ~/.fzf.bash ] && source ~/.fzf.bash +#export VIRTUALENVWRAPPER_PYTHON=`/usr/bin/env python3` +#. /mingw64/bin/virtualenvwrapper.sh + +# last line +[ -f ~/.bashrc_local ] && . ~/.bashrc_local diff --git a/.bashrc_local b/.bashrc_local new file mode 100644 index 0000000..39f8a23 --- /dev/null +++ b/.bashrc_local @@ -0,0 +1,12 @@ +alias gvim="C:/programs/Vim/vim74/gvim.exe" + +if [ -d "${HOME}/.fzf" ] ; then + PATH="${HOME}/.fzf:${PATH}" +fi + +PATH="C:/Program\ Files\ (x86)/MSBuild/12.0/Bin:/c/programs/CMake/bin:${PATH}" + +[ -f ~/.fzf.bash ] && source ~/.fzf.bash + +eval "$(ssh-agent -s)" +ssh-add.exe ~/.ssh/github diff --git a/.config/bash/aliases b/.config/bash/aliases index 19859cd..eb2f979 100644 --- a/.config/bash/aliases +++ b/.config/bash/aliases @@ -87,12 +87,10 @@ alias reload="exec $SHELL -l" alias newterm='mintty /bin/env CHERE_INVOKING=1 /bin/bash -l &' alias gtypist='gtypist -wi' alias startxwin='run /usr/bin/bash.exe -l -c "/usr/bin/startxwin -- -nolock -unixkill"' -alias sumatra='startSumatra.sh' -alias lynx='lynx -use_mouse -vikeys' alias startvnc='vncserver -geometry 1870x980 -depth 24' alias startvnc4='vnc4server -geometry 1870x980 -depth 24' -#alias python='/usr/local/bin/python3' -alias git_local='git --git-dir=.git_local' alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' -alias vcbuild='"C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe"' - +alias vcbuild='winpty "c:/program files (x86)/microsoft visual studio 9.0/vc/vcpackages/vcbuild.exe"' +alias msbuild='winpty "c:/program files (x86)/msbuild/12.0/bin/msbuild.exe"' +alias python='winpty "c:/program files (x86)/python35-32/python.exe"' +alias cmake='winpty "c:/programs/cmake/bin/cmake.exe"' diff --git a/.config/bash/bashrc_local b/.config/bash/bashrc_local deleted file mode 100644 index 2f5faba..0000000 --- a/.config/bash/bashrc_local +++ /dev/null @@ -1,12 +0,0 @@ -alias gvim="C:/programs/Vim/vim74/gvim.exe" - -if [ -d "${HOME}/.fzf" ] ; then - PATH="${HOME}/.fzf:${PATH}" -fi - - -export GOPATH="$HOME/gopath" -#export GOROOT=/mingw64 -export GOROOT=/mingw64/lib/go -eval "$(ssh-agent -s)" -ssh-add.exe ~/.ssh/github diff --git a/.config/profile/environ.sh b/.config/profile/environ.sh index b4f75b9..c906c16 100644 --- a/.config/profile/environ.sh +++ b/.config/profile/environ.sh @@ -32,7 +32,9 @@ export LESS_TERMCAP_md="${yellow}"; # export LESSOPEN="| /usr/bin/src-hilite-lesspipe.sh %s" export LESS=-eFRX - +export GTEST_DIR=~/repos/googletest/googletest +export CPPUNITDIR=~/repos/cppunit +export VIRTUALENVWRAPPER_PYTHON=/mingw64/bin/python3 #export XDG_CONFIG_HOME = ~/.config/ #export XDG_DATA_HOME = ~/.local/share/ diff --git a/.config/profile/paths.sh b/.config/profile/paths.sh index 2de7134..3d5875b 100644 --- a/.config/profile/paths.sh +++ b/.config/profile/paths.sh @@ -20,6 +20,8 @@ fi # Set PATH to temporary folders export TMPDIR="${HOME}/.tmp" export TEMPDIR="$TMPDIR" +export TEMP="$TMPDIR" +export TMP="$TMPDIR" mkdir -m700 "$TMPDIR" > /dev/null 2>&1 # Set PATH to PREFIX folders diff --git a/.inputrc b/.inputrc index b6d3781..630cf3c 100644 --- a/.inputrc +++ b/.inputrc @@ -1,7 +1,4 @@ # Use vi keybindings for everything that uses readline. -set editing-mode vi -# Prompt will be prefixed with a `+` while in insert mode and a `:` when in command mode -#set show-mode-in-prompt on # Adds punctuation as word delimiters set bind-tty-special-chars off @@ -17,23 +14,23 @@ set completion-query-items 200 set visible-stats on set skip-completed-text on +set editing-mode vi +set keymap vi $if mode=vi + # Prompt will be prefixed with a `+` while in insert mode and a `:` when in command mode + #set show-mode-in-prompt on set keymap vi-command "gg": beginning-of-history "G": end-of-history - "p": history-search-backward - "n": history-search-forward -# "\e[C": forward-char -# "\e[D": backward-char + "k": history-search-backward + "j": history-search-forward set keymap vi-insert + "jj": vi-movement-mode "\C-l": clear-screen "\C-w": backward-kill-word - # auto-complete from the history - "\C-p": history-search-backward - "\C-n": history-search-forward -# "\e[C": forward-char -# "\e[D": backward-char + "\C-k": history-search-backward + "\C-j": history-search-forward $endif $if Bash diff --git a/.local/exe/msys2_here.reg b/.local/exe/msys2_here.reg new file mode 100644 index 0000000..61ab49d Binary files /dev/null and b/.local/exe/msys2_here.reg differ diff --git a/.vimrc b/.vimrc index 9c11be0..06cd13c 100644 --- a/.vimrc +++ b/.vimrc @@ -20,7 +20,7 @@ set runtimepath+=~/.cache/vim " section: plugins {{{1 " --------------------- -call plug#begin('~/.cache/vim/bundle') +silent call plug#begin('~/.cache/vim/bundle') "Plug 'tpope/vim-sensible' "Plug 'tpope/vim-ragtag' Plug 'tpope/vim-repeat' @@ -46,6 +46,7 @@ Plug 'kana/vim-tabpagecd' " Load on nothing Plug 'SirVer/ultisnips', { 'on': [] } Plug 'Valloric/YouCompleteMe', { 'on': [] } +Plug 'heaths/vim-msbuild' call plug#end() " section: options {{{1 @@ -90,7 +91,7 @@ set sidescrolloff=5 set smartcase " case insensitive searches become sensitive with capitals set smarttab " sw at the start of the line, sts everywhere else setglobal tags=./tags; -set timeoutlen=1200 " a little bit more time for macros +set timeoutlen=500 " leader key timeout set ttimeoutlen=50 " make esc work faster set visualbell if exists('+undofile') @@ -175,18 +176,12 @@ endif" " let mapleader = "\" -if has("cscope") - nnoremap fs :cscope find s =expand(""):botright cwindow - nnoremap fg :cscope find g =expand(""):botright cwindow - nnoremap fc :cscope find c =expand(""):botright cwindow - nnoremap ft :cscope find t =expand(""):botright cwindow - nnoremap fe :cscope find e =expand(""):botright cwindow - nnoremap ff :cscope find f =expand(""):botright cwindow - nnoremap fd :cscope find d =expand(""):botright cwindow - nnoremap fi :cscope find i ^=expand("")$:botright cwindow - "todo: figure out how to get cstag output in quickfix or a popup menu. - map :cstag =expand("") -endif +" explorer +nnoremap e :Lexplore . +" cd to same directory as file +nnoremap cd :cd %:p:h:pwd +" source .vimrc +nnoremap v :so ~/.vimrc " copy/paste from system clipboard if has("win32") @@ -207,10 +202,19 @@ else "noremap P "*P endif -" cd to same directory as file -nnoremap cd :cd %:p:h:pwd -" source .vimrc -nnoremap v :so ~/.vimrc +if has("cscope") + nnoremap fs :cscope find s =expand(""):botright cwindow + nnoremap fg :cscope find g =expand(""):botright cwindow + nnoremap fc :cscope find c =expand(""):botright cwindow + nnoremap ft :cscope find t =expand(""):botright cwindow + nnoremap fe :cscope find e =expand(""):botright cwindow + nnoremap ff :cscope find f =expand(""):botright cwindow + nnoremap fd :cscope find d =expand(""):botright cwindow + nnoremap fi :cscope find i ^=expand("")$:botright cwindow + "todo: figure out how to get cstag output in quickfix or a popup menu. + map :cstag =expand("") +endif + " split navigations nnoremap nnoremap @@ -221,9 +225,6 @@ nnoremap za "exit insert mode inoremap jj inoremap j j -" explorer -"nnoremap e :e . -nnoremap e :Lexplore . " section: autocommands {{{1 " --------------------------