diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index 9ee697e..36c010a 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -40,7 +40,6 @@
   '';
 
   environment.systemPackages = with pkgs; [
-  komikku
   ];
 
   services.flatpak = {
diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix
index dc2b30f..f65f138 100644
--- a/hosts/laptop1/configuration.nix
+++ b/hosts/laptop1/configuration.nix
@@ -30,7 +30,6 @@
 
   environment.systemPackages = with pkgs; [
   floorp
-  komikku
   librewolf
   ];
 
diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
index b579c16..1167d03 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -32,6 +32,7 @@ in
       thunderbird.enable = true;
       blender.enable = true;
       inkscape.enable = true;
+      komikku.enable = true;
     };
   };
 }
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
index 3824968..1b10429 100644
--- a/modules/nix/groups/laptop.nix
+++ b/modules/nix/groups/laptop.nix
@@ -31,6 +31,7 @@ in
       kdenlive.enable = true;
       thunderbird.enable = true;
       inkscape.enable = true;
+      komikku.enable = true;
     };
     services.logind.lidSwitch = "ignore";
   };
diff --git a/modules/nix/office/default.nix b/modules/nix/office/default.nix
index bc386e1..56fdcff 100644
--- a/modules/nix/office/default.nix
+++ b/modules/nix/office/default.nix
@@ -5,6 +5,7 @@
     ./obsidian.nix
     ./kdenlive.nix
     ./blender.nix
-    ./inkscape.nic
+    ./inkscape.nix
+    ./komikku.nix
   ];
 }
diff --git a/modules/nix/office/komikku.nix b/modules/nix/office/komikku.nix
new file mode 100644
index 0000000..51291d8
--- /dev/null
+++ b/modules/nix/office/komikku.nix
@@ -0,0 +1,17 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.komikku.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "komikku";
+  };
+
+  config = mkIf config.smayzy.komikku.enable {
+    environment.systemPackages = with pkgs; [
+      komikku
+    ];
+  };
+}