Removing tmux.service -- accounted for in EtcFiles/profile.d/shadowarch-session.sh
Adding session dependence to Ansible Ensuring EtcFiles/profile.d/shadowarch-ssh.sh starts ssh-agent user service
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
			
		||||
syncList = profile.d tmux.conf
 | 
			
		||||
userServiceList = tmux.service
 | 
			
		||||
userServiceList =
 | 
			
		||||
 | 
			
		||||
compile: ./shadowarch ${syncList} ${userServiceList} ./shadowarch.vim ./skel
 | 
			
		||||
	@echo Nothing to compile
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ function vncdesktop() {
 | 
			
		||||
alias vi=vim
 | 
			
		||||
alias view="vim -R"
 | 
			
		||||
alias top="top -o %CPU"
 | 
			
		||||
alias make-entrypoints="egrep '^[a-zA-Z0-9\-]*:' Makefile"
 | 
			
		||||
alias make-entrypoints="grep -E '^[a-zA-Z0-9\-]*:' Makefile"
 | 
			
		||||
alias rdns="dig +short -x "
 | 
			
		||||
alias dns="dig +short " 
 | 
			
		||||
export WEECHAT_HOME=$HOME/.weechat
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,5 @@
 | 
			
		||||
### Ansible ###
 | 
			
		||||
source /etc/profile.d/shadowarch-shell-environment.sh
 | 
			
		||||
export ANSIBLE_VAULT_PASSWORD_FILE=$HOME/password-store/${organization}.vault.password
 | 
			
		||||
export ANSIBLE_VAULT_FILE=$HOME/password-store/${organization}.vault
 | 
			
		||||
alias ansible="/usr/bin/ansible -e @${ANSIBLE_VAULT_FILE}"
 | 
			
		||||
 
 | 
			
		||||
@@ -13,6 +13,6 @@ if [ -n "$SSH_CLIENT" ]; then
 | 
			
		||||
    fi;
 | 
			
		||||
 | 
			
		||||
### XFCE4 ###
 | 
			
		||||
elif [ `who -m | egrep "^$(whoami)" | awk '{ print $2; }' | egrep -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ] && [ `pgrep -ac xinit` -eq 0 ] && [ `whoami` != 'root' ]; then
 | 
			
		||||
elif [ `who -m | grep -E "^$(whoami)" | awk '{ print $2; }' | grep -E -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ] && [ `pgrep -ac xinit` -eq 0 ] && [ `whoami` != 'root' ]; then
 | 
			
		||||
    exec startxfce4
 | 
			
		||||
fi
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,9 @@
 | 
			
		||||
### SSH ###
 | 
			
		||||
# Tell shell about ssh-agent -- enable with 'systemctl --user enable --now ssh-agent.service'
 | 
			
		||||
if [ `ps -u "$USER" | grep -c ssh-agent` -eq 0 ]; then
 | 
			
		||||
    systemctl --user start ssh-agent.service
 | 
			
		||||
    sleep 1
 | 
			
		||||
fi
 | 
			
		||||
export SSH_AGENT_PID="$(pgrep -fu "$USER" ssh-agent)"
 | 
			
		||||
if [ -n "$SSH_AGENT_PID" ]; then
 | 
			
		||||
    export SSH_AUTH_SOCK="/run/user/$EUID/ssh-agent.socket"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user