stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Many fixes

Browse Source
This commit is contained in:
Austen Adler 2020-03-15 12:05:01 -04:00
parent c9c3fec128
commit 3dc6159640
3 changed files with 165 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
i3/.Xresources
View File

@ -1,4 +1,5 @@
!URxvt.boldFont: -misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1 !URxvt.boldFont: -misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1
URxvt.font: xft:Less Perfect DOS VGA
!URxvt.font: -*-*-*-*-*-*-*-*-*-*-*-*-*-* !URxvt.font: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
!URxvt.font: xft:Misc Fixed:size=14 !URxvt.font: xft:Misc Fixed:size=14
!URxvt.boldFont: -*-*-*-*-*-*-*-*-*-*-*-*-*-* !URxvt.boldFont: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
@ -10,7 +11,7 @@
!URxvt.font: xft:Gohu GohuFont:size=12 !URxvt.font: xft:Gohu GohuFont:size=12
!URxvt.font: xft:Misc Termsynu:size=13 !URxvt.font: xft:Misc Termsynu:size=13
!URxvt.font: xft:Unifont:size=13 !URxvt.font: xft:Unifont:size=13
URxvt.font: xft:Monospace:size=11 !URxvt.font: xft:Monospace:size=11
!URxvt.font: xft:FixedsysTTF Semi-Bold:size=11 !URxvt.font: xft:FixedsysTTF Semi-Bold:size=11
!URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-* !URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-*
!URxvt.font: xft:Fixed:style=SemiCondensed:size=16 !URxvt.font: xft:Fixed:style=SemiCondensed:size=16

4
i3/.config/i3/config
View File

@ -26,7 +26,7 @@ bindsym $mod+d exec "~/.config/i3/run.sh run"
#bindsym $mod+shift+p exec "rofi-pass --last-used" #bindsym $mod+shift+p exec "rofi-pass --last-used"
# Misc shortcuts # Misc shortcuts
bindsym --release Num_Lock exec "xdotool key --clearmodifiers Shift+Insert;numlockx on" bindsym --release Num_Lock exec "xdotool key --clearmodifiers Shift+Insert;numlockx on"
bindsym Print exec "~/.config/i3/run.sh screenshot" bindsym $mod+p exec "~/.config/i3/run.sh screenshot"
# Split in vertical orientation # Split in vertical orientation
bindsym $mod+v split h bindsym $mod+v split h
# Split in horizontal orientation # Split in horizontal orientation
@ -230,4 +230,6 @@ exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/s
#exec --no-startup-id "~/bin/indicator-kdeconnect" #exec --no-startup-id "~/bin/indicator-kdeconnect"
# riot # riot
exec --no-startup-id riot-web --hidden exec --no-startup-id riot-web --hidden
# setxkbmap
exec --no-startup-id setxkbmap -option caps:swapescape
# vim: ts=2:sw=2:et # vim: ts=2:sw=2:et

126
i3/.config/i3/run.sh
View File

@ -1,50 +1,49 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ARG="$1" ARG="$1"
shift shift
if [ "$ARG" = "move" ]; then case "${ARG}" in
shift move)
eval "$(xdotool getwindowfocus getwindowgeometry | grep Geometry: | perl -pe 's/^\s*Geometry: /WinH=/;s/x/\nWinW=/g')" eval "$(xdotool getwindowfocus getwindowgeometry | grep Geometry: | perl -pe 's/^\s*Geometry: /WinH=/;s/x/\nWinW=/g')"
eval "$(xdotool getwindowfocus getwindowgeometry | grep Position: | perl -pe 's/^\s*Position: /WinY=/;s/,/\nWinX=/g;s/\s\(.+//')" eval "$(xdotool getwindowfocus getwindowgeometry | grep Position: | perl -pe 's/^\s*Position: /WinY=/;s/,/\nWinX=/g;s/\s\(.+//')"
eval "$(xrandr | grep -w connected | perl -pe 's/.+?(\d+x\d+)\+\d+\+\d+.*/\1/g;s/^/MonH=/;s/x/\nMonW=/;' | head -n2)" eval "$(xrandr | grep -w connected | perl -pe 's/.+?(\d+x\d+)\+\d+\+\d+.*/\1/g;s/^/MonH=/;s/x/\nMonW=/;' | head -n2)"
if [ "$ARG" = "top" ]; then if [[ "$ARG" = "top" ]]; then
echo $((WinY)) echo $((WinY))
xdotool getwindowfocus windowmove $((WinY - 1)) 0 xdotool getwindowfocus windowmove $((WinY - 1)) 0
elif [ "$ARG" = "right" ]; then elif [[ "$ARG" = "right" ]]; then
xdotool getwindowfocus windowmove $((MonH - WinH)) $((WinX - 1)) xdotool getwindowfocus windowmove $((MonH - WinH)) $((WinX - 1))
elif [ "$ARG" = "left" ]; then elif [[ "$ARG" = "left" ]]; then
xdotool getwindowfocus windowmove 0 $((WinX - 1)) xdotool getwindowfocus windowmove 0 $((WinX - 1))
elif [ "$ARG" = "bottom" ]; then elif [[ "$ARG" = "bottom" ]]; then
xdotool getwindowfocus windowmove $((WinY - 1)) $((MonW - WinW)) xdotool getwindowfocus windowmove $((WinY - 1)) $((MonW - WinW))
fi fi
elif [ "$ARG" = "lock" ];then ;;
#!/bin/bash lock)
declare -i ID declare -i ID
ID=`xinput list | grep -Eo 'TouchPad\s*id\=[0-9]{1,2}' | grep -Eo '[0-9]{1,2}'` ID=`xinput list | grep -Eo 'TouchPad\s*id\=[0-9]{1,2}' | grep -Eo '[0-9]{1,2}'`
declare -i STATE declare -i STATE
STATE=`xinput list-props $ID|grep 'Device Enabled'|awk '{print $4}'` STATE=`xinput list-props "${ID}"|grep 'Device Enabled'|awk '{print $4}'`
if [ $STATE -eq 1 ];then if [[ $STATE -eq 1 ]];then
xinput disable $ID xinput disable "${ID}"
echo "Touchpad disabled." echo "Touchpad disabled."
else else
xinput enable $ID xinput enable "${ID}"
echo "Touchpad enabled." echo "Touchpad enabled."
fi fi
fi ;;
if [ "$ARG" = "pass" ];then pass)
pass -c $(ls ~/.password-store/*/*|cut -b-37 --complement|rofi -dmenu|sed -e 's/\.gpg//') pass -c "$(ls ~/.password-store/*/*|cut -b-37 --complement|rofi -dmenu|sed -e 's/\.gpg//')"
fi ;;
if [ "$ARG" = "screensaver" ];then screensaver)
cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*` cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*`
fi ;;
if [ "$ARG" = "wall" ];then wall)
#if [[ -d ~/.i3/wallOM ]];then feh --bg-scale "`shuf -n1 -e ~/.i3/wallOM/*`";else feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`";fi; #if [[ -d ~/.i3/wallOM ]];then feh --bg-scale "`shuf -n1 -e ~/.i3/wallOM/*`";else feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`";fi;
#feh --bg-scale "$(shuf -n1 -e ~/.i3/wallOM/*)" #feh --bg-scale "$(shuf -n1 -e ~/.i3/wallOM/*)"
#feh --bg-scale ~/.i3/image.png #feh --bg-scale ~/.i3/image.png
feh --bg-scale "$(shuf -n1 <(realpath /home/stonewareslord/sync/wallpaper/"$(hostname)"/*))" feh --bg-scale "$(shuf -n1 <(realpath /home/stonewareslord/sync/wallpaper/"$(hostname)"/*))"
fi ;;
if [ "$ARG" = "swap" ];then swap)
python << EOF python <<-EOF
import i3 import i3
swap = [output for output in i3.get_outputs() if output['active']] swap = [output for output in i3.get_outputs() if output['active']]
if len(swap) == 2: if len(swap) == 2:
@ -52,8 +51,8 @@ if len(swap) == 2:
i3.workspace(output['current_workspace']) i3.workspace(output['current_workspace'])
i3.command('move', 'workspace to output right') i3.command('move', 'workspace to output right')
EOF EOF
fi ;;
if [ "$ARG" = "boot" ];then boot)
test -f ~/.screenlayout/default.sh && ~/.screenlayout/default.sh test -f ~/.screenlayout/default.sh && ~/.screenlayout/default.sh
/usr/bin/xset -b /usr/bin/xset -b
/usr/bin/xset +fp /usr/share/fonts/X11/misc /usr/bin/xset +fp /usr/share/fonts/X11/misc
@ -63,10 +62,10 @@ if [ "$ARG" = "boot" ];then
/usr/bin/xset -dpms /usr/bin/xset -dpms
# This will segfault and ruin your day # This will segfault and ruin your day
#/usr/bin/urxvtd -q -f -o #/usr/bin/urxvtd -q -f -o
#if [ "$(hostname)" = "MMLin" ]; then #if [[ "$(hostname)" = "MMLin" ]]; then
# xrandr --output HDMI1 --primary # xrandr --output HDMI1 --primary
# xmodmap <(echo pointer = 3 2 1) # xmodmap <(echo pointer = 3 2 1)
#elif [ "$(hostname)" = "G2" ]; then #elif [[ "$(hostname)" = "G2" ]]; then
# #TODO: Figure out what the display is called # #TODO: Figure out what the display is called
# xrandr --output eDP1 --primary # xrandr --output eDP1 --primary
# xmodmap <(echo pointer = 1 2 3) # xmodmap <(echo pointer = 1 2 3)
@ -78,8 +77,8 @@ if [ "$ARG" = "boot" ];then
else else
i3 i3
fi fi
fi ;;
if [ "$ARG" = "screen-lock" ];then screen-lock)
revert(){ revert(){
xset dpms 0 0 0 xset dpms 0 0 0
} }
@ -87,15 +86,14 @@ if [ "$ARG" = "screen-lock" ];then
xset +dpms dpms 5 5 5 xset +dpms dpms 5 5 5
slock slock
revert revert
fi ;;
if [ "$ARG" = "paste" ]; then paste)
sleep 2 sleep 2
DISPLAY=:0.0 xdotool type --clearmodifiers --file <(xsel) DISPLAY=:0.0 xdotool type --clearmodifiers --file <(xsel)
fi ;;
if [ "$ARG" = "ping" ]; then ping)
shift
# Return code # Return code
local RET=0 RET=0
# nc has some intense divergence. netcat6 has no -z, but netcat has no -x # nc has some intense divergence. netcat6 has no -z, but netcat has no -x
# -w3: 3 second timeout # -w3: 3 second timeout
# -4 : ipv4 only # -4 : ipv4 only
@ -107,42 +105,24 @@ if [ "$ARG" = "ping" ]; then
nc -w 1 -4 "$ARG" "$1" -x </dev/null >& /dev/null && RET=1 nc -w 1 -4 "$ARG" "$1" -x </dev/null >& /dev/null && RET=1
fi fi
echo $RET echo $RET
fi ;;
if [ "$ARG" = "ip" ]; then screenshot)
shift
local RET=0
if [ "$(hostname)" = "MMLin" ]; then
if grep -q "$ARG" < <(ifconfig enp2s0f0); then
RET=1
fi
elif [ "$(hostname)" = "G2" ]; then
if grep -q "$ARG" < <(ifconfig enp1s0;ifconfig wlp2s0); then
RET=1
fi
elif [ "$(hostname)" = "SGen" ]; then
if grep -q "$ARG" < <(ifconfig enp0s25); then
RET=1
fi
fi
echo $RET
fi
if [ "$ARG" = "copy" ]; then
(printf '-chegg ';xsel | perl -pe 's/[^a-zA-Z ]//g;chomp()') | xsel && notify-send "Copied" || notify-send "Error"
fi
if [ "$ARG" = "screenshot" ]; then
#\rm -f ~/last-photo/*(N) #\rm -f ~/last-photo/*(N)
find ~/last-photo/ -type f -delete
#DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo #DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo
local FNAME="$HOME/last-photo/$(date +'%Y-%m-%d_%T').png" FNAME="$HOME/last-photo/$(date +'%Y-%m-%d_%T').png"
DISPLAY=:0.0 import "${FNAME}" DISPLAY=:0.0 import "${FNAME}"
DISPLAY=:0.0 xclip -selection clipboard -t image/png -i "${FNAME}" DISPLAY=:0.0 xclip -selection clipboard -t image/png -i "${FNAME}"
#DISPLAY=:0.0 scrot -s "$HOME/last-photo/$(date +'%Y-%m-%d_%T').png" #DISPLAY=:0.0 scrot -s "$HOME/last-photo/$(date +'%Y-%m-%d_%T').png"
\cp ~/last-photo/* ~/Pictures \cp ~/last-photo/* ~/Pictures
fi ;;
if [ "$ARG" = "shutdownprompt" ]; then shutdownprompt)
RESP=$(printf 'Sleep\nNMRestart\nShutdown\nRestart\nLogout\n' | rofi -i -dmenu 2>/dev/null) RESP=$(printf 'Sleep\nNMRestart\nShutdown\nRestart\nLogout\n' | rofi -i -dmenu 2>/dev/null)
if [[ ! -z "$RESP" ]]; then if [[ ! -z "$RESP" ]]; then
case "$RESP" in case "$RESP" in
NMRestart) nmcli radio wifi off;sleep 1;nmcli radio wifi on;; NMRestart)
nmcli radio wifi off;sleep 1;nmcli radio wifi on
;;
Restart) Restart)
sudo /sbin/shutdown -r now sudo /sbin/shutdown -r now
;; ;;
@ -154,7 +134,10 @@ if [ "$ARG" = "shutdownprompt" ]; then
;; ;;
Sleep) Sleep)
amixer set Master 0% mute amixer set Master 0% mute
slock&until echo mem|sudo tee /sys/power/state>/dev/null;do sleep 1;done slock &
until sudo tee /sys/power/state <<<"mem" >/dev/null; do
sleep 1
done
sleep 4 sleep 4
nmcli radio wifi off nmcli radio wifi off
sleep 3 sleep 3
@ -162,18 +145,19 @@ if [ "$ARG" = "shutdownprompt" ]; then
;; ;;
esac esac
fi fi
fi ;;
if [ "$ARG" = "run" ]; then run)
PATH="$HOME/bin:/usr/games/bin:$PATH" rofi -show run PATH="$HOME/bin:/usr/games/bin:$PATH" rofi -show run
fi ;;
if [ "$ARG" = "window" ]; then window)
rofi -show window rofi -show window
fi ;;
if [ "$ARG" = "clip" ]; then clip)
# Get the rofi-selected index of what to paste # Get the rofi-selected index of what to paste
local INDEX="$(gpaste-client --oneline | colrm 80 | rofi -dmenu | perl -pe 's/:.*//')" INDEX="$(gpaste-client --oneline | colrm 80 | rofi -dmenu | perl -pe 's/:.*//')"
# If they made a selection, select it # If they made a selection, select it
if [[ ! -z "$INDEX" ]]; then if [[ ! -z "$INDEX" ]]; then
gpaste-client select "$INDEX" gpaste-client select "$INDEX"
fi fi
fi ;;
esac