Remove sddm from hyprland, set terminal back to wezterm, switch vanguard to using sway due to issues starting steam

desktop/hyprland.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  imports = [./sddm.nix];
   nixpkgs.overlays = [
     (self: super: {
       waybar = super.waybar.overrideAttrs (oldAttrs: {

home/desktop/hyprland.nix

@@ -91,8 +91,7 @@ in {
     }
 
     # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-    # bind = SUPER, Return, exec, wezterm
-    bind = SUPER, Return, exec, kitty
+    bind = SUPER, Return, exec, wezterm
     bind = SUPER, Q, killactive,
     bind = SUPER, E, exec, power-profiles
     bind = SUPER, P, exec, powermenu

home/desktop/sway.nix

@@ -32,6 +32,8 @@ in {
         size = 12.0;
       };
       bars = [];
+      modifier = lib.mkDefault "Mod4";
+      terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
       keybindings = lib.mkOptionDefault {
         "${modifier}+Return" = "exec ${term}";
         "${modifier}+q" = "kill";

machines/Vanguard/default.nix

@@ -4,6 +4,7 @@
     ../../hardware/audio.nix
     ../../hardware/bluetooth.nix
     ../../locales/en_GB.nix
+    ../../desktop/hyprland.nix
     ../../services/sshd
   ];
   networking = {
@@ -39,7 +40,8 @@
     enable = true;
     settings = rec {
       initial_session = {
-        command = "${pkgs.gamescope}/bin/gamescope --steam  -- steam -tenfoot -pipewire-dmabuf";
+        # command = "${pkgs.gamescope}/bin/gamescope --steam  -- steam -tenfoot -pipewire-dmabuf";
+        command = "sway";
         user = "xenia";
       };
       default_session = initial_session;

machines/Vanguard/xenia.nix

@@ -1,11 +1,36 @@
 {...}: {
-  imports = [../../home/personal.nix];
+  imports = [
+    ../../home/personal.nix
+    ../../home/gui
+    ../../home/desktop/sway.nix
+  ];
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
 
+  # wayland.windowManager.hyprland.extraConfig = ''
+  #   source=./common.conf
+  #   monitor=HDMI-A-2,preferred,auto,2.00
+  # '';
+  wayland.windowManager.sway = {
+    config = {
+      input = {"*" = {xkb_layout = "gb";};};
+      modifier = "Mod4";
+      output = {
+        HDMI-A-2 = {
+          scale = "2.0";
+          bg = "~/nixos/wallpaper.jpg fill";
+        };
+      };
+      gaps = {
+        inner = 5;
+        outer = 20;
+      };
+      startup = [{command = "dunst";} {command = "waybar";} {command = "steam";}];
+    };
+  };
   programs.waybar.settings.main = {
-    "modules-left" = ["wlr/workspaces"];
+    "modules-left" = ["sway/workspaces"];
     "modules-center" = ["clock"];
     "modules-right" = [
       "cpu"
@@ -16,7 +41,6 @@
       "network"
       "backlight"
       "battery"
-      "battery#bat2"
       "tray"
     ];
   };