diff --git a/i3/config b/i3/config index 768ad79..1692435 100644 --- a/i3/config +++ b/i3/config @@ -11,7 +11,7 @@ bindsym Print exec "shutter -r" #screensaver bindsym $mod+shift+backslash exec "cat /tmp/noss&&(rm /tmp/noss;notify-send 'Screensaver Enabled' -t 200)||(touch /tmp/noss;notify-send 'Screensaver Disabled' -t 200)" -exec --no-startup-id xautolock -time 3 -locker 'zsh -c "cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*`"' +exec --no-startup-id xautolock -time 3 -locker '~/.i3/screensaver.sh' set $bg #121212 set $fg #9f9f9f diff --git a/i3/screensaver.sh b/i3/screensaver.sh new file mode 100755 index 0000000..bc549ce --- /dev/null +++ b/i3/screensaver.sh @@ -0,0 +1,2 @@ +#!/bin/bash +cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*` diff --git a/scripts/desktop.txt b/scripts/desktop.txt index 16a5bc1..51991b3 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -31,7 +31,7 @@ suckless-tools pm-utils alsa-utils numlockx -virtualbox +#virtualbox x11vnc xvnc4viewer ntop diff --git a/scripts/server.txt b/scripts/server.txt index 2307972..9fda9a8 100644 --- a/scripts/server.txt +++ b/scripts/server.txt @@ -76,3 +76,4 @@ minimodem hfsutils hfsprogs vifm +git-annex diff --git a/scripts/sync.sh b/scripts/sync.sh index 447be54..9ccab91 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -78,9 +78,9 @@ while getopts ":hbsdpcw" VALUE "$@"; do ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc if [ "$(uname)" != "Darwin" ]; then if which trash >/dev/null; then - trash ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.i3/i3status.conf ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources + trash ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.i3/i3status.conf ~/.i3/screensaver.sh ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources else - rm ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/i3status.conf ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources + rm ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/i3status.conf ~/.i3/screensaver.sh ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources fi # Don't install these on Mac mkdir -p ~/.i3 @@ -88,6 +88,7 @@ while getopts ":hbsdpcw" VALUE "$@"; do ln -s $ABSPATH/i3/sleep.sh ~/.i3/sleep.sh ln -s $ABSPATH/i3/wall.sh ~/.i3/wall.sh ln -s $ABSPATH/i3/i3status.conf ~/.i3/i3status.conf + ln -s $ABSPATH/i3/screensaver.sh ~/.i3/screensaver.sh ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap ln -s $ABSPATH/i3/xsession ~/.xsession mkdir -p ~/.config/synapse diff --git a/shells/zshrc b/shells/zshrc index 015ae46..76eaaac 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -49,7 +49,7 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo alias disphost='export DISPLAY=:0.0' alias ll='ls -AglhF' alias la='ls -A' -alias l='ls -CFA' +alias l='ls -CF' alias logout='sudo pkill -u $USER' alias fixsh='ssh-keygen -R' alias tmux='tmux -2'