diff --git a/modules/nix/cad/default.nix b/modules/nix/cad/default.nix
deleted file mode 100644
index 573514f..0000000
--- a/modules/nix/cad/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./freecad.nix
-    ./fritzing.nix
-  ];
-}
diff --git a/modules/nix/cad/freecad.nix b/modules/nix/cad/freecad.nix
deleted file mode 100644
index fd93f2a..0000000
--- a/modules/nix/cad/freecad.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.freecad.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable freecad";
-  };
-
-  config = mkIf config.smayzy.freecad.enable {
-    environment.systemPackages = with pkgs; [ freecad-wayland ];
-  };
-}
diff --git a/modules/nix/cad/fritzing.nix b/modules/nix/cad/fritzing.nix
deleted file mode 100644
index 28a8b35..0000000
--- a/modules/nix/cad/fritzing.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.fritzing.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable fritzing";
-  };
-
-  config = mkIf config.smayzy.fritzing.enable {
-    environment.systemPackages = with pkgs; [ fritzing ];
-  };
-}
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index fe2ba63..e7f2a00 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -4,7 +4,6 @@
     ./audio
     ./base-cli
     ./browser
-    ./cad
     ./comm
     ./containers
     ./ctf
diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
index ce7cd87..b1a63ff 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -31,8 +31,6 @@ in
       };
       arduino.enable = true;
       calibre.enable = true;
-      freecad.enable = true;
-      fritzing.enable = true;
       tor.enable = true;
       chromium.enable = true;
       ghidra.enable = true;
@@ -51,6 +49,8 @@ in
       bitwarden-desktop
       aegisub
       kdePackages.kdenlive
+      freecad-wayland
+      fritzing
     ];
   };
 }
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
index 5b8e743..b622310 100644
--- a/modules/nix/groups/laptop.nix
+++ b/modules/nix/groups/laptop.nix
@@ -35,9 +35,7 @@ in
       };
       arduino.enable = true;
       calibre.enable = true;
-      freecad.enable = true;
       tor.enable = true;
-      fritzing.enable = true;
       alacritty.enable = true;
       chromium.enable = true;
       firejail.enable = true;
@@ -56,6 +54,8 @@ in
       bitwarden-desktop
       aegisub
       kdePackages.kdenlive
+      freecad-wayland
+      fritzing
     ];
   };
 }