From 4e745ee4f14d3de01b9689a3b93c40c4dca1e94d Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Fri, 23 Jun 2023 01:19:22 -0400 Subject: [PATCH] Try out gdm --- modules/linux/hyprland.nix | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/modules/linux/hyprland.nix b/modules/linux/hyprland.nix index 8acc8b1..aac118a 100644 --- a/modules/linux/hyprland.nix +++ b/modules/linux/hyprland.nix @@ -4,14 +4,14 @@ in with lib; { config = mkMerge [ (mkIf nc.hyprland.enableGreetd { # Greetd for login - programs.regreet = { - enable = true; - settings = { GTK = { font_name = "Roboto 16"; }; }; - }; - services.greetd = { - enable = true; - settings = { default_session.command = "cage -s -- regreet"; }; - }; + # programs.regreet = { + # enable = true; + # settings = { GTK = { font_name = "Roboto 16"; }; }; + # }; + # services.greetd = { + # enable = true; + # settings = { default_session.command = "cage -s -- regreet"; }; + # }; environment.systemPackages = with pkgs; [ # Greeter packages cage @@ -23,9 +23,14 @@ in with lib; { # Turn on GDM for login services.xserver = { enable = true; - autorun = false; + autorun = true; # Enable plasma for the applications desktopManager.plasma5.enable = true; + displayManager.defaultSession = "hyprland"; + displayManager.gdm = { + enable = true; + wayland = true; + }; }; # Setup drivers hardware.opengl = { @@ -42,21 +47,6 @@ in with lib; { gsettings-desktop-schemas lxappearance kde-gtk-config - (stdenv.mkDerivation rec { - pname = "sddm-sugar-dark-theme"; - version = "1.2"; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/sddm/themes - cp -aR $src $out/share/sddm/themes/sugar-dark - ''; - src = fetchFromGitHub { - owner = "MarianArlt"; - repo = "sddm-sugar-dark"; - rev = "v${version}"; - sha256 = "0gx0am7vq1ywaw2rm1p015x90b75ccqxnb1sz3wy8yjl27v82yhb"; - }; - }) ]; qt.platformTheme = "qt5ct"; # Enable and configure hyperland