From 281bc8d1ccbb6a86ee669288feefcc7ba56c9c61 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sat, 25 Dec 2021 20:45:57 +0100 Subject: [PATCH 1/8] initial empty From b7dd3c96e6c382eb093e22dc84ef1e272aac4765 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sat, 25 Dec 2021 20:46:17 +0100 Subject: [PATCH 2/8] sway config.d layout --- bin/keyboard-layout-per-window.py | 42 +++++++++ config | 22 +++++ config.d/10-variables.conf | 15 +++ config.d/20-output.conf | 14 +++ config.d/30-input.conf | 27 ++++++ config.d/40-bindings.conf | 148 ++++++++++++++++++++++++++++++ config.d/41-swaysome.conf | 52 +++++++++++ config.d/50-style.conf | 47 ++++++++++ config.d/60-app-windows.conf | 34 +++++++ config.d/99-startup.conf | 3 + 10 files changed, 404 insertions(+) create mode 100755 bin/keyboard-layout-per-window.py create mode 100644 config create mode 100644 config.d/10-variables.conf create mode 100644 config.d/20-output.conf create mode 100644 config.d/30-input.conf create mode 100644 config.d/40-bindings.conf create mode 100644 config.d/41-swaysome.conf create mode 100644 config.d/50-style.conf create mode 100644 config.d/60-app-windows.conf create mode 100644 config.d/99-startup.conf diff --git a/bin/keyboard-layout-per-window.py b/bin/keyboard-layout-per-window.py new file mode 100755 index 0000000..15e5dfb --- /dev/null +++ b/bin/keyboard-layout-per-window.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python + +# This script keeps track of active keyboard layouts per window. +# +# This script requires i3ipc-python package (install it from a system package +# manager or pip). +# +# https://github.com/swaywm/sway/pull/4504/files +import i3ipc + +sway = i3ipc.Connection() +prev_focused = sway.get_tree().find_focused().id +windows = {} + +def on_window_focus(ipc, event): + global windows, prev_focused + + # Save current layouts + layouts = {input.identifier: input.xkb_active_layout_index for input in sway.get_inputs()} + windows[prev_focused] = layouts + + # Restore layout of the newly focused window + if event.container.id in windows: + for (input_id, layout_index) in windows[event.container.id].items(): + if layout_index != layouts[input_id]: + sway.command(f'input "{input_id}" xkb_switch_layout {layout_index}') + + prev_focused = event.container.id + +def on_window_close(ipc, event): + global windows + if event.container.id in windows: + del(windows[event.container.id]) + +def on_window(ipc, event): + if event.change == "focus": + on_window_focus(ipc, event) + elif event.change == "close": + on_window_close(ipc, event) + +sway.on("window", on_window) +sway.main() diff --git a/config b/config new file mode 100644 index 0000000..bb9ec2d --- /dev/null +++ b/config @@ -0,0 +1,22 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Idle configuration +# +# Example configuration: +# +# 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' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +include /etc/sway/config.d/* +include /var/home/vladan/.config/sway/config.d/* diff --git a/config.d/10-variables.conf b/config.d/10-variables.conf new file mode 100644 index 0000000..afc9aff --- /dev/null +++ b/config.d/10-variables.conf @@ -0,0 +1,15 @@ +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term alacritty +# Your preferred application launcher +# Note: it's recommended that you pass the final command to sway +# set $menu wofi -c $HOME/.config/wofi/config -s $HOME/.config/wofi/style.css | xargs swaymsg exec -- +set $menu ~/src/wldash/target/release/wldash diff --git a/config.d/20-output.conf b/config.d/20-output.conf new file mode 100644 index 0000000..c80834c --- /dev/null +++ b/config.d/20-output.conf @@ -0,0 +1,14 @@ +### Output configuration +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs +# +output DP-1 bg /home/vladan/.config/sway/bkg2.jpg fill +output DP-1 scale 1.2 res 3840x2160 pos 0 0 +output DP-2 bg /home/vladan/.config/sway/bkg2.jpg fill +output DP-2 scale 1.2 res 3840x2160 pos 0 0 +output eDP-1 bg /home/vladan/.config/sway/bkg.jpg fill +output eDP-1 scale 1.0 res 1920x1080 pos 640 1800 diff --git a/config.d/30-input.conf b/config.d/30-input.conf new file mode 100644 index 0000000..9dfbe9d --- /dev/null +++ b/config.d/30-input.conf @@ -0,0 +1,27 @@ +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +input * xkb_layout "us,mk" +input * xkb_variant "typewriter" +input * xkb_options "grp:caps_toggle" + +# Pulse Audio controls +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume +bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% #decrease sound volume +bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle # mute sound +bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_00_1b.0.analog-stereo toggle # mute mic + +# Sreen brightness controls +bindsym XF86MonBrightnessUp exec brightnessctl -q s +10% +bindsym XF86MonBrightnessDown exec brightnessctl -q s 10%- diff --git a/config.d/40-bindings.conf b/config.d/40-bindings.conf new file mode 100644 index 0000000..45d47ad --- /dev/null +++ b/config.d/40-bindings.conf @@ -0,0 +1,148 @@ +### Key bindings +# +# Basics: +# + # start a terminal + bindsym $mod+Return exec $term + + # kill focused window + bindsym $mod+Shift+q kill + + # start your launcher + bindsym $mod+d exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # reload the configuration file + bindsym $mod+Shift+c reload + + # exit sway (logs you out of your Wayland session) + bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # _move_ the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # switch to workspace + bindsym $mod+1 workspace 1 + bindsym $mod+2 workspace 2 + bindsym $mod+3 workspace 3 + bindsym $mod+4 workspace 4 + bindsym $mod+5 workspace 5 + bindsym $mod+6 workspace 6 + bindsym $mod+7 workspace 7 + bindsym $mod+8 workspace 8 + bindsym $mod+9 workspace 9 + bindsym $mod+0 workspace 10 + # move focused container to workspace + bindsym $mod+Shift+1 move container to workspace 1 + bindsym $mod+Shift+2 move container to workspace 2 + bindsym $mod+Shift+3 move container to workspace 3 + bindsym $mod+Shift+4 move container to workspace 4 + bindsym $mod+Shift+5 move container to workspace 5 + bindsym $mod+Shift+6 move container to workspace 6 + bindsym $mod+Shift+7 move container to workspace 7 + bindsym $mod+Shift+8 move container to workspace 8 + bindsym $mod+Shift+9 move container to workspace 9 + bindsym $mod+Shift+0 move container to workspace 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show + + # Lock screen + bindsym $mod+z exec swaylock -c 000000 + + # Take full screen screenshot with PrtScr + bindsym Print exec grim -t png /tmp/screen.png + # Take area screenshot with Shift+PrtScr + bindsym Shift+Print exec grim -g "$(slurp)" /var/home/vladan/Pictures/screen.png + +# +# Resizing containers: +# + bindsym $mod+r mode "resize" + + mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" + } + diff --git a/config.d/41-swaysome.conf b/config.d/41-swaysome.conf new file mode 100644 index 0000000..7f5308f --- /dev/null +++ b/config.d/41-swaysome.conf @@ -0,0 +1,52 @@ +# Change focus between workspaces +unbindsym $mod+1 +unbindsym $mod+2 +unbindsym $mod+3 +unbindsym $mod+4 +unbindsym $mod+5 +unbindsym $mod+6 +unbindsym $mod+7 +unbindsym $mod+8 +unbindsym $mod+9 +unbindsym $mod+0 +bindsym $mod+1 exec "swaysome focus 1" +bindsym $mod+2 exec "swaysome focus 2" +bindsym $mod+3 exec "swaysome focus 3" +bindsym $mod+4 exec "swaysome focus 4" +bindsym $mod+5 exec "swaysome focus 5" +bindsym $mod+6 exec "swaysome focus 6" +bindsym $mod+7 exec "swaysome focus 7" +bindsym $mod+8 exec "swaysome focus 8" +bindsym $mod+9 exec "swaysome focus 9" +bindsym $mod+0 exec "swaysome focus 0" + +# Move containers between workspaces +unbindsym $mod+Shift+1 +unbindsym $mod+Shift+2 +unbindsym $mod+Shift+3 +unbindsym $mod+Shift+4 +unbindsym $mod+Shift+5 +unbindsym $mod+Shift+6 +unbindsym $mod+Shift+7 +unbindsym $mod+Shift+8 +unbindsym $mod+Shift+9 +unbindsym $mod+Shift+0 +bindsym $mod+Shift+1 exec "swaysome move 1" +bindsym $mod+Shift+2 exec "swaysome move 2" +bindsym $mod+Shift+3 exec "swaysome move 3" +bindsym $mod+Shift+4 exec "swaysome move 4" +bindsym $mod+Shift+5 exec "swaysome move 5" +bindsym $mod+Shift+6 exec "swaysome move 6" +bindsym $mod+Shift+7 exec "swaysome move 7" +bindsym $mod+Shift+8 exec "swaysome move 8" +bindsym $mod+Shift+9 exec "swaysome move 9" +bindsym $mod+Shift+0 exec "swaysome move 0" + +# Move focused container to next output +bindsym $mod+o exec "swaysome next_output" + +# Move focused container to previous output +bindsym $mod+Shift+o exec "swaysome prev_output" + +# Init workspaces for every screen +exec "swaysome init 1" diff --git a/config.d/50-style.conf b/config.d/50-style.conf new file mode 100644 index 0000000..49f4ab4 --- /dev/null +++ b/config.d/50-style.conf @@ -0,0 +1,47 @@ +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position top + + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + swaybar_command waybar +} + +# Remove title from windows +default_border pixel 1 +default_floating_border normal +bindsym $mod+t border toggle + +hide_edge_borders smart + +# Background +set $bg #232425 +# Background active +set $ba #191919 +# Background inactive +set $bi #3f3f3f +# Foreground active +set $fa #eff1f5 +# Foreground inactive +set $fi #646464 +# Border active +set $bra #9a9a9a +# Border inactive +set $bri #000000 + +# class border backgr. text indicator child_border +client.focused $bra $bra $bg $bg $bra +client.focused_inactive $bra $ba $fa $bg $bri +client.unfocused $bri $bi $fi $bg $bri +#client.urgent $br $br $fg $bg $br #currently not implemented +#client.placeholder $br $br $fg $bg $br #currently not implemented +client.background $bg + +gaps inner 0 +gaps outer 0 +#smart_gaps on + +for_window [app_id=".*"] border normal diff --git a/config.d/60-app-windows.conf b/config.d/60-app-windows.conf new file mode 100644 index 0000000..e5221e2 --- /dev/null +++ b/config.d/60-app-windows.conf @@ -0,0 +1,34 @@ +for_window [class="Firefox"] mark Browser +for_window [class="Firefox" window_role="Browser"] { + border normal 0 +} +# firefox floating menus +for_window [window_role="pop-up"] floating enable +for_window [window_role="task_dialog"] floating enable +for_window [window_role="pop-up"] floating enable +for_window [window_role="bubble"] floating enable +for_window [window_role="task_dialog"] floating enable +for_window [window_role="Preferences"] floating enable +for_window [window_type="dialog"] floating enable +for_window [window_type="menu"] floating enable +for_window [title="About Mozilla Firefox"] floating enabled +for_window [title="Password Required - Mozilla Firefox"] floating enabled +for_window [app_id="pinentry-qt"] { + move position center + floating enable +} +for_window [app_id="pavucontrol"] { + move position center + floating enable +} +for_window [app_id="wdisplays"] { + floating enable +} +for_window [app_id="com.nextcloud.desktopclient.nextcloud"] { + border normal 1 + floating enable +} + +for_window [app_id="avizo-service"] border pixel 0 +for_window [app_id="avizo-service"] sticky toggle +no_focus [app_id="avizo-service"] diff --git a/config.d/99-startup.conf b/config.d/99-startup.conf new file mode 100644 index 0000000..33d9a5e --- /dev/null +++ b/config.d/99-startup.conf @@ -0,0 +1,3 @@ +exec "~/.config/sway/bin/keyboard-layout-per-window.py" +exec "systemctl --user import-environment ; systemctl --user start sway-session.target" +exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway From ad9675b24417c243a0611e9bd97cbf6370619db2 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 8 Apr 2022 12:03:02 +0200 Subject: [PATCH 3/8] move file order and use config.d/* --- config | 22 +------------------ config.d/{20-output.conf => 00-output.conf} | 8 ++++--- .../{40-bindings.conf => 90-bindings.conf} | 2 +- .../{41-swaysome.conf => 91-swaysome.conf} | 0 config.d/99-startup.conf | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) rename config.d/{20-output.conf => 00-output.conf} (58%) rename config.d/{40-bindings.conf => 90-bindings.conf} (98%) rename config.d/{41-swaysome.conf => 91-swaysome.conf} (100%) diff --git a/config b/config index bb9ec2d..5b13f8f 100644 --- a/config +++ b/config @@ -1,22 +1,2 @@ -# Default config for sway -# -# Copy this to ~/.config/sway/config and edit it to your liking. -# -# Read `man 5 sway` for a complete reference. - -### Idle configuration -# -# Example configuration: -# -# 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' -# -# This will lock your screen after 300 seconds of inactivity, then turn off -# your displays after another 300 seconds, and turn your screens back on when -# resumed. It will also lock your screen before your computer goes to sleep. - include /etc/sway/config.d/* -include /var/home/vladan/.config/sway/config.d/* +include ~/.config/sway/config.d/* diff --git a/config.d/20-output.conf b/config.d/00-output.conf similarity index 58% rename from config.d/20-output.conf rename to config.d/00-output.conf index c80834c..3a723ab 100644 --- a/config.d/20-output.conf +++ b/config.d/00-output.conf @@ -6,9 +6,11 @@ # # You can get the names of your outputs by running: swaymsg -t get_outputs # -output DP-1 bg /home/vladan/.config/sway/bkg2.jpg fill +output DP-1 bg ~/.config/sway/bkg2.jpg fill output DP-1 scale 1.2 res 3840x2160 pos 0 0 -output DP-2 bg /home/vladan/.config/sway/bkg2.jpg fill +output DP-2 bg ~/.config/sway/bkg2.jpg fill output DP-2 scale 1.2 res 3840x2160 pos 0 0 -output eDP-1 bg /home/vladan/.config/sway/bkg.jpg fill +output HDMI-A-1 bg ~/.config/sway/bkg2.jpg fill +output HDMI-A-1 scale 1.2 res 3840x2160 pos 0 0 +output eDP-1 bg ~/.config/sway/bkg.jpg fill output eDP-1 scale 1.0 res 1920x1080 pos 640 1800 diff --git a/config.d/40-bindings.conf b/config.d/90-bindings.conf similarity index 98% rename from config.d/40-bindings.conf rename to config.d/90-bindings.conf index 45d47ad..d2fc7dc 100644 --- a/config.d/40-bindings.conf +++ b/config.d/90-bindings.conf @@ -118,7 +118,7 @@ # Take full screen screenshot with PrtScr bindsym Print exec grim -t png /tmp/screen.png # Take area screenshot with Shift+PrtScr - bindsym Shift+Print exec grim -g "$(slurp)" /var/home/vladan/Pictures/screen.png + bindsym Shift+Print exec grim -g "$(slurp)" /home/vladan/Pictures/screen.png # # Resizing containers: diff --git a/config.d/41-swaysome.conf b/config.d/91-swaysome.conf similarity index 100% rename from config.d/41-swaysome.conf rename to config.d/91-swaysome.conf diff --git a/config.d/99-startup.conf b/config.d/99-startup.conf index 33d9a5e..dd448c8 100644 --- a/config.d/99-startup.conf +++ b/config.d/99-startup.conf @@ -1,3 +1,3 @@ exec "~/.config/sway/bin/keyboard-layout-per-window.py" -exec "systemctl --user import-environment ; systemctl --user start sway-session.target" +exec "systemctl --user start sway-session.target" exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway From 2bae3f06bd917413f295cb97cf2b062751dde80b Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Tue, 27 Dec 2022 11:18:02 +0100 Subject: [PATCH 4/8] fix indent in bindings conf --- config.d/90-bindings.conf | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/config.d/90-bindings.conf b/config.d/90-bindings.conf index d2fc7dc..51af250 100644 --- a/config.d/90-bindings.conf +++ b/config.d/90-bindings.conf @@ -112,13 +112,15 @@ # If there are multiple scratchpad windows, this command cycles through them. bindsym $mod+minus scratchpad show - # Lock screen - bindsym $mod+z exec swaylock -c 000000 - # Take full screen screenshot with PrtScr - bindsym Print exec grim -t png /tmp/screen.png - # Take area screenshot with Shift+PrtScr - bindsym Shift+Print exec grim -g "$(slurp)" /home/vladan/Pictures/screen.png + +# Lock screen +bindsym $mod+z exec swaylock -c 000000 + +# Take full screen screenshot with PrtScr +bindsym Print exec grim -t png /tmp/screen.png +# Take area screenshot with Shift+PrtScr +bindsym Shift+Print exec grim -g "$(slurp)" /tmp/screen.png # # Resizing containers: From 85c1affbdc77cc9fa86226ef476b3ced33fce256 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 3 May 2023 15:24:49 +0200 Subject: [PATCH 5/8] use nwg-displays output --- config.d/00-output.conf | 48 ++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/config.d/00-output.conf b/config.d/00-output.conf index 3a723ab..ec42b5e 100644 --- a/config.d/00-output.conf +++ b/config.d/00-output.conf @@ -6,11 +6,43 @@ # # You can get the names of your outputs by running: swaymsg -t get_outputs # -output DP-1 bg ~/.config/sway/bkg2.jpg fill -output DP-1 scale 1.2 res 3840x2160 pos 0 0 -output DP-2 bg ~/.config/sway/bkg2.jpg fill -output DP-2 scale 1.2 res 3840x2160 pos 0 0 -output HDMI-A-1 bg ~/.config/sway/bkg2.jpg fill -output HDMI-A-1 scale 1.2 res 3840x2160 pos 0 0 -output eDP-1 bg ~/.config/sway/bkg.jpg fill -output eDP-1 scale 1.0 res 1920x1080 pos 640 1800 +output "eDP-1" { + mode 1920x1080@60.033Hz + pos 0 720 + transform normal + scale 1.0 + scale_filter nearest + adaptive_sync off + dpms on + bg ~/.config/sway/bkg.jpg fill +} +output "DP-1" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.2 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} +output "DP-2" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.2 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} +output "HDMI-A-1" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.2 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} From 80c39a76e8c9d3c964a087742dd9992c0314707c Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 3 May 2023 15:25:01 +0200 Subject: [PATCH 6/8] ignore images --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b53f1b3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +bkg.jpg +bkg2.jpg From ee41264a8f645e6c1a58789c824324bde514f5c1 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Thu, 18 Jul 2024 14:01:55 +0200 Subject: [PATCH 7/8] hm setup --- config.d/00-output.conf | 48 -------------------------------------- config.d/10-variables.conf | 15 ------------ config.d/50-style.conf | 12 +++------- config.d/90-bindings.conf | 4 ++-- config.d/91-swaysome.conf | 46 ++++++++++++++++++------------------ config.d/99-startup.conf | 9 ++++--- 6 files changed, 34 insertions(+), 100 deletions(-) delete mode 100644 config.d/00-output.conf delete mode 100644 config.d/10-variables.conf diff --git a/config.d/00-output.conf b/config.d/00-output.conf deleted file mode 100644 index ec42b5e..0000000 --- a/config.d/00-output.conf +++ /dev/null @@ -1,48 +0,0 @@ -### Output configuration -# -# Example configuration: -# -# output HDMI-A-1 resolution 1920x1080 position 1920,0 -# -# You can get the names of your outputs by running: swaymsg -t get_outputs -# -output "eDP-1" { - mode 1920x1080@60.033Hz - pos 0 720 - transform normal - scale 1.0 - scale_filter nearest - adaptive_sync off - dpms on - bg ~/.config/sway/bkg.jpg fill -} -output "DP-1" { - mode 3840x2160@59.997Hz - pos 1920 0 - transform normal - scale 1.2 - scale_filter linear - adaptive_sync off - dpms on - bg ~/.config/sway/bkg2.jpg fill -} -output "DP-2" { - mode 3840x2160@59.997Hz - pos 1920 0 - transform normal - scale 1.2 - scale_filter linear - adaptive_sync off - dpms on - bg ~/.config/sway/bkg2.jpg fill -} -output "HDMI-A-1" { - mode 3840x2160@59.997Hz - pos 1920 0 - transform normal - scale 1.2 - scale_filter linear - adaptive_sync off - dpms on - bg ~/.config/sway/bkg2.jpg fill -} diff --git a/config.d/10-variables.conf b/config.d/10-variables.conf deleted file mode 100644 index afc9aff..0000000 --- a/config.d/10-variables.conf +++ /dev/null @@ -1,15 +0,0 @@ -### Variables -# -# Logo key. Use Mod1 for Alt. -set $mod Mod4 -# Home row direction keys, like vim -set $left h -set $down j -set $up k -set $right l -# Your preferred terminal emulator -set $term alacritty -# Your preferred application launcher -# Note: it's recommended that you pass the final command to sway -# set $menu wofi -c $HOME/.config/wofi/config -s $HOME/.config/wofi/style.css | xargs swaymsg exec -- -set $menu ~/src/wldash/target/release/wldash diff --git a/config.d/50-style.conf b/config.d/50-style.conf index 49f4ab4..54e42b9 100644 --- a/config.d/50-style.conf +++ b/config.d/50-style.conf @@ -1,13 +1,7 @@ +# Ignore the status bar here, it's started by systemd. # -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. bar { - position top - - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. - swaybar_command waybar + swaybar_command /dev/null } # Remove title from windows @@ -42,6 +36,6 @@ client.background $bg gaps inner 0 gaps outer 0 -#smart_gaps on +smart_gaps on for_window [app_id=".*"] border normal diff --git a/config.d/90-bindings.conf b/config.d/90-bindings.conf index 51af250..e45a79b 100644 --- a/config.d/90-bindings.conf +++ b/config.d/90-bindings.conf @@ -16,7 +16,7 @@ # Despite the name, also works for non-floating windows. # Change normal to inverse to use left mouse button for resizing and right # mouse button for dragging. - floating_modifier $mod normal + # floating_modifier $mod normal # reload the configuration file bindsym $mod+Shift+c reload @@ -120,7 +120,7 @@ bindsym $mod+z exec swaylock -c 000000 # Take full screen screenshot with PrtScr bindsym Print exec grim -t png /tmp/screen.png # Take area screenshot with Shift+PrtScr -bindsym Shift+Print exec grim -g "$(slurp)" /tmp/screen.png +bindsym Shift+Print exec grim -g "$(slurp)" "/tmp/screenshot-$(date +%Y%m%d%H%M%S).png" # # Resizing containers: diff --git a/config.d/91-swaysome.conf b/config.d/91-swaysome.conf index 7f5308f..c05af33 100644 --- a/config.d/91-swaysome.conf +++ b/config.d/91-swaysome.conf @@ -9,16 +9,16 @@ unbindsym $mod+7 unbindsym $mod+8 unbindsym $mod+9 unbindsym $mod+0 -bindsym $mod+1 exec "swaysome focus 1" -bindsym $mod+2 exec "swaysome focus 2" -bindsym $mod+3 exec "swaysome focus 3" -bindsym $mod+4 exec "swaysome focus 4" -bindsym $mod+5 exec "swaysome focus 5" -bindsym $mod+6 exec "swaysome focus 6" -bindsym $mod+7 exec "swaysome focus 7" -bindsym $mod+8 exec "swaysome focus 8" -bindsym $mod+9 exec "swaysome focus 9" -bindsym $mod+0 exec "swaysome focus 0" +bindsym $mod+1 exec "/home/vladanpopovic/.local/bin/swaysome focus 1" +bindsym $mod+2 exec "/home/vladanpopovic/.local/bin/swaysome focus 2" +bindsym $mod+3 exec "/home/vladanpopovic/.local/bin/swaysome focus 3" +bindsym $mod+4 exec "/home/vladanpopovic/.local/bin/swaysome focus 4" +bindsym $mod+5 exec "/home/vladanpopovic/.local/bin/swaysome focus 5" +bindsym $mod+6 exec "/home/vladanpopovic/.local/bin/swaysome focus 6" +bindsym $mod+7 exec "/home/vladanpopovic/.local/bin/swaysome focus 7" +bindsym $mod+8 exec "/home/vladanpopovic/.local/bin/swaysome focus 8" +bindsym $mod+9 exec "/home/vladanpopovic/.local/bin/swaysome focus 9" +bindsym $mod+0 exec "/home/vladanpopovic/.local/bin/swaysome focus 0" # Move containers between workspaces unbindsym $mod+Shift+1 @@ -31,22 +31,22 @@ unbindsym $mod+Shift+7 unbindsym $mod+Shift+8 unbindsym $mod+Shift+9 unbindsym $mod+Shift+0 -bindsym $mod+Shift+1 exec "swaysome move 1" -bindsym $mod+Shift+2 exec "swaysome move 2" -bindsym $mod+Shift+3 exec "swaysome move 3" -bindsym $mod+Shift+4 exec "swaysome move 4" -bindsym $mod+Shift+5 exec "swaysome move 5" -bindsym $mod+Shift+6 exec "swaysome move 6" -bindsym $mod+Shift+7 exec "swaysome move 7" -bindsym $mod+Shift+8 exec "swaysome move 8" -bindsym $mod+Shift+9 exec "swaysome move 9" -bindsym $mod+Shift+0 exec "swaysome move 0" +bindsym $mod+Shift+1 exec "/home/vladanpopovic/.local/bin/swaysome move 1" +bindsym $mod+Shift+2 exec "/home/vladanpopovic/.local/bin/swaysome move 2" +bindsym $mod+Shift+3 exec "/home/vladanpopovic/.local/bin/swaysome move 3" +bindsym $mod+Shift+4 exec "/home/vladanpopovic/.local/bin/swaysome move 4" +bindsym $mod+Shift+5 exec "/home/vladanpopovic/.local/bin/swaysome move 5" +bindsym $mod+Shift+6 exec "/home/vladanpopovic/.local/bin/swaysome move 6" +bindsym $mod+Shift+7 exec "/home/vladanpopovic/.local/bin/swaysome move 7" +bindsym $mod+Shift+8 exec "/home/vladanpopovic/.local/bin/swaysome move 8" +bindsym $mod+Shift+9 exec "/home/vladanpopovic/.local/bin/swaysome move 9" +bindsym $mod+Shift+0 exec "/home/vladanpopovic/.local/bin/swaysome move 0" # Move focused container to next output -bindsym $mod+o exec "swaysome next_output" +bindsym $mod+o exec "/home/vladanpopovic/.local/bin/swaysome next-output" # Move focused container to previous output -bindsym $mod+Shift+o exec "swaysome prev_output" +bindsym $mod+Shift+o exec "/home/vladanpopovic/.local/bin/swaysome prev-output" # Init workspaces for every screen -exec "swaysome init 1" +exec "/home/vladanpopovic/.local/bin/swaysome init 1" diff --git a/config.d/99-startup.conf b/config.d/99-startup.conf index dd448c8..90dabe5 100644 --- a/config.d/99-startup.conf +++ b/config.d/99-startup.conf @@ -1,3 +1,6 @@ -exec "~/.config/sway/bin/keyboard-layout-per-window.py" -exec "systemctl --user start sway-session.target" -exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway +#exec "~/.config/sway/bin/keyboard-layout-per-window.py" +# +exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway + +exec hash dbus-update-activation-environment 2>/dev/null && \ + dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK From 06ba4b31d612e1b81f6e33c7a649a0c4676550d1 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 12 Aug 2024 16:00:40 +0200 Subject: [PATCH 8/8] add all config files --- config | 1 - config.d/00-variables.conf | 15 +++++++ config.d/10-systemd-cgroups.conf | 11 +++++ config.d/10-systemd-session.conf | 31 +++++++++++++ config.d/30-output.conf | 58 +++++++++++++++++++++++++ config.d/95-system-keyboard-config.conf | 9 ++++ config.d/95-xdg-desktop-autostart.conf | 14 ++++++ 7 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 config.d/00-variables.conf create mode 100644 config.d/10-systemd-cgroups.conf create mode 100644 config.d/10-systemd-session.conf create mode 100644 config.d/30-output.conf create mode 100644 config.d/95-system-keyboard-config.conf create mode 100644 config.d/95-xdg-desktop-autostart.conf diff --git a/config b/config index 5b13f8f..54adc14 100644 --- a/config +++ b/config @@ -1,2 +1 @@ -include /etc/sway/config.d/* include ~/.config/sway/config.d/* diff --git a/config.d/00-variables.conf b/config.d/00-variables.conf new file mode 100644 index 0000000..b3553ba --- /dev/null +++ b/config.d/00-variables.conf @@ -0,0 +1,15 @@ +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term alacritty +# Your preferred application launcher +# Note: it's recommended that you pass the final command to sway +set $menu /usr/bin/fuzzel +set $exedir /home/vladanpopovic/.local/bin diff --git a/config.d/10-systemd-cgroups.conf b/config.d/10-systemd-cgroups.conf new file mode 100644 index 0000000..9e60e7a --- /dev/null +++ b/config.d/10-systemd-cgroups.conf @@ -0,0 +1,11 @@ +# Automatically assign a dedicated systemd scope to the GUI applications +# launched in the same cgroup as the compositor. This could be helpful for +# implementing cgroup-based resource management and would be necessary when +# `systemd-oomd` is in use. +# +# Limitations: The script is using i3ipc window:new event to detect application +# launches and would fail to detect background apps or special surfaces. +# Therefore it's recommended to supplement the script with use of systemd user +# services for such background apps. +# +exec $exedir/assign-cgroups.py diff --git a/config.d/10-systemd-session.conf b/config.d/10-systemd-session.conf new file mode 100644 index 0000000..80ed890 --- /dev/null +++ b/config.d/10-systemd-session.conf @@ -0,0 +1,31 @@ +# Address several issues with DBus activation and systemd user sessions +# +# 1. DBus-activated and systemd services do not share the environment with user +# login session. In order to make the applications that have GUI or interact +# with the compositor work as a systemd user service, certain variables must +# be propagated to the systemd and dbus. +# Possible (but not exhaustive) list of variables: +# - DISPLAY - for X11 applications that are started as user session services +# - WAYLAND_DISPLAY - similarly, this is needed for wayland-native services +# - I3SOCK/SWAYSOCK - allow services to talk with sway using i3 IPC protocol +# +# 2. `xdg-desktop-portal` requires XDG_CURRENT_DESKTOP to be set in order to +# select the right implementation for screenshot and screencast portals. +# With all the numerous ways to start sway, it's not possible to rely on the +# right value of the XDG_CURRENT_DESKTOP variable within the login session, +# therefore the script will ensure that it is always set to `sway`. +# +# 3. GUI applications started as a systemd service (or via xdg-autostart-generator) +# may rely on the XDG_SESSION_TYPE variable to select the backend. +# Ensure that it is always set to `wayland`. +# +# 4. The common way to autostart a systemd service along with the desktop +# environment is to add it to a `graphical-session.target`. However, systemd +# forbids starting the graphical session target directly and encourages use +# of an environment-specific target units. Therefore, the integration +# package here provides and uses `sway-session.target` which would bind to +# the `graphical-session.target`. +# +# 5. Stop the target and unset the variables when the compositor exits. +# +exec $exedir/session.sh diff --git a/config.d/30-output.conf b/config.d/30-output.conf new file mode 100644 index 0000000..c67de40 --- /dev/null +++ b/config.d/30-output.conf @@ -0,0 +1,58 @@ +### Output configuration +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs +# +output "eDP-1" { + mode 1920x1080@60.033Hz + pos 0 720 + transform normal + scale 1.0 + scale_filter nearest + adaptive_sync off + dpms on + bg ~/.config/sway/bkg.jpg fill +} +output "DP-1" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.1 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} +output "DP-2" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.1 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} +output "DP-3" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.1 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} +output "HDMI-A-1" { + mode 3840x2160@59.997Hz + pos 1920 0 + transform normal + scale 1.1 + scale_filter linear + adaptive_sync off + dpms on + bg ~/.config/sway/bkg2.jpg fill +} diff --git a/config.d/95-system-keyboard-config.conf b/config.d/95-system-keyboard-config.conf new file mode 100644 index 0000000..4d6d54d --- /dev/null +++ b/config.d/95-system-keyboard-config.conf @@ -0,0 +1,9 @@ +# Apply system-wide XKB configuration stored in systemd-localed. +# +# The configuration can be viewed with `localectl` and modified +# with `localectl set-x11-keymap`. +# +# Normal mode will pick up the configuration changes immediately +# and oneshot mode will require a Sway config reload. + +exec_always $exedir/locale1-xkb-config --oneshot diff --git a/config.d/95-xdg-desktop-autostart.conf b/config.d/95-xdg-desktop-autostart.conf new file mode 100644 index 0000000..d383887 --- /dev/null +++ b/config.d/95-xdg-desktop-autostart.conf @@ -0,0 +1,14 @@ +# Wait until a StatusNotifierItem tray implementation is available and +# process XDG autostart entries. +# +# This horror has to exist because +# +# - SNI spec mandates that if `IsStatusNotifierHostRegistered` is not set, +# the client should fall back to the Freedesktop System Tray specification +# (XEmbed). +# - There are actual implementations that take this seriously and implement +# a fallback *even if* StatusNotifierWatcher is already DBus-activated. +# - https://github.com/systemd/systemd/issues/3750 +# +exec $exedir/wait-sni-ready && \ + systemctl --user start sway-xdg-autostart.target