Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plasma 5.26.0, KDE Frameworks 5.99 #191357

Merged
merged 8 commits into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,14 @@ in
is not strictly required for Plasma Mobile to run.
'';
};

bigscreen.enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable support for running the Plasma Bigscreen session.
'';
};
};

imports = [
Expand All @@ -237,7 +245,7 @@ in

config = mkMerge [
# Common Plasma dependencies
(mkIf (cfg.enable || cfg.mobile.enable) {
(mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) {

security.wrappers = {
kscreenlocker_greet = {
Expand Down Expand Up @@ -595,5 +603,29 @@ in

services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-mobile ];
})

# Plasma Bigscreen
(mkIf cfg.bigscreen.enable {
environment.systemPackages =
with pkgs.plasma5Packages;
[
plasma-nano
plasma-settings
plasma-bigscreen
plasma-remotecontrollers

aura-browser
plank-player

plasma-pa
plasma-nm
kdeconnect-kde
];

services.xserver.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ];

# required for plasma-remotecontrollers to work correctly
hardware.uinput.enable = true;
})
];
}
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ in {
phylactery = handleTest ./web-apps/phylactery.nix {};
pict-rs = handleTest ./pict-rs.nix {};
pinnwand = handleTest ./pinnwand.nix {};
plasma-bigscreen = handleTest ./plasma-bigscreen.nix {};
plasma5 = handleTest ./plasma5.nix {};
plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};
plausible = handleTest ./plausible.nix {};
Expand Down
38 changes: 38 additions & 0 deletions nixos/tests/plasma-bigscreen.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import ./make-test-python.nix ({ pkgs, ...} :

{
name = "plasma-bigscreen";
meta = with pkgs.lib.maintainers; {
maintainers = [ ttuegel k900 ];
};

nodes.machine = { ... }:

{
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.defaultSession = "plasma-bigscreen-x11";
services.xserver.desktopManager.plasma5.bigscreen.enable = true;
services.xserver.displayManager.autoLogin = {
enable = true;
user = "alice";
};

users.users.alice.extraGroups = ["uinput"];
};

testScript = { nodes, ... }: let
user = nodes.machine.users.users.alice;
xdo = "${pkgs.xdotool}/bin/xdotool";
in ''
with subtest("Wait for login"):
start_all()
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")

with subtest("Check plasmashell started"):
machine.wait_until_succeeds("pgrep plasmashell")
machine.wait_for_window("Plasma Big Screen")
'';
})
12 changes: 9 additions & 3 deletions pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules
, kwindowsystem, plasma-framework }:
{ lib
, mkDerivation
, fetchFromGitHub
, extra-cmake-modules
, kwindowsystem
, plasma-framework
}:

mkDerivation rec {
pname = "plasma-applet-caffeine-plus";
Expand All @@ -13,7 +18,8 @@ mkDerivation rec {
};

buildInputs = [
kwindowsystem plasma-framework
kwindowsystem
plasma-framework
];

nativeBuildInputs = [ extra-cmake-modules ];
Expand Down
13 changes: 10 additions & 3 deletions pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{ lib, stdenv
, cmake, fetchFromGitHub, extra-cmake-modules
, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner
{ lib
, stdenv
, cmake
, fetchFromGitHub
, extra-cmake-modules
, qtbase
, wrapQtAppsHook
, ki18n
, kdelibs4support
, krunner
}:

stdenv.mkDerivation rec {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ mkDerivation rec {
};

buildInputs = [
kwindowsystem plasma-framework qtx11extras
kwindowsystem
plasma-framework
qtx11extras
];

nativeBuildInputs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ lib, mkDerivation, fetchFromGitHub
, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
{ lib
, mkDerivation
, fetchFromGitHub
, kcoreaddons
, kwindowsystem
, plasma-framework
, systemsettings
}:

mkDerivation rec {
pname = "dynamic_workspaces";
Expand All @@ -13,7 +19,10 @@ mkDerivation rec {
};

buildInputs = [
kcoreaddons kwindowsystem plasma-framework systemsettings
kcoreaddons
kwindowsystem
plasma-framework
systemsettings
];

dontBuild = true;
Expand Down
15 changes: 12 additions & 3 deletions pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ lib, mkDerivation, fetchFromGitHub
, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
{ lib
, mkDerivation
, fetchFromGitHub
, kcoreaddons
, kwindowsystem
, plasma-framework
, systemsettings
}:

mkDerivation rec {
pname = "krohnkite";
Expand All @@ -13,7 +19,10 @@ mkDerivation rec {
};

buildInputs = [
kcoreaddons kwindowsystem plasma-framework systemsettings
kcoreaddons
kwindowsystem
plasma-framework
systemsettings
];

dontBuild = true;
Expand Down
15 changes: 12 additions & 3 deletions pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ lib, mkDerivation, fetchFromGitHub
, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
{ lib
, mkDerivation
, fetchFromGitHub
, kcoreaddons
, kwindowsystem
, plasma-framework
, systemsettings
}:

mkDerivation rec {
pname = "kzones";
Expand All @@ -13,7 +19,10 @@ mkDerivation rec {
};

buildInputs = [
kcoreaddons kwindowsystem plasma-framework systemsettings
kcoreaddons
kwindowsystem
plasma-framework
systemsettings
];

dontBuild = true;
Expand Down
15 changes: 12 additions & 3 deletions pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ lib, mkDerivation, fetchFromGitHub
, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
{ lib
, mkDerivation
, fetchFromGitHub
, kcoreaddons
, kwindowsystem
, plasma-framework
, systemsettings
}:

mkDerivation rec {
pname = "parachute";
Expand All @@ -13,7 +19,10 @@ mkDerivation rec {
};

buildInputs = [
kcoreaddons kwindowsystem plasma-framework systemsettings
kcoreaddons
kwindowsystem
plasma-framework
systemsettings
];

dontBuild = true;
Expand Down
15 changes: 12 additions & 3 deletions pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ lib, mkDerivation, fetchFromGitHub
, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
{ lib
, mkDerivation
, fetchFromGitHub
, kcoreaddons
, kwindowsystem
, plasma-framework
, systemsettings
}:

mkDerivation rec {
pname = "kwin-tiling";
Expand All @@ -18,7 +24,10 @@ mkDerivation rec {
'';

buildInputs = [
kcoreaddons kwindowsystem plasma-framework systemsettings
kcoreaddons
kwindowsystem
plasma-framework
systemsettings
];

dontBuild = true;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mkDerivation rec{
sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI=";
};

extraCmakeFlags=["-DBUILD_TESTING=OFF"];
extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ];

nativeBuildInputs = [ cmake extra-cmake-modules ];

Expand Down
17 changes: 17 additions & 0 deletions pkgs/desktops/plasma-5/aura-browser.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{ mkDerivation
, extra-cmake-modules
, qtwebengine
, qtquickcontrols2
, kirigami2
, ki18n
}:
mkDerivation {
pname = "aura-browser";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtwebengine
qtquickcontrols2
kirigami2
ki18n
];
}
40 changes: 32 additions & 8 deletions pkgs/desktops/plasma-5/bluedevil.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,40 @@
{
mkDerivation, lib, extra-cmake-modules, shared-mime-info,
qtbase, qtdeclarative, bluez-qt,
kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications,
kwidgetsaddons, kwindowsystem, plasma-framework
{ mkDerivation
, lib
, extra-cmake-modules
, shared-mime-info
, qtbase
, qtdeclarative
, bluez-qt
, kcoreaddons
, kcmutils
, kdbusaddons
, kded
, ki18n
, kiconthemes
, kio
, knotifications
, kwidgetsaddons
, kwindowsystem
, plasma-framework
}:

mkDerivation {
pname = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
qtbase qtdeclarative bluez-qt
ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded
kiconthemes knotifications kwidgetsaddons
qtbase
qtdeclarative
bluez-qt
ki18n
kio
kwindowsystem
plasma-framework
kcoreaddons
kdbusaddons
kded
kiconthemes
knotifications
kwidgetsaddons
kcmutils
];
}
3 changes: 1 addition & 2 deletions pkgs/desktops/plasma-5/breeze-grub.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
mkDerivation
{ mkDerivation
}:

mkDerivation {
Expand Down
Loading