diff options
| -rw-r--r-- | home-dots/dot-bashrc | 2 | ||||
| -rw-r--r-- | home-dots/dot-gitconfig | 4 | ||||
| -rwxr-xr-x | install.scm | 3 | ||||
| -rw-r--r-- | other_configs/byte-gitconfig | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/home-dots/dot-bashrc b/home-dots/dot-bashrc index 1641221..8829999 100644 --- a/home-dots/dot-bashrc +++ b/home-dots/dot-bashrc @@ -5,6 +5,8 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return +# If emacs tramp or eshell, don't execute any of this +[[ $TERM == "dumb" ]] && return HISTSIZE=-1 HISTFILESIZE=-1 diff --git a/home-dots/dot-gitconfig b/home-dots/dot-gitconfig index 11cff2d..c080709 100644 --- a/home-dots/dot-gitconfig +++ b/home-dots/dot-gitconfig @@ -1,3 +1,4 @@ +# -*- mode: conf-unix; -*- [user] name = Oscar Najera email = hi@oscarnajera.com @@ -21,3 +22,6 @@ cmd = compare $REMOTE $LOCAL png:- | montage -font Liberation-Sans -tile 3x -geometry 400x -label "reference" $LOCAL -label "diff" - -label "current--%f" $REMOTE x: [diff] algorithm = histogram + +[includeIf "gitdir:~/bytegit/**"] + path = ~/bytegit/.gitconfig diff --git a/install.scm b/install.scm index 4569bb6..c9e60ec 100755 --- a/install.scm +++ b/install.scm @@ -217,6 +217,9 @@ (config-links "gnupg/gpg.conf" "~/.gnupg/gpg.conf" #f) (config-links "gnupg/gpg-agent.conf" "~/.gnupg/gpg-agent.conf" #f) (symlink-tree "config" "~/.config") + (when (string=? (gethostname) "obp") + (config-links "other_configs/byte-gitconfig" + "~/bytegit/.gitconfig" #f)) (mail-config) (shutdown-logging)) diff --git a/other_configs/byte-gitconfig b/other_configs/byte-gitconfig new file mode 100644 index 0000000..9f0dfa3 --- /dev/null +++ b/other_configs/byte-gitconfig @@ -0,0 +1,3 @@ +# -*- mode: conf-unix; -*- +[user] + email = oscar@byteplant.com |