diff --git a/cad/default.nix b/cad/default.nix
index c3e63d8..0b1c996 100644
--- a/cad/default.nix
+++ b/cad/default.nix
@@ -102,16 +102,19 @@
           # Dev Shell that lets you enter an environment with all the necessary utilites
           # Available through 'nix develop'
           # Also can be activated automatically if direnv is installed on the system with 'direnv allow'
-          devShells.${cfg.devShell.name} = lib.mkIf cfg.devShell.enable (pkgs.mkShell {
-              packages = [
-                pyEnv
-              ];
+          devShells = lib.mkIf cfg.devShell.enable {
+            ${cfg.devShell.name} =
+              pkgs.mkShell {
+                packages = [
+                  pyEnv
+                ];
 
-              shellHook = ''
-                export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
-              '';
-            }
-            // cfg.devShell.extraAttrs);
+                shellHook = ''
+                  export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
+                '';
+              }
+              // cfg.devShell.extraAttrs;
+          };
 
           # Formatter for nix files, available through 'nix fmt'
           treefmt = {
@@ -120,32 +123,35 @@
 
           # Your custom packages
           # Accessible through 'nix build', 'nix shell', 'nix run', etc
-          packages.${cfg.package.name} = lib.mkIf cfg.package.enable (pkgs.runCommand cfg.outputName {}
-            /*
-            bash
-            */
-            ''
-              mkdir $out
-              cd $out
+          packages = lib.mkIf cfg.package.enable {
+            ${cfg.package.name} =
+              pkgs.runCommand cfg.outputName {}
+              /*
+              bash
+              */
+              ''
+                mkdir $out
+                cd $out
 
-              ${pyEnv}/bin/python ${cfg.builder}
+                ${pyEnv}/bin/python ${cfg.builder}
 
-              ${
-                if cfg.outputName != ""
-                then
-                  /*
-                  bash
-                  */
-                  ''
-                    for ext in ${lib.concatStringsSep " " outputExt}; do
-                      if [[ -f output.$ext ]]; then
-                        mv output.$ext ${cfg.outputName}.$ext
-                      fi
-                    done
-                  ''
-                else ""
-              }
-            '');
+                ${
+                  if cfg.outputName != ""
+                  then
+                    /*
+                    bash
+                    */
+                    ''
+                      for ext in ${lib.concatStringsSep " " outputExt}; do
+                        if [[ -f output.$ext ]]; then
+                          mv output.$ext ${cfg.outputName}.$ext
+                        fi
+                      done
+                    ''
+                  else ""
+                }
+              '';
+          };
         };
       });
     };
diff --git a/rust/default.nix b/rust/default.nix
index 07084cc..f87feb4 100644
--- a/rust/default.nix
+++ b/rust/default.nix
@@ -135,15 +135,18 @@
           # Dev Shell that lets you enter an environment with all the necessary utilites
           # Available through 'nix develop'
           # Also can be activated automatically if direnv is installed on the system with 'direnv allow'
-          devShells.${cfg.devShell.name} = lib.mkIf cfg.devShell.enable (craneLib.devShell {
-              inherit (self') checks;
+          devShells = lib.mkIf cfg.devShell.enable {
+            ${cfg.devShell.name} =
+              craneLib.devShell {
+                inherit (self') checks;
 
-              # extra tooling dependencies
-              packages = cfg.devDeps;
+                # extra tooling dependencies
+                packages = cfg.devDeps;
 
-              inputsFrom = [self'.packages.${cfg.package.name}];
-            }
-            // cfg.devShell.extraAttrs);
+                inputsFrom = [self'.packages.${cfg.package.name}];
+              }
+              // cfg.devShell.extraAttrs;
+          };
 
           # Formatter for nix files, available through 'nix fmt'
           treefmt = {
@@ -156,10 +159,13 @@
 
           # Your custom packages
           # Accessible through 'nix build', 'nix shell', 'nix run', etc
-          packages.${cfg.package.name} = lib.mkIf cfg.package.enable (craneLib.buildPackage {
-              inherit src buildInputs nativeBuildInputs cargoArtifacts;
-            }
-            // cfg.package.extraAttrs);
+          packages = lib.mkIf cfg.package.enable {
+            ${cfg.package.name} =
+              craneLib.buildPackage {
+                inherit src buildInputs nativeBuildInputs cargoArtifacts;
+              }
+              // cfg.package.extraAttrs;
+          };
 
           checks = {
             clippy = craneLib.cargoClippy {