modules: sddm is no longer the config wide default
Make room for a GDM option as well (SDDM does not start on my NVIDIA+Wayland config)
This commit is contained in:
parent
c3100e4cfb
commit
b8c954350c
5 changed files with 26 additions and 2 deletions
|
|
@ -18,8 +18,6 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf config.my.gui.enable {
|
config = mkIf config.my.gui.enable {
|
||||||
my.displayManager.sddm.enable = true;
|
|
||||||
|
|
||||||
programs.gnupg.agent = {
|
programs.gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSSHSupport = true;
|
enableSSHSupport = true;
|
||||||
|
|
|
||||||
|
|
@ -111,5 +111,6 @@
|
||||||
programs.waybar.enable = true;
|
programs.waybar.enable = true;
|
||||||
programs.foot.enable = true;
|
programs.foot.enable = true;
|
||||||
services.displayManager.sddm.wayland.enable = true;
|
services.displayManager.sddm.wayland.enable = true;
|
||||||
|
my.displayManager.gdm.enable = true;
|
||||||
services.power-profiles-daemon.enable = true;
|
services.power-profiles-daemon.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the KDE Plasma Desktop Environment.
|
# Enable the KDE Plasma Desktop Environment.
|
||||||
|
my.displayManager.sddm.enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
services.desktopManager.cosmic.enable = true;
|
services.desktopManager.cosmic.enable = true;
|
||||||
services.power-profiles-daemon.enable = true;
|
services.power-profiles-daemon.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
./gdm.nix
|
||||||
./sddm.nix
|
./sddm.nix
|
||||||
./secrets
|
./secrets
|
||||||
./wakeonwlan.nix
|
./wakeonwlan.nix
|
||||||
|
|
|
||||||
23
modules/gdm.nix
Normal file
23
modules/gdm.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit
|
||||||
|
(lib)
|
||||||
|
mkEnableOption
|
||||||
|
mkIf
|
||||||
|
;
|
||||||
|
|
||||||
|
cfg = config.my.displayManager.gdm;
|
||||||
|
in {
|
||||||
|
options.my.displayManager.gdm.enable = mkEnableOption "GDM setup";
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
services.displayManager.gdm = {
|
||||||
|
enable = true;
|
||||||
|
wayland = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue