config

commit c7a9d97533e5e99f9e02b4896369560848221b69
parent c889eff18a88d87635ec1f2e5b3a882aca1c4751
Author: jacob@nzxt <jacobouno@protonmail.com>
Date:   Sun, 24 May 2020 12:43:16 -0700

Merge branch 'master' of git:/git/config

Diffstat:
M
aliases/.aliases
 | 
5
+++--
M
sxhkd/.config/sxhkd/sxhkdrc
 | 
66
++++++++++++++++++++++--------------------------------------------
M
xinitrc/.xinitrc
 | 
2
+-
M
xsession/.xsession
 | 
2
+-

4 files changed, 27 insertions(+), 48 deletions(-)
diff --git a/aliases/.aliases b/aliases/.aliases
@@ -61,8 +61,9 @@ alias ssh-port="grep -Ei '^port' /etc/ssh/sshd_config || echo 'port 22'"
 alias now="date +%Y%m%d-%H%M%S"
 
 # locations
-alias ds="cd ~/src/suckless/"
-alias dn="cd $NOTES"
+alias sl="cd ~/src/suckless/"
+alias n="cd $NOTES"
+alias src="cd ~/own/src/"
 
 # 1 char
 alias l="$PAGER"
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
@@ -1,24 +1,12 @@
-### launch software
+#! launch software
 # terminal
 super + t
   "$TERMINAL"
 
-# BROWSER
+# browser
 super + f
   "$BROWSER"
 
-# qutebrowser
-super + f
-  qutebrowser
-
-# surf browser
-super + c
-  tabbed surf -e
-
-# vimb browser
-super + v
-  tabbed -c vimb -e
-
 # htop
 super + e
   "$TERMINAL" -e htop
@@ -39,18 +27,7 @@ super + n
 shift + super + {m,alt + m, n}
   dmenu-bookmarks -n {-o,-oc,-e}
 
-# webcam
-super + alt + w
-  mpv av://v4l2:/dev/video0 '--geometry=+100%+100%'
-
-
-### toggle programs
-# picom
-alt + p
-  toggle "$COMPOSITOR"
-
-
-### basic utilities
+#! display and sound
 # hardware brightness controls
 XF86MonBrightness{Up,Down}
   xbl {--up,--down}
@@ -59,23 +36,36 @@ XF86MonBrightness{Up,Down}
 super + alt + {e,r}
   xbl {--up,--down}
 
-# suspend screen
+# hardware volume controls
+XF86Audio{Raise,Lower}Volume
+    notify-send $(sndioctl output.level={+,-}0.05 | cut -d"=" -f2) || volume {--inc,--dec} 5
+
+# volume controls
+super + alt + {i,o}
+    notify-send $(sndioctl output.level={+,-}0.05 | cut -d"=" -f2) || volume {--inc,--dec} 5
+
+# mute mic and speakers
+XF86Audio{_,Mic}Mute
+  volume {--mute,--mute-mic}
+
+#! basics
+# blank screen
 F4
   xset dpms force suspend
 
-# lock & then suspend
+# start locker
 super + F4
-  slock & sleep 1.2; systemctl suspend
+  $LOCKER
 
 # switch tty
 alt + F{1,2,3,4,5,6}
   sudo chvt {1,2,3,4,5,6}
 
-# launch wallpaper selector
-Menu
+# launch sxiv on WALLPAPERS
+super + shift + p
     dmenu-do-dir "$WALLPAPERS" "sxiv -rtb ./"
 
-# look at screenshots
+# launch sxiv on SCREENSHOTS
 super + alt + Print
   sxiv -t "$SCREENSHOTS"
 
@@ -94,15 +84,3 @@ XF86Audio{Play,Stop}
 # seek (mpd)
 shift + XF86Audio{Next,Prev}
     mpc seek {+,-}10
-
-# hardware volume controls
-XF86Audio{Raise,Lower}Volume
-    notify-send $(sndioctl output.level={+,-}0.05 | cut -d"=" -f2) || volume {--inc,--dec} 5
-
-# volume controls
-super + alt + {i,o}
-    notify-send $(sndioctl output.level={+,-}0.05 | cut -d"=" -f2) || volume {--inc,--dec} 5
-
-# mute mic and speakers
-XF86Audio{_,Mic}Mute
-  volume {--mute,--mute-mic}
diff --git a/xinitrc/.xinitrc b/xinitrc/.xinitrc
@@ -42,7 +42,7 @@ fi
 
 # kbd
 setxkbmap -option ctrl:nocaps
-xmodmap -e "keycode 66 = Return" &
+xmodmap -e "keycode 66 = Escape" &
 xset r rate 250 30 &
 
 # notifications
diff --git a/xsession/.xsession b/xsession/.xsession
@@ -9,7 +9,7 @@ ulimit -Sc 0
 notifyb &
 
 /usr/X11R6/bin/setxkbmap -option ctrl:nocaps &
-/usr/X11R6/bin/xmodmap -e "keycode 66 = Return" &
+/usr/X11R6/bin/xmodmap -e "keycode 66 = Escape" &
 /usr/X11R6/bin/xset dpms 320 &
 /usr/X11R6/bin/xset r rate 250 30 &
 /usr/X11R6/bin/xsetroot -xcf /home/jacob/.icons/Quintom/cursors/left_ptr 13 &