diff --git a/modules/attrs/cad/default.nix b/modules/attrs/cad/default.nix
new file mode 100644
index 0000000..3e7a14c
--- /dev/null
+++ b/modules/attrs/cad/default.nix
@@ -0,0 +1,16 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.cad = moduleWithSystem ({...}: let
+    modules = with self.nixosModules; [
+      freecad
+      openscad
+      prusa-slicer
+    ];
+  in {
+    imports = modules;
+  });
+}
+
diff --git a/modules/features/freecad/default.nix b/modules/features/freecad/default.nix
new file mode 100644
index 0000000..d58009c
--- /dev/null
+++ b/modules/features/freecad/default.nix
@@ -0,0 +1,9 @@
+{...}: {
+  # Screenshot capture, region selection, annotation, and clipboard support for
+  # the Hyprland screenshot keybinds managed in the dotfiles repo.
+  flake.nixosModules.freecad = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      freecad
+    ];
+  };
+}
diff --git a/modules/features/openscad/default.nix b/modules/features/openscad/default.nix
new file mode 100644
index 0000000..9b51c44
--- /dev/null
+++ b/modules/features/openscad/default.nix
@@ -0,0 +1,10 @@
+{...}: {
+  # Screenshot capture, region selection, annotation, and clipboard support for
+  # the Hyprland screenshot keybinds managed in the dotfiles repo.
+  flake.nixosModules.openscad = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      openscad
+      openscad-lsp
+    ];
+  };
+}