From 6be4f3743cf42caefdf13b42549c328c1792a711 Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Fri, 13 Sep 2024 12:31:10 -0300
Subject: [PATCH] modded some greetd stuff and plasticity is broken rn

---
 hosts/desktops/common/packages.nix |  2 +-
 hosts/desktops/common/services.nix | 38 ++++++++++++++----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 69ce691..a6f9703 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -45,7 +45,7 @@ in {
       orca-slicer
       openscad
       p7zip
-      plasticity
+      # plasticity
       prismlauncher
       protonup
       qbittorrent
diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix
index 1becfeb..40a0546 100644
--- a/hosts/desktops/common/services.nix
+++ b/hosts/desktops/common/services.nix
@@ -1,17 +1,12 @@
 { inputs, config, pkgs, lib, ... }:
 
-let
-  plasma = pkgs.writeScriptBin "plasma" ''
-    ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
-  '';
-
-in {
+{
   services = {
     printing = {
       enable = true;
       drivers = with pkgs; [ epson-escpr ];
     };
-    udev.packages = with pkgs; [ platformio openocd yubikey-personalization ];
+    udev.packages = with pkgs; [ yubikey-personalization ];
     desktopManager.plasma6.enable = true;
     nginx = {
       enable = true;
@@ -25,23 +20,26 @@ in {
       jack.enable = true;
       wireplumber.enable = true;
     };
-    xserver = {
-      enable = true;
-      xkb = {
-        layout = "us";
-        variant = "altgr-intl";
-      };
-      exportConfiguration = true;
-      excludePackages = (with pkgs; [ xterm ]);
-      displayManager.startx.enable = true;
-    };
     greetd = {
       enable = true;
       settings = {
-        default_session.command = ''
-          ${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --greeting "Welcome to NixOS" --cmd ${plasma}/bin/plasma'';
+        default_session.command = let
+          xSessions =
+            "${config.services.displayManager.sessionData.desktops}/share/xsessions";
+          wlSessions =
+            "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
+        in ''
+          ${pkgs.greetd.tuigreet}/bin/tuigreet \
+          --remember \
+          --asterisks \
+          --time \
+          --greeting "NixOS" \
+          --sessions ${xSessions}:${wlSessions}
+        '';
         initial_session = {
-          command = "${plasma}/bin/plasma";
+          command = ''
+            ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
+          '';
           user = "user";
         };
       };