diff --git a/hosts/common/common.nix b/hosts/common/common.nix
index db0f2c7..b80a235 100644
--- a/hosts/common/common.nix
+++ b/hosts/common/common.nix
@@ -29,8 +29,6 @@
     loupe
     gimp3
     mullvad-vpn
-    libreoffice-qt6-still
-    hunspellDicts.fr-any
     base16-schemes
     tor
     wireshark
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index b98af28..ec89ed2 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -12,6 +12,7 @@
     ./groups
     ./wm
     ./de
+    ./office
   ];
 
   # Timzone and locales (same for all machines so I put it here)
diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
index ceba22e..dde22ba 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -19,6 +19,7 @@ in
       librewolf.enable = true;
       stylix.enable = true;
       audio.enable = true;
+      office.enable = true;
     };
   };
 }
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
index 9a194c8..d39214e 100644
--- a/modules/nix/groups/laptop.nix
+++ b/modules/nix/groups/laptop.nix
@@ -19,6 +19,7 @@ in
       floorp.enable = true;
       stylix.enable = true;
       audio.enable = true;
+      office.enable= true;
     };
     services.logind.lidSwitch = "ignore";
   };
diff --git a/modules/nix/office/default.nix b/modules/nix/office/default.nix
new file mode 100644
index 0000000..887435f
--- /dev/null
+++ b/modules/nix/office/default.nix
@@ -0,0 +1,6 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./office.nix
+  ];
+}
diff --git a/modules/nix/office/office.nix b/modules/nix/office/office.nix
new file mode 100644
index 0000000..0d9c5d2
--- /dev/null
+++ b/modules/nix/office/office.nix
@@ -0,0 +1,18 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.office.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "office";
+  };
+
+  config = mkIf config.smayzy.office.enable {
+    environment.systemPackages = with pkgs; [
+      libreoffice-qt6-still
+      hunspellDicts.fr-any
+    ];
+  };
+}