From 285061d50c1f0216a420a811d812e31ad4fe88a7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 7 Jun 2016 06:20:11 -0500 Subject: nixos/kde5: install oxygen-fonts and noto-fonts --- nixos/modules/services/x11/desktop-managers/kde5.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixos/modules/services/x11') diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 2e9183da970a..be5c7df9365c 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -150,7 +150,8 @@ in then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; } else { }); - fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ]; + # Plasma uses Noto Sans and Oxygen Mono by default + fonts.fonts = [ kde5.oxygen-fonts pkgs.noto-fonts ]; programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass"; -- cgit 1.4.1 From 9dcbc4b015ae7b3f0b40e7501d36ffb8e99dcc68 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 7 Jun 2016 06:20:29 -0500 Subject: nixos/kde5: install plasma-integration frameworkintegration was split with plasma-integration in Plasma 5.6. --- nixos/modules/services/x11/desktop-managers/kde5.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nixos/modules/services/x11') diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index be5c7df9365c..55b89592bb86 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -117,6 +117,9 @@ in # Install activity manager if available ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd + # frameworkintegration was split with plasma-integration in Plasma 5.6 + ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm -- cgit 1.4.1 From 4eebb77df261457695b6580fcd2b56b7c04d93e6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 7 Jun 2016 06:24:23 -0500 Subject: Revert "nixos/kde5: install oxygen-fonts and noto-fonts" This reverts commit 285061d50c1f0216a420a811d812e31ad4fe88a7. --- nixos/modules/services/x11/desktop-managers/kde5.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos/modules/services/x11') diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 55b89592bb86..538300f5793a 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -153,8 +153,7 @@ in then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; } else { }); - # Plasma uses Noto Sans and Oxygen Mono by default - fonts.fonts = [ kde5.oxygen-fonts pkgs.noto-fonts ]; + fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ]; programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass"; -- cgit 1.4.1