From ee41264a8f645e6c1a58789c824324bde514f5c1 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Thu, 18 Jul 2024 14:01:55 +0200 Subject: [PATCH] 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