beginning a lot of reorganizing stuff

modules/desktop-environments/cosmic/default.nix

@@ -1,9 +1,7 @@
 { ... }:
 {
-  # specialisation.cosmic.configuration = {
-    services = {
-      desktopManager.cosmic.enable = true;
-      displayManager.cosmic-greeter.enable = true;
-    };
-  # };
+  services = {
+    desktopManager.cosmic.enable = true;
+    displayManager.cosmic-greeter.enable = true;
+  };
 }

modules/desktop-environments/cosmic/specialisation.nix

@@ -1,18 +1,6 @@
 { lib, ... }:
 {
   specialisation.cosmic.configuration = {
-    services = {
-      desktopManager.cosmic.enable = lib.mkForce true;
-      displayManager.cosmic-greeter.enable = lib.mkForce true;
-      # Disable Gnome
-      xserver = {
-        desktopManager.gnome.enable = lib.mkForce false;
-        # Enable Desktop Environment.
-        displayManager = {
-          gdm.enable = lib.mkForce false;
-          gdm.wayland = lib.mkForce false;
-        };
-      };
-    };
+    imports = [ ./default.nix ]
   };
 }

modules/desktop-environments/gnome/default.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  services = {
+    # Enable Desktop Environment.
+    xserver = {
+      desktopManager.gnome.enable = true;
+      # Enable Desktop Environment.
+      displayManager = {
+        gdm.enable = lib.mkDefault true;
+        gdm.wayland = lib.mkDefault true;
+      };
+    };
+
+    gnome.gnome-remote-desktop.enable = true;
+  };
+
+  programs = {
+    kdeconnect = {
+      enable = true;
+      package = pkgs.gnomeExtensions.gsconnect;
+    };
+  };
+}

modules/desktop-environments/hyprland/default.nix

@@ -3,106 +3,104 @@ let
   sddmTheme = "catppuccin-mocha";
 in
 {
-  specialisation.hyprland.configuration = {
-    imports = [
-      ./environment.nix
-    ];
+  imports = [
+    ./environment.nix
+  ];
 
-    home-manager.users.matt = import ./home.nix;
+  home-manager.users.matt = import ./home.nix;
 
-    services = {
-      displayManager.sddm.enable = true;
-      displayManager.sddm.package = pkgs.kdePackages.sddm;
-      displayManager.sddm.theme = sddmTheme;
-      displayManager.defaultSession = "hyprland";
-      # disable plasma
-      desktopManager.plasma6.enable = false;
+  services = {
+    displayManager.sddm.enable = true;
+    displayManager.sddm.package = pkgs.kdePackages.sddm;
+    displayManager.sddm.theme = sddmTheme;
+    displayManager.defaultSession = "hyprland";
+    # disable plasma
+    desktopManager.plasma6.enable = false;
 
-      dbus.enable = true;
+    dbus.enable = true;
 
-      ddccontrol.enable = true;
+    ddccontrol.enable = true;
 
-      blueman.enable = true;
-    };
+    blueman.enable = true;
+  };
 
-    programs.hyprland = {
-      enable = true;
-      xwayland.enable = true;
-      portalPackage = pkgs.xdg-desktop-portal-hyprland;
-    };
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+    portalPackage = pkgs.xdg-desktop-portal-hyprland;
+  };
 
-    programs.nm-applet.enable = true;
+  programs.nm-applet.enable = true;
 
-    systemd = {
-      user.services.polkit-gnome-authentication-agent-1 = {
-        description = "polkit-gnome-authentication-agent-1";
-        wantedBy = [ "graphical-session.target" ];
-        wants = [ "graphical-session.target" ];
-        after = [ "graphical-session.target" ];
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = [ "graphical-session.target" ];
+      wants = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        Restart = "on-failure";
+        RestartSec = 1;
+        TimeoutStopSec = 10;
       };
-      extraConfig = ''
-          DefaultTimeoutStopSec=10s
-      '';
     };
+    extraConfig = ''
+        DefaultTimeoutStopSec=10s
+    '';
+  };
 
-    security = {
-      polkit.enable = true;
+  security = {
+    polkit.enable = true;
 
-      # configure sudo
-      sudo.extraRules = [
-        {
-          commands = [
-            {
-              command = "/run/current-system/sw/bin/waybar-weather";
-              options = [ "NOPASSWD" ];
-            }
-            {
-              command = "/run/current-system/sw/bin/waybar-updates";
-              options = [ "NOPASSWD" ];
-            }
-          ];
-          groups = [ "wheel" ];
-        }
-      ];
-    };
-
-    xdg.portal = {
-      enable = true;
-      wlr.enable = false;
-      xdgOpenUsePortal = false;
-      extraPortals = [
-      pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal-gtk
-      ];
-    };
-
-    fonts.packages = with pkgs; [
-      font-awesome
-      noto-fonts
-      noto-fonts-color-emoji
-      nerdfonts
-      meslo-lgs-nf
-    ];
-
-    fonts.fontconfig.defaultFonts = {
-      emoji = [
-        "Noto Color Emoji"
-      ];
-    };
-
-    nixpkgs.overlays = [
-      (self: super: {
-        waybar = super.waybar.overrideAttrs (oldAttrs: {
-        mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-        });
-      })
+    # configure sudo
+    sudo.extraRules = [
+      {
+        commands = [
+          {
+            command = "/run/current-system/sw/bin/waybar-weather";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command = "/run/current-system/sw/bin/waybar-updates";
+            options = [ "NOPASSWD" ];
+          }
+        ];
+        groups = [ "wheel" ];
+      }
     ];
   };
+
+  xdg.portal = {
+    enable = true;
+    wlr.enable = false;
+    xdgOpenUsePortal = false;
+    extraPortals = [
+    pkgs.xdg-desktop-portal-hyprland
+    pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+
+  fonts.packages = with pkgs; [
+    font-awesome
+    noto-fonts
+    noto-fonts-color-emoji
+    nerdfonts
+    meslo-lgs-nf
+  ];
+
+  fonts.fontconfig.defaultFonts = {
+    emoji = [
+      "Noto Color Emoji"
+    ];
+  };
+
+  nixpkgs.overlays = [
+    (self: super: {
+      waybar = super.waybar.overrideAttrs (oldAttrs: {
+      mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+      });
+    })
+  ];
 }

modules/desktop-environments/hyprland/specialisation.nix

@@ -0,0 +1,6 @@
+{ lib, ... }:
+{
+  specialisation.hyprland.configuration = {
+    imports = [ ./default.nix ]
+  };
+}