imp: adds default, dev devshell

* Default shell with basic fmt and commit hook pkgs
* Dev shell with rust tooling and extra utility pkgs
* Exclude Cargo.lock from editorconfig indent rule
* Misc alejandra updates

Author: johnalotoski

.editorconfig

@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[Cargo.lock]
+indent_size = unset
+
 # Use 4 spaces for the Python files
 [*.py]
 indent_size = 4

.envrc

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+# default devshell target includes pkgs for code formatting and commit hooks
+# dev devshell target includes rust dev and hashicorp/cert related pkgs
+
+[ -f .envrc.local ] && source_env .envrc.local
+DEVSHELL_TARGET=${DEVSHELL_TARGET:-default}
+
+source_url \
+  "https://raw.githubusercontent.com/divnix/std/main/direnv_lib.sh" \
+  "sha256-JkRxy5PilGkOQcI/KaiZeyJKUTMTKduQwsw/ayUyz4k="
+use std nix "//automation/devshells:${DEVSHELL_TARGET}"

modules/terraform.nix

@@ -417,7 +417,7 @@
                   cidr = net.cidr.subnet 8 idx cidr;
                   availabilityZone =
                     var
-                      "element(module.instance_types_to_azs.availability_zones, ${toString idx})";
+                    "element(module.instance_types_to_azs.availability_zones, ${toString idx})";
                 }))
               lib.listToAttrs
             ];

modules/terraform/clients.nix

@@ -195,8 +195,8 @@ in {
     resource.aws_s3_bucket_object = lib.flip lib.mapAttrs' config.cluster.awsAutoScalingGroups (name: group:
       lib.nameValuePair "${name}-flake" rec {
         bucket = config.cluster.s3Bucket;
-        key    = with config; "infra/secrets/${cluster.name}/${cluster.kms}/source/${name}-source.tar.xz";
-        etag  = var ''filemd5("${source}")'';
+        key = with config; "infra/secrets/${cluster.name}/${cluster.kms}/source/${name}-source.tar.xz";
+        etag = var ''filemd5("${source}")'';
         source = "${pkgs.runCommand "source.tar.xz" {} ''
           tar cvf $out -C ${config.cluster.flakePath} .
         ''}";
@@ -344,7 +344,8 @@ in {
       requesterMeshPeeringOptions = mapAwsAsgVpcPeers (link:
         lib.nameValuePair "${link.connector}-connect-${link.accepter}" {
           provider = awsProviderFor link.connector;
-          vpc_peering_connection_id = id
+          vpc_peering_connection_id =
+            id
             "aws_vpc_peering_connection_accepter.${link.accepter}-accept-${link.connector}";
 
           requester = {allow_remote_vpc_dns_resolution = true;};
@@ -388,7 +389,7 @@ in {
         name = group.uid;
         inherit (group.iam.instanceProfile) path;
         role = var "data.aws_iam_role.${config.cluster.iam.roles.client.uid}.name";
-        lifecycle = [{ create_before_destroy = true; }];
+        lifecycle = [{create_before_destroy = true;}];
       });
 
     data.aws_iam_role = let
@@ -411,7 +412,8 @@ in {
               inherit (policy) condition;
             });
         };
-    in lib.mapAttrs' op role.policies;
+    in
+      lib.mapAttrs' op role.policies;
 
     resource.aws_iam_role_policy = let
       # deploy for client role
@@ -422,7 +424,8 @@ in {
           role = id "data.aws_iam_role.${role.uid}";
           policy = var "data.aws_iam_policy_document.${policy.uid}.json";
         };
-    in lib.mapAttrs' op role.policies;
+    in
+      lib.mapAttrs' op role.policies;
 
     resource.aws_security_group =
       lib.flip lib.mapAttrsToList config.cluster.awsAutoScalingGroups

modules/terraform/core.nix

@@ -230,12 +230,12 @@ in {
       "${client.uid}" = {
         name = "core-${client.uid}";
         assume_role_policy = client.assumePolicy.tfJson;
-        lifecycle = [{ create_before_destroy = true; }];
+        lifecycle = [{create_before_destroy = true;}];
       };
       "${core.uid}" = {
         name = core.uid;
         assume_role_policy = core.assumePolicy.tfJson;
-        lifecycle = [{ create_before_destroy = true; }];
+        lifecycle = [{create_before_destroy = true;}];
       };
     };
 

nix/automation/devshells.nix

@@ -26,6 +26,14 @@
       ]);
 in {
   default = std.lib.mkShell {
+    imports = [
+      capsules.base
+      capsules.tools
+      capsules.integrations
+      capsules.hooks
+    ];
+  };
+  dev = std.lib.mkShell {
     packages = rust-dev-pkgs;
     language.rust = {
       packageSet = rustPlatform;
@@ -52,5 +60,14 @@ in {
       capsules.integrations
       capsules.hooks
     ];
+    commands = let
+      withCategory = category: attrset: attrset // {inherit category;};
+      bitte = withCategory "bitte";
+    in
+      with nixpkgs; [
+        (bitte {package = awscli;})
+        (bitte {package = cfssl;})
+        (bitte {package = cue;})
+      ];
   };
 }

nix/cli/packages/cli/.envrc

@@ -16,8 +16,8 @@ in {
 
   systemd.mounts = [
     (lib.mkIf cfg.enable {
-      after = [ "consul.service" "dnsmasq.service" ];
-      wants = [ "consul.service" "dnsmasq.service" ];
+      after = ["consul.service" "dnsmasq.service"];
+      wants = ["consul.service" "dnsmasq.service"];
       what = "glusterd.service.consul:/gv0";
       where = "/mnt/gv0";
       type = "glusterfs";