From 3b7b79a79b1c31450aff22e6f4f652ad966e9341 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Thu, 28 Aug 2025 13:32:10 +0300 Subject: Re-enabled Xwayland? --- hosts/configuration.nix | 2 +- modules/display.nix | 27 +++++++++++++++++++++++++++ modules/hyprland.nix | 7 ------- modules/kde.nix | 23 ----------------------- 4 files changed, 28 insertions(+), 31 deletions(-) create mode 100644 modules/display.nix delete mode 100644 modules/hyprland.nix delete mode 100644 modules/kde.nix diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 6261922..44ed52c 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -4,7 +4,7 @@ inputs.sops-nix.nixosModules.sops ../modules/apps.nix ../modules/overrides.nix - ../modules/hyprland.nix + ../modules/display.nix ../modules/networking.nix ../modules/development.nix ../modules/gaming.nix 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 = ""; - }; - -} -- cgit v1.3.1