nixos/sddm: add extraPackages option
This commit is contained in:
parent
59aa3af15d
commit
2248bdfbbc
@ -7,7 +7,7 @@ let
|
|||||||
cfg = dmcfg.sddm;
|
cfg = dmcfg.sddm;
|
||||||
xEnv = config.systemd.services.display-manager.environment;
|
xEnv = config.systemd.services.display-manager.environment;
|
||||||
|
|
||||||
sddm = cfg.package;
|
sddm = cfg.package.override(old: { extraPackages = old.extraPackages or [] ++ cfg.extraPackages; });
|
||||||
|
|
||||||
iniFmt = pkgs.formats.ini { };
|
iniFmt = pkgs.formats.ini { };
|
||||||
|
|
||||||
@ -140,6 +140,15 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extraPackages = mkOption {
|
||||||
|
type = types.listOf types.package;
|
||||||
|
default = [];
|
||||||
|
defaultText = "[]";
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Extra Qt plugins / QML libraries to add to the environment.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
autoNumlock = mkOption {
|
autoNumlock = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
@ -235,15 +244,7 @@ in
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
services.xserver.displayManager.job = {
|
services.xserver.displayManager.job.execCmd = "exec /run/current-system/sw/bin/sddm";
|
||||||
environment = {
|
|
||||||
# Load themes from system environment
|
|
||||||
QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;
|
|
||||||
QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;
|
|
||||||
};
|
|
||||||
|
|
||||||
execCmd = "exec /run/current-system/sw/bin/sddm";
|
|
||||||
};
|
|
||||||
|
|
||||||
security.pam.services = {
|
security.pam.services = {
|
||||||
sddm.text = ''
|
sddm.text = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user