commit 35d0bafabfc7befb8fa9e490454c7c0b846f5ff0 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/configuration/modularity.section.md

···

       33
       33
        
       {

     

       34
       34
        
         services.xserver.enable = true;

     

       35
       35
        
         services.displayManager.sddm.enable = true;

     

       36
       36
       -
         services.xserver.desktopManager.plasma5.enable = true;

     

       36
       36
       +
         services.desktopManager.plasma6.enable = true;

     

       37
       37
        
         environment.systemPackages = [ pkgs.vim ];

     

       38
       38
        
       }

     

       39
       39
        
       ```

+2 -2

nixos/doc/manual/configuration/profiles/graphical.section.md

···

       1
       1
        
       # Graphical {#sec-profile-graphical}

     

       2
       2
        
       

     

       3
       3
       -
       Defines a NixOS configuration with the Plasma 5 desktop. It's used by the

     

       3
       3
       +
       Defines a NixOS configuration with the Plasma 6 desktop. It's used by the

     

       4
       4
        
       graphical installation CD.

     

       5
       5
        
       

     

       6
       6
        
       It sets [](#opt-services.xserver.enable),

     

       7
       7
        
       [](#opt-services.displayManager.sddm.enable),

     

       8
       8
       -
       [](#opt-services.xserver.desktopManager.plasma5.enable),

     

       8
       8
       +
       [](#opt-services.desktopManager.plasma6.enable),

     

       9
       9
        
       and [](#opt-services.libinput.enable) to true. It also

     

       10
       10
        
       includes glxinfo and firefox in the system packages list.

+1 -1

nixos/doc/manual/configuration/x-windows.chapter.md

···

       23
       23
        
       

     

       24
       24
        
       ```nix

     

       25
       25
        
       {

     

       26
       26
       -
         services.xserver.desktopManager.plasma5.enable = true;

     

       26
       26
       +
         services.desktopManager.plasma6.enable = true;

     

       27
       27
        
         services.xserver.desktopManager.xfce.enable = true;

     

       28
       28
        
         services.desktopManager.gnome.enable = true;

     

       29
       29
        
         services.xserver.desktopManager.mate.enable = true;

+1 -1

nixos/modules/i18n/input-method/ibus.nix

···

       53
       53
        
             panel = lib.mkOption {

     

       54
       54
        
               type = with lib.types; nullOr path;

     

       55
       55
        
               default = null;

     

       56
       56
       -
               example = lib.literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/libexec/kimpanel-ibus-panel"'';

     

       56
       56
       +
               example = lib.literalExpression ''"''${pkgs.kdePackages.plasma-desktop}/libexec/kimpanel-ibus-panel"'';

     

       57
       57
        
               description = "Replace the IBus panel with another panel.";

     

       58
       58
        
             };

     

       59
       59
        
           };

+2 -2

nixos/modules/profiles/graphical.nix

···

       1
       1
       -
       # This module defines a NixOS configuration with the Plasma 5 desktop.

     

       1
       1
       +
       # This module defines a NixOS configuration with the Plasma 6 desktop.

     

       2
       2
        
       # It's used by the graphical installation CD.

     

       3
       3
        
       

     

       4
       4
        
       { pkgs, ... }:

     
···

       6
       6
        
       {

     

       7
       7
        
         services.xserver = {

     

       8
       8
        
           enable = true;

     

       9
       9
       -
           desktopManager.plasma5.enable = true;

     

       9
       9
       +
           desktopManager.plasma6.enable = true;

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         services = {

+1 -1

nixos/modules/programs/chromium.nix

···

       27
       27
        
             enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";

     

       28
       28
        
       

     

       29
       29
        
             plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [

     

       30
       30
       -
               "plasma5Packages"

     

       30
       30
       +
               "kdePackages"

     

       31
       31
        
               "plasma-browser-integration"

     

       32
       32
        
             ] { };

     

       33
       33

+1 -1

nixos/modules/programs/gnupg.nix

···

       77
       77
        
               Which pinentry package to use. The path to the mainProgram as defined in

     

       78
       78
        
               the package's meta attributes will be set in /etc/gnupg/gpg-agent.conf.

     

       79
       79
        
               If not set by the user, it'll pick an appropriate flavor depending on the

     

       80
       80
       -
               system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce,

     

       80
       80
       +
               system configuration (qt flavor for lxqt and plasma, gtk2 for xfce,

     

       81
       81
        
               gnome3 on all other systems with X enabled, curses otherwise).

     

       82
       82
        
             '';

     

       83
       83
        
           };

+1 -1

nixos/modules/programs/kdeconnect.nix

···

       15
       15
        
             `gnomeExtensions.gsconnect` as an alternative

     

       16
       16
        
             implementation if you use Gnome

     

       17
       17
        
           '';

     

       18
       18
       -
           package = lib.mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] {

     

       18
       18
       +
           package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] {

     

       19
       19
        
             example = "gnomeExtensions.gsconnect";

     

       20
       20
        
           };

     

       21
       21
        
         };

-4

nixos/modules/programs/zoom-us.nix

···

       23
       23
        
               plasma6XdgDesktopPortalSupport =

     

       24
       24
        
                 prev.plasma6XdgDesktopPortalSupport or config.services.desktopManager.plasma6.enable;

     

       25
       25
        
       

     

       26
       26
       -
               # Support Plasma 5 desktop environment if it's enabled on the system.

     

       27
       27
       -
               plasma5XdgDesktopPortalSupport =

     

       28
       28
       -
                 prev.plasma5XdgDesktopPortalSupport or config.services.xserver.desktopManager.plasma5.enable;

     

       29
       29
       -
       

     

       30
       26
        
               # Support LXQT desktop environment if it's enabled on the system.

     

       31
       27
        
               # There's also `config.services.xserver.desktopManager.lxqt.enable`

     

       32
       28
        
               lxqtXdgDesktopPortalSupport = prev.lxqtXdgDesktopPortalSupport or config.xdg.portal.lxqt.enable;

+2 -2

nixos/modules/security/pam.nix

···

       549
       549
        
                   '';

     

       550
       550
        
                 };

     

       551
       551
        
       

     

       552
       552
       -
                 package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" {

     

       553
       553
       -
                   pkgsText = "pkgs.plasma5Packages";

     

       552
       552
       +
                 package = lib.mkPackageOption pkgs.kdePackages "kwallet-pam" {

     

       553
       553
       +
                   pkgsText = "pkgs.kdePackages";

     

       554
       554
        
                 };

     

       555
       555
        
       

     

       556
       556
        
                 forceRun = lib.mkEnableOption null // {

-7

nixos/modules/services/desktop-managers/plasma6.nix

···

       68
       68
        
         ];

     

       69
       69
        
       

     

       70
       70
        
         config = mkIf cfg.enable {

     

       71
       71
       -
           assertions = [

     

       72
       72
       -
             {

     

       73
       73
       -
               assertion = cfg.enable -> !config.services.xserver.desktopManager.plasma5.enable;

     

       74
       74
       -
               message = "Cannot enable plasma5 and plasma6 at the same time!";

     

       75
       75
       -
             }

     

       76
       76
       -
           ];

     

       77
       77
       -
       

     

       78
       71
        
           qt.enable = true;

     

       79
       72
        
           programs.xwayland.enable = true;

     

       80
       73
        
           environment.systemPackages =

+1 -1

nixos/modules/services/display-managers/sddm.nix

···

       228
       228
        
               '';

     

       229
       229
        
             };

     

       230
       230
        
       

     

       231
       231
       -
             package = mkPackageOption pkgs [ "plasma5Packages" "sddm" ] { };

     

       231
       231
       +
             package = mkPackageOption pkgs [ "libsForQt5" "sddm" ] { };

     

       232
       232
        
       

     

       233
       233
        
             enableHidpi = mkOption {

     

       234
       234
        
               type = types.bool;

+1 -13

nixos/modules/system/boot/plymouth.nix

···

       17
       17
        
         cfg = config.boot.plymouth;

     

       18
       18
        
         opt = options.boot.plymouth;

     

       19
       19
        
       

     

       20
       20
       -
         nixosBreezePlymouth = pkgs.plasma5Packages.breeze-plymouth.override {

     

       21
       21
       -
           logoFile = cfg.logo;

     

       22
       22
       -
           logoName = "nixos";

     

       23
       23
       -
           osName = "NixOS";

     

       24
       24
       -
           osVersion = config.system.nixos.release;

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       20
        
         plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } ''

     

       28
       21
        
           mkdir -p $out

     

       29
       22
        
       

     
···

       87
       80
        
             };

     

       88
       81
        
       

     

       89
       82
        
             themePackages = mkOption {

     

       90
       90
       -
               default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;

     

       91
       91
       -
               defaultText = literalMD ''

     

       92
       92
       -
                 A NixOS branded variant of the breeze theme when

     

       93
       93
       -
                 `config.${opt.theme} == "breeze"`, otherwise

     

       94
       94
       -
                 `[ ]`.

     

       95
       95
       -
               '';

     

       83
       83
       +
               default = [ ];

     

       96
       84
        
               type = types.listOf types.package;

     

       97
       85
        
               description = ''

     

       98
       86
        
                 Extra theme packages for plymouth.

+1 -1

nixos/release-combined.nix

···

       171
       171
        
               (onFullSupported "nixos.tests.php.fpm")

     

       172
       172
        
               (onFullSupported "nixos.tests.php.httpd")

     

       173
       173
        
               (onFullSupported "nixos.tests.php.pcre")

     

       174
       174
       -
               (onFullSupported "nixos.tests.plasma5")

     

       174
       174
       +
               (onFullSupported "nixos.tests.plasma6")

     

       175
       175
        
               (onSystems [ "x86_64-linux" ] "nixos.tests.podman")

     

       176
       176
        
               (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")

     

       177
       177
        
               (onFullSupported "nixos.tests.predictable-interface-names.predictable")

+1 -1

nixos/release.nix

···

       594
       594
        
             {

     

       595
       595
        
               services.xserver.enable = true;

     

       596
       596
        
               services.displayManager.sddm.enable = true;

     

       597
       597
       -
               services.xserver.desktopManager.plasma5.enable = true;

     

       597
       597
       +
               services.desktopManager.plasma6.enable = true;

     

       598
       598
        
             }

     

       599
       599
        
           );

     

       600
       600

+2 -5

nixos/tests/maestral.nix

···

       31
       31
        
             gui =

     

       32
       32
        
               { ... }:

     

       33
       33
        
               common {

     

       34
       34
       -
                 services.xserver = {

     

       35
       35
       -
                   enable = true;

     

       36
       36
       -
                   desktopManager.plasma5.enable = true;

     

       37
       37
       -
                   desktopManager.plasma5.runUsingSystemd = true;

     

       38
       38
       -
                 };

     

       34
       34
       +
                 services.xserver.enable = true;

     

       35
       35
       +
                 services.desktopManager.plasma6.enable = true;

     

       39
       36
        
       

     

       40
       37
        
                 services.displayManager = {

     

       41
       38
        
                   sddm.enable = true;

+1 -1

nixos/tests/terminal-emulators.nix

···

       63
       63
        
           kitty.pkg = p: p.kitty;

     

       64
       64
        
           kitty.cmd = "kitty $command";

     

       65
       65
        
       

     

       66
       66
       -
           konsole.pkg = p: p.plasma5Packages.konsole;

     

       66
       66
       +
           konsole.pkg = p: p.kdePackages.konsole;

     

       67
       67
        
       

     

       68
       68
        
           lxterminal.pkg = p: p.lxterminal;

     

       69
       69