diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-11-23 08:47:18 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-11-23 08:47:18 -0600 |
| commit | d0589b0c549d22ee7c981989a5f915b3b7d5f002 (patch) | |
| tree | b52fcd0196918f135fda70092f813897929dc0ab /nixos | |
| parent | ec980c7b1ec8a788dd25daacdc3df8eec6eb1bf6 (diff) | |
| parent | f8206f68578e407e95b0cb1053545bf84fd8ee84 (diff) | |
| download | nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.tar nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.tar.gz nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.tar.bz2 nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.tar.lz nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.tar.xz nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.tar.zst nixlib-d0589b0c549d22ee7c981989a5f915b3b7d5f002.zip | |
Merge branch 'kde-frameworks-5.16'
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 4 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/sddm.nix | 28 |
3 files changed, 31 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 6fdd5b4fa36d..0e9aa60a0fc7 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -108,7 +108,7 @@ in kdeApps.okular kdeApps.print-manager - kdeApps.oxygen-icons + (plasma5.oxygen-icons or kf5.oxygen-icons5) pkgs.hicolor_icon_theme plasma5.kde-gtk-config @@ -155,7 +155,7 @@ in GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; }; - fonts.fonts = [ plasma5.oxygen-fonts ]; + fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ]; programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; diff --git a/nixos/release.nix b/nixos/release.nix index e48954ceaf59..f0df3fe3e1ef 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -285,6 +285,7 @@ in rec { tests.proxy = callTest tests/proxy.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; + tests.sddm = callTest tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix new file mode 100644 index 000000000000..e11b5714d5c2 --- /dev/null +++ b/nixos/tests/sddm.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "sddm"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ttuegel ]; + }; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + startAll; + $machine->waitForWindow("^IceWM "); + ''; +}) |