Simplify CI workflow and flake.nix (#16)

.github/workflows/ci.yml

@@ -13,6 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: cachix/install-nix-action@v22
-      - run: nix build .#ci
-      # TODO: Fix issue running darwin-rebuild
-      # - run: ./result/sw/bin/darwin-rebuild switch --flake .
+      - run: nix build .#darwinConfigurations.ci.system
+      # FIXME: error: Directory /run does not exist, aborting activation
+      # - run: ./result/sw/bin/darwin-rebuild switch --flake .#ci

bin/switch

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-./result/sw/bin/darwin-rebuild switch --flake .
+./result/sw/bin/darwin-rebuild switch --flake .#work

flake.nix

@@ -34,39 +34,34 @@
           }
         ];
       };
-      darwinConfigurations = {
-        "ec-2022-127-lp-sestrella" = mkDarwinSystem "aarch64-darwin";
-        "ghactions" = mkDarwinSystem "x86_64-darwin";
-      };
     in
     {
-      inherit darwinConfigurations;
-    } // flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in
-      {
-        devShells.default = devenv.lib.mkShell {
-          inherit inputs pkgs;
-          modules = [
-            ({ pkgs, ... }: {
-              packages = [
-                pkgs.gitleaks
-              ];
-
-              pre-commit.hooks = {
-                luacheck.enable = true;
-                nixpkgs-fmt.enable = true;
-                stylua.enable = true;
-                yamllint.enable = true;
-              };
-            })
-          ];
-        };
+      darwinConfigurations = {
+        ci = mkDarwinSystem "x86_64-darwin";
+        work = mkDarwinSystem "aarch64-darwin";
+      };
+    } // flake-utils.lib.eachSystem [ "aarch64-darwin" "x86_64-darwin" ]
+      (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          devShells.default = devenv.lib.mkShell {
+            inherit inputs pkgs;
+            modules = [
+              ({ pkgs, ... }: {
+                packages = [
+                  pkgs.gitleaks
+                ];
 
-        packages = {
-          ci = darwinConfigurations."ghactions".system;
-          default = darwinConfigurations."ec-2022-127-lp-sestrella".system;
-        };
-      });
+                pre-commit.hooks = {
+                  luacheck.enable = true;
+                  nixpkgs-fmt.enable = true;
+                  stylua.enable = true;
+                  yamllint.enable = true;
+                };
+              })
+            ];
+          };
+        });
 }

home.nix

@@ -25,14 +25,14 @@
     pkgs.aws-vault
     pkgs.awscli2
     pkgs.btop
-    pkgs.circleci-cli
     pkgs.jq
     pkgs.nix-prefetch-git
     pkgs.pstree
     pkgs.tmate
     pkgs.tree
     pkgs.watch
     pkgs.wget
+    pkgs.yq
   ];
 
   programs.autojump.enable = true;