Merge branch 'master' of github.com:stv0g/dotfiles
Conflicts: .gitconfig .vimrc
This commit is contained in:
commit
fef8fd5801
5 changed files with 95 additions and 13 deletions
|
@ -13,5 +13,5 @@ if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ]; then
|
|||
exec startx
|
||||
# start byobu session
|
||||
elif [[ "$TERM" != "screen-bce" && "$SSH_CONNECTION" != "" ]]; then
|
||||
/usr/bin/byobu-screen -S sshscreen -d -R
|
||||
/usr/bin/byobu-screen -xR -S sshscreen && exit
|
||||
fi
|
||||
|
|
2
.gitattributes
vendored
Normal file
2
.gitattributes
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
# Diff .t2d files as if they were XML (they are).
|
||||
*.t2d diff=xml
|
48
.gitconfig
48
.gitconfig
|
@ -1,9 +1,49 @@
|
|||
[user]
|
||||
email = post@steffenvogel.de
|
||||
name = Steffen Vogel
|
||||
[credential]
|
||||
helper = cache --timeout=3600
|
||||
|
||||
[github]
|
||||
username = stv0g
|
||||
|
||||
[shell]
|
||||
username = stv0g
|
||||
|
||||
[color]
|
||||
ui = true
|
||||
ui = auto
|
||||
|
||||
[push]
|
||||
default = matching
|
||||
default = simple
|
||||
|
||||
[core]
|
||||
ignorecase = false
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
|
||||
[rerere]
|
||||
# Store and re-use manual conflict resolution changes.
|
||||
enabled = 1
|
||||
|
||||
[core]
|
||||
# Exclude everything this file. Used for general exclusions.
|
||||
excludesfile = ~/.gitignore
|
||||
# Set attributes on files. Used for general diff improvements.
|
||||
attributesfile = ~/.gitattributes
|
||||
|
||||
[help]
|
||||
# Open Git help pages in the browser as HTML.
|
||||
format = web
|
||||
autocorrect = 1
|
||||
|
||||
[difftool "sourcetree"]
|
||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||
path =
|
||||
[mergetool "sourcetree"]
|
||||
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||
trustExitCode = true
|
||||
|
||||
[diff "xml"]
|
||||
textconv = xmllint --format --recover
|
||||
|
|
48
.gitignore
vendored
Normal file
48
.gitignore
vendored
Normal file
|
@ -0,0 +1,48 @@
|
|||
# Ignore files generated by Qt.
|
||||
moc_*.cpp
|
||||
qrc_*.cpp
|
||||
ui_*.h
|
||||
|
||||
# Ignore files generated by QMake.
|
||||
.qmake.*
|
||||
qmake/*.d
|
||||
.moc/
|
||||
.obj/
|
||||
|
||||
# Ignore compiler output files.
|
||||
config.log
|
||||
config.tests/
|
||||
*.o
|
||||
*.pyc
|
||||
|
||||
# Ignore text editor local configuration..
|
||||
*.pro.user
|
||||
.tm_properties
|
||||
*.xcodeproj/project.xcworkspace/
|
||||
*.xcodeproj/xcuserdata/
|
||||
|
||||
# Ignore temporary generated files.
|
||||
*.rej
|
||||
*.swp
|
||||
*~
|
||||
|
||||
# Ignore thumbnails metadata generated by OSX.
|
||||
.DS_Store
|
||||
|
||||
# Ignore things generated by Bundler.
|
||||
.bundle/bin/
|
||||
vendor/ruby/
|
||||
vendor/*/vendor/ruby/
|
||||
|
||||
# Ignore files generated by CMake.
|
||||
CMakeFiles/
|
||||
CMakeCache.txt
|
||||
cmake_install.cmake
|
||||
install_manifest.txt
|
||||
|
||||
# Ignore build directories.
|
||||
b/
|
||||
|
||||
# Ignore secrets files
|
||||
.env
|
||||
|
|
@ -3,11 +3,3 @@ file:///home/stv0g/Musik
|
|||
file:///home/stv0g/Bilder
|
||||
file:///home/stv0g/Videos
|
||||
file:///home/stv0g/Downloads
|
||||
davs://sv111090@www2.elearning.rwth-aachen.de/ss12/12ss-06119/materials/documents L²P Info 4
|
||||
ftp://stv0g@styx/home/stv0g styx
|
||||
ftp://stv0g@sea/home/stv0g sea
|
||||
sftp://stv0g@lux/home/stv0g lux
|
||||
sftp://stv0g@lux/dropbox/Dropbox dropbox
|
||||
ftp://ryl@0l.de/home/ryl
|
||||
sftp://steffen@appserver.fset.rwth-aachen.de/ appserver
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue