Option to disable use of display manager (slightly broken)

This commit is contained in:
xenia 2024-06-27 12:40:22 +02:00
parent e2049d9ad1
commit 7957f18ecf
2 changed files with 12 additions and 5 deletions

View File

@ -104,6 +104,7 @@
graphical = mkNixOsGraphical { graphical = mkNixOsGraphical {
inherit pkgs; inherit pkgs;
background = "pan-wire-3.png"; background = "pan-wire-3.png";
use-display-manager = false;
}; };
networking = mkNixOsNetworking { inherit pkgs; }; networking = mkNixOsNetworking { inherit pkgs; };
@ -166,6 +167,7 @@
graphical = mkNixOsGraphical { graphical = mkNixOsGraphical {
inherit pkgs; inherit pkgs;
background = "pan-wire-3.png"; background = "pan-wire-3.png";
use-display-manager = true;
}; };
coral = coral =
let let

View File

@ -1,14 +1,18 @@
{ {
pkgs, pkgs,
background-image ? "pan-wire-3.png", background-image ? "pan-wire-3.png",
use-display-manager,
... ...
}: }:
let start-plasma-shortcut = pkgs.writeScriptBin "desktop" ''
${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland
'';
in
{ {
# Enable the X11 windowing system.
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.lightdm.enable = true;
displayManager.lightdm.enable = use-display-manager;
xkb = { xkb = {
layout = "fox"; layout = "fox";
@ -22,11 +26,11 @@
}; };
}; };
hardware.opengl.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
services.displayManager.defaultSession = "plasma"; services.displayManager.defaultSession = "plasma";
hardware.opengl.enable = true;
console.useXkbConfig = true; console.useXkbConfig = true;
sound.enable = false; # let pipewire handle sound sound.enable = false; # let pipewire handle sound
@ -51,5 +55,6 @@
firefox firefox
glxinfo glxinfo
start-plasma-shortcut
]; ];
} }