Merge pull request #167381 from jonringer/qtile-module-fixes
nixos/qtile: fixes
This commit is contained in:
commit
04ce3788d3
|
@ -7,19 +7,26 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
options = {
|
options.services.xserver.windowManager.qtile = {
|
||||||
services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
|
enable = mkEnableOption "qtile";
|
||||||
|
|
||||||
|
package = mkPackageOption pkgs "qtile" { };
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
services.xserver.windowManager.session = [{
|
services.xserver.windowManager.session = [{
|
||||||
name = "qtile";
|
name = "qtile";
|
||||||
start = ''
|
start = ''
|
||||||
${pkgs.qtile}/bin/qtile start &
|
${cfg.package}/bin/qtile start &
|
||||||
waitPID=$!
|
waitPID=$!
|
||||||
'';
|
'';
|
||||||
}];
|
}];
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.qtile ];
|
environment.systemPackages = [
|
||||||
|
# pkgs.qtile is currently a buildenv of qtile and its dependencies.
|
||||||
|
# For userland commands, we want the underlying package so that
|
||||||
|
# packages such as python don't bleed into userland and overwrite intended behavior.
|
||||||
|
(cfg.package.unwrapped or cfg.package)
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue