Fix jude

modules/nixos/default.nix

@@ -20,7 +20,6 @@
     ./remote-builder.nix
     ./router.nix
     ./rpi4.nix
-    ./sway.nix
     ./syncthing.nix
     ./tailscale.nix
     ./vmdev.nix

modules/nixos/gnome.nix

@@ -23,10 +23,10 @@ with lib;
       # Trackpad support
       libinput.enable = true;
 
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+
       xserver = {
-        enable = true;
-        displayManager.gdm.enable = true;
-        desktopManager.gnome.enable = true;
         xkb.layout = "us";
       };
 

modules/nixos/kde.nix

@@ -24,12 +24,6 @@ with lib;
     systemd.services.bluetooth.requiredBy = [ "multi-user.target" ];
     services =
       {
-        xserver = {
-          enable = true;
-          xkb.layout = "us";
-          # Trackpad support
-        };
-
         libinput.enable = true;
         blueman.enable = true;
 
@@ -49,7 +43,7 @@ with lib;
       });
 
     programs.dconf.enable = true;
-    programs.sway.enable = true; # Gives us Wayland
+
     xdg.portal = {
       enable = true;
       wlr.enable = true; # Enables screen sharing in Wayland

modules/nixos/sway.nix

@@ -1,44 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.greg.sway;
-
-in
-with lib;
-{
-  options = {
-    greg.sway.enable = mkEnableOption "Enable my default Gnome3 setup";
-  };
-
-  config = mkIf cfg.enable {
-    services = {
-      accounts-daemon.enable = true;
-
-      pipewire = {
-        enable = true;
-        alsa.enable = true;
-        audio.enable = true;
-        jack.enable = true;
-        pulse.enable = true;
-        wireplumber.enable = true;
-      };
-
-      xserver = {
-        enable = true;
-        displayManager.gdm = {
-          enable = true;
-          autoSuspend = false;
-          banner = "Welcome to Greg's JUDE machine. Do I know you?";
-          wayland = true;
-        };
-        xkb.layout = "us";
-      };
-    };
-
-    programs.sway = {
-      enable = true; # Will be enabled through home-manager
-      wrapperFeatures.gtk = true;
-    };
-    security.pam.services.swaylock = { };
-  };
-}