chore: clean up flake

Signed-off-by: jolheiser <john.olheiser@gmail.com>

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 
     home-manager = {
@@ -17,7 +18,6 @@
         home-manager.follows = "";
       };
     };
-    flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     nur.url = "github:nix-community/NUR";
@@ -125,8 +125,7 @@
       inputs.golink.overlay
     ];
     pkgs = import nixpkgs {
-      inherit overlays;
-      system = "x86_64-linux";
+      inherit overlays system;
       config.allowUnfree = true;
     };
     userSecret = path: {
@@ -191,8 +190,8 @@
       })
     ];
     username = "jolheiser";
-  in
-    {
+    system = "x86_64-linux";
+  in {
     homeConfigurations = let
       commonModules = [
         {
@@ -229,7 +228,7 @@
     };
     nixosConfigurations = {
       "chai" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        inherit system;
         modules =
           workModules
           ++ [
@@ -237,7 +236,7 @@
           ];
       };
       "earlgrey" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        inherit system;
         modules =
           workModules
           ++ [
@@ -245,7 +244,7 @@
           ];
       };
       "masala" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        inherit system;
         modules =
           workModules
           ++ [
@@ -254,7 +253,7 @@
           ];
       };
       "matcha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        inherit system;
         modules = [
           agenix.nixosModules.default
           ./machines/matcha
@@ -262,7 +261,7 @@
         ];
       };
       "genmaicha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        inherit system;
         modules = [
           nixos-hardware.nixosModules.framework-13-7040-amd
           agenix.nixosModules.default
@@ -271,7 +270,7 @@
         ];
       };
       "sencha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        inherit system;
         modules = [
           agenix.nixosModules.default
           ./machines/sencha
@@ -282,8 +281,7 @@
     colmena = {
       meta = {
         nixpkgs = import nixpkgs {
-            system = "x86_64-linux";
-            overlays = overlays;
+          inherit overlays system;
         };
       };
       dragonwell = {
@@ -299,15 +297,11 @@
       extra-substitutors = ["https://jolheiser.cachix.org"];
       extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
     };
-    }
-    // inputs.flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      devShells.default = pkgs.mkShell {
+    devShells.${system}.default = pkgs.mkShell {
       nativeBuildInputs = [
         agenix.packages.${system}.agenix
         pkgs.colmena
       ];
     };
-    });
+  };
 }