refactor: make nixd happy

common/modules/cachix.nix

@@ -3,8 +3,8 @@
   pkgs,
   ...
 }: {
-  environment.systemPackages = with pkgs; [
-    (writeShellApplication {
+  environment.systemPackages = [
+    (pkgs.writeShellApplication {
       name = "rebuild-no-cache";
       runtimeInputs = [config.programs.nh.package];
       text = ''

common/overlays/nix/patch

@@ -1,12 +0,0 @@
-diff --git a/src/libstore/path.cc b/src/libstore/path.cc
-index e642abcd5..0e584ef33 100644
---- a/src/libstore/path.cc
-+++ b/src/libstore/path.cc
-@@ -12,7 +12,7 @@ static void checkName(std::string_view path, std::string_view name)
-         if (!((c >= '0' && c <= '9')
-                 || (c >= 'a' && c <= 'z')
-                 || (c >= 'A' && c <= 'Z')
--                || c == '+' || c == '-' || c == '.' || c == '_' || c == '?' || c == '='))
-+                || c == '+' || c == '-' || c == '.' || c == '_' || c == '?' || c == '=' || c == '!'))
-             throw BadStorePath("store path '%s' contains illegal character '%s'", path, c);
- }

common/vars/default.nix

@@ -35,16 +35,17 @@ in {
       default = import ./prompt-schemes.nix cfg.promptMainColor;
 
       readOnly = true;
-      type = with types;
-        submodule {
-          options = {
-            textColor = mkOption {type = str;};
-            firstColor = mkOption {type = str;};
-            secondColor = mkOption {type = str;};
-            thirdColor = mkOption {type = str;};
-            fourthColor = mkOption {type = str;};
-          };
+      type = types.submodule {
+        options = let
+          inherit (types) str;
+        in {
+          textColor = mkOption {type = str;};
+          firstColor = mkOption {type = str;};
+          secondColor = mkOption {type = str;};
+          thirdColor = mkOption {type = str;};
+          fourthColor = mkOption {type = str;};
         };
+      };
     };
 
     configDir = mkOption {