sway: make most of config auto-loading

Signed-off-by: Robert Günzler <r@gnzler.io>

7 files changed, 28 insertions, 52 deletions

diff --git a/.config/sway/colors.conf.in b/.config/sway/colors.conf.in
deleted file mode 100644
index 4d9ed3c..0000000
--- a/.config/sway/colors.conf.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-set $text              {{ hex .bright_white }}
-set $text2             {{ hex .normal_white }}
-set $bg                {{ hex .normal_black }}
-#set $bg2              {{ hex (lighter .normal_black 0.2) }}
-set $bg2               {{ hex .dim_white }}
-set $main              {{ hex .accent }}
-set $main2             {{ hex .accent_darkerdarker }}
-set $urgent            {{ hex .bright_red }}
-set $urgent2           {{ hex .normal_red }}
-set $indicator_focused {{ hex .normal_yellow }}
-set $indicator_unfocused $bg
-
-client.focused           $main    $main   $text  $indicator_focused   $main
-#client.focused_inactive $bg      $bg     $text2 $indicator_unfocused $bg
-client.focused_inactive  $main2   $main2  $text2 $indicator_unfocused $main2
-client.unfocused         $bg      $bg     $text2 $indicator_unfocused $bg
-#client.unfocused        $main2   $main2  $text2 $indicator_unfocused $main2
-client.urgent            $urgent2 $urgent $text  $indicator_focused   $urgent
diff --git a/.config/sway/config b/.config/sway/config
index 408791f..392dc87 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -58,34 +58,13 @@ show_marks yes
 floating_maximum_size 0 x 0
 floating_minimum_size 75 x 50
 
-include input.conf
-include binds.conf
-include auto.conf
-
 # style {{{
 font pango:Iosevka Aile 10
 seat * xcursor_theme WinSur
-exec_always {
-	gsettings set org.gnome.desktop.interface gtk-theme Adwaita
-	gsettings set org.gnome.desktop.interface icon-theme Adwaita
-	gsettings set org.gnome.desktop.interface cursor-theme WinSur
-	# gsettings set org.gnome.desktop.interface font-name "Noto Sans"
-	gsettings set org.gnome.desktop.interface font-name "Iosevka Aile"
-	gsettings set org.gnome.desktop.interface enable-animations false
-	gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark
-	gsettings set org.gnome.desktop.interface color-scheme prefer-dark
-	gsettings set org.gnome.desktop.privacy remember-recent-files false
-	gsettings set org.gnome.desktop.privacy recent-files-max-age 0
-	gsettings set org.gtk.Settings.FileChooser show-hidden false
-	gsettings set org.gtk.Settings.FileChooser startup-mode cwd
-}
-
 set $bpix 3
 set $fat_bpix 5
 default_border pixel $bpix
 default_floating_border pixel $fat_bpix
-
-include colors.conf
 # }}}
 
 include config.d/*
diff --git a/.config/sway/auto.conf b/.config/sway/config.d/auto.conf
index d22be1b..1898e06 100644
--- a/.config/sway/auto.conf
+++ b/.config/sway/config.d/auto.conf
@@ -30,21 +30,23 @@ for_window [app_id="zoom" title="Settings"] floating enable
 for_window [app_id="zoom" title="^as_toolbar$"] floating enable
 for_window [app_id="zoom" title="^zoom$"] floating enable
 for_window [class="Chromium-browser"] mark browser
-for_window [class="Slack"] mark mail
-for_window [app_id="" title="^Slack"] mark mail
-for_window [class="balena-etcher-electron"] floating enable; border normal
-for_window [class="discord"] mark mail
-for_window [class="parsecd"] inhibit_idle fullscreen
-for_window [class="pinentry"] floating enable; border normal
+#for_window [class="discord"] mark mail
+#for_window [class="parsecd"] inhibit_idle fullscreen
+#for_window [class="pinentry"] floating enable; border normal
 for_window [con_mark="browser"] inhibit_idle fullscreen
+# fix primary clipboard paste not working
+for_window [con_mark="browser"] bindsym Shift-Insert exec 'wl-paste -p -n | wtype -'
 for_window [title="tridactyledit"] floating enable
 
 set $outputSide eDP-1
 for_window [con_mark="work"] move workspace $wsWork
 for_window [con_mark="mail"] move workspace $wsMail, move workspace to output $outputSide, layout tabbed
-for_window [class="Spotify"] move workspace $wsMusic, move workspace to output $outputSide
-for_window [class="osu!"] move workspace $wsGame, layout tabbed, exec osu-mode on
+#for_window [class="Spotify"] move workspace $wsMusic, move workspace to output $outputSide
+#for_window [class="osu!"] move workspace $wsGame, layout tabbed, exec osu-mode on
 for_window [app_id="org.keepassxc.KeePassXC"] move scratchpad; scratchpad show
-for_window [class="Gvncviewer"] move workspace __vnc; fullscreen
+#for_window [class="Gvncviewer"] move workspace __vnc; fullscreen
 for_window [app_id="retroarch"] fullscreen
-for_window [class="^Minecraft"] fullscreen; sway output - scale 1
+#for_window [class="^Minecraft"] fullscreen; sway output - scale 1
+
+for_window [app_id="gramps"] floating disable
+for_window [app_id="xdg-desktop-portal-gtk"] floating enable
diff --git a/.config/sway/binds.conf b/.config/sway/config.d/binds.conf
index 1e7c066..1e7c066 100644
--- a/.config/sway/binds.conf
+++ b/.config/sway/config.d/binds.conf
diff --git a/.config/sway/colors.conf b/.config/sway/config.d/colors.conf
index 498a50c..498a50c 100644
--- a/.config/sway/colors.conf
+++ b/.config/sway/config.d/colors.conf
diff --git a/.config/sway/config.d/gsettings.conf b/.config/sway/config.d/gsettings.conf
new file mode 100644
index 0000000..08d184a
--- /dev/null
+++ b/.config/sway/config.d/gsettings.conf
@@ -0,0 +1,14 @@
+exec_always {
+	gsettings set org.gnome.desktop.interface gtk-theme Adwaita
+	gsettings set org.gnome.desktop.interface icon-theme Adwaita
+	gsettings set org.gnome.desktop.interface cursor-theme WinSur
+	# gsettings set org.gnome.desktop.interface font-name "Noto Sans"
+	gsettings set org.gnome.desktop.interface font-name "Iosevka Aile"
+	gsettings set org.gnome.desktop.interface enable-animations false
+	gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark
+	gsettings set org.gnome.desktop.interface color-scheme prefer-dark
+	gsettings set org.gnome.desktop.privacy remember-recent-files false
+	gsettings set org.gnome.desktop.privacy recent-files-max-age 0
+	gsettings set org.gtk.Settings.FileChooser show-hidden false
+	gsettings set org.gtk.Settings.FileChooser startup-mode cwd
+}
diff --git a/.config/sway/input.conf b/.config/sway/config.d/input.conf
index 4246663..67ee374 100644
--- a/.config/sway/input.conf
+++ b/.config/sway/config.d/input.conf
@@ -23,8 +23,8 @@ input type:touchpad {
 	accel_profile adaptive
 	tap enabled
 	natural_scroll enabled
-
-  #events disabled
+	dwt enabled
+	#events disabled
 }
 
 set {