From ad9675b24417c243a0611e9bd97cbf6370619db2 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 8 Apr 2022 12:03:02 +0200 Subject: [PATCH] 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