add kde de for Tytonidae

README.md

@@ -17,6 +17,7 @@ Hey, you. This is my nixos configurations.
 | Specialisation | DE / WM | Shell       | Editor      | Terminal | Launcher | Browser | DM               |
 | -------------- | ------- | ----------- | ----------- | -------- | -------- | ------- | ---------------- |
 | default        | niri    | fish + bash | helix + zed | ghostty  | fuzzel   | firefox | greetd + regreet |
+| kde            | kde     | fish + bash | helix + zed | ghostty  | kde run  | firefox | sddm             |
 
 - david@Akun
 

home/david/configurations/Tytonidae/niri.nix

@@ -2,7 +2,6 @@
   inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
 in {
   david.programs.niri = {
-    enable = true;
     extraConfig = let
       output = node "output";
     in [

home/david/modules/programs/niri/default.nix

@@ -15,12 +15,18 @@ in {
       };
     };
   };
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
+    {
+      david.programs.niri.enable = config.youthlic.programs.niri.enable;
+    }
+    (
+      lib.mkIf cfg.enable {
         youthlic.programs.niri = {
-      enable = true;
           # settings = lib.mkMerge [(import ./settings.nix args) cfg.settings];
           config = (lib.toList (import ./config.nix args)) ++ (lib.toList cfg.extraConfig);
         };
         david.programs.wluma.enable = true;
-  };
+      }
+    )
+  ];
 }

home/modules/programs/niri.nix

@@ -20,7 +20,12 @@ in {
       };
     };
   };
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
+    {
+      youthlic.programs.niri.enable = osConfig.youthlic.gui.enabled == "niri";
+    }
+    (
+      lib.mkIf cfg.enable {
         home.packages =
           (with pkgs; [
             swaynotificationcenter
@@ -70,5 +75,7 @@ in {
           config = cfg.config;
           package = niri;
         };
-  };
+      }
+    )
+  ];
 }

nixos/configurations/Tytonidae/default.nix

@@ -48,20 +48,20 @@
     };
   };
 
-  # specialisation = {
+  specialisation = {
     # cosmic = {
     #   inheritParentConfig = true;
     #   configuration = {
     #     youthlic.gui.enabled = lib.mkForce "cosmic";
     #   };
     # };
-  #   kde = {
+    kde = {
-  #     inheritParentConfig = true;
+      inheritParentConfig = true;
-  #     configuration = {
+      configuration = {
-  #       youthlic.gui.enabled = lib.mkForce "kde";
+        youthlic.gui.enabled = lib.mkForce "kde";
-  #     };
+      };
-  #   };
+    };
-  # };
+  };
 
   programs.gnupg.agent = {
     enable = true;

nixos/modules/gui/cosmic.nix

@@ -13,7 +13,7 @@ in {
       display = 0;
       enable = true;
       xkb = {
-        layout = "cn";
+        layout = "us";
         variant = "";
       };
     };

nixos/modules/gui/kde.nix

@@ -6,14 +6,13 @@
   cfg = config.youthlic.gui;
 in {
   config = lib.mkIf (cfg.enabled == "kde") {
-    stylix.targets.qt.platform = "kde";
     services = {
       desktopManager.plasma6.enable = true;
       displayManager.sddm.enable = true;
       xserver = {
         enable = true;
         xkb = {
-          layout = "cn";
+          layout = "us";
           variant = "";
         };
       };

nixos/modules/gui/niri.nix

@@ -97,10 +97,6 @@ in {
           layout = "us";
           variant = "";
         };
-        # displayManager.gdm = {
-        #   enable = true;
-        #   wayland = true;
-        # };
       };
     };
     programs = {