dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #23388 from ttuegel/nixos-plasma5

Browse Source 
NixOS: Plasma 5 tests and warnings
This commit is contained in:
Thomas Tuegel 2017-03-03 09:50:08 -06:00 committed by GitHub
commit 044c7d091b
10 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/configuration/modularity.xml
View File

@ -37,7 +37,7 @@ latter might look like this:
{ services.xserver.enable = true; { services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
} }
</programlisting> </programlisting>

2
nixos/doc/manual/configuration/x-windows.xml
View File

@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated
<command>xterm</command> window. Thus you should pick one or more of <command>xterm</command> window. Thus you should pick one or more of
the following lines: the following lines:
<programlisting> <programlisting>
services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.xfce.enable = true;
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome3.enable = true;
services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.xmonad.enable = true;

4
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
View File

@ -18,7 +18,7 @@ with lib;
autoLogin = true; autoLogin = true;
}; };
desktopManager.kde5 = { desktopManager.plasma5 = {
enable = true; enable = true;
enableQt4Support = false; enableQt4Support = false;
}; };
@ -66,7 +66,7 @@ with lib;
in '' in ''
mkdir -p /root/Desktop mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.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 ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
''; '';

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -607,7 +607,7 @@ $bootLoaderConfig
# Enable the KDE Desktop Environment. # Enable the KDE Desktop Environment.
# services.xserver.displayManager.sddm.enable = true; # 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’. # Define a user account. Don't forget to set a password with ‘passwd’.
# users.extraUsers.guest = { # users.extraUsers.guest = {

6
nixos/modules/profiles/graphical.nix
View File

@ -1,5 +1,5 @@
# This module defines a NixOS configuration that contains X11 and # This module defines a NixOS configuration with the Plasma 5 desktop.
# KDE 4. It's used by the graphical installation CD. # It's used by the graphical installation CD.
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -7,7 +7,7 @@
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
desktopManager.kde5.enable = true; desktopManager.plasma5.enable = true;
synaptics.enable = true; # for touchpad support on many laptops synaptics.enable = true; # for touchpad support on many laptops
}; };

2
nixos/release-combined.nix
View File

@ -72,7 +72,7 @@ in rec {
(all nixos.tests.ecryptfs) (all nixos.tests.ecryptfs)
(all nixos.tests.ipv6) (all nixos.tests.ipv6)
(all nixos.tests.i3wm) (all nixos.tests.i3wm)
(all nixos.tests.kde5) (all nixos.tests.plasma5)
#(all nixos.tests.lightdm) #(all nixos.tests.lightdm)
(all nixos.tests.login) (all nixos.tests.login)
(all nixos.tests.misc) (all nixos.tests.misc)

4
nixos/release.nix
View File

@ -255,7 +255,7 @@ in rec {
tests.influxdb = callTest tests/influxdb.nix {}; tests.influxdb = callTest tests/influxdb.nix {};
tests.ipv6 = callTest tests/ipv6.nix {}; tests.ipv6 = callTest tests/ipv6.nix {};
tests.jenkins = callTest tests/jenkins.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.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {};
tests.keystone = callTest tests/keystone.nix {}; tests.keystone = callTest tests/keystone.nix {};
@ -327,7 +327,7 @@ in rec {
kde = makeClosure ({ pkgs, ... }: kde = makeClosure ({ pkgs, ... }:
{ services.xserver.enable = true; { services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
}); });
xfce = makeClosure ({ pkgs, ... }: xfce = makeClosure ({ pkgs, ... }:

2
nixos/tests/phabricator.nix
View File

@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: {
client = client =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ imports = [ ./common/x11.nix ]; { imports = [ ./common/x11.nix ];
services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
}; };
}; };

5
nixos/tests/kde5.nix → nixos/tests/plasma5.nix
View File

@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ...} : import ./make-test.nix ({ pkgs, ...} :
{ {
name = "kde5"; name = "plasma5";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ttuegel ]; maintainers = [ ttuegel ];
}; };
@ -17,7 +17,8 @@ import ./make-test.nix ({ pkgs, ...} :
user = "alice"; user = "alice";
}; };
}; };
services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.default = "plasma5";
virtualisation.writableStore = false; # FIXME virtualisation.writableStore = false; # FIXME
}; };

2
nixos/tests/trac.nix
View File

@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: {
client = client =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ imports = [ ./common/x11.nix ]; { imports = [ ./common/x11.nix ];
services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
}; };
}; };