diff --git a/hosts/common/common.nix b/hosts/common/common.nix
index 2904951..a3cb712 100644
--- a/hosts/common/common.nix
+++ b/hosts/common/common.nix
@@ -7,14 +7,6 @@
       ../../modules/nix/default.nix
    ];
 
-  smayzy.virt.enable = true;
-
-  smayzy.nh.enable = true;
-
-  smayzy.nvf.enable = true;
-
-  smayzy.audio.enable = true;
-
   users.users.smayzy = {
     isNormalUser = true;
     description = "smayzy";
diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index be20e56..76ef0e7 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -11,12 +11,8 @@
 
   smayzy = {
     nvidia.enable = true;
-    steam.enable = true;
-    prism.enable = true;
-    fzf.enable = true;
-    firefox.enable = true;
-    zsh.enable = true;
-    stylix.enable = true;
+    virt.enable = true;
+    desktop.enable = true;
   };
 
   home-manager = {
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 37e247d..bb9594f 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -9,6 +9,7 @@
     ./browser
     ./shell
     ./rice
+    ./groups
   ];
 
   # Timzone and locales (same for all machines so I put it here)
diff --git a/modules/nix/groups/base.nix b/modules/nix/groups/base.nix
new file mode 100644
index 0000000..a7888c9
--- /dev/null
+++ b/modules/nix/groups/base.nix
@@ -0,0 +1,21 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.base = mkOption {
+    type = types.bool;
+    default = false;
+    description = "base settings";
+  };
+
+  config = mkIf config.smayzy.base {
+    smayzy = {
+      nvf.enable = true;
+      nh.enable = true;
+      fzf.enable = true;
+      zsh.enable = true;
+
+    };
+  };
+}
diff --git a/modules/nix/groups/default.nix b/modules/nix/groups/default.nix
new file mode 100644
index 0000000..c6355ee
--- /dev/null
+++ b/modules/nix/groups/default.nix
@@ -0,0 +1,8 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./desktop.nix
+    ./laptop.nix
+    ./base.nix
+  ];
+}
diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
new file mode 100644
index 0000000..1401edc
--- /dev/null
+++ b/modules/nix/groups/desktop.nix
@@ -0,0 +1,22 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.desktop.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "desktop settings";
+  };
+
+  config = mkIf config.smayzy.desktop.enable {
+    smayzy = {
+      base = true;
+      steam.enable = true;
+      prism.enable = true;
+      firefox.enable = true;
+      stylix.enable = true;
+      audio.enable = true;
+    };
+  };
+}
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
new file mode 100644
index 0000000..f37eee7
--- /dev/null
+++ b/modules/nix/groups/laptop.nix
@@ -0,0 +1,21 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.laptop.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "laptop settings";
+  };
+
+  config = mkIf config.smayzy.laptop.enable {
+    smayzy = {
+      base = true;
+      prism.enable = true;
+      firefox.enable = true;
+      stylix.enable = true;
+      audio.enable = true;
+    };
+  };
+}