diff --git a/build123d/default.nix b/cad/default.nix similarity index 94% rename from build123d/default.nix rename to cad/default.nix index 8050c65..c3e63d8 100644 --- a/build123d/default.nix +++ b/cad/default.nix @@ -5,13 +5,13 @@ }: { flake = { templates = { - build123d = { + cad = { path = ./template; description = "A python flake with a build132d/cadquery parametric cad setup"; }; }; - flakeModules.build123d = { + flakeModules.cad = { imports = [ inputs.treefmt-nix.flakeModule ]; @@ -23,7 +23,7 @@ system, ... }: let - cfg = config.krantz.build123d; + cfg = config.krantz.cad; cq = inputs.cadquery.packages.${system}; @@ -39,7 +39,7 @@ "3mf" ]; in { - options.krantz.build123d = { + options.krantz.cad = { enable = lib.mkEnableOption "executing a python build123d/cadquery file to generate 3d files"; builder = lib.mkOption { @@ -65,13 +65,13 @@ }; devShell = { - enable = lib.mkEnableOption "a build123d development environment" // {default = true;}; + enable = lib.mkEnableOption "a build123d/cadquery development environment" // {default = true;}; name = lib.mkOption { description = "The name of the attribute in devShells to configure"; type = lib.types.str; default = "default"; - example = "build123d"; + example = "cad"; }; extraAttrs = lib.mkOption { diff --git a/build123d/template/.envrc b/cad/template/.envrc similarity index 100% rename from build123d/template/.envrc rename to cad/template/.envrc diff --git a/build123d/template/.gitignore b/cad/template/.gitignore similarity index 100% rename from build123d/template/.gitignore rename to cad/template/.gitignore diff --git a/build123d/template/build3d.py b/cad/template/build.py similarity index 100% rename from build123d/template/build3d.py rename to cad/template/build.py diff --git a/build123d/template/flake.nix b/cad/template/flake.nix similarity index 81% rename from build123d/template/flake.nix rename to cad/template/flake.nix index f0bdc6f..25b4f8b 100644 --- a/build123d/template/flake.nix +++ b/cad/template/flake.nix @@ -1,5 +1,5 @@ { - description = "made with build123d"; + description = "made with build123d/cadquery"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -20,15 +20,15 @@ } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { imports = [ - project-templates.flakeModules.build123d + project-templates.flakeModules.cad ]; systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"]; perSystem = {pkgs, ...}: { - krantz.build123d = { + krantz.cad = { enable = true; - builder = ./build3d.py; + builder = ./build.py; outputName = "box"; }; diff --git a/flake.nix b/flake.nix index ead7755..d32b04f 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ imports = [ flake-parts.flakeModules.flakeModules - ./build123d + ./cad ./rust ];