diff --git a/cranberry/features.nix b/cranberry/features.nix index 0c77503..6b73529 100644 --- a/cranberry/features.nix +++ b/cranberry/features.nix @@ -4,6 +4,7 @@ frogeye = { desktop.xorg = true; dev = { + "3d" = true; c = true; vm = true; }; diff --git a/curacao/features.nix b/curacao/features.nix index 8ec040f..d10975b 100644 --- a/curacao/features.nix +++ b/curacao/features.nix @@ -5,6 +5,7 @@ xorg = true; }; dev = { + "3d" = true; c = true; docker = true; vm = true; diff --git a/flake.nix b/flake.nix index e26258e..9dd9fe1 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,7 @@ { jjui = upkgs.jjui; labelle = upkgs.labelle; + orca-slicer = upkgs.orca-slicer; # Not prebuilt in 24.11 for some reason } ) ]; diff --git a/hm/dev/3d.nix b/hm/dev/3d.nix new file mode 100644 index 0000000..1a24f06 --- /dev/null +++ b/hm/dev/3d.nix @@ -0,0 +1,22 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + config = lib.mkIf config.frogeye.dev."3d" { + home = { + packages = with pkgs; [ + blender + openscad + orca-slicer + ]; + }; + programs.nixvim.plugins = { + # TODO Neither seem to do anything... + # openscad.enable = true; + lsp.servers.openscad_lsp.enable = true; + }; + }; +} diff --git a/hm/dev/default.nix b/hm/dev/default.nix index 1a76a94..428fccf 100644 --- a/hm/dev/default.nix +++ b/hm/dev/default.nix @@ -1,6 +1,7 @@ { pkgs, config, ... }: { imports = [ + ./3d.nix ./c.nix ./common.nix ./go.nix diff --git a/hm/extra/default.nix b/hm/extra/default.nix index 03275cc..f791c81 100644 --- a/hm/extra/default.nix +++ b/hm/extra/default.nix @@ -72,9 +72,6 @@ ++ lib.optionals (!stdenv.isAarch64) [ # Musescore is broken on aarch64 musescore - # Blender 4.0.1 can't compile on aarch64 - # https://hydra.nixos.org/job/nixos/release-23.11/nixpkgs.blender.aarch64-linux - blender ] ); }; diff --git a/options.nix b/options.nix index fb15381..c41f68e 100644 --- a/options.nix +++ b/options.nix @@ -64,6 +64,7 @@ in }; }; dev = { + "3d" = lib.mkEnableOption "3D (printing) / CAD stuff"; ansible = lib.mkEnableOption "Ansible dev stuff"; c = lib.mkEnableOption "C/C++ dev stuff"; docker = lib.mkEnableOption "Docker dev stuff";