diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index 705107c..cfaf6e9 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -40,7 +40,6 @@
   '';
 
   environment.systemPackages = with pkgs; [
-  obsidian
   libsForQt5.kdenlive
   komikku
   blender
diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix
index 8d61725..5497697 100644
--- a/hosts/laptop1/configuration.nix
+++ b/hosts/laptop1/configuration.nix
@@ -29,7 +29,6 @@
   networking.hostName = "laptop1";
 
   environment.systemPackages = with pkgs; [
-  obsidian
   libsForQt5.kdenlive
   floorp
   komikku
diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
index 4c1c774..ffe3c45 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -27,6 +27,7 @@ in
       wireguard.enable = true;
       gui-utilities.enable = true;
       mouse.enable = true;
+      obsidian.enable = true;
       thunderbird.enable = true;
     };
   };
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
index b4b1c60..93e5b6f 100644
--- a/modules/nix/groups/laptop.nix
+++ b/modules/nix/groups/laptop.nix
@@ -27,6 +27,7 @@ in
       wireguard.enable = true;
       gui-utilities.enable = true;
       mouse.enable = true;
+      obsidian.enable = true;
       thunderbird.enable = true;
     };
     services.logind.lidSwitch = "ignore";
diff --git a/modules/nix/office/default.nix b/modules/nix/office/default.nix
index 887435f..7ee9322 100644
--- a/modules/nix/office/default.nix
+++ b/modules/nix/office/default.nix
@@ -2,5 +2,6 @@
 {
   imports = [
     ./office.nix
+    ./obsidian.nix
   ];
 }
diff --git a/modules/nix/office/obsidian.nix b/modules/nix/office/obsidian.nix
new file mode 100644
index 0000000..189e69a
--- /dev/null
+++ b/modules/nix/office/obsidian.nix
@@ -0,0 +1,17 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.obsidian.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "obsidian";
+  };
+
+  config = mkIf config.smayzy.obsidian.enable {
+    environment.systemPackages = with pkgs; [
+      obsidian
+    ];
+  };
+}