5 files changed, 33 insertions, 23 deletions
diff --git a/home-dots/dot-bash_profile b/home-dots/dot-bash_profile
deleted file mode 100644
index ea2a147..0000000
--- a/home-dots/dot-bash_profile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# ~/.bash_profile
-#
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-# [ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
-# source "$HOME/.cargo/env"
diff --git a/home-dots/dot-bashrc b/home-dots/dot-bashrc
index aefd08b..5488946 100644
--- a/home-dots/dot-bashrc
+++ b/home-dots/dot-bashrc
@@ -5,17 +5,17 @@
 
 # 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
+HISTCONTROL=ignorespace
 
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    # test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
     alias grep='grep --color=auto'
     alias fgrep='fgrep --color=auto'
     alias egrep='egrep --color=auto'
@@ -34,10 +34,11 @@ git_current_branch() {
     echo "  ${ref#refs/heads/}"
 }
 
+[[ -f /usr/bin/virtualenvwrapper_lazy.sh ]] && source /usr/bin/virtualenvwrapper_lazy.sh
 python_current_venv() {
     local orange="\[\e[0;91m\]"
-    if [[ -n ${VIRTUAL_ENV_PROMPT} ]]; then
-        echo " ${orange}${VIRTUAL_ENV_PROMPT}"
+    if [[ -n ${VIRTUAL_ENV} ]]; then
+        echo " ${orange} $(basename "${VIRTUAL_ENV}")"
     fi
 }
 
@@ -66,9 +67,12 @@ PROMPT_COMMAND=__prompt_command
 export EDITOR='emacsclient'
 
 # GPG agent with ssh
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+if [ -z "$SSH_CLIENT" ]; then
+    unset SSH_AGENT_PID
+    if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+        SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+        export SSH_AUTH_SOCK
+    fi
 fi
 
 # For python lsp
@@ -78,5 +82,6 @@ alias isrun='ps -ae | grep'
 alias gdimg='git difftool -t image_diff'
 alias G='grep -i'
 alias lar='ls -lahrt'
+alias ssh='TERM=xterm-256color ssh'
 alias emacs='TERM=xterm-direct emacs'
 alias mykeys='setxkbmap -I$HOME/.config/xkb/ oscar -option caps:escape -print | xkbcomp -I$HOME/.config/xkb/ - $DISPLAY'
diff --git a/home-dots/dot-gitconfig b/home-dots/dot-gitconfig
index 4370974..cacdd3e 100644
--- a/home-dots/dot-gitconfig
+++ b/home-dots/dot-gitconfig
@@ -1,5 +1,6 @@
+# -*- mode: conf-unix; -*-
 [user]
-  name = Óscar Nájera
+  name = Oscar Najera
   email = hi@oscarnajera.com
 [pull]
   rebase = true
@@ -14,7 +15,19 @@
       xfuncname = "^(\\*+ +.*)$"
 [diff "lisp"]
       xfuncname = "^[ \t]*(((;+ )|\\((cl-|el-patch-|ert-)?def(un|var|macro|method|custom|ine|test)).*)$"
+[diff "ledger"]
+      xfuncname = "^([0-9]{4}-[0-9]+-[0-9]+ .*)$"
+
 [difftool "image_diff"]
           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
+
+[sendemail]
+  smtpEncryption = tls
+  smtpServer = mail.oscarnajera.com
+  smtpUser = hi@oscarnajera.com
+  smtpServerPort = 587
+
+[includeIf "gitdir:~/bytegit/**"]
+    path = ~/bytegit/.gitconfig
diff --git a/home-dots/dot-profile b/home-dots/dot-profile
index f156b80..084d096 100644
--- a/home-dots/dot-profile
+++ b/home-dots/dot-profile
@@ -1,8 +1,4 @@
 #!/bin/sh
 export PATH="$HOME/.local/bin:$HOME/dev/dotfiles/bin:$PATH"
-[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
-source "$HOME/.cargo/env"
-# GUIX_PROFILE="$HOME/.guix-profile" && [ -e "$GUIX_PROFILE" ] && . "$GUIX_PROFILE/etc/profile" && export GUIX_LOCPATH=$GUIX_PROFILE/lib/locale
-# GUIX_PROFILE="$HOME/.config/guix/current" && [ -e "$GUIX_PROFILE" ] && . "$GUIX_PROFILE/etc/profile"
-# export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
-# export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
+[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env"
+[ -f "$HOME/.cargo/env" ] && source "$HOME/.cargo/env"
diff --git a/home-dots/dot-sbclrc b/home-dots/dot-sbclrc
index a9569d3..035c861 100644
--- a/home-dots/dot-sbclrc
+++ b/home-dots/dot-sbclrc
@@ -2,7 +2,9 @@
 
 ;;; The following lines added by ql:add-to-init-file:
 #-quicklisp
-(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp"
+(let ((quicklisp-init (merge-pathnames ".quicklisp/setup.lisp"
                                        (user-homedir-pathname))))
   (when (probe-file quicklisp-init)
     (load quicklisp-init)))
+
+(push (merge-pathnames "dev/bitcoin/bp/" (user-homedir-pathname)) asdf:*central-registry*)