Cleanup And Trying To Add OpenSCAD

flake.nix

@@ -46,14 +46,23 @@
     in
     rec
     {
-      nix.settings.extra-substituters = [
+      nix = {
-        "https://cache.lix.systems"
+        settings = {
-        "https://cache.nix.org"
+          extra-substituters = [
-      ];
+            "https://cache.lix.systems"
+            "https://cache.nix.org"
+          ];
+          trusted-public-keys = [
+            "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+          ];
+        };
+        gc = {
+          automatic = true;
+          randomizedDelaySec = "14m";
+          options = "--delete-order-than 10d";
+        };
+      };
       
-      nix.settings.trusted-public-keys = [
-        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-      ];
       nixosConfigurations = {
         kim = import ./hosts/kim {
           inherit inputs globals;

hosts/kim/default.nix

@@ -92,11 +92,6 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # TODO: Move this out
 
-      nix.gc = {
-        automatic = true;
-        randomizedDelaySec = "14m";
-        options = "--delete-older-than 10d";
-      };
     }
   ];
 }

modules/common/programming/default.nix

@@ -2,6 +2,7 @@
 {
   imports = [
     ./nixpkgs-fmt.nix
+    ./openscad.nix
     ./platformio.nix
     ./python.nix
     ./vscode.nix

modules/common/programming/openscad.nix

@@ -0,0 +1,24 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    openscad = {
+      enable = lib.mkEnableOption {
+        description = "Enable openSCAD";
+        default = false;
+      };
+    };
+  };
+  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)
+  # ]
+}