cosmic module

hosts/_common/components/cosmic.nix

@@ -1,11 +1,11 @@
-{ nixos-cosmic, pkgs, ... }:
+{ cosmic, ... }:
 {
   nix.settings = {
     substituters = [ "https://cosmic.cachix.org/" ];
     trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
   };
 
-  imports = [ nixos-cosmic.nixosModules.default ];
+  imports = [ cosmic.nixosModules.default ];
 
   services.desktopManager.cosmic.enable = true;
   services.displayManager.cosmic-greeter.enable = true;

hosts/gpdPocket3/configuration.nix

@@ -4,7 +4,7 @@
   pkgs,
   settings,
   ...
-}@args:
+}:
 {
   imports = [
     # Common components this machine uses
@@ -16,7 +16,7 @@
     # (settings.hostsDir + "/_common/components/audio.nix")
     (settings.hostsDir + "/_common/components/home_manager.nix")
     # (settings.hostsDir + "/_common/components/gnome_wayland.nix")
-    (settings.hostsDir + "/_common/components/cosmic.nix")
+    # (settings.hostsDir + "/_common/components/cosmic.nix")
     (settings.hostsDir + "/_common/components/docker.nix")
     (settings.hostsDir + "/_common/components/nebula.nix")
     # Users this machine has
@@ -27,30 +27,7 @@
     # ./stupid-keyboard-2.nix
   ];
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      cosmic-comp = prev.cosmic-comp.overrideAttrs (prevAttrs: {
-        patches = (prevAttrs.patches or [ ]) ++ [
-          (final.writeText "cosmic-comp-disable-direct-scanout.patch" ''
-            diff --git a/src/backend/kms/surface/mod.rs b/src/backend/kms/surface/mod.rs
-            index d0cfb8d..32aaf4a 100644
-            --- a/src/backend/kms/surface/mod.rs
-            +++ b/src/backend/kms/surface/mod.rs
-            @@ -624,7 +624,8 @@ impl SurfaceThreadState {
-                         cursor_size,
-                         Some(gbm),
-                     ) {
-            -            Ok(compositor) => {
-            +            Ok(mut compositor) => {
-            +                compositor.use_direct_scanout(false);
-                             self.active.store(true, Ordering::SeqCst);
-                             self.compositor = Some(compositor);
-                             Ok(())
-          '')
-        ];
-      });
-    })
-  ];
+  my_modules.de_cosmic.enable = true;
 
   # machine specific configuration
   # ==============================