Merge branch 'master' of ssh://git.lyte.dev:2222/lytedev/dotfiles

apps/neovim/settings.vim

@@ -77,7 +77,8 @@ set nobackup " sessions handle this quite nicely
 set nowritebackup " no but really they do
 set noswapfile " no seriously sessions are cool
 set timeout " key combo mapping timeout
-set ttimeoutlen=200 " ms for key combo mapping timeout
+set ttimeoutlen=100 " ms delay for tapping key combos
+set timeoutlen=150 " ms for key combo mapping timeout
 set isfname+=32 " allow filenames to show them 32s
 
 " no freakin' bell

bin/devtunnel

@@ -0,0 +1,11 @@
+#!/usr/bin/env moon
+arg_spec = {
+	{"target", "REMOTE_MACHINE", "remote"}
+	{"fwd", "FORWARD_PORTS", "1313,3000,4800:8000,8080,1234,40080:80,40443:443"}
+	{"sargs", "SSH_ARGS", "-XY"}
+}
+args = {v[1], os.getenv(v[2]) or arg[i] or v[3] for i, v in ipairs(arg_spec)}
+ports = {a, (if b == "" then a else b) for a, b in args.fwd\gmatch "(%d+):?(%d*),?"}
+pargs = table.concat ["-L #{k}:localhost:#{v}" for k,v in pairs ports], " "
+for k,v in pairs ports do print "Forwarding localhost:#{k} to #{args.target}:#{v}"
+os.execute "ssh -N #{args.target} #{pargs} #{args.sargs}"

bin/fsw

@@ -49,6 +49,11 @@ FSW_EVENTS="${FSW_EVENTS:-close_write}"
 SHELL_COMMAND="${1}"; shift
 FILTER="${1}"; shift
 DIRS=("${1:-.}"); shift
+if [[ -e $FILTER ]]; then
+	# TODO: this is a sad hack/workaround
+	echo "It looks like your filter is an actual file. I'll just watch that for you."
+	DIRS=("${FILTER}")
+fi
 while [[ ! -z $1 ]]; do
 	DIRS+=("$1"); shift
 done

bin/remote

@@ -1,17 +1,9 @@
 #!/usr/bin/env moon
-
+arg_spec = {
-require('fun')!
+	{"target", "REMOTE_MACHINE", "remote"}
-
+	{"mpr", "MOSH_PORT_RANGE", "60000:61000"}
-garg = (v, i) -> os.getenv(v[1]) or arg[i] or v[2]
+	{"sargs", "SSH_ARGS", "-XY"}
-target, fwd, mpr, sargs, margs = unpack totable map garg, iter {
+	{"margs", "MOSH_ARGS", ""}
-	{"REMOTE_MACHINE", "remote"}
-	{"SSH_FORWARD_PORTS", "1313,3000,8000,8080,1234,40080:80,40443:443"}
-	{"MOSH_PORT_RANGE", "60000:61000"}
-	{"SSH_ARGS", "-XY"}
-	{"MOSH_ARGS", ""}
 }
-
+args = {v[1], os.getenv(v[2]) or arg[i] or v[3] for i, v in ipairs(arg_spec)}
-sfwd = fwd\gsub "(%d+):?(%d*),?", (p, mp) ->
+os.execute "mosh -p '#{args.mpr}' '#{args.target}' --ssh='ssh #{args.sargs}' #{args.margs}"
-	"-L #{p}:localhost:#{if mp == "" then p else mp} "
-
-os.execute "mosh -p '#{mpr}' '#{target}' --ssh='ssh #{sfwd} #{sargs}' #{margs}"

de/libinput/gestures.conf

@@ -1,9 +1,12 @@
-gesture swipe right	3 bspc desktop -f next
+gesture swipe left	3 bspc desktop -f next
-gesture swipe left	3 bspc desktop -f prev
+gesture swipe right	3 bspc desktop -f prev
 
 gesture swipe up   3 xdotool key XF86AudioRaiseVolume
 gesture swipe down 3 xdotool key XF86AudioLowerVolume
 
+gesture swipe left 4 xdotool key alt+Right
+gesture swipe right 4 xdotool key alt+Left
+
 # GNOME SHELL open/close overview (works for GNOME on Xorg only)
 #gesture pinch in	xdotool key super+s
 #gesture pinch out	xdotool key super+s
@@ -21,7 +24,7 @@ gesture swipe down 3 xdotool key XF86AudioLowerVolume
 # are actioned using the swipe_threshold configuration command.
 # Specify this value in dots. The default is 0.
 # E.g. set it to 100 dots with "swipe_threshold 100".
-swipe_threshold 50
+swipe_threshold 25
 
 ###############################################################################
 # You can set a timeout on gestures from start to end. The default is

de/x/modmap

@@ -4,4 +4,4 @@ keycode 66 = Control_L
 add Control = Control_L
 
 ! a fake keycode for xcape
-keycode 999 = Escape
+keycode 254 = Escape

de/x/profile

@@ -44,10 +44,14 @@ if command -v xcape >/dev/null 2>&1; then
 	xcape -e 'Control_L=Escape' &
 fi
 
-if command -v autocutsel >/dev/null 2>&1; then
+if command -v autocutsel &> /dev/null; then
 	autocutsel -fork &
 fi
 
+if command -v libinput-gestures-setup &> /dev/null; then
+	libinput-gestures-setup start
+fi
+
 if [ -f "$HOME/.env_xprofile" ]; then
 	source "$HOME/.env_xprofile"
 fi

de/x/resources

@@ -17,6 +17,8 @@
 ## Set fonts in "$HOME/.Xresources.env"
 URxvt.font: xft:Iosevka Term:pixelsize=14,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
 URxvt.faceName: xft:Iosevka Term:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
+Emacs.font: Iosevka Term
+Emacs.faceName: Iosevka Term
 # URxvt.transparent: true
 # URxvt.shading: 70
 URxvt.letterSpace: 0

scripts/arch-linux/provisioning/3-extras.bash

@@ -45,4 +45,6 @@ pacaur --needed -S \
 	ncdu `# Disk Usage Analyzer` \
 	zathura zathura-pdf-mupdf `# Document Viewer` \
 	scrot `# Screenshot Tool` \
+	libinput libinput-gestures `# Trackpad Control` \
+	xcape `# Escape Better` \
 	--noconfirm --noedit