From 812b7b53a15957b48ea8cbb6e1334667675d168b Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Sat, 6 May 2023 16:11:17 +0300
Subject: [PATCH] Clean: Reformat

---
 flake.nix                          | 36 +++++++++++++-----------------
 machines/asus/nixpkgs/fonts.nix    | 10 ++++++---
 machines/asus/nixpkgs/packages.nix | 16 +++++++------
 machines/asus/nushell/default.nix  |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8e5a126..3d1f00a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,7 @@
       nix-command
       flakes
     '';
+
     extra-substituters = "https://nix-community.cachix.org";
     extra-trusted-public-keys = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
   };
@@ -24,21 +25,16 @@
     };
   };
 
-  outputs = {
-    nixpkgs,
-    home-manager,
-    fenix,
-    ...
-  }:
+  outputs = { nixpkgs, home-manager, fenix, ... }:
+
+  with {
+    importConfiguration = configDirectory:
+    with {
+      hostName = builtins.baseNameOf configDirectory;
+      hostPlatform = import (configDirectory + "/platform.nix");
+      userName = import (configDirectory + "/username.nix");
+    };
 
-  let
-    importConfiguration = directory:
-    let
-      hostPlatform = import (directory + "/platform.nix");
-      # The folder name is the host name of the machine.
-      hostName = builtins.baseNameOf directory;
-      userName = import (directory + "/username.nix");
-    in
     {
       nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem {
         specialArgs = {
@@ -46,9 +42,7 @@
             system = hostPlatform;
             config.allowUnfree = true;
 
-            overlays = [
-              fenix.overlays.default
-            ];
+            overlays = [fenix.overlays.default];
           };
 
           # Helper function for DRY.
@@ -58,7 +52,7 @@
         };
 
         modules = [
-          directory
+          configDirectory
           home-manager.nixosModules.home-manager
 
           {
@@ -67,7 +61,7 @@
               "flakes"
             ];
 
-            networking.hostName = builtins.baseNameOf directory;
+            networking.hostName = hostName;
             nixpkgs.hostPlatform = hostPlatform;
 
             home-manager.useGlobalPkgs = true;
@@ -76,8 +70,8 @@
         ];
       };
     };
-  in
-  # Basically imports all machines in ./machines/.
+  };
+
   builtins.foldl' nixpkgs.lib.recursiveUpdate {} (builtins.map importConfiguration [
     ./machines/asus # HACK: Use a function to list the directory.
   ]);
diff --git a/machines/asus/nixpkgs/fonts.nix b/machines/asus/nixpkgs/fonts.nix
index 2148d89..1f684c0 100644
--- a/machines/asus/nixpkgs/fonts.nix
+++ b/machines/asus/nixpkgs/fonts.nix
@@ -1,5 +1,9 @@
 pkgs: with pkgs; []
 
-++ [ (nerdfonts.override { fonts = [ # NERD FONTS
-  "JetBrainsMono"
-]; }) ]
+++ [ # NERD FONTS
+  (nerdfonts.override {
+    fonts = [
+      "JetBrainsMono"
+    ];
+  })
+]
diff --git a/machines/asus/nixpkgs/packages.nix b/machines/asus/nixpkgs/packages.nix
index 5b405c0..af982a6 100644
--- a/machines/asus/nixpkgs/packages.nix
+++ b/machines/asus/nixpkgs/packages.nix
@@ -53,13 +53,15 @@ pkgs: with pkgs; []
   poetry
 ]
 
-++ [ (fenix.complete.withComponents [ # RUST
-  "rustc"
-  "rust-src"
-  "cargo"
-  "rustfmt"
-  "clippy"
-]) ]
+++ [ # RUST
+  (fenix.complete.withComponents [
+    "rustc"
+    "rust-src"
+    "cargo"
+    "rustfmt"
+    "clippy"
+  ])
+]
 
 ++ [ # SHELLS
   # nushell # Declared in nushell/.
diff --git a/machines/asus/nushell/default.nix b/machines/asus/nushell/default.nix
index 7f12dff..858fcb2 100644
--- a/machines/asus/nushell/default.nix
+++ b/machines/asus/nushell/default.nix
@@ -7,7 +7,7 @@ homeManagerConfiguration {
     envFile.source = ./env.nu;
 
     shellAliases = {
-      g  = "git";
+      g = "git";
       ga = "git add";
       gb = "git branch";
       gc = "git commit -m";