summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@secure.mailbox.org>2018-02-04 17:41:50 -0600
committerGitHub <noreply@github.com>2018-02-04 17:41:50 -0600
commit4688dd0cf5909f74daac1777bda41acd1b2b5fe1 (patch)
treee02dd4949e98d573d33d9e55f9e7b9371c586c1f /nixos/modules/services
parent5d2b4a5dc85fe0dfe488be124ff18c043a66a6f6 (diff)
parent77a607aa88d505f5ad54624ebeea83b320792e4a (diff)
downloadnixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.tar
nixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.tar.gz
nixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.tar.bz2
nixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.tar.lz
nixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.tar.xz
nixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.tar.zst
nixlib-4688dd0cf5909f74daac1777bda41acd1b2b5fe1.zip
Merge pull request #34526 from ttuegel/bugfix/plasma-integration/font-style
plasma-integration: Fix font style name bug with Qt >= 5.8
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/desktop-managers/plasma5.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 17a2cde3a65d..4c76ce0bb195 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -47,6 +47,18 @@ in
             ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
           ''}
 
+          if [ -f "$HOME/.config/kdeglobals" ]
+          then
+              # Remove extraneous font style names.
+              # See also: https://phabricator.kde.org/D9070
+              ${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \
+                  -e '/^fixed=/ s/,Regular$//' \
+                  -e '/^font=/ s/,Regular$//' \
+                  -e '/^menuFont=/ s/,Regular$//' \
+                  -e '/^smallestReadableFont=/ s/,Regular$//' \
+                  -e '/^toolBarFont=/ s/,Regular$//'
+          fi
+
           exec "${getBin plasma5.plasma-workspace}/bin/startkde"
         '';
       };