Re-enabled Xwayland?

3 files changed, 27 insertions, 30 deletions

diff --git a/modules/display.nix b/modules/display.nix
new file mode 100644
index 0000000..9e88f9e
--- /dev/null
+++ b/modules/display.nix
@@ -0,0 +1,27 @@
+{ ... }: {
+  
+  programs.hyprland.enable = true;
+  # Optional, hint electron apps to use wayland:
+  # environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  # # Enable the KDE Plasma Desktop Environment.
+  # services.displayManager.sddm.enable = true;
+  # services.desktopManager.plasma6.enable = true;
+  # services.displayManager.sddm.settings = {
+  #   Autologin = {
+  #     Session = "plasma.desktop";
+  #     User = "kyren";
+  #   };
+  # };
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+}
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
deleted file mode 100644
index 3e17d99..0000000
--- a/modules/hyprland.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-
-  programs.hyprland.enable = true;
-  # Optional, hint electron apps to use wayland:
-  # environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-}
diff --git a/modules/kde.nix b/modules/kde.nix
deleted file mode 100644
index 9b2cc2d..0000000
--- a/modules/kde.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }: {
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.desktopManager.plasma6.enable = true;
-  services.displayManager.sddm.settings = {
-    Autologin = {
-      Session = "plasma.desktop";
-      User = "kyren";
-    };
-  };
-
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = true;
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
-}