From 9eca8b59d3fcf833cf0b1b22ea906203e80f90e9 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Wed, 30 Apr 2025 00:33:56 +0300
Subject: [PATCH] desktop/cosmic: small refactor

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 modules/nixos/desktop/cosmic.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix
index e3344f8..aff4f9b 100644
--- a/modules/nixos/desktop/cosmic.nix
+++ b/modules/nixos/desktop/cosmic.nix
@@ -16,23 +16,21 @@ in {
       mkEnableOption "enable cosmic desktop";
   };
   config = mkIf cfg.enable {
-    sound.pipewire.enable = true;
-    nix.settings = {
-      substituters = ["https://cosmic.cachix.org/"];
-      trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
-    };
     environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
-    systemd.packages = [pkgs.observatory];
-    systemd.services.monitord.wantedBy = ["multi-user.target"];
-    services.desktopManager.cosmic.enable = true;
-    services.displayManager.cosmic-greeter.enable = true;
+    sound.pipewire.enable = true;
     services = {
+      desktopManager.cosmic.enable = true;
+      displayManager.cosmic-greeter.enable = true;
       gnome.gnome-keyring.enable = true;
       dbus = {
         apparmor = "enabled";
         implementation = "broker";
       };
     };
+    systemd = {
+      packages = [pkgs.observatory];
+      services.monitord.wantedBy = ["multi-user.target"];
+    };
     xdg.portal = {
       enable = true;
       extraPortals = with pkgs; [