0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-04-06 00:11:25 +00:00 committed by GitHub
commit 42ec765901
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 3485 additions and 2814 deletions

View file

@ -7,19 +7,26 @@ let
in
{
options = {
services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
options.services.xserver.windowManager.qtile = {
enable = mkEnableOption "qtile";
package = mkPackageOption pkgs "qtile" { };
};
config = mkIf cfg.enable {
services.xserver.windowManager.session = [{
name = "qtile";
start = ''
${pkgs.qtile}/bin/qtile start &
${cfg.package}/bin/qtile start &
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)
];
};
}