From 85312fa35b671df89887aa5c09aeb29b01d3e30a Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sun, 13 Mar 2022 05:31:44 +0000 Subject: Silence keychain --- profile/ssh-agent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'profile') diff --git a/profile/ssh-agent.sh b/profile/ssh-agent.sh index 8e478c2..acd65a4 100644 --- a/profile/ssh-agent.sh +++ b/profile/ssh-agent.sh @@ -4,7 +4,7 @@ if type keychain > /dev/null 2>&1; then # Save directory name in a variable (for ease of maintenance) export KEYCHAIN_HOME="$HOME/.keychain" - eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh) + eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh 2>/dev/null) else eval $(ssh-agent -s) fi -- cgit 1.4.1-21-gabe81 From ebc1695f4cdccc1813d94177216140265e81ca2b Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sun, 13 Mar 2022 05:32:01 +0000 Subject: Source system profile --- profile/profile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'profile') diff --git a/profile/profile b/profile/profile index 7a86c76..121615f 100644 --- a/profile/profile +++ b/profile/profile @@ -1,6 +1,9 @@ # ~/.profile -*- sh -*- # vim: ft=sh +# Source system profile +source /etc/profile + # XDG directories export XDG_CONFIG_HOME="$HOME/etc" export XDG_CACHE_HOME="$HOME/var/cache" @@ -11,7 +14,7 @@ export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}" # source files in $XDG_CONFIG_HOME/profile if [ -d "$XDG_CONFIG_HOME/profile" ]; then - for file in "$XDG_CONFIG_HOME"/profile/*.sh; do - [ -r "$file" ] && . "$file" - done + for file in "$XDG_CONFIG_HOME"/profile/*.sh; do + [ -r "$file" ] && . "$file" + done fi -- cgit 1.4.1-21-gabe81 From e0672f8f024b5d50101428c20dadf9e8053ee131 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 2 Apr 2022 12:38:05 -0500 Subject: Fix XDG_RUNTIME_DIR --- profile/xdg.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'profile') diff --git a/profile/xdg.sh b/profile/xdg.sh index caa1a9a..7d0ed61 100644 --- a/profile/xdg.sh +++ b/profile/xdg.sh @@ -22,6 +22,4 @@ export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat" export LYNX_CFG="$XDG_CONFIG_HOME/lynx/lynx.cfg" # Xorg -export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" -export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" -export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" +export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$HOME}" -- cgit 1.4.1-21-gabe81 From 00b0f259bac97003344f032d4a2df6580aa5df2d Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 2 Apr 2022 12:38:13 -0500 Subject: Set $EDITOR to emacsclient --- profile/defaults.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'profile') diff --git a/profile/defaults.sh b/profile/defaults.sh index 8facc97..e167147 100644 --- a/profile/defaults.sh +++ b/profile/defaults.sh @@ -1,4 +1,5 @@ # Default programs -export EDITOR="$(which vim)" # TODO: change to emacs +export EDITOR="$(which emacsclient)" +export ALTERNATE_EDITOR= export VISUAL="$EDITOR" -- cgit 1.4.1-21-gabe81