Revert "qenya: plasma: workaround for issue in randomcat's config"
This reverts commit 7189fae109
.
This didn't actually fix the issue, as it turns out mkIf still
resolves the children of its attrset recursively. The longer-term
solution is to export my home-manager config as a flake output,
which I'm moving towards.
This commit is contained in:
parent
a6359fdd36
commit
d881607cb0
|
@ -1,19 +1,11 @@
|
||||||
{ config, lib, pkgs, osConfig, ... }:
|
{ config, lib, pkgs, osConfig, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) mkIf;
|
|
||||||
isPlasma = osConfig.services.desktopManager.plasma6.enable || osConfig.services.xserver.desktopManager.plasma5.enable;
|
isPlasma = osConfig.services.desktopManager.plasma6.enable || osConfig.services.xserver.desktopManager.plasma5.enable;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# FIXME: this mkIf is necessary because home/qenya is imported into shaw here:
|
programs.plasma.enable = isPlasma;
|
||||||
# https://github.com/randomnetcat/nix-configs/blob/75d491dc6904475e43a820287edf3cf2f89abcfb/hosts/shaw/birdsong.nix#L74
|
programs.plasma.overrideConfig = true;
|
||||||
# shaw doesn't understand programs.plasma because randomcat doesn't import
|
|
||||||
# plasma-manager, and is unwilling to because none of her machines run KDE.
|
|
||||||
# This probably can't be fixed until we merge our configs completely.
|
|
||||||
programs = mkIf isPlasma {
|
|
||||||
plasma.enable = isPlasma;
|
|
||||||
plasma.overrideConfig = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = [ ];
|
imports = [ ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue