diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
index d99db3c..ce7cd87 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -22,12 +22,7 @@ in
       wireguard.enable = true;
       gui-utilities.enable = true;
       mouse.enable = true;
-      obsidian.enable = true;
-      kdenlive.enable = true;
       thunderbird.enable = true;
-      blender.enable = true;
-      inkscape.enable = true;
-      komikku.enable = true;
       flatpak = {
         enable = true;
         media.enable = true;
@@ -38,19 +33,24 @@ in
       calibre.enable = true;
       freecad.enable = true;
       fritzing.enable = true;
-      aegisub.enable = true;
       tor.enable = true;
       chromium.enable = true;
       ghidra.enable = true;
       firejail.enable = true;
       wireshark.enable = true;
-      bitwarden.enable = true;
       alacritty.enable = true;
     };
     programs.firefox.enable = true;
     environment.systemPackages = with pkgs; [
       librewolf
       prismlauncher
+      obsidian
+      komikku
+      inkscape
+      blender
+      bitwarden-desktop
+      aegisub
+      kdePackages.kdenlive
     ];
   };
 }
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
index e96940b..5b8e743 100644
--- a/modules/nix/groups/laptop.nix
+++ b/modules/nix/groups/laptop.nix
@@ -27,11 +27,7 @@ in
       wireguard.enable = true;
       gui-utilities.enable = true;
       mouse.enable = true;
-      obsidian.enable = true;
-      kdenlive.enable = true;
       thunderbird.enable = true;
-      inkscape.enable = true;
-      komikku.enable = true;
       flatpak = {
         enable = true;
         dev.enable = true;
@@ -42,17 +38,24 @@ in
       freecad.enable = true;
       tor.enable = true;
       fritzing.enable = true;
-      aegisub.enable = true;
       alacritty.enable = true;
       chromium.enable = true;
       firejail.enable = true;
       wireshark.enable = true;
-      bitwarden.enable = true;
       steam.enable = true;
     };
     programs.firefox.enable = true;
 
     networking.networkmanager.enable = true;
-    environment.systemPackages = with pkgs; [ networkmanagerapplet librewolf];
+    environment.systemPackages = with pkgs; [
+      networkmanagerapplet
+      librewolf
+      obsidian
+      komikku
+      inkscape
+      bitwarden-desktop
+      aegisub
+      kdePackages.kdenlive
+    ];
   };
 }
diff --git a/modules/nix/office/aegisub.nix b/modules/nix/office/aegisub.nix
deleted file mode 100644
index f6f4230..0000000
--- a/modules/nix/office/aegisub.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.aegisub.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "aegisub";
-  };
-
-  config = mkIf config.smayzy.aegisub.enable {
-    environment.systemPackages = with pkgs; [
-      aegisub
-    ];
-  };
-}
diff --git a/modules/nix/office/bitwarden.nix b/modules/nix/office/bitwarden.nix
deleted file mode 100644
index 30e59d0..0000000
--- a/modules/nix/office/bitwarden.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.bitwarden.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "bitwarden";
-  };
-
-  config = mkIf config.smayzy.bitwarden.enable {
-    environment.systemPackages = with pkgs; [
-      bitwarden-desktop
-    ];
-  };
-}
diff --git a/modules/nix/office/blender.nix b/modules/nix/office/blender.nix
deleted file mode 100644
index 488eb45..0000000
--- a/modules/nix/office/blender.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.blender.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "blender";
-  };
-
-  config = mkIf config.smayzy.blender.enable {
-    environment.systemPackages = with pkgs; [
-      blender
-    ];
-  };
-}
diff --git a/modules/nix/office/default.nix b/modules/nix/office/default.nix
index e3dc43e..8495bf1 100644
--- a/modules/nix/office/default.nix
+++ b/modules/nix/office/default.nix
@@ -1,13 +1,6 @@
 { ... }:
 {
   imports = [
-    ./aegisub.nix
-    ./bitwarden.nix
-    ./blender.nix
-    ./inkscape.nix
-    ./kdenlive.nix
-    ./komikku.nix
-    ./obsidian.nix
     ./office.nix
   ];
 }
diff --git a/modules/nix/office/inkscape.nix b/modules/nix/office/inkscape.nix
deleted file mode 100644
index 22dcd37..0000000
--- a/modules/nix/office/inkscape.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.inkscape.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "inkscape";
-  };
-
-  config = mkIf config.smayzy.inkscape.enable {
-    environment.systemPackages = with pkgs; [
-      inkscape
-    ];
-  };
-}
diff --git a/modules/nix/office/kdenlive.nix b/modules/nix/office/kdenlive.nix
deleted file mode 100644
index d3da9ee..0000000
--- a/modules/nix/office/kdenlive.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.kdenlive.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "kdenlive";
-  };
-
-  config = mkIf config.smayzy.kdenlive.enable {
-    environment.systemPackages = with pkgs; [
-      kdePackages.kdenlive
-    ];
-  };
-}
diff --git a/modules/nix/office/komikku.nix b/modules/nix/office/komikku.nix
deleted file mode 100644
index b1c76d9..0000000
--- a/modules/nix/office/komikku.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  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
-    ];
-  };
-}
diff --git a/modules/nix/office/obsidian.nix b/modules/nix/office/obsidian.nix
deleted file mode 100644
index f2b5c37..0000000
--- a/modules/nix/office/obsidian.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  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
-    ];
-  };
-}