diff options
| author | Andreas Fankhauser (@tux-six) | 2022-07-12 21:53:12 +0200 |
|---|---|---|
| committer | Andreas Fankhauser (@tux-six) | 2022-07-12 21:53:12 +0200 |
| commit | aef16d63f30bb7c55995b4f9a25bb20399b87259 (patch) | |
| tree | 577dd85af50bbfaab4c21843ef2b4060dff3d36b /src | |
| parent | d0abe52a3d11ab234ec8dde0b36958ebee57c0db (diff) | |
| parent | 54b394a632eaf250d42ae8fbc90b29928c206ae6 (diff) | |
| download | dotfiles-aef16d63f30bb7c55995b4f9a25bb20399b87259.zip dotfiles-aef16d63f30bb7c55995b4f9a25bb20399b87259.tar.gz | |
Merge upstream changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/bash/_bashrc | 5 | ||||
| -rw-r--r-- | src/windoof/ConEmu/ConEmu.xml | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/bash/_bashrc b/src/bash/_bashrc index e6bc567..aa512c7 100644 --- a/src/bash/_bashrc +++ b/src/bash/_bashrc @@ -31,5 +31,10 @@ if $WINDOOF; then fi unset env + # Fix vim-behind-ssh on windoof + # TODO this fixes the remote shell, but breaks the local one (Eg del prints + # tilde). Grr .... + #if test -n "$ConEmuBuild"; then TERM=dumb; export TERM; fi + fi diff --git a/src/windoof/ConEmu/ConEmu.xml b/src/windoof/ConEmu/ConEmu.xml index c4617f0..a5d6d1c 100644 --- a/src/windoof/ConEmu/ConEmu.xml +++ b/src/windoof/ConEmu/ConEmu.xml @@ -5,13 +5,15 @@ <?xml version="1.0" encoding="utf-8"?> <key name="Software"> <key name="ConEmu"> - <key name=".Vanilla" modified="2022-06-27 00:42:42" build="210912"> + <key name=".Vanilla" modified="2022-07-12 12:22:45" build="210912"> <!-- <value name="UseCurrentSizePos" type="hex" data="01"/> --> <!-- <value name="AutoSaveSizePos" type="hex" data="01"/> --> <!-- <value name="WindowMode" type="dword" data="0000051f"/> --> <!-- Copy LF=00, CRLF=01 --> <value name="ClipboardEOL" type="hex" data="00"/> + <!-- AnsiExecution 00=everywhere, 01=cmdOnly, ... --> + <value name="AnsiExecution" type="hex" data="00"/> <value name="AutoTrimSingleLine" type="hex" data="01"/> <value name="ClipboardConfirmEnter" type="hex" data="01"/> <value name="ClipboardConfirmLonger" type="ulong" data="1024"/> @@ -21,7 +23,7 @@ <value name="FocusInChildWindows" type="hex" data="01"/> <value name="HighlightMouseCol" type="hex" data="00"/> <value name="HighlightMouseRow" type="hex" data="00"/> - <value name="KillSshAgent" type="hex" data="01"/> + <value name="KillSshAgent" type="hex" data="00"/> <value name="MinimizeOnLoseFocus" type="hex" data="00"/> <value name="QuakeStyle" type="hex" data="00"/> <value name="SaveCmdHistory" type="hex" data="01"/> @@ -93,8 +95,10 @@ <value name="CompressLongStrings" type="hex" data="01"/> <value name="EnvironmentSet" type="multi"> + <!-- Kludge to fix nightmare systems. Namely to make ssh-agent work on WINDOOF --> + <line data="set PATH=/c/Users/%USERNAME%/.opt/git/cmd;/c/Users/%USERNAME%/.opt/git/usr/bin;%PATH%"/> <!-- Prepend my custom binaries --> - <line data="set PATH=C:\Users\%USERNAME%\.bin;C:\Users\%USERNAME%\.opt\git\cmd;C:\Users\%USERNAME%\.opt\mingw64\bin;C:\Users\%USERNAME%\.opt\git\usr\bin;%PATH%"/> + <line data="set PATH=/c/Users/%USERNAME%/.bin;%PATH%"/> <!-- BusyBox setting not sure what it is for --> <line data="BB_SKIP_ANSI_EMULATION=1"/> </value> |