From 094ba120f42eb6a4d45051e674a34c5a52b68a7f Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Wed, 15 Nov 2017 13:38:44 +0100 Subject: [PATCH] Bash for Windows cleanup --- .bash_profile | 1 - .bashrc | 4 +- .config/git/config | 4 +- .config/git/config_local | 7 +- .config/profile/environ.sh | 49 - .config/profile/install.sh | 13 - .config/profile/paths.sh | 42 - .minttyrc | 25 - .screenrc | 8 - .vimrc | 2 +- .../usdanish.bundle/Contents/Info.plist | 19 - .../Resources/English.lproj/InfoPlist.strings | Bin 64 -> 0 bytes .../Contents/Resources/U.S.Denmark.icns | Bin 1127 -> 0 bytes .../Contents/Resources/U.S.Denmark.keylayout | 1143 ----------------- .../usdanish.bundle/Contents/version.plist | 12 - 15 files changed, 11 insertions(+), 1318 deletions(-) delete mode 100644 .bash_profile delete mode 100644 .config/profile/environ.sh delete mode 100644 .config/profile/install.sh delete mode 100644 .config/profile/paths.sh delete mode 100644 .minttyrc delete mode 100644 .screenrc delete mode 100644 Library/Keyboard Layouts/usdanish.bundle/Contents/Info.plist delete mode 100644 Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/English.lproj/InfoPlist.strings delete mode 100644 Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.icns delete mode 100644 Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.keylayout delete mode 100644 Library/Keyboard Layouts/usdanish.bundle/Contents/version.plist diff --git a/.bash_profile b/.bash_profile deleted file mode 100644 index f8f9564..0000000 --- a/.bash_profile +++ /dev/null @@ -1 +0,0 @@ -[ -f ~/.profile ] && source ~/.profile diff --git a/.bashrc b/.bashrc index 05d73af..a9eba35 100644 --- a/.bashrc +++ b/.bashrc @@ -13,4 +13,6 @@ done; # last line [ -f ~/.bashrc_local ] && . ~/.bashrc_local -LS_COLORS="ow=01;36;40" && export LS_COLORS +#LS_COLORS="ow=01;36;40" && export LS_COLORS + +[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/.config/git/config b/.config/git/config index 07110c3..e167d4a 100644 --- a/.config/git/config +++ b/.config/git/config @@ -110,9 +110,9 @@ # attributesFile = ~/.config/git/attributes editor = vim # eol = native - autocrlf = true + autocrlf = true [include] -# path = ~/.config/git/config_local + path = ~/.config/git/config_local [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f diff --git a/.config/git/config_local b/.config/git/config_local index 132c93e..9638d61 100644 --- a/.config/git/config_local +++ b/.config/git/config_local @@ -1,3 +1,6 @@ [user] - name = Jannik ZANDER - email = jzander@grundfos.com + name = Jannik ZANDER + email = jzander@grundfos.com +#[core] +# autocrlf = false + diff --git a/.config/profile/environ.sh b/.config/profile/environ.sh deleted file mode 100644 index a16bcda..0000000 --- a/.config/profile/environ.sh +++ /dev/null @@ -1,49 +0,0 @@ -export USERNAME=$LOGNAME -export HOSTNAME=`hostname` -#echo Welcome $USERNAME. You are on Server: $HOSTNAME !!! - -# Set defaults -export SHELL='bash' -export EDITOR='vim' -export VISUAL='vim' -export PAGER='less -eFRX' -export MANPAGER="less -eFRX" -export BROWSER='lynx -vikeys -use_mouse' - - -# Prefer US language and UTF-8 -export LANG="en_US.UTF-8"; -export LC_ALL="en_US.UTF-8"; -#export LC_ALL="en_DK.UTF-8"; -#export LC_NUMERIC=en_DK.UTF-8 -#export LC_TIME=en_DK.UTF-8 -#export LC_MONETARY=en_DK.UTF-8 -#export LC_PAPER=en_DK.UTF-8 -#export LC_MEASUREMENT=en_DK.UTF-8 -export KEYMAP=us -# Highlight section titles in manual pages -export LESS_TERMCAP_md="${yellow}"; - -# Always enable colored `grep` output -#export GREP_OPTIONS="--color=auto"; - -# Set up syntax highlighting for 'less' (requires source-highlight package) -# See http://www.gnu.org/software/src-highlite/source-highlight.html -# export LESSOPEN="| /usr/bin/src-hilite-lesspipe.sh %s" -export LESS=-eFRX - -#export GTEST_DIR='c:/googletest-release-1.7.0' -#export GTEST_DIR='c:/googletest-release-1.8.0' -#export CPPUNITDIR='c:/cppunit-1.12.1' -#export CPPUNITDIR='c:/cppunit-1.13.2' -export CPPUNITDIR_2013='c:/programs/cppunit_2013' - -export VIRTUALENVWRAPPER_PYTHON=/mingw64/bin/python3 - -#export XDG_CONFIG_HOME = ~/.config/ -#export XDG_DATA_HOME = ~/.local/share/ -#export XDG_DATA_DIRS = /usr/local/share/:/usr/share/ -if [ -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs ]; then - . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs - export XDG_DESKTOP_DIR XDG_DOWNLOAD_DIR XDG_TEMPLATES_DIR XDG_PUBLICSHARE_DIR XDG_DOCUMENTS_DIR XDG_MUSIC_DIR XDG_PICTURES_DIR XDG_VIDEOS_DIR -fi diff --git a/.config/profile/install.sh b/.config/profile/install.sh deleted file mode 100644 index 5bdc46b..0000000 --- a/.config/profile/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Install git completion -if [ ! -f "${HOME}/.cache/bash/git-completion.bash" ]; then - URL="https://raw.githubusercontent.com/git/git/master/contrib/completion" - mkdir -p ${HOME}/.cache/bash > /dev/null 2>&1 - curl "${URL}/git-completion.bash" -L -s -o "${HOME}/.cache/bash/git-completion.bash" - curl "${URL}/git-prompt.sh" -L -s -o "${HOME}/.cache/bash/git-prompt.sh" -fi - -# Install fzf -if [ ! -f "${HOME}/.cache/fzf/install" ]; then - git clone --depth 1 https://github.com/junegunn/fzf.git $HOME/.cache/fzf - $HOME/.cache/fzf/install -fi diff --git a/.config/profile/paths.sh b/.config/profile/paths.sh deleted file mode 100644 index 0d355c3..0000000 --- a/.config/profile/paths.sh +++ /dev/null @@ -1,42 +0,0 @@ -# Set XDG directory defaults -#export XDG_DATA_DIRS=/usr/share/ -#export XDG_CONFIG_DIRS=/etc/xdg/ - -PATH=.:${HOME}/bin:${PATH} -#PATH=/c/ProgramData/chocolatey/bin:${PATH} -PATH=${HOME}/.gem/ruby/2.3.0/gems/asciidoctor-1.5.6.1/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} -fi - -# Set MANPATH so it includes users' private man if it exists -if [ -d "${HOME}/.local/share/man" ]; then - MANPATH="${HOME}/.local/share/man:${MANPATH}" -fi - -# Set INFOPATH so it includes users' private info if it exists -if [ -d "${HOME}/.local/share/info" ]; then - INFOPATH="${HOME}/.local/share/info:${INFOPATH}" -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 -export PREFIX="${HOME}/.local/" - -# Add local libraries to libpath -# LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}" - -# Setup some the location environment variable. -#export MYVIMRC="$HOME/.config/vim/vimrc" -export INPUTRC="$HOME/.inputrc" -export HISTFILE="$HOME/.local/share/bash/history"; - - diff --git a/.minttyrc b/.minttyrc deleted file mode 100644 index 644ac08..0000000 --- a/.minttyrc +++ /dev/null @@ -1,25 +0,0 @@ -BoldAsFont=no -RightClickAction=paste -Font=Consolas -FontHeight=11 -Term=xterm-256color -BoldAsColour=no -Charset=UTF-8 -Locale=en_US -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 -ScrollbackLines=100000 diff --git a/.screenrc b/.screenrc deleted file mode 100644 index a4a33ba..0000000 --- a/.screenrc +++ /dev/null @@ -1,8 +0,0 @@ -# Disable the startup message -startup_message off - -# Set a large scrollback buffer -defscrollback 32000 - -# Always start `screen` with UTF-8 enabled (`screen -U`) -defutf8 on diff --git a/.vimrc b/.vimrc index 0a55228..f983de5 100644 --- a/.vimrc +++ b/.vimrc @@ -22,7 +22,7 @@ set runtimepath+=~/.cache/vim " --------------------- silent call plug#begin('~/.cache/vim/bundle') Plug 'tpope/vim-repeat' -Plug 'tpope/vim-fugitive' +"Plug 'tpope/vim-fugitive' Plug 'tpope/vim-surround' Plug 'tpope/vim-commentary' Plug 'tpope/vim-unimpaired' diff --git a/Library/Keyboard Layouts/usdanish.bundle/Contents/Info.plist b/Library/Keyboard Layouts/usdanish.bundle/Contents/Info.plist deleted file mode 100644 index edeb5af..0000000 --- a/Library/Keyboard Layouts/usdanish.bundle/Contents/Info.plist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - CFBundleIdentifier - org.sil.ukelele.keyboardlayout.usdanish - CFBundleName - usdanish - CFBundleVersion - - KLInfo_U.S.Denmark - - TISInputSourceID - org.sil.ukelele.keyboardlayout.usdanish.u.s.denmark - TISIntendedLanguage - en-DK - - - diff --git a/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/English.lproj/InfoPlist.strings b/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index 9ecb0c3c9cbd8a19fb9e7abab454bbe370ad4d01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 scmezWPl+LvL60FAh+P;`8S)r%84?+a7_u3Z7!(+6ff%>EH3Js|0GX2t)Bpeg diff --git a/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.icns b/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.icns deleted file mode 100644 index 57dec2d11e183bfe3189b7a2327cf83ba4cd191b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1127 zcmc~y&MRhMU`fwRHZ){lVAAXi@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA% zCx&(BWL^R}oCO|{Koi7NL734qNaX`i!7)!4$B+olyo0_mrzOlVLskM=!qfCIZI{gx9aXsLF1~ zt6^-wz^(j>F*$&jot10Wd5KG}wi`%T-${BP{O8z*kFw&2-*#`}*(vwaK$S89|aKKK#{|c7C~J>VcSo$&GVgt2eLum)!PDwK!15Wphly<2g3Yb0SqOq_?e~ zbMyfBnYMVlBBMJt`rVHhW<6yRiT+TKA;wzq#$_TCgJIrHyYGM3-2_H6gQu&X%Q~lo zrp#hvBVY{cwJ@~ZWn=gchOPe@u0Z%;E(3y(D$j7G8>q7PE`)Bs+icv?q2*m01KYd*U|L0JU#&aOf{JR diff --git a/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.keylayout b/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.keylayout deleted file mode 100644 index ae0a6a5..0000000 --- a/Library/Keyboard Layouts/usdanish.bundle/Contents/Resources/U.S.Denmark.keylayout +++ /dev/null @@ -1,1143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Library/Keyboard Layouts/usdanish.bundle/Contents/version.plist b/Library/Keyboard Layouts/usdanish.bundle/Contents/version.plist deleted file mode 100644 index 72f1092..0000000 --- a/Library/Keyboard Layouts/usdanish.bundle/Contents/version.plist +++ /dev/null @@ -1,12 +0,0 @@ - - - - - BuildVersion - - ProjectName - usdanish - SourceVersion - - - -- 2.43.0