diff --git a/line-package-install.sh b/line-package-install.sh index 2c6155907a7..750a68dbd94 100644 --- a/line-package-install.sh +++ b/line-package-install.sh @@ -95,7 +95,7 @@ gmrun xmonad-contrib libnotify dunst -dmenu-xft +dmenu gnome-themes-standard xautolock slock diff --git a/system/aliases.zsh b/system/aliases.zsh index 92f1ef81f08..4db1b3e6539 100644 --- a/system/aliases.zsh +++ b/system/aliases.zsh @@ -10,8 +10,8 @@ if [ "$TERM" != "dumb" ]; then alias ls='ls --group-directories-first --color=auto' fi -alias ll='ls -lh' -alias la='ls -lha' +alias ll='ls -lNh' +alias la='ls -lNha' alias ..='cd ..' function cdls() { diff --git a/tmux/env.zsh b/tmux/env.zsh index 343126fd1bb..de91083c645 100644 --- a/tmux/env.zsh +++ b/tmux/env.zsh @@ -1,5 +1,7 @@ -test $SSH_AUTH_SOCK && [[ $SSH_AUTH_SOCK != "/tmp/ssh-agent-$USER-screen" ]] && \ - ln -sf "$SSH_AUTH_SOCK" "/tmp/ssh-agent-$USER-screen" +if [[ -S "$SSH_AUTH_SOCK" && ! -h "$SSH_AUTH_SOCK" ]]; then + ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock; +fi +export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock; if [ $SSH_TTY ] && [ ! $WINDOW ]; then if [[ -z "$TMUX" ]] ;then diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink index 5485395b86e..3df11d8054c 100644 --- a/tmux/tmux.conf.symlink +++ b/tmux/tmux.conf.symlink @@ -19,3 +19,6 @@ set -g default-command "${SHELL}" # Make control-arrows work set-window-option -g xterm-keys on + +set -g update-environment -r +setenv -g SSH_AUTH_SOCK $HOME/.ssh/ssh_auth_sock