From 80e883a7c31b78124c48fa3f60111f1b60c64671 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 11:26:01 -0600 Subject: [PATCH 1/9] iso_graphical: fix warning about Plasma 5 desktop module name --- .../installer/cd-dvd/installation-cd-graphical-kde.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index b15aef885369..63227d573495 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -18,7 +18,7 @@ with lib; autoLogin = true; }; - desktopManager.kde5 = { + desktopManager.plasma5 = { enable = true; enableQt4Support = false; }; @@ -66,7 +66,7 @@ with lib; in '' mkdir -p /root/Desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - ln -sfT ${pkgs.kdeApplications.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop + ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop ''; From 0da421ce17a0226e4880c596702adcc58cb19d6c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 19:09:56 -0600 Subject: [PATCH 2/9] nixos/tests: fix Plasma 5 test --- nixos/release-combined.nix | 2 +- nixos/release.nix | 2 +- nixos/tests/{kde5.nix => plasma5.nix} | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename nixos/tests/{kde5.nix => plasma5.nix} (92%) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6c048e8a0aca..341724b58475 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -72,7 +72,7 @@ in rec { (all nixos.tests.ecryptfs) (all nixos.tests.ipv6) (all nixos.tests.i3wm) - (all nixos.tests.kde5) + (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) diff --git a/nixos/release.nix b/nixos/release.nix index 2bfe8eada0b8..face44b94e2a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,7 +255,7 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; - tests.kde5 = callTest tests/kde5.nix {}; + tests.plasma5 = callTest tests/plasma5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.keystone = callTest tests/keystone.nix {}; diff --git a/nixos/tests/kde5.nix b/nixos/tests/plasma5.nix similarity index 92% rename from nixos/tests/kde5.nix rename to nixos/tests/plasma5.nix index 2b61d6f3f0a1..3dd5121607a0 100644 --- a/nixos/tests/kde5.nix +++ b/nixos/tests/plasma5.nix @@ -17,7 +17,8 @@ import ./make-test.nix ({ pkgs, ...} : user = "alice"; }; }; - services.xserver.desktopManager.kde5.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.desktopManager.default = "plasma5"; virtualisation.writableStore = false; # FIXME }; From 7755fcd5439093e37d028a44ef809fb0421dc3c5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:24:58 -0600 Subject: [PATCH 3/9] nixos: fix renaming warning in KDE closure --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index face44b94e2a..8a5b41ca3bb3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -327,7 +327,7 @@ in rec { kde = makeClosure ({ pkgs, ... }: { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.kde5.enable = true; + services.xserver.desktopManager.plasma5.enable = true; }); xfce = makeClosure ({ pkgs, ... }: From dcee54c935f893566085471e786aaeecbde75d11 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:25:45 -0600 Subject: [PATCH 4/9] nixos/tests/plasma5: fix test name --- nixos/tests/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 3dd5121607a0..ca787e9c7b9b 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { - name = "kde5"; + name = "plasma5"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ttuegel ]; }; From e7b0b2bb66fb0047ccd6288bd4faaf91ebad00a0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:26:17 -0600 Subject: [PATCH 5/9] nixos/tests/phabricator: fix renaming warning --- nixos/tests/phabricator.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 85faafd56899..fdc39393faea 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde5.enable = true; + services.xserver.desktopManager.plasma5.enable = true; }; }; From 60817e4715a2fd42390a44b189b1c1cd1b888529 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:26:51 -0600 Subject: [PATCH 6/9] nixos/tests/trac: fix renaming warning --- nixos/tests/trac.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 0d56c564e182..d426bbde68d2 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde5.enable = true; + services.xserver.desktopManager.plasma5.enable = true; }; }; From 8e6bdcc7317179fbc906d725e2b1c0f6b1c72199 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:27:41 -0600 Subject: [PATCH 7/9] nixos: fix renaming warning in graphical profile --- nixos/modules/profiles/graphical.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 73dd2d4bc9f7..e23375375188 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -1,5 +1,5 @@ -# This module defines a NixOS configuration that contains X11 and -# KDE 4. It's used by the graphical installation CD. +# This module defines a NixOS configuration with the Plasma 5 desktop. +# It's used by the graphical installation CD. { config, pkgs, ... }: @@ -7,7 +7,7 @@ services.xserver = { enable = true; displayManager.sddm.enable = true; - desktopManager.kde5.enable = true; + desktopManager.plasma5.enable = true; synaptics.enable = true; # for touchpad support on many laptops }; From d91637c54632761b8a918da28d047d96c4cdfd68 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:28:29 -0600 Subject: [PATCH 8/9] nixos-generate-config: rename plasma5 desktop --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index b72db1f6f503..29b447912e70 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -607,7 +607,7 @@ $bootLoaderConfig # Enable the KDE Desktop Environment. # services.xserver.displayManager.sddm.enable = true; - # services.xserver.desktopManager.kde5.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. # users.extraUsers.guest = { From ecb65eceaa746c7d9bc6b5c1330268e959912d4e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Mar 2017 07:29:16 -0600 Subject: [PATCH 9/9] nixos/doc/manual: rename plasma5 desktop --- nixos/doc/manual/configuration/modularity.xml | 2 +- nixos/doc/manual/configuration/x-windows.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 30da064ac579..5420c7f88385 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -37,7 +37,7 @@ latter might look like this: { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.kde5.enable = true; + services.xserver.desktopManager.plasma5.enable = true; } diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 214eec9e1fc4..4a73695e0942 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.kde5.enable = true; +services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.gnome3.enable = true; services.xserver.windowManager.xmonad.enable = true;