Enable some kde specifics

flake.lock

@@ -573,12 +573,15 @@
       }
     },
     "flake-utils_7": {
+      "inputs": {
+        "systems": "systems_6"
+      },
       "locked": {
-        "lastModified": 1676283394,
+        "lastModified": 1710146030,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -604,7 +607,7 @@
     },
     "flake-utils_9": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -804,11 +807,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693387424,
+        "lastModified": 1717338947,
-        "narHash": "sha256-TU+DLqZP3muRf24CN07Lppe0VWbZ3Xz+olsESMq2IaE=",
+        "narHash": "sha256-5WN1l9ggyA/VlzRhOZZthfF2olBfKY6h0tvvMdhJOCQ=",
         "owner": "natsukagami",
         "repo": "mpd-mpris",
-        "rev": "2fce108b7539f299aae563cb5218799ccb918397",
+        "rev": "e764577519eaeb791c67605336a303888001c7dd",
         "type": "github"
       },
       "original": {
@@ -1441,6 +1444,21 @@
         "type": "github"
       }
     },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "locked": {
         "lastModified": 1667395993,

home/fish/fish.nix

@@ -10,10 +10,10 @@ let
     set -x GUM_CHOOSE_HEADER "Select the Desktop to boot into:"
     set CHOICES
 
-    if which sway >/dev/null
+    if which sway &>/dev/null
       set -a CHOICES "sway"
     end
-    if which startplasma-wayland >/dev/null
+    if which startplasma-wayland &>/dev/null
       set -a CHOICES "KDE Plasma"
     end
     set -a CHOICES "None: continue to shell"
@@ -22,9 +22,10 @@ let
       case "sway"
         exec sway
       case "KDE Plasma"
+        export NIXOS_OZONE_WL=1
         exec dbus-run-session startplasma-wayland
       case '*'
-        exit 255
+        exec fish -i
     end
   '';
 in
@@ -150,10 +151,7 @@ in
     interactiveShellInit = ''
       # Sway!
       if status --is-login; and test -z $DISPLAY; and test (tty) = "/dev/tty1"
-        ${bootDesktop}
+        exec ${bootDesktop}
-        if test $status -eq 0
-          exit 0
-        end
       end
 
       function fish_greeting

home/modules/linux/graphical/wayland.nix

@@ -45,10 +45,26 @@ let
         '';
       };
     };
+
+  plasmaModule = { pkgs, ... }: {
+    home.packages = with pkgs.kdePackages; [
+      discover
+      kmail
+      akonadi
+      kdepim-runtime
+      kmail-account-wizard
+      akonadi-import-wizard
+    ];
+    # Not working yet, see #316784
+    xdg.configFile."plasma-workspace/env/wayland.sh".source = pkgs.writeScript "plasma-wayland-env.sh" ''
+      export NIXOS_OZONE_WL=1
+    '';
+    xdg.dataFile."dbus-1/services/org.freedesktop.Notifications.service".source = "${pkgs.kdePackages.plasma-workspace}/share/dbus-1/services/org.kde.plasma.Notifications.service";
+  };
 in
 with lib;
 {
-  imports = [ notificationModule ];
+  imports = [ notificationModule plasmaModule ];
   config = mkIf (config.linux.graphical.type == "wayland") {
     # Additional packages
     home.packages = with pkgs; [

nki-home/configuration.nix

@@ -24,6 +24,9 @@ with lib;
   # Kernel
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_stable;
 
+  # Plasma!
+  services.desktopManager.plasma6.enable = true;
+
 
   ## Encryption
   # Kernel modules needed for mounting USB VFAT devices in initrd stage