colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292141 from SuperSandro2000/plasma-out-xserver

Browse Source
This commit is contained in:
Sandro 2024-03-12 13:55:27 +01:00 committed by GitHub
commit e220724911
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/x11/desktop-managers/plasma6.nix → nixos/modules/services/desktop-managers/plasma6.nix
View File

@ -5,8 +5,7 @@
utils, utils,
... ...
}: let }: let
xcfg = config.services.xserver; cfg = config.services.desktopManager.plasma6;
cfg = xcfg.desktopManager.plasma6;
inherit (pkgs) kdePackages; inherit (pkgs) kdePackages;
inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types; inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types;
@ -17,7 +16,7 @@
''; '';
in { in {
options = { options = {
services.xserver.desktopManager.plasma6 = { services.desktopManager.plasma6 = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -44,6 +43,12 @@ in {
}; };
}; };
imports = [
(lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "plasma6" "enable" ] [ "services" "desktopManager" "plasma6" "enable" ])
(lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "plasma6" "enableQt5Integration" ] [ "services" "desktopManager" "plasma6" "enableQt5Integration" ])
(lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "plasma6" "notoPackage" ] [ "services" "desktopManager" "plasma6" "notoPackage" ])
];
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [
{ {
@ -161,7 +166,7 @@ in {
in in
requiredPackages requiredPackages
++ utils.removePackagesByName optionalPackages config.environment.plasma6.excludePackages ++ utils.removePackagesByName optionalPackages config.environment.plasma6.excludePackages
++ lib.optionals config.services.xserver.desktopManager.plasma6.enableQt5Integration [ ++ lib.optionals config.services.desktopManager.plasma6.enableQt5Integration [
breeze.qt5 breeze.qt5
plasma-integration.qt5 plasma-integration.qt5
pkgs.plasma5Packages.kwayland-integration pkgs.plasma5Packages.kwayland-integration
@ -185,7 +190,7 @@ in {
"/libexec" # for drkonqi "/libexec" # for drkonqi
]; ];
environment.etc."X11/xkb".source = xcfg.xkb.dir; environment.etc."X11/xkb".source = config.services.xserver.xkb.dir;
# Add ~/.config/kdedefaults to XDG_CONFIG_DIRS for shells, since Plasma sets that. # Add ~/.config/kdedefaults to XDG_CONFIG_DIRS for shells, since Plasma sets that.
# FIXME: maybe we should append to XDG_CONFIG_DIRS in /etc/set-environment instead? # FIXME: maybe we should append to XDG_CONFIG_DIRS in /etc/set-environment instead?

2
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -18,7 +18,7 @@ in
# determines the default: later modules (if enabled) are preferred. # determines the default: later modules (if enabled) are preferred.
# E.g., if Plasma 5 is enabled, it supersedes xterm. # E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [ imports = [
./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./plasma6.nix ./lumina.nix ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ../../desktop-managers/plasma6.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
./cinnamon.nix ./budgie.nix ./deepin.nix ./cinnamon.nix ./budgie.nix ./deepin.nix