Add swayfx version of sway, switch to using for consistent setup across devices

home/desktop/sway.nix

@@ -9,7 +9,6 @@
 in {
   imports = [
     ./swaylock.nix
-    # ./eww.nix
     ./waybar.nix
     ./gtk.nix
     ./dunst.nix
@@ -20,7 +19,6 @@ in {
     wireplumber
     wl-clipboard
     swayimg
-    hyprpaper
     brightnessctl
   ];
   programs.rofi.package = pkgs.rofi-wayland;
@@ -39,7 +37,7 @@ in {
       };
       bars = [];
       startup = [{command = "dunst";} {command = "waybar";}];
-      modifier = lib.mkDefault "Mod4";
+      modifier = lib.mkDefault "Mod1";
       terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
       keybindings = lib.mkOptionDefault {
         "${modifier}+Return" = "exec ${term}";
@@ -48,7 +46,7 @@ in {
         "${modifier}+p" = "exec powermenu";
         "${modifier}+v" = "floating toggle";
         "${modifier}+space" = "exec ${pkgs.rofi}/bin/rofi -show drun";
-        # "${modifier}+F1" = "exec ${pkgs.swaylock}/bin/swaylock";
+        "${modifier}+F1" = "exec ${pkgs.swaylock}/bin/swaylock";
         "${modifier}+w" = "exec ${pkgs.firefox}/bin/firefox";
         "${modifier}+f" = "exec ${pkgs.xfce.thunar}/bin/thunar";
         "${modifier}+m" = "fullscreen toggle";

home/desktop/swayfx.nix

@@ -0,0 +1,16 @@
+{pkgs, ...}: {
+  imports = [./sway.nix];
+  wayland.windowManager.sway = {
+    package = pkgs.swayfx;
+    extraConfig = ''
+      corner_radius 10
+      blur enable
+      blur_xray disable
+      blur_passes 3
+      blur_radius 5
+      shadows enable
+      shadow_blur_radius 4
+      scratchpad_minimize disable
+    '';
+  };
+}

machines/N0245/default.nix

@@ -28,7 +28,7 @@
     enable = true;
     settings = rec {
       initial_session = {
-        command = "Hyprland";
+        command = "sway";
         user = "elitherl";
       };
       default_session = initial_session;

machines/N0245/elitherl.nix

@@ -2,7 +2,7 @@
   imports = [
     ../../home/work.nix
     ../../home/gui
-    ../../home/desktop/hyprland.nix
+    ../../home/desktop/swayfx.nix
   ];
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
@@ -16,23 +16,24 @@
   ];
   programs.firefox.package = pkgs.firefox-wayland;
 
-  wayland.windowManager.hyprland.extraConfig = ''
-    source=./common.conf
-    monitor=eDP-1,preferred,auto,auto
-    monitor=DP-3,preferred,auto,auto
-    monitor=DP-4,preferred,auto,auto,transform,1
-    windowrule = float, title:^([Zz]oom).*$
-    windowrule = center, title:^([Zz]oom).*$
-    windowrule = float, ^(Nxplayer.bin)$
-    windowrule = center, ^(Nxplayer.bin)$
-    windowrule = workspace 3, title:^([Zz]oom).*$
-    windowrule = workspace 4, ^(Nxplayer.bin)$
-  '';
+  # wayland.windowManager.hyprland.extraConfig = ''
+  #   source=./common.conf
+  #   monitor=eDP-1,preferred,auto,auto
+  #   monitor=DP-3,preferred,auto,auto
+  #   monitor=DP-4,preferred,auto,auto,transform,1
+  #   windowrule = float, title:^([Zz]oom).*$
+  #   windowrule = center, title:^([Zz]oom).*$
+  #   windowrule = float, ^(Nxplayer.bin)$
+  #   windowrule = center, ^(Nxplayer.bin)$
+  #   windowrule = workspace 3, title:^([Zz]oom).*$
+  #   windowrule = workspace 4, ^(Nxplayer.bin)$
+  # '';
+  wayland.windowManager.sway.config.output.eDP-2.scale = "1.5";
   programs.waybar.settings = {
     main = {
       "output" = "DP-3";
       "modules-left" = [
-        "wlr/workspaces"
+        "sway/workspaces"
         "cpu"
         "memory"
         "temperature"
@@ -54,7 +55,7 @@
       ];
       "output" = "eDP-1";
       "modules-left" = [
-        "wlr/workspaces"
+        "sway/workspaces"
         "cpu"
         "memory"
         "temperature"
@@ -75,7 +76,7 @@
         "~/.config/waybar/layout.json"
       ];
       "output" = "DP-4";
-      "modules-left" = ["wlr/workspaces"];
+      "modules-left" = ["sway/workspaces"];
       "modules-center" = ["clock#compact"];
       "modules-right" = ["tray"];
     };

machines/Vanguard/xenia.nix

@@ -2,7 +2,7 @@
   imports = [
     ../../home/personal.nix
     ../../home/gui
-    ../../home/desktop/sway.nix
+    ../../home/desktop/swayfx.nix
   ];
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";
@@ -17,12 +17,14 @@
     startup = [{command = "steam";}];
   };
   programs.waybar.settings.main = {
-    "modules-left" = ["sway/workspaces"];
-    "modules-center" = ["clock"];
-    "modules-right" = [
+    "modules-left" = [
+      "sway/workspaces"
       "cpu"
       "memory"
       "temperature"
+    ];
+    "modules-center" = ["clock"];
+    "modules-right" = [
       "pulseaudio"
       "bluetooth"
       "network"