~cyplo/dotfiles

58fb2609eda60f9c369d1ab9439dafdf974eb018 — Cyryl Plotnicki-Chudyk 6 years ago 317ec92
kdiff3 as a default diff tool under linux

* kdiff3 config updated to a newer version
* fresh system configuration files now know about kdiff3
3 files changed, 102 insertions(+), 94 deletions(-)

M .gitconfig_includes.common
M .kdiff3rc
M common/configure_fresh_system
M .gitconfig_includes.common => .gitconfig_includes.common +1 -1
@@ 17,7 17,7 @@


[diff]
    tool = vimdiff
    tool = kdiff3
[difftool]
    prompt = false
[merge]

M .kdiff3rc => .kdiff3rc +99 -93
@@ 1,93 1,99 @@
AutoAdvance=0
AutoAdvanceDelay=500
AutoCopySelection=0
AutoDetectUnicodeA=1
AutoDetectUnicodeB=1
AutoDetectUnicodeC=1
AutoIndentation=1
AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.*
AutoSaveAndQuitOnMergeWithoutConflicts=0
AutoSelectOutEncoding=1
BgColor=255,255,255
BinaryComparison=0
CaseSensitiveFilenameComparison=0
ColorA=0,0,200
ColorB=0,150,0
ColorC=150,0,150
ColorForConflict=255,0,0
CopyNewer=0
CreateBakFiles=0
CurrentRangeBgColor=220,220,100
CurrentRangeDiffBgColor=255,255,150
Diff3AlignBC=1
DiffBgColor=224,224,224
DirAntiPattern=CVS;.deps;.svn;.hg;.git
EncodingForA=System
EncodingForB=System
EncodingForC=System
EncodingForOutput=System
EncodingForPP=System
EscapeKeyQuits=0
FgColor=0,0,0
FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
FilePattern=*
FindHidden=1
FollowDirLinks=0
FollowFileLinks=0
Font=Courier New,10,normal
FullAnalysis=1
Geometry=600,400
HistoryEntryStartRegExp=\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)
HistoryEntryStartSortKeyOrder=4,3,2,5,1,6
HistoryMergeSorting=0
HistoryStartRegExp=.*\\$Log.*\\$.*
HorizDiffWindowSplitting=1
IgnorableCmdLineOptions=-u;-query;-html;-abort
IgnoreCase=0
IgnoreComments=0
IgnoreNumbers=0
IrrelevantMergeCmd=
ItalicForDeltas=0
Language=Auto
LineEndStyle=2
LineMatchingPreProcessorCmd=
ManualAlignmentRangeColor=255,208,128
MaxNofHistoryEntries=-1
MidAgeFileColor=192,192,0
MissingFileColor=0,0,0
NewestFileColor=0,208,0
OldestFileColor=240,0,0
Position=0,22
PreProcessorCmd=
RecentAFiles=
RecentBFiles=
RecentCFiles=
RecentEncodings=
RecentOutputFiles=
RecursiveDirs=1
ReplaceTabs=1
RightToLeftLanguage=0
RunHistoryAutoMergeOnMergeStart=0
RunRegExpAutoMergeOnMergeStart=0
SameEncoding=1
Show Statusbar=1
Show Toolbar=1
ShowIdenticalFiles=0
ShowInfoDialogs=1
ShowLineNumbers=0
ShowWhiteSpace=1
ShowWhiteSpaceCharacters=1
SkipDirStatus=0
SyncMode=0
TabSize=4
TrustDate=0
TrustDateFallbackToBinary=0
TrustSize=0
TryHard=1
UnfoldSubdirs=1
UseCvsIgnore=0
WhiteSpace2FileMergeDefault=0
WhiteSpace3FileMergeDefault=0
WhiteSpaceEqual=1
WindowStateMaximised=1
WordWrap=0
[KDiff3 Options]
AutoAdvance=false
AutoAdvanceDelay=500
AutoCopySelection=false
AutoDetectUnicodeA=true
AutoDetectUnicodeB=true
AutoDetectUnicodeC=true
AutoIndentation=true
AutoMergeRegExp=.*\\\\$(Version|Header|Date|Author).*\\\\$.*
AutoSaveAndQuitOnMergeWithoutConflicts=false
AutoSelectOutEncoding=true
BgColor=255,255,255
BinaryComparison=false
CaseSensitiveFilenameComparison=true
ColorA=0,0,200
ColorB=0,150,0
ColorC=150,0,150
ColorForConflict=255,0,0
CopyNewer=false
CreateBakFiles=false
CurrentRangeBgColor=220,220,100
CurrentRangeDiffBgColor=255,255,150
Diff3AlignBC=true
DiffBgColor=224,224,224
DirAntiPattern=CVS;.deps;.svn;.hg;.git
EncodingForA=UTF-8
EncodingForB=UTF-8
EncodingForC=UTF-8
EncodingForOutput=UTF-8
EncodingForPP=UTF-8
EscapeKeyQuits=false
FgColor=0,0,0
FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
FilePattern=*
FindHidden=true
FollowDirLinks=false
FollowFileLinks=false
Font=Monospace,9,-1,5,50,0,0,0,0,0
FullAnalysis=true
Geometry=600,400
HistoryEntryStartRegExp=\\\\s*\\\\\\\\main\\\\\\\\(\\\\S+)\\\\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\\\s+(.*)
HistoryEntryStartSortKeyOrder=4\\,3\\,2\\,5\\,1\\,6
HistoryMergeSorting=false
HistoryStartRegExp=.*\\\\$Log.*\\\\$.*
HorizDiffWindowSplitting=true
IgnorableCmdLineOptions=-u;-query;-html;-abort
IgnoreCase=false
IgnoreComments=false
IgnoreNumbers=false
IrrelevantMergeCmd=\\0
ItalicForDeltas=false
LineEndStyle=2
LineMatchingPreProcessorCmd=\\0
ManualAlignmentRangeColor=255,208,128
MaxNofHistoryEntries=-1
MidAgeFileColor=192,192,0
MissingFileColor=0,0,0
NewestFileColor=0,208,0
OldestFileColor=240,0,0
Position=0,22
PreProcessorCmd=\\0
RecentAFiles=
RecentBFiles=
RecentCFiles=
RecentEncodings=
RecentOutputFiles=
RecursiveDirs=true
ReplaceTabs=true
RightToLeftLanguage=false
RunHistoryAutoMergeOnMergeStart=false
RunRegExpAutoMergeOnMergeStart=false
SameEncoding=true
Show Statusbar=true
Show Toolbar=true
ShowIdenticalFiles=true
ShowInfoDialogs=true
ShowLineNumbers=false
ShowWhiteSpace=true
ShowWhiteSpaceCharacters=true
SkipDirStatus=true
SyncMode=false
TabSize=4
TrustDate=false
TrustDateFallbackToBinary=false
TrustSize=false
TryHard=true
UnfoldSubdirs=true
UseCvsIgnore=false
WhiteSpace2FileMergeDefault=0
WhiteSpace3FileMergeDefault=0
WhiteSpaceEqual=true
WindowStateMaximised=true
WordWrap=false

[MainWindow]
Height 768=769
State=AAAA/wAAAAD9AAAAAAAABVYAAAJaAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
ToolBarsMovable=Disabled
Width 1366=1367

M common/configure_fresh_system => common/configure_fresh_system +2 -0
@@ 21,6 21,8 @@ ln -vfs "$DIR/.zshrc" ~/.
ln -vfs "$DIR/.oh-my-zsh" ~/.
ln -vfs "$DIR/.Slic3r" ~/.
ln -vfs "$DIR/.ghci" ~/.
mkdir -p ~/.kde/share/config/
ln -vfs "$DIR/.kdiff3rc" ~/.kde/share/config/kdiff3rc
ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
ln -vfs "$DIR/tools" ~/