From 65067880db257cbfc2388fbb7383b86a5ddf7665 Mon Sep 17 00:00:00 2001 From: Taeyeon Mori Date: Thu, 23 May 2019 19:58:57 +0200 Subject: [PATCH] Add stuff for KDE dev --- git/config | 27 ++++++++++++++++++++++----- zsh/zprofile | 13 +++++++++++++ 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/git/config b/git/config index f3fea60..6416565 100644 --- a/git/config +++ b/git/config @@ -4,12 +4,29 @@ [push] default = simple +[merge] + tool = kdiff3 + +[includeIf "gitdir:~/Development/KDE/"] + path = "kde.local" + +# ----------------------------------------------- +# Remotes +# ----------------------------------------------- +# GitHub [url "https://github.com/"] insteadOf = git://github.com/ + insteadOf = gh: + +[url "git@github.com:"] + pushInsteadOf = git://github.com/ + pushInsteadOf = https://github.com/ + pushInsteadOf = gh: + +# KDE +[url "https://anongit.kde.org/"] + insteadOf = kde: -#[url "git@github.com:"] -# insteadOf = git://github.com/ -# insteadOf = https://github.com/ +[url "git@git.kde.org:"] + pushInsteadOf = kde: -[url "https://aur.archlinux.org/"] - insteadOf = https://aur4.archlinux.org/ diff --git a/zsh/zprofile b/zsh/zprofile index a35f743..4d898fa 100644 --- a/zsh/zprofile +++ b/zsh/zprofile @@ -70,6 +70,18 @@ if [[ ! -f "${PREFIX:-/usr}/share/terminfo/${TERM:0:1}/$TERM" ]]; then fi fi +# +# KDE +# +export KDE_DEVEL_HOME=$HOME/Development/KDE +if [ -d "$KDE_DEVEL_HOME" ]; then + if [ -d "$KDE_DEVEL_HOME/kdesrc-build" ]; then + KDE_SRC_BUILD="$KDE_DEVEL_HOME/kdesrc-build" + fi +else + unset KDE_DEVEL_HOME +fi + # # Paths @@ -85,6 +97,7 @@ path=( $HOME/.local/bin $DOTFILES/bin $HOME/junest/bin + $KDE_SRC_BUILD /usr/local/{bin,sbin} $path )