From 9fffce71cdb79690e2efac03ed6a38b74f1a7724 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Fri, 19 Apr 2024 22:51:28 +0200
Subject: [PATCH] Cosmic+Cosmic greeter: Align to upstream changes

---
 nix-os/desktopManagers/cosmic.nix         | 26 +----------------------
 nix-os/displayManagers/cosmic-greeter.nix |  6 +-----
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
index a26c073..589ee56 100644
--- a/nix-os/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -16,35 +16,11 @@ in
     "${nixos-cosmic}/nixos/cosmic/module.nix"
   ];
   config = {
-    services.xserver.desktopManager.cosmic.enable = true;
+    services.desktopManager.cosmic.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
   };
-  options = {
-    cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
-    cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
-    cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
-    cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
-    cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
-    cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
-    cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
-    cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
-    cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
-    cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
-    cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
-    cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
-    cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
-    cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
-    cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
-    cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
-    cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
-    cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
-    cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
-    cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
-    wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
-    xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
-  };
 }
diff --git a/nix-os/displayManagers/cosmic-greeter.nix b/nix-os/displayManagers/cosmic-greeter.nix
index b66341a..da54a6d 100644
--- a/nix-os/displayManagers/cosmic-greeter.nix
+++ b/nix-os/displayManagers/cosmic-greeter.nix
@@ -16,15 +16,11 @@ in
     "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
   ];
   config = {
-    services.xserver.desktopManager.cosmic.enable = true;
-    services.xserver.displayManager.cosmic-greeter.enable = true;
+    services.displayManager.cosmic-greeter.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
   };
-  options = {
-    cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
-  };
 }