From b1d30cce24f6e01741b17efaf1218eb878cb4146 Mon Sep 17 00:00:00 2001
From: Christopher James Hayward <chris@chrishayward.xyz>
Date: Tue, 17 May 2022 12:36:51 -0400
Subject: [PATCH] Move import

---
 README.org | 39 ++++++++++++++++++++-------------------
 flake.nix  | 39 ++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/README.org b/README.org
index 94e1d66..b843f2e 100644
--- a/README.org
+++ b/README.org
@@ -127,9 +127,8 @@ RUN nix-shell /etc/dotfiles/shell.nix
     nixosConfigurations = {
       <<host-default>>
     };
-  } // inputs.flake-utils.lib.eachDefaultSystem (system:
+  } //
     <<development-shells>>
-  );
 }
 #+END_SRC
 
@@ -189,23 +188,25 @@ The command ~nix develop~ will run a bash shell that provides the build environm
 
 #+NAME: development-shells
 #+BEGIN_SRC nix
-let
-  pkgs = inputs.nixpkgs.legacyPackages.${system};
-in
-  rec {
-    devShells = {
-      default = import ./shell.nix { inherit pkgs; };
-      cc = import ./shells/cc.nix { inherit pkgs; };
-      docker = import ./shells/docker.nix { inherit pkgs; };
-      go = import ./shells/go.nix { inherit pkgs; };
-      grpc = import ./shells/grpc.nix { inherit pkgs; };
-      heroku = import ./shells/heroku.nix { inherit pkgs; };
-      java = import ./shells/java.nix { inherit pkgs; };
-      node = import ./shells/node.nix { inherit pkgs; };
-      python = import ./shells/python.nix { inherit pkgs; };
-      rust = import ./shells/rust.nix { inherit pkgs; };
-    };
-  }
+inputs.flake-utils.lib.eachDefaultSystem (system:
+  let
+    pkgs = inputs.nixpkgs.legacyPackages.${system};
+  in
+    rec {
+      devShells = {
+        default = import ./shell.nix { inherit pkgs; };
+        cc = import ./shells/cc.nix { inherit pkgs; };
+        docker = import ./shells/docker.nix { inherit pkgs; };
+        go = import ./shells/go.nix { inherit pkgs; };
+        grpc = import ./shells/grpc.nix { inherit pkgs; };
+        heroku = import ./shells/heroku.nix { inherit pkgs; };
+        java = import ./shells/java.nix { inherit pkgs; };
+        node = import ./shells/node.nix { inherit pkgs; };
+        python = import ./shells/python.nix { inherit pkgs; };
+        rust = import ./shells/rust.nix { inherit pkgs; };
+      };
+    }
+);
 #+END_SRC
 
 ** Nix
diff --git a/flake.nix b/flake.nix
index 0dbd529..58917b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,23 +42,24 @@
         ];
       };
     };
-  } // inputs.flake-utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = inputs.nixpkgs.legacyPackages.${system};
-    in
-      rec {
-        devShells = {
-          default = import ./shell.nix { inherit pkgs; };
-          cc = import ./shells/cc.nix { inherit pkgs; };
-          docker = import ./shells/docker.nix { inherit pkgs; };
-          go = import ./shells/go.nix { inherit pkgs; };
-          grpc = import ./shells/grpc.nix { inherit pkgs; };
-          heroku = import ./shells/heroku.nix { inherit pkgs; };
-          java = import ./shells/java.nix { inherit pkgs; };
-          node = import ./shells/node.nix { inherit pkgs; };
-          python = import ./shells/python.nix { inherit pkgs; };
-          rust = import ./shells/rust.nix { inherit pkgs; };
-        };
-      }
-  );
+  } //
+    inputs.flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = inputs.nixpkgs.legacyPackages.${system};
+      in
+        rec {
+          devShells = {
+            default = import ./shell.nix { inherit pkgs; };
+            cc = import ./shells/cc.nix { inherit pkgs; };
+            docker = import ./shells/docker.nix { inherit pkgs; };
+            go = import ./shells/go.nix { inherit pkgs; };
+            grpc = import ./shells/grpc.nix { inherit pkgs; };
+            heroku = import ./shells/heroku.nix { inherit pkgs; };
+            java = import ./shells/java.nix { inherit pkgs; };
+            node = import ./shells/node.nix { inherit pkgs; };
+            python = import ./shells/python.nix { inherit pkgs; };
+            rust = import ./shells/rust.nix { inherit pkgs; };
+          };
+        }
+    );
 }