2 files changed, 23 insertions, 8 deletions
diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix
index 3f10d92..5ac17ec 100644
--- a/modules/desktop/nixos/fonts.nix
+++ b/modules/desktop/nixos/fonts.nix
@@ -1,8 +1,7 @@
 {pkgs, ...}: {
   fonts = {
     enableDefaultPackages = false;
-    # fontDir.enable = true;
     fontconfig.enable = true;
-    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot)
+    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot or ghostty)
   };
 }
diff --git a/modules/desktop/nixos/greeters/greetd.nix b/modules/desktop/nixos/greeters/greetd.nix
index b612c86..02af31f 100644
--- a/modules/desktop/nixos/greeters/greetd.nix
+++ b/modules/desktop/nixos/greeters/greetd.nix
@@ -1,19 +1,35 @@
 {
+  pkgs,
   config,
   lib,
   ...
 }: let
   cfg = config.collinux.desktop.greetd;
+
+  session =
+    if cfg.cosmic-greeter.enable
+    then {
+      command = "${pkgs.cosmic-greeter}/bin/cosmic-greeter-start";
+      user = config.collinux.user.name;
+    }
+    else if cfg.autologin.enable
+    then {
+      user = config.collinux.user.name;
+      command = with config.collinux.desktop;
+        if (wm.sway.enable && !gnome.enable && !wm.niri.enable)
+        then lib.getExe pkgs.sway
+        else if (wm.niri.enable && !gnome.enable && !wm.sway.enable)
+        then "${pkgs.niri}/bin/niri-session"
+        else null;
+    }
+    else {};
 in
   lib.mkIf cfg.enable {
     services.greetd = {
       enable = true;
-      settings = rec {
-        initial_session = {
-          command = cfg.command;
-          user = config.collinux.user.name;
-        };
-        default_session = initial_session;
+      settings = {
+        initial_session = session;
+        default_session = session;
       };
     };
   }