Reorganize files, use less extra options on Sway, move session commands to home-manager

modules/home/wms/sway/autostart/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   wayland.windowManager.sway.config = {
     bars = [{ command = "waybar"; }];
@@ -10,7 +10,11 @@
       { command = "foot -a sound -T Sound pulsemixer"; }
 
       # Daemons and tray
-      { command = "sway-audio-idle-inhibit"; }
+      { 
+        command = "kanshictl reload";
+        always = true;
+      }
+      { command = "wayland-pipewire-idle-inhibit"; }
 
       # Foreground
       { command = "thunderbird"; }

modules/home/wms/sway/default.nix

@@ -1,7 +1,8 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   imports = [
     ./autostart
+    ./extra
     ./hotkeys
     ./inputs
     ./outputs
@@ -11,15 +12,12 @@
 
   wayland.windowManager.sway = {
     enable = config.home.desktop.enable;
-    package = null;
     wrapperFeatures.gtk = true;
     checkConfig = false;
-    extraConfig = ''
-      default_floating_border pixel ${config.look.border.string}
-      hide_edge_borders --i3 smart
-      titlebar_padding 10 1
-      primary_selection disabled
-      mouse_warping container
+    extraOptions = [ "--unsupported-gpu" ];
+    extraSessionCommands = ''
+      export ELECTRON_OZONE_PLATFORM_HINT=wayland
+      export WLR_RENDERER=vulkan
     '';
   };
 }

modules/home/wms/sway/extra/default.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  wayland.windowManager.sway.extraConfig = ''
+    titlebar_padding 10 1
+    primary_selection disabled
+  '';
+}

modules/home/wms/sway/hotkeys/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   wayland.windowManager.sway.config = let
     # Set default modifier and variables
@@ -55,7 +55,7 @@
       ## Miscellaneous
 
       # Notifications
-      "${primeMod}+n" = ''exec makotoggle'';
+      "${primeMod}+n" = ''exec makoctl mode -t do-not-disturb'';
       "${primeMod}+Shift+n" = ''exec makoctl restore'';
       "${primeMod}+Ctrl+n" = ''exec makoctl dismiss -a'';
 

modules/home/wms/sway/inputs/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 {
   # HID devices
   wayland.windowManager.sway.config.input = {
@@ -8,9 +8,6 @@
     "9639:64097:Compx_2.4G_Receiver_Mouse" = {
       pointer_accel = "-0.82";
     };
-    "1452:627:bcm5974" = {
-      scroll_factor = "0.3";
-    };
     "*" = {
       accel_profile = "flat";
       dwt = "disabled";

modules/home/wms/sway/rules/default.nix

@@ -1,7 +1,14 @@
 { config, ... }:
 {
   wayland.windowManager.sway.config = {
-    defaultWorkspace = "1:${config.ws.w1}";
+    defaultWorkspace = "workspace 1:${config.ws.w1}";
+
+    focus = {
+      mouseWarping = "container";
+      wrapping = "yes";
+    };
+
+    workspaceAutoBackAndForth = true;
 
     window = {
       titlebar = false;
@@ -66,6 +73,5 @@
       ];
       "44:${config.ws.w4a}" = [{ app_id = "com.obsproject.Studio"; }];
     };
-    focus.newWindow = "focus";
   };
 }

modules/home/wms/sway/theme/default.nix

@@ -31,21 +31,31 @@
         childBorder = "#${config.look.colors.urgent}";
       };
     };
+
     fonts = {
       names = [ config.look.fonts.main ];
       size = 10.5;
     };
+
     window = {
       border = config.look.border.int;
+      hideEdgeBorders = "smart";
     };
+
+    floating.border = config.look.border.int;
+
     gaps = {
       inner = 5;
       smartGaps = true;
     };
+
     output = {
-      "*".bg = "~/.assets/wallpapers/1.png fill";
-      "${config.displays.tower2}".bg = "~/.assets/wallpapers/2.png fill";
-      "${config.displays.tower3}".bg = "~/.assets/wallpapers/3.png fill";
+      "*".bg = "${builtins.toString ./wallpapers/1.png} fill";
+
+      "${config.displays.tower2}".bg = "${builtins.toString ./wallpapers/2.png} fill";
+      "${config.displays.tower3}".bg = "${builtins.toString ./wallpapers/3.png} fill";
+
+      "${config.displays.estradiol2}".bg = "${builtins.toString ./wallpapers/2.png} fill";
     };
   };
 }