2024-03-19

2 files changed, 6 insertions, 8 deletions

diff --git a/modules/nixos/common/stylix.nix b/modules/nixos/common/stylix.nix
index 7ac7fa7..5ca5571 100644
--- a/modules/nixos/common/stylix.nix
+++ b/modules/nixos/common/stylix.nix
@@ -17,26 +17,27 @@ with lib; {
   fonts = {
     packages = mkAfter config.nixfiles.modules.common.stylix.fonts.extraPackages;
 
-    fontconfig.defaultFonts = {
+    fontconfig.defaultFonts = with config.stylix.fonts; {
       serif = mkForce [
-        "Iosevka Etoile"
+        serif.name
         "Sarasa Gothic"
         "Source Han Serif"
         "Noto Serif"
       ];
       sansSerif = mkForce [
-        "Iosevka Aile"
+        sansSerif.name
         "Sarasa Gothic"
         "Source Han Sans"
         "Noto Sans"
       ];
       monospace = mkForce [
-        "Iosevka SS15"
+        monospace.name
         "Sarasa Mono"
         "Source Han Mono"
         "Noto Sans Mono"
       ];
       emoji = mkForce [
+        "Twitter Color Emoji"
         "Noto Color Emoji"
       ];
     };
diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix
index 0bdf6f9..2f6aa92 100644
--- a/modules/nixos/kde.nix
+++ b/modules/nixos/kde.nix
@@ -45,10 +45,7 @@ in {
 
     services = {
       desktopManager.plasma6.enable = true;
-      xserver.displayManager.sddm = {
-        enable = true;
-        wayland.enable = true;
-      };
+      xserver.displayManager.sddm.enable = true;
     };
 
     environment.plasma6.excludePackages = with pkgs.kdePackages; [