From e970a0230fff900d5537142a447a706a09482470 Mon Sep 17 00:00:00 2001 From: tdpeuter Date: Wed, 14 Jun 2023 17:13:32 +0200 Subject: [PATCH] Small fixes --- stow/sway/.config/sway/autostart.sh | 2 +- stow/sway/.config/sway/commands | 194 ++++++++++++++-------------- stow/sway/.config/sway/config | 7 +- 3 files changed, 101 insertions(+), 102 deletions(-) diff --git a/stow/sway/.config/sway/autostart.sh b/stow/sway/.config/sway/autostart.sh index f3dcf69..dfea59b 100755 --- a/stow/sway/.config/sway/autostart.sh +++ b/stow/sway/.config/sway/autostart.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # ~/.config/sway/autostart.sh # List of applications to autostart diff --git a/stow/sway/.config/sway/commands b/stow/sway/.config/sway/commands index c380e04..4c3c621 100644 --- a/stow/sway/.config/sway/commands +++ b/stow/sway/.config/sway/commands @@ -13,121 +13,125 @@ set { # Focus bindsym { - $flag+h focus left - $flag+j focus down - $flag+k focus up - $flag+l focus right + $flag+h focus left + $flag+j focus down + $flag+k focus up + $flag+l focus right - $flag+Left focus left - $flag+Down focus down - $flag+Up focus up - $flag+Right focus right + $flag+Left focus left + $flag+Down focus down + $flag+Up focus up + $flag+Right focus right - $flag+m focus mode_toggle - $flag+p focus parent + $flag+semicolon focus mode_toggle + $flag+p focus parent } # Move windows bindsym { $flag+Shift+h move left - $flag+Shift+j move down - $flag+Shift+k move up - $flag+Shift+l move right + $flag+Shift+j move down + $flag+Shift+k move up + $flag+Shift+l move right - $flag+Shift+Left move left - $flag+Shift+Down move down - $flag+Shift+Up move up - $flag+Shift+Right move right + $flag+Shift+Left move left + $flag+Shift+Down move down + $flag+Shift+Up move up + $flag+Shift+Right move right - $flag+Next move scratchpad - $flag+Prior scratchpad show + $flag+Next move scratchpad + $flag+KP_Next move scratchpad + $flag+Prior scratchpad show + $flag+KP_Prior scratchpad show } # Layouts bindsym { $flag+w layout toggle split - $flag+x layout tabbed - $flag+c split h - $flag+v split v + $flag+x layout tabbed + $flag+c split h + $flag+v split v - $flag+f floating enable, border normal 1 - $flag+Shift+f floating disable, border pixel 1 + $flag+f floating enable, border normal 1 + $flag+Shift+f floating disable, border pixel 1 - $alt+Next border pixel 1 # Show window title - $alt+Prior border normal 1 # Hide window title + $alt+Next border pixel 1 # Show window title + $alt+KP_Next border pixel 1 + $alt+Prior border normal 1 # Hide window title + $alt+KP_Prior border normal 1 - $flag+s sticky toggle + $flag+s sticky toggle } # Workspaces set { $ws1 "1:1" - $ws2 "2:2" - $ws3 "3:3" - $ws4 "4:4" - $ws5 "5:5" - $ws6 "6:6" - $ws7 "7:7" - $ws8 "8:8" - $ws9 "9:9" - $ws10 "10:10" - $ws11 "11:Soc" - $ws12 "12:Ent" + $ws2 "2:2" + $ws3 "3:3" + $ws4 "4:4" + $ws5 "5:5" + $ws6 "6:6" + $ws7 "7:7" + $ws8 "8:8" + $ws9 "9:9" + $ws10 "10:10" + $ws11 "11:Soc" + $ws12 "12:Ent" } bindsym { - $flag+ampersand workspace $ws1 - $flag+eacute workspace $ws2 - $flag+quotedbl workspace $ws3 - $flag+apostrophe workspace $ws4 - $flag+parenleft workspace $ws5 - $flag+section workspace $ws6 - $flag+egrave workspace $ws7 - $flag+exclam workspace $ws8 - $flag+ccedilla workspace $ws9 - $flag+agrave workspace $ws10 - $flag+parenright workspace $ws11 - $flag+minus workspace $ws12 + $flag+1 workspace $ws1 + $flag+2 workspace $ws2 + $flag+3 workspace $ws3 + $flag+4 workspace $ws4 + $flag+5 workspace $ws5 + $flag+6 workspace $ws6 + $flag+7 workspace $ws7 + $flag+8 workspace $ws8 + $flag+9 workspace $ws9 + $flag+0 workspace $ws10 + $flag+minus workspace $ws11 + $flag+equal workspace $ws12 - $flag+Shift+ampersand move container to workspace $ws1, workspace $ws1 - $flag+Shift+eacute move container to workspace $ws2, workspace $ws2 - $flag+Shift+quotedbl move container to workspace $ws3, workspace $ws3 - $flag+Shift+apostrophe move container to workspace $ws4, workspace $ws4 - $flag+Shift+parenleft move container to workspace $ws5, workspace $ws5 - $flag+Shift+section move container to workspace $ws6, workspace $ws6 - $flag+Shift+egrave move container to workspace $ws7, workspace $ws7 - $flag+Shift+exclam move container to workspace $ws8, workspace $ws8 - $flag+Shift+ccedilla move container to workspace $ws9, workspace $ws9 - $flag+Shift+agrave move container to workspace $ws10, workspace $ws10 - $flag+Shift+parenright move container to workspace $ws11, workspace $ws11 - $flag+Shift+minus move container to workspace $ws12, workspace $ws12 + $flag+Shift+1 move container to workspace $ws1, workspace $ws1 + $flag+Shift+2 move container to workspace $ws2, workspace $ws2 + $flag+Shift+3 move container to workspace $ws3, workspace $ws3 + $flag+Shift+4 move container to workspace $ws4, workspace $ws4 + $flag+Shift+5 move container to workspace $ws5, workspace $ws5 + $flag+Shift+6 move container to workspace $ws6, workspace $ws6 + $flag+Shift+7 move container to workspace $ws7, workspace $ws7 + $flag+Shift+8 move container to workspace $ws8, workspace $ws8 + $flag+Shift+9 move container to workspace $ws9, workspace $ws9 + $flag+Shift+0 move container to workspace $ws10, workspace $ws10 + $flag+Shift+minus move container to workspace $ws11, workspace $ws11 + $flag+Shift+equal move container to workspace $ws12, workspace $ws12 - $flag+Control+j focus output 'eDP-1' - $flag+Control+h workspace prev_on_output - $flag+Control+l workspace next_on_output - $flag+Control+k focus output 'HDMI-A-1' + $flag+Control+j focus output 'eDP-1' + $flag+Control+h workspace prev_on_output + $flag+Control+l workspace next_on_output + $flag+Control+k focus output 'HDMI-A-1' - $flag+Control+Down focus output 'eDP-1' - $flag+Control+Left workspace prev_on_output - $flag+Control+Right workspace next_on_output - $flag+Control+Up focus output 'HDMI-A-1' + $flag+Control+Down focus output 'eDP-1' + $flag+Control+Left workspace prev_on_output + $flag+Control+Right workspace next_on_output + $flag+Control+Up focus output 'HDMI-A-1' - $flag+Control+Shift+j \ - move container to output 'eDP-1', focus output 'eDP-1' - $flag+Control+Shift+h \ - move container to workspace prev_on_output, workspace prev_on_output - $flag+Control+Shift+l \ - move container to workspace next_on_output, workspace next_on_output - $flag+Control+Shift+k \ + $flag+Control+Shift+j \ + move container to output 'eDP-1', focus output 'eDP-1' + $flag+Control+Shift+h \ + move container to workspace prev_on_output, workspace prev_on_output + $flag+Control+Shift+l \ + move container to workspace next_on_output, workspace next_on_output + $flag+Control+Shift+k \ move container to output 'HDMI-A-1', focus output 'HDMI-A-1' - $flag+Control+Shift+Down \ + $flag+Control+Shift+Down \ move container to output 'eDP-1', focus output 'eDP-1' - $flag+Control+Shift+Left \ + $flag+Control+Shift+Left \ move container to workspace prev_on_output, workspace prev_on_output - $flag+Control+Shift+Right \ + $flag+Control+Shift+Right \ move container to workspace next_on_output, workspace next_on_output - $flag+Control+Shift+Up \ + $flag+Control+Shift+Up \ move container to output 'HDMI-A-1', focus output 'HDMI-A-1' } @@ -135,31 +139,31 @@ bindsym { bindsym --locked { # Brightness XF86MonBrightnessDown exec brightnessctl -e s 5%- && $notify -b - XF86MonBrightnessUp exec brightnessctl -e s +5% && $notify -b + XF86MonBrightnessUp exec brightnessctl -e s +5% && $notify -b # Volume control (Pulsemixer is slow!) - XF86AudioRaiseVolume exec pamixer -i 2 --set-limit 100 && $notify -v - XF86AudioLowerVolume exec pamixer -d 2 && $notify -v - XF86AudioMute exec pamixer -t && $notify -v - XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle + XF86AudioRaiseVolume exec pamixer -i 2 --set-limit 100 && $notify -v + XF86AudioLowerVolume exec pamixer -d 2 && $notify -v + XF86AudioMute exec pamixer -t && $notify -v + XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle # Media control - F7 exec playerctl play-pause - Shift+XF86AudioLowerVolume exec playerctl previous - Shift+XF86AudioRaiseVolume exec playerctl next + F7 exec playerctl play-pause + Shift+XF86AudioLowerVolume exec playerctl previous + Shift+XF86AudioRaiseVolume exec playerctl next } # Special commands set $fzf ~/.scripts/fzf-jump bindsym { -# Reload sway + # Reload sway $alt+Shift+r reload -# Dialog to exit sway - $alt+Shift+e exec swaynag -t warning -m 'Do you really want to exit sway?' \ - -B 'Yes, exit sway' 'swaymsg exit' + # Dialog to exit sway + $alt+Shift+e exec swaynag -t warning -m 'Do you really want to exit sway?' \ + -B 'Yes, exit sway' 'swaymsg exit' - $flag+q kill # Kill focused window - $flag+Return exec $term -e bash -c "zellij attach || zellij" # Start a terminal + $flag+q kill # Kill focused window + $flag+Return exec $term -e bash -c "zellij attach || zellij" # Start a terminal $flag+Delete exec swaylock # Lockscreen # Start application launcher diff --git a/stow/sway/.config/sway/config b/stow/sway/.config/sway/config index 20137ae..14915b2 100644 --- a/stow/sway/.config/sway/config +++ b/stow/sway/.config/sway/config @@ -11,12 +11,7 @@ include { style } -# Input -input type:keyboard { - xkb_layout "be" -} - -input 2:7:SynPS/2_Synaptics_TouchPad { +input type:touchpad { natural_scroll enabled scroll_factor 0.6 middle_emulation enabled