From a3b8c3406c1f6259e19f033f6ef340f1a6b5958d Mon Sep 17 00:00:00 2001
From: Oscar Najera <hi@oscarnajera.com>
Date: Thu, 21 Sep 2023 15:00:41 +0200
Subject: byteplant config

git conf user
make emacs tramp work
---
 home-dots/dot-bashrc    | 2 ++
 home-dots/dot-gitconfig | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'home-dots')

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
-- 
cgit v1.2.3