From 10d65d87ceaec465c9ccb8c6f7e9579f7f2ceefc Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 26 Aug 2022 00:04:32 -0500 Subject: [PATCH] Fix gestures and nginx config --- host/laptop/third/sway/config | 2 +- .../nginx-user-public/.nginx-autoindex-after.html | 0 .../nginx-user-public/.nginx-autoindex-before.html | 0 host/layer/nginx-user-public/dotfiles-setup.d.fish | 14 +++++++------- os/linux/arch/provision.d/20-install-packages.bash | 1 + os/linux/libinput/gestures.conf | 8 ++++++++ 6 files changed, 17 insertions(+), 8 deletions(-) mode change 100644 => 100755 host/layer/nginx-user-public/.nginx-autoindex-after.html mode change 100644 => 100755 host/layer/nginx-user-public/.nginx-autoindex-before.html diff --git a/host/laptop/third/sway/config b/host/laptop/third/sway/config index 335c3a2..a5de172 100644 --- a/host/laptop/third/sway/config +++ b/host/laptop/third/sway/config @@ -1,4 +1,4 @@ -exec libinput-gestures -c $DOTFILES_PATH/os/linux/libinput/sway-gestures.conf +exec libinput-gestures -c ~/.config/libinput-gestures.conf exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000' bindswitch lid:toggle exec swaylock diff --git a/host/layer/nginx-user-public/.nginx-autoindex-after.html b/host/layer/nginx-user-public/.nginx-autoindex-after.html old mode 100644 new mode 100755 diff --git a/host/layer/nginx-user-public/.nginx-autoindex-before.html b/host/layer/nginx-user-public/.nginx-autoindex-before.html old mode 100644 new mode 100755 diff --git a/host/layer/nginx-user-public/dotfiles-setup.d.fish b/host/layer/nginx-user-public/dotfiles-setup.d.fish index 437e87a..a48c103 100644 --- a/host/layer/nginx-user-public/dotfiles-setup.d.fish +++ b/host/layer/nginx-user-public/dotfiles-setup.d.fish @@ -5,15 +5,15 @@ set h $argv[2] set c $argv[3] pushd (dirname $me) -function force_link +function _cp sudo rm -f "$argv[2]" - echo "Linking $argv[1] to $argv[2]" - sudo ln -s "$argv[1]" "$argv[2]" + echo "Copying $argv[1] to $argv[2]" + sudo cp "$argv[1]" "$argv[2]" end -force_link (pwd)/user-public-http.conf /etc/nginx/user-public-http.conf -force_link (pwd)/user-public-server.conf /etc/nginx/user-public-server.conf -force_link (pwd)/.nginx-autoindex-before.html /usr/share/nginx/html/.nginx-autoindex-before.html -force_link (pwd)/.nginx-autoindex-after.html /usr/share/nginx/html/.nginx-autoindex-after.html +_cp (pwd)/user-public-http.conf /etc/nginx/user-public-http.conf +_cp (pwd)/user-public-server.conf /etc/nginx/user-public-server.conf +_cp (pwd)/.nginx-autoindex-before.html /usr/share/nginx/html/.nginx-autoindex-before.html +_cp (pwd)/.nginx-autoindex-after.html /usr/share/nginx/html/.nginx-autoindex-after.html echo 'Don\'t forget to include the nginx files in your config inside their respective blocks!' diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index d41039b..9725330 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/os/linux/arch/provision.d/20-install-packages.bash @@ -47,4 +47,5 @@ paru -Sy --needed --noconfirm \ reflector `# Simplify Mirror Management` \ inetutils `# netutils` \ nnn `# CLI File Manager` \ + avahi nss-mdns `# .local DNS` \ man-db man-pages `# Come On, Man!` diff --git a/os/linux/libinput/gestures.conf b/os/linux/libinput/gestures.conf index cec37f5..2d6681d 100644 --- a/os/linux/libinput/gestures.conf +++ b/os/linux/libinput/gestures.conf @@ -1,2 +1,10 @@ swipe_threshold 25 timeout 0.9 + +# TODO: sway gestures? + +gesture swipe left 3 swaymsg workspace back_and_forth + +gesture swipe right 2 swaymsg seat seat0 cursor press BTN_EXTRA && swaymsg seat seat0 cursor release BTN_EXTRA + +gesture swipe left 2 swaymsg seat seat0 cursor press BTN_SIDE && swaymsg seat seat0 cursor release BTN_SIDE