~cyplo/dotfiles

64ec45eb6962f10df38ead98b6b455dc6c5460a5 — Cyryl Płotnicki 2 years ago 45d5363
Add form3-specific git settings
A .gitconfig.linux.form3 => .gitconfig.linux.form3 +10 -0
@@ 0,0 1,10 @@
[include]
	path = dev/dotfiles/.gitconfig_includes.common
	path = dev/dotfiles/.gitconfig_includes.linux
[gpg]
	program = gpg2
[user]
	signingkey = CA6A60C801F3CDAFE4601D76436DDB0D638A3C61
	email = cyryl.plotnicki@form3.tech
[commit]
	gpgsign = true

M .gitconfig.linux.private => .gitconfig.linux.private +0 -7
@@ 5,12 5,5 @@
[alias]
	signedcommit = !git commit -S

[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
[gpg]
	program = gpg2

M .gitconfig_includes.common => .gitconfig_includes.common +1 -0
@@ 13,6 13,7 @@
    tree = log --show-signature --color --decorate --date=short --all --graph -n 3
    newbranch = !git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b "$2"
    head = log HEAD -n1
	signedcommit = !git commit -S
[core]
    autocrlf = false
[diff]

M .hyper_plugins/.hyper_plugins => .hyper_plugins/.hyper_plugins +1 -1
@@ 1,1 1,1 @@
/home/cyryl/dev/dotfiles/.hyper_plugins
\ No newline at end of file
/home/cyrylplotnicki/dev/dotfiles/.hyper_plugins
\ No newline at end of file

M common/configure_fresh_system.sh => common/configure_fresh_system.sh +6 -0
@@ 50,13 50,19 @@ ln -vfs "$DIR/.zprezto/runcoms/zshenv" ~/.zshenv
ln -vfs "$DIR/.zshrc" ~/.zshrc
ln -vfs "$DIR/.hyper.js" ~/.hyper.js
ln -vfs "$DIR/.hyper_plugins" ~/.hyper_plugins
ln -vfs "$DIR/.hyper_plugins" ~/.hyper_plugins

ln -vfs "$DIR/.Slic3r" ~/.
ln -vfs "$DIR/.ghci" ~/.
ln -vfs "$DIR/.conkyrc" ~/.
mkdir -p ~/.kde/share/config/
ln -vfs "$DIR/.kdiff3rc" ~/.kde/share/config/kdiff3rc

ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
if [[ `hostname` == "xps15" ]]; then
    ln -vfs "$DIR/.gitconfig.linux.form3" ~/.gitconfig
fi

mkdir -p ~/.config/autostart/
# autostart apps
mkdir -p ~/.config/vdirsyncer/