shell: it probably makes more sense to start ssh-agent in ~/.profile

[~bandali/configs] / .profile

diff --git a/.profile b/.profile
index 3ceec12..3b0071f 100644 (file)
--- a/.profile
+++ b/.profile
@@ -1,22 +1,72 @@
-export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+
+# source host-specific profile
+if [ -f "$HOME/.config/profiles/$(hostname)" ]; then
+    . "$HOME/.config/profiles/$(hostname)"
+fi

 
 

-export VISUAL="emacsclient -c"
+export EDITOR="emacsclient -nw"
+export VISUAL="emcl"

 
 

-export PATH="$HOME/.local/bin:$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin${PATH:+:}$PATH"
+PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
+if [ -z "$IS_GUIX_SYSTEM" ]; then
+    PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
+    export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"
+fi
+export PATH

 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"

-export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+
+export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
+export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc

 
 export MAILDIR="$HOME/mail"
 export CVS_RSH="ssh"
 
 
 export MAILDIR="$HOME/mail"
 export CVS_RSH="ssh"
 

-if [ -x "$(command -v guix)" ]; then
-    export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"
-    export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
-    export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
-    export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
-    export GIT_SSL_CAINFO="$SSL_CERT_FILE"
+export GOPATH="$HOME/src/go"
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+       . "$HOME/.bashrc"
+    fi
+fi
+
+if [ -z "$IS_GUIX_SYSTEM" ]; then
+    # if guix is installed
+    if [ -x "$(command -v guix)" ]; then
+        SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
+        if [ -d "$SSL_CERT_DIR" -o -h "$SSL_CERT_DIR" ]; then
+            export SSL_CERT_DIR
+            export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
+        else
+            printf "it seems you forgot to \`guix install nss-certs\'\n"
+        fi
+        GUIX_PROFILE="$HOME/.guix-profile"
+        . "$GUIX_PROFILE/etc/profile"
+    fi

 fi
 
 fi
 

-export NIXPKGS="$HOME/src/git/nixpkgs"
+# start an ssh-agent (with guix's openssh)
+if [ -z "$IS_GUIX_SYSTEM" ]; then
+    if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+        ssh-agent > ~/.ssh-agent-thing
+    fi
+    if [[ ! "$SSH_AUTH_SOCK" ]]; then
+        eval "$(<~/.ssh-agent-thing)"
+    fi
+fi
+
+setxkbmap \
+    -layout us,ir \
+    -option ctrl:nocaps \
+    -option grp:shifts_toggle
+
+xmodmap -e "keysym Menu = Super_R"
+
+xrdb -merge "$HOME/.Xresources"