diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 821227b..a9fa47f 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -1,33 +1,54 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  imports = [ # Include the results of the hardware scan.
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
 
-    # GUI
-    ../../modules/system/gui/steam.nix
-    ../../modules/system/gui/hyprland.nix
-    ../../modules/system/gui/thunar.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-    ../../modules/system/hardware/nvidia.nix
+    # Import modules
+    ../../modules/system/default.nix
   ];
 
+  settings = {
+    display-manager = "cosmic-greeter";
+    desktop-environments = {
+      cosmic.enable = true;
+      hyprland.enable = false;
+      gnome.enable = false;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = true;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = false;
+      quickemu.enable = false;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = true;
+      bluetooth.enable = false;
+      firewall.enable = true;
+      locale.enable = true;
+    };
+  };
+
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
 
     substituters = [
       "https://nix-community.cachix.org"
+      "https://cosmic.cachix.org/"
+    ];
+
+    trusted-public-keys = [
+      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
     ];
   };
 
-
   # Bootloader.
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.grub = {
@@ -36,6 +57,7 @@
     device = "nodev";
   };
 
+  # Networking configuration
   networking.hostName = "xv-desktop"; # Define your hostname.
   networking.interfaces.enp7s0.wakeOnLan.enable = true;
 
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index a72aec8..00a4dfb 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -2,16 +2,13 @@
 
 {
   imports = [
-    # GUI
-    ../../modules/home/gui/common
-    ../../modules/home/gui/hyprland
-    ../../modules/home/gui/nextcloud.nix
-    ../../modules/home/gui/theming.nix
-
-    # CLI
-    ../../modules/home/cli/common
+    # Modules
+    ../../modules/home/default.nix
   ];
 
+  # Enable home-manager
+  programs.home-manager.enable = true;
+
   options = {
     host = lib.mkOption {
       type = with lib.types; str;
@@ -41,6 +38,28 @@
        unstable.prismlauncher
     ];
 
+    settings = {
+      applications.common.enable = true;
+      applications.alacritty.enable = false;
+      applications.devenv.enable = true;
+      applications.firefox.enable = true;
+      applications.git.enable = true;
+      applications.helix.enable = true;
+      applications.zsh.enable = true;
+      applications.ssh.enable = true;
+      applications.thunderbird.enable = true;
+      applications.yazi.enable = true;
+      applications.zellij.enable = true;
+
+      services.nextcloud-sync.enable = true;
+
+      theming.fonts.enable = true;
+      theming.nix-colors.enable = false;
+      theming.stylix.enable = true;
+
+      desktop-environments.hyprland.enable = false;
+    };
+
     home.stateVersion = "24.05";
   };
 }
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 8d68777..f72af71 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -49,9 +49,6 @@
     ];
   };
 
-  # Configure hardware
-  services.ratbagd.enable = true;
-
   # Bootloader.
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.grub = {
@@ -78,15 +75,5 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # Configure wacom tablet
-  hardware.opentabletdriver = {
-    enable = true;
-    package = pkgs.unstable.opentabletdriver;
-  };
-
-  services.libinput.enable = true;
-  services.fwupd.enable = true;
-
   system.stateVersion = "24.05";
-
 }