From 47d8848fb1f8c4e51b14d683290430d2af33cc4c Mon Sep 17 00:00:00 2001 From: Frieder Schlesier Date: Fri, 31 May 2024 21:18:20 +0200 Subject: [PATCH] tower: update sway+waybar --- .config/sway/config | 31 ++++++++++++++++++++----------- .config/waybar/config | 24 ++++++++++++++++++------ 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/.config/sway/config b/.config/sway/config index 36464c6..4904711 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -3,15 +3,19 @@ set $mod Mod4 # Configure displays -# The annoying thing is that sometimes the display ID changes when hotplugging -# my Thunderbolt dock... -set $primary DP-7 DP-8 HDMI-A-1 + +# swaymsg -t get_outputs +set $primary DP-2 +set $secondary DVI-D-1 set $laptop eDP-1 -output $laptop pos 1920 135 scale 2 -output DP-7 pos 0 0 scale 2 -output DP-8 pos 0 0 scale 2 -output HDMI-A-1 scale 2 +# output $laptop pos 1920 135 scale 2 +output $primary pos 1080 135 +output $secondary pos 0 0 transform 90 + +# output DP-7 pos 0 0 scale 2 +# output DP-8 pos 0 0 scale 2 +# output HDMI-A-1 scale 2 # output * bg ~/.dotfiles/backgrounds/samuel-ferrara-uOi3lg8fGl4-unsplash.jpg fill # output * bg ~/.dotfiles/backgrounds/scott-rodgerson-lRtzEExP0H8-unsplash.jpg fill @@ -49,6 +53,11 @@ bindsym $mod+j focus down bindsym $mod+k focus up bindsym $mod+l focus right +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + # move workspace bindsym $mod+Mod1+h move workspace to output left bindsym $mod+Mod1+l move workspace to output right @@ -100,7 +109,7 @@ workspace_layout tabbed default_border pixel 1 gaps outer 2 gaps inner 4 -smart_borders off +# smart_borders off hide_edge_borders --i3 none # Define names for default workspaces for which we configure key bindings later on. @@ -126,9 +135,9 @@ assign [app_id="org.keepassxc.KeePassXC"] $ws8 workspace $ws0 output $laptop workspace $ws1 output $primary $laptop workspace $ws2 output $primary $laptop -workspace $ws3 output $laptop -workspace $ws4 output $laptop -workspace $ws5 output $laptop +workspace $ws3 output $secondary $laptop +workspace $ws4 output $secondary $laptop +workspace $ws5 output $secondary $laptop # Switch to dev workspace by default #workspace $ws1 diff --git a/.config/waybar/config b/.config/waybar/config index 6a088c0..bd23221 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -7,9 +7,9 @@ // https://github.com/Alexays/Waybar/wiki/Configuration // https://github.com/Alexays/Waybar/wiki/Examples - "modules-left": ["sway/workspaces", "sway/mode"], - "modules-center": [ "custom/disk_root", "network"], - "modules-right": [ "custom/mail", "memory", "tray", "battery", "clock" ], + "modules-left": ["sway/workspaces", "sway/mode", "sway/window" ], + "modules-center": [ "custom/disk_root", "custom/disk_docs", "custom/disk_store", "network"], + "modules-right": [ "custom/mail", "memory", "tray", "clock" ], "sway/mode": { "format": " {}" }, @@ -36,15 +36,28 @@ "custom/disk_home": { "format": "🏠 {} ", "interval": 30, - "exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '" + "exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '", + "tooltip": true , + "tooltip-format": "{path} ({percentage_used}% of {total})" }, "custom/disk_root": { - "format": "💽 {} ", + "format": "root💽{} ", "interval": 30, "exec": "df -h --output=avail / | tail -1 | tr -d ' '", "tooltip": true , "tooltip-format": "{path} ({percentage_used}% of {total})" }, + + "custom/disk_store": { + "format": "store💽{} ", + "interval": 30, + "exec": "df -h --output=avail /media/store | tail -1 | tr -d ' '" + }, + "custom/disk_docs": { + "format": "docs💽{} ", + "interval": 30, + "exec": "df -h --output=avail /media/docs | tail -1 | tr -d ' '" + }, "temperature": { // "thermal-zone": 2, // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", @@ -67,7 +80,6 @@ }, "network": { // "family": "ipv6", - "interface": "wlp3*", // (Optional) To force the use of this interface "format-wifi": " {essid} {frequency} {signaldBm} dB {bandwidthUpBits}/{bandwidthDownBits}", "format-ethernet": "{ifname}: {ipaddr}/{cidr} ", "format-linked": "{ifname} (No IP) ",