Msys2 here

diff --git a/.bashrc b/.bashrc
index 0afaa6522d05efee64839d6c3721e7b60eaaadf9..3551ddfbbfa32595e40751e8a3e131f104c4c9d6 100644 (file)
--- 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 (file)
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 19859cd1fba0051a1e749d19a53faaf40c65fab6..eb2f9795ad02224810fd23c752f2d838e048ca81 100644 (file)
--- 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 (file)
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 b4f75b988d5ab719089167a8d5943da914f46d85..c906c1633c25d94e53d856b71d9c19642aa1f63e 100644 (file)
--- 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 2de7134570344a51586caca5f967fe1677588843..3d5875b06ab662a525e3438251a4bbf159f7fc78 100644 (file)
--- 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 b6d378175eeab392cce64551ae540411fbf5713e..630cf3c659e6f1e80b0cce9aad9c75ac3e52d763 100644 (file)
--- 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 (file)
index 0000000..61ab49d
Binary files /dev/null and b/.local/exe/msys2_here.reg differ

diff --git a/.vimrc b/.vimrc
index 9c11be0442f821b59c2d2b2496530aafb54dc32b..06cd13cfbe8914df00eb806534782114ef977fdc 100644 (file)
--- 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 = "\<space>"
 
-if has("cscope")
-  nnoremap <leader>fs :cscope find s <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>fg :cscope find g <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>fc :cscope find c <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>ft :cscope find t <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>fe :cscope find e <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>ff :cscope find f <c-r>=expand("<cfile>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>fd :cscope find d <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
-  nnoremap <leader>fi :cscope find i ^<c-r>=expand("<cfile>")<cr>$<cr>:botright cwindow<cr>
-  "todo: figure out how to get cstag output in quickfix or a popup menu.
-  map <c-_> :cstag <c-r>=expand("<cword>")<cr><cr>
-endif
+" explorer
+nnoremap <leader>e    :Lexplore .<cr>
+" cd to same directory as file
+nnoremap <leader>cd   :cd %:p:h<cr>:pwd<cr>
+" source .vimrc
+nnoremap <leader>v    :so ~/.vimrc<cr>
 
 " copy/paste from system clipboard
 if  has("win32")
@@ -207,10 +202,19 @@ else
 "noremap  <Leader>P  "*P
 endif
 
-" cd to same directory as file
-nnoremap <leader>cd   :cd %:p:h<cr>:pwd<cr>
-" source .vimrc
-nnoremap <leader>v    :so ~/.vimrc<cr>
+if has("cscope")
+  nnoremap <leader>fs :cscope find s <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>fg :cscope find g <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>fc :cscope find c <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>ft :cscope find t <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>fe :cscope find e <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>ff :cscope find f <c-r>=expand("<cfile>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>fd :cscope find d <c-r>=expand("<cword>")<cr><cr>:botright cwindow<cr>
+  nnoremap <leader>fi :cscope find i ^<c-r>=expand("<cfile>")<cr>$<cr>:botright cwindow<cr>
+  "todo: figure out how to get cstag output in quickfix or a popup menu.
+  map <c-_> :cstag <c-r>=expand("<cword>")<cr><cr>
+endif
+
 " split navigations
 nnoremap <C-J>        <C-W><C-J>
 nnoremap <C-K>        <C-W><C-K>
@@ -221,9 +225,6 @@ nnoremap <cr> za
 "exit insert mode
 inoremap jj           <esc>
 inoremap j<space>     j
-" explorer
-"nnoremap <leader>e    :e .<cr>
-nnoremap <leader>e    :Lexplore .<cr>
 
 " section: autocommands {{{1
 " --------------------------