diff --git a/modules/common/programming/openscad.nix b/modules/common/programming/openscad.nix index f733276..6581cd7 100644 --- a/modules/common/programming/openscad.nix +++ b/modules/common/programming/openscad.nix @@ -8,17 +8,19 @@ }; }; }; - config = lib.mkIf (config.gui.enable && config.openscad.enable) { - environment.systemPackages = [ - pkgs.openscad - ]; - lib.mkIf (config.vscode.enable) { - extensions = with pkgs.vscode-extensions; [ - Leathong.openscad-language-support - ]; - }; - }; - # config = lib.mkMerge [ - # (lib.mkIf) - # ] -} \ No newline at end of file + config = lib.mkIf (config.gui.enable && config.openscad.enable) + ( + lib.mkMerge [ + { + environment.systemPackages = [ + pkgs.openscad + ]; + } + (lib.mkIf (config.vscode.enable) { + extensions = with.pkgs.vscode-extensions; [ + Leathong.openscad-language-support + ]; + }) + ] + ); +}