aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-02-25 08:17:44 +0100
committerKarel Kočí <cynerd@email.cz>2022-02-25 08:17:44 +0100
commitea86783651f5561bc735f7393a6d1b8aca81b4d5 (patch)
tree31b8e9f85f4f2c8538473849d632da67972397ee
parent9ca5e516ee02940ae7c8c56254940d6ace009c20 (diff)
downloadmyconfigs-ea86783651f5561bc735f7393a6d1b8aca81b4d5.tar.gz
myconfigs-ea86783651f5561bc735f7393a6d1b8aca81b4d5.tar.bz2
myconfigs-ea86783651f5561bc735f7393a6d1b8aca81b4d5.zip
sway: improve integration
-rw-r--r--config/sway/config3
-rw-r--r--config/sway/gsettings2
-rw-r--r--config/sway/inputs13
-rwxr-xr-xlocal/bin/sshvnc4
-rwxr-xr-xlocal/bin/startsway2
m---------private0
6 files changed, 20 insertions, 4 deletions
diff --git a/config/sway/config b/config/sway/config
index 9008042..14341d2 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -4,9 +4,10 @@ exec --no-startup-id gentoo-pipewire-launcher
exec --no-startup-id myswaylock
exec --no-startup-id swaybackground
################################################################################
-include gsettings
include inputs
+include gsettings
################################################################################
+include bar
smart_borders on
default_border normal
diff --git a/config/sway/gsettings b/config/sway/gsettings
index cae6b84..c3ea34c 100644
--- a/config/sway/gsettings
+++ b/config/sway/gsettings
@@ -2,7 +2,7 @@
exec_always {
gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita'
gsettings set org.gnome.desktop.interface cursor-theme 'Adwaita'
- gsettings set org.gnome.desktop.interface icon-theme 'Faenza'
+ gsettings set org.gnome.desktop.interface icon-theme 'Delft'
gsettings set org.gnome.desktop.interface font-name 'DejaVu Sans 8'
gsettings set org.gnome.desktop.interface gtk-key-theme 'Emacs'
}
diff --git a/config/sway/inputs b/config/sway/inputs
index 4bfd203..235105e 100644
--- a/config/sway/inputs
+++ b/config/sway/inputs
@@ -8,6 +8,7 @@ input type:keyboard {
input type:touchpad {
tap enabled
+ middle_emulation enabled
}
seat '*' {
@@ -15,3 +16,15 @@ seat '*' {
hide_cursor 10000
hide_cursor when-typing disable
}
+
+## Susan inputs ################################################################
+input '9610:33:HAILUCK_CO.,LTD_USB_KEYBOARD_Mouse' {
+ middle_emulation enabled
+ scroll_method on_button_down
+}
+input '10182:275:GXTP7386:00_27C6:0113_Stylus' {
+ calibration_matrix 0 -1 1 1 0 0
+}
+input '10182:275:GXTP7386:00_27C6:0113' {
+ calibration_matrix 0 -1 1 1 0 0
+}
diff --git a/local/bin/sshvnc b/local/bin/sshvnc
index 8b6fa0d..af133b4 100755
--- a/local/bin/sshvnc
+++ b/local/bin/sshvnc
@@ -9,9 +9,9 @@ while lsof -i:$localport; do
done
ssh -L "$localport":localhost:5900 "$target" \
- 'x11vnc -bg -localhost -display :0'
+ 'start-stop-daemon -v -w 1000 -bmp "/var/run/user/$(id -u)/sshvnc.pid" -e WAYLAND_DISPLAY=wayland-1 -S wayvnc localhost 5900'
vncviewer "localhost:$localport"
-ssh "$target" 'x11vnc -remote stop -localhost -display :0'
+ssh "$target" 'start-stop-daemon -v -p /var/run/user/$(id -u)/sshvnc.pid -K wayvnc'
ssh -O cancel -L "$localport":localhost:5900 "$target"
diff --git a/local/bin/startsway b/local/bin/startsway
index 995362e..63163ee 100755
--- a/local/bin/startsway
+++ b/local/bin/startsway
@@ -14,5 +14,7 @@ export force_s3tc_enable=true
# Fix firefox touchscreen gestures and force wayland
export MOZ_USE_XINPUT2=1
export MOZ_ENABLE_WAYLAND=1
+# Java application do not display properly
+export _JAVA_AWT_WM_NONREPARENTING=1
exec dbus-run-session sway
diff --git a/private b/private
-Subproject 25d88b1cc753ab9c2b0ef51a39be04c8fc88890
+Subproject c3a2678922b92e2fca58fbf8f56a77d1d5abfcc