diff --git a/hosts/common/common.nix b/hosts/common/common.nix
index 3b9916b..49a04f2 100644
--- a/hosts/common/common.nix
+++ b/hosts/common/common.nix
@@ -20,10 +20,8 @@
     home-manager
     tor
     tshark
-    freecad-wayland
     aegisub
     mpv
-    fritzing
   ];
 
 }
diff --git a/modules/nix/cad/default.nix b/modules/nix/cad/default.nix
new file mode 100644
index 0000000..c14107e
--- /dev/null
+++ b/modules/nix/cad/default.nix
@@ -0,0 +1,7 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ./fritzing.nix
+    ./freecad.nix
+  ];
+}
diff --git a/modules/nix/cad/freecad.nix b/modules/nix/cad/freecad.nix
new file mode 100644
index 0000000..6443104
--- /dev/null
+++ b/modules/nix/cad/freecad.nix
@@ -0,0 +1,15 @@
+{  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
new file mode 100644
index 0000000..79c6701
--- /dev/null
+++ b/modules/nix/cad/fritzing.nix
@@ -0,0 +1,15 @@
+{  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 d325c51..7a15621 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -20,6 +20,7 @@
     ./flatpak
     ./ide
     ./ebook
+    ./cad
   ];
 
   # 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 a5b6059..0a75156 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -41,6 +41,8 @@ in
       };
       arduino.enable = true;
       calibre.enable = true;
+      freecad.enable = true;
+      fritzing.enable = true;
     };
   };
 }
diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix
index e6232b6..194030e 100644
--- a/modules/nix/groups/laptop.nix
+++ b/modules/nix/groups/laptop.nix
@@ -39,6 +39,8 @@ in
       };
       arduino.enable = true;
       calibre.enable = true;
+      freecad.enable = true;
+      fritzing.enable = true;
     };
     services.logind.lidSwitch = "ignore";
   };