From be00b40c8f5602d553a2a4366e4cc17650c0c4a6 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Mon, 8 Aug 2022 20:24:37 -0300
Subject: [PATCH] improve flake config formatting a bit

---
 minimal/flake.nix  | 19 +++++++++----------
 standard/flake.nix | 40 +++++++++++++++-------------------------
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/minimal/flake.nix b/minimal/flake.nix
index 9623687..6d98fc9 100644
--- a/minimal/flake.nix
+++ b/minimal/flake.nix
@@ -22,22 +22,21 @@
       # FIXME replace with your hostname
       your-hostname = nixpkgs.lib.nixosSystem {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
-
+        specialArgs = { inherit inputs; }; # Pass flake inputs to our config
+        # > Our main nixos configuration file <
         modules = [ ./nixos/configuration.nix ];
-        # Pass inputs down to our config, so that they can consume flake inputs
-        specialArgs = { inherit inputs; };
       };
     };
 
     homeConfigurations = {
       # FIXME replace with your username@hostname
-      "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-
-        modules = [ ./home-manager/home.nix ];
-        # Pass inputs down to our config, so that they can consume flake inputs
-        extraSpecialArgs = { inherit inputs; };
-      };
+      "your-username@your-hostname" =
+        home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
+          # > Our main home-manager configuration file <
+          modules = [ ./home-manager/home.nix ];
+        };
     };
   };
 }
diff --git a/standard/flake.nix b/standard/flake.nix
index 0790034..cdace3a 100644
--- a/standard/flake.nix
+++ b/standard/flake.nix
@@ -27,12 +27,9 @@
         "aarch64-darwin"
         "x86_64-darwin"
       ];
-    in
-    rec {
+    in rec {
       # Your custom packages and modifications
-      overlays = {
-        default = import ./overlay { inherit inputs; };
-      };
+      overlays = { default = import ./overlay { inherit inputs; }; };
 
       # Reusable nixos modules you might want to export
       # These are usually stuff you would upstream into nixpkgs
@@ -53,38 +50,31 @@
         import inputs.nixpkgs {
           inherit system;
           overlays = builtins.attrValues overlays;
-        }
-      );
+        });
 
       nixosConfigurations = {
         # FIXME replace with your hostname
         your-hostname = nixpkgs.lib.nixosSystem {
           pkgs = legacyPackages.x86_64-linux;
-
-          modules = [
+          specialArgs = { inherit inputs; }; # Pass flake inputs to our config
+          modules = (builtins.attrValues nixosModules) ++ [
             # > Our main nixos configuration file <
             ./nixos/configuration.nix
-          ] ++ (builtins.attrValues nixosModules); # Import our reusable nixos modules
-
-          # Pass inputs down to our config, so that they can consume flake inputs
-          specialArgs = { inherit inputs; };
+          ];
         };
       };
 
       homeConfigurations = {
         # FIXME replace with your username@hostname
-        "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
-          pkgs = legacyPackages.x86_64-linux;
-
-          modules = [
-            # > Our main home-manager configuration file <
-            ./home-manager/home.nix
-            # Import our reusable home-manager modules
-          ] ++ (builtins.attrValues homeManagerModules); # Import our reusable home-manager modules
-
-          # Pass inputs down to our config, so that they can consume flake inputs
-          extraSpecialArgs = { inherit inputs; };
-        };
+        "your-username@your-hostname" =
+          home-manager.lib.homeManagerConfiguration {
+            pkgs = legacyPackages.x86_64-linux;
+            extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
+            modules = (builtins.attrValues homeManagerModules) ++ [
+              # > Our main home-manager configuration file <
+              ./home-manager/home.nix
+            ];
+          };
       };
     };
 }