From 6169cb61d8e334c708929dfedb6a3584a0e91c0b Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Sat, 16 Jul 2016 23:01:02 +0200 Subject: [PATCH] Move bin files --- .bashrc_local | 11 ++-- .config/bash/aliases | 5 -- .config/profile/environ.sh | 4 +- .config/profile/paths.sh | 4 +- .vimrc | 56 +++++++++--------- {.local/bin => bin}/build-luajit.sh | 0 {.local/bin => bin}/build-vim.sh | 0 {.local/bin => bin}/build-wifi.sh | 0 {.local/bin => bin}/colortest | 0 {.local/bin => bin}/git-diffall.sh | 0 {.local/bin => bin}/git-difftool.sh | 0 {.local/bin => bin}/git-editor.sh | 0 {.local/bin => bin}/git-mergetool.sh | 0 {.local/bin => bin}/git-review | 0 {.local/exe => exe}/caps_and_rwin_to_ctrl.reg | Bin {.local/exe => exe}/msys2_here.reg | Bin .../exe => exe}/remove_scancode_mappings.reg | Bin {.local/exe => exe}/solarized.reg | 0 {.local/exe => exe}/usdk-hhkb.ahk | 0 {.local/exe => exe}/usdk-hhkb.exe | Bin 20 files changed, 39 insertions(+), 41 deletions(-) rename {.local/bin => bin}/build-luajit.sh (100%) rename {.local/bin => bin}/build-vim.sh (100%) rename {.local/bin => bin}/build-wifi.sh (100%) rename {.local/bin => bin}/colortest (100%) rename {.local/bin => bin}/git-diffall.sh (100%) rename {.local/bin => bin}/git-difftool.sh (100%) rename {.local/bin => bin}/git-editor.sh (100%) rename {.local/bin => bin}/git-mergetool.sh (100%) rename {.local/bin => bin}/git-review (100%) rename {.local/exe => exe}/caps_and_rwin_to_ctrl.reg (100%) rename {.local/exe => exe}/msys2_here.reg (100%) rename {.local/exe => exe}/remove_scancode_mappings.reg (100%) rename {.local/exe => exe}/solarized.reg (100%) rename {.local/exe => exe}/usdk-hhkb.ahk (100%) rename {.local/exe => exe}/usdk-hhkb.exe (100%) diff --git a/.bashrc_local b/.bashrc_local index 39f8a23..49aafa7 100644 --- a/.bashrc_local +++ b/.bashrc_local @@ -1,12 +1,15 @@ -alias gvim="C:/programs/Vim/vim74/gvim.exe" - if [ -d "${HOME}/.fzf" ] ; then PATH="${HOME}/.fzf:${PATH}" fi +[ -f ~/.fzf.bash ] && source ~/.fzf.bash -PATH="C:/Program\ Files\ (x86)/MSBuild/12.0/Bin:/c/programs/CMake/bin:${PATH}" +PATH='/c/programs/CMake/bin':'/c/program files (x86)/msbuild/12.0/bin':${PATH} -[ -f ~/.fzf.bash ] && source ~/.fzf.bash +alias gvim='winpty "c:/programs/vim/vim74/gvim.exe"' +alias python='winpty "c:/program files (x86)/python35-32/python.exe"' +alias cmake='winpty "c:/programs/cmake/bin/cmake.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"' eval "$(ssh-agent -s)" ssh-add.exe ~/.ssh/github diff --git a/.config/bash/aliases b/.config/bash/aliases index eb2f979..5518512 100644 --- a/.config/bash/aliases +++ b/.config/bash/aliases @@ -84,13 +84,8 @@ alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date alias reload="exec $SHELL -l" # alias bashhere='chere -il -t mintty -s bash' -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 startvnc='vncserver -geometry 1870x980 -depth 24' alias startvnc4='vnc4server -geometry 1870x980 -depth 24' alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' -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/profile/environ.sh b/.config/profile/environ.sh index c906c16..308b036 100644 --- a/.config/profile/environ.sh +++ b/.config/profile/environ.sh @@ -32,8 +32,8 @@ 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 GTEST_DIR='c:/users/59698/repos/googletest/googletest' +export CPPUNITDIR='c:/users/59698/repos/cppunit' export VIRTUALENVWRAPPER_PYTHON=/mingw64/bin/python3 #export XDG_CONFIG_HOME = ~/.config/ diff --git a/.config/profile/paths.sh b/.config/profile/paths.sh index 3d5875b..2863285 100644 --- a/.config/profile/paths.sh +++ b/.config/profile/paths.sh @@ -2,9 +2,11 @@ #export XDG_DATA_DIRS=/usr/share/ #export XDG_CONFIG_DIRS=/etc/xdg/ +PATH=.:${HOME}/bin:${PATH} + # Set PATH so it includes user's private bin if it exists if [ -d "${HOME}/.local/bin" ] ; then - PATH=.:${HOME}/.local/bin:${PATH} + PATH=${HOME}/.local/bin:${PATH} fi # Set MANPATH so it includes users' private man if it exists diff --git a/.vimrc b/.vimrc index 06cd13c..ff56210 100644 --- a/.vimrc +++ b/.vimrc @@ -21,32 +21,17 @@ set runtimepath+=~/.cache/vim " section: plugins {{{1 " --------------------- silent call plug#begin('~/.cache/vim/bundle') -"Plug 'tpope/vim-sensible' -"Plug 'tpope/vim-ragtag' Plug 'tpope/vim-repeat' Plug 'tpope/vim-surround' Plug 'tpope/vim-fugitive' -"Plug 'vim-airline/vim-airline' -"Plug 'vim-airline/vim-airline-themes' -"Plug 'mileszs/ack.vim' +Plug 'tpope/vim-commentary' +Plug 'scrooloose/syntastic' +Plug 'ctrlpvim/ctrlp.vim' Plug 'brandonbloom/csearch.vim' Plug 'chazy/cscope_maps' -Plug 'majutsushi/tagbar' -"Plug 'airblade/vim-gitgutter' -"Plug 'Lokaltog/powerline',{'rtp': 'powerline/binding/vim/'} -"Plug 'junegunn/fzf.vim' -Plug 'thanthese/Tortoise-Typing' Plug 'altercation/vim-colors-solarized' Plug 'editorconfig/editorconfig-vim' Plug 'vim-scripts/a.vim' -Plug 'Shougo/unite.vim' -Plug 'bronson/vim-trailing-whitespace' -Plug 'junegunn/vim-easy-align' -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 @@ -89,8 +74,8 @@ set showcmd " show (partial) command in status line. set showmatch " show matching brackets. 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 smarttab " sw at the start of the line, sts everywhere else +"setglobal tags=./tags; set timeoutlen=500 " leader key timeout set ttimeoutlen=50 " make esc work faster set visualbell @@ -126,7 +111,7 @@ let g:markdown_syntax_conceal = 0 "let g:airline#extensions#tabline#enabled = 1 let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] -let g:editorconfig_verbose=0 +let g:editorconfig_verbose=1 set colorcolumn=80 highlight ColorColumn ctermbg=9 @@ -192,17 +177,30 @@ nnoremap P "*P vnoremap p "*p vnoremap P "*P else -"nnoremap y "*y -"nnoremap p "*p -"nnoremap Y "+y -"nnoremap P "+p -"nnoremap y "*y -"nnoremap yy "*yy -"noremap p "*p -"noremap P "*P +" nnoremap y "*y +" nnoremap p "*p +" nnoremap Y "+y +" nnoremap P "+p +" nnoremap y "*y +" nnoremap yy "*yy +" noremap p "*p +" noremap P "*P endif if has("cscope") + cnoreabbrev csa + \ ((getcmdtype() == ':' && getcmdpos() <= 4)? 'cs add' : 'csa') + cnoreabbrev csf + \ ((getcmdtype() == ':' && getcmdpos() <= 4)? 'cs find' : 'csf') + cnoreabbrev csk + \ ((getcmdtype() == ':' && getcmdpos() <= 4)? 'cs kill' : 'csk') + cnoreabbrev csr + \ ((getcmdtype() == ':' && getcmdpos() <= 4)? 'cs reset' : 'csr') + cnoreabbrev css + \ ((getcmdtype() == ':' && getcmdpos() <= 4)? 'cs show' : 'css') + cnoreabbrev csh + \ ((getcmdtype() == ':' && getcmdpos() <= 4)? 'cs help' : 'csh') + nnoremap fs :cscope find s =expand(""):botright cwindow nnoremap fg :cscope find g =expand(""):botright cwindow nnoremap fc :cscope find c =expand(""):botright cwindow diff --git a/.local/bin/build-luajit.sh b/bin/build-luajit.sh similarity index 100% rename from .local/bin/build-luajit.sh rename to bin/build-luajit.sh diff --git a/.local/bin/build-vim.sh b/bin/build-vim.sh similarity index 100% rename from .local/bin/build-vim.sh rename to bin/build-vim.sh diff --git a/.local/bin/build-wifi.sh b/bin/build-wifi.sh similarity index 100% rename from .local/bin/build-wifi.sh rename to bin/build-wifi.sh diff --git a/.local/bin/colortest b/bin/colortest similarity index 100% rename from .local/bin/colortest rename to bin/colortest diff --git a/.local/bin/git-diffall.sh b/bin/git-diffall.sh similarity index 100% rename from .local/bin/git-diffall.sh rename to bin/git-diffall.sh diff --git a/.local/bin/git-difftool.sh b/bin/git-difftool.sh similarity index 100% rename from .local/bin/git-difftool.sh rename to bin/git-difftool.sh diff --git a/.local/bin/git-editor.sh b/bin/git-editor.sh similarity index 100% rename from .local/bin/git-editor.sh rename to bin/git-editor.sh diff --git a/.local/bin/git-mergetool.sh b/bin/git-mergetool.sh similarity index 100% rename from .local/bin/git-mergetool.sh rename to bin/git-mergetool.sh diff --git a/.local/bin/git-review b/bin/git-review similarity index 100% rename from .local/bin/git-review rename to bin/git-review diff --git a/.local/exe/caps_and_rwin_to_ctrl.reg b/exe/caps_and_rwin_to_ctrl.reg similarity index 100% rename from .local/exe/caps_and_rwin_to_ctrl.reg rename to exe/caps_and_rwin_to_ctrl.reg diff --git a/.local/exe/msys2_here.reg b/exe/msys2_here.reg similarity index 100% rename from .local/exe/msys2_here.reg rename to exe/msys2_here.reg diff --git a/.local/exe/remove_scancode_mappings.reg b/exe/remove_scancode_mappings.reg similarity index 100% rename from .local/exe/remove_scancode_mappings.reg rename to exe/remove_scancode_mappings.reg diff --git a/.local/exe/solarized.reg b/exe/solarized.reg similarity index 100% rename from .local/exe/solarized.reg rename to exe/solarized.reg diff --git a/.local/exe/usdk-hhkb.ahk b/exe/usdk-hhkb.ahk similarity index 100% rename from .local/exe/usdk-hhkb.ahk rename to exe/usdk-hhkb.ahk diff --git a/.local/exe/usdk-hhkb.exe b/exe/usdk-hhkb.exe similarity index 100% rename from .local/exe/usdk-hhkb.exe rename to exe/usdk-hhkb.exe -- 2.43.0