From 9920928a745a3a51cfecf988b0a07fa186761d4c Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Wed, 10 May 2023 23:17:02 +0300
Subject: [PATCH] Apply fixes

---
 flake.nix                  | 14 +++++++-------
 machines/asus/platform.nix |  1 +
 rebuild.sh                 | 10 +++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 machines/asus/platform.nix

diff --git a/flake.nix b/flake.nix
index 01583d6..b7648b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
 
     importConfiguration = configurationDirectory: let
       hostName = builtins.baseNameOf configurationDirectory;
-      hostPlatform = import configurationDirectory + "/platform.nix";
+      hostPlatform = import (configurationDirectory + "/platform.nix");
     in {
       nixosConfigurations.${hostName} = nixosSystem {
         lib = nixpkgs.lib;
@@ -54,24 +54,24 @@
         # Helper functions for readability & DRY.
         systemConfiguration = attributes: attributes;
 
-        homeConfiguration = userName: attributes: systemConfiguration {
+        homeConfiguration = userName: attributes: {
           home-manager.users.${userName} = attributes;
         };
 
-        imports = importPaths: systemConfiguration {
+        imports = importPaths: {
           imports = importPaths;
         };
 
-        packages = packages: systemConfiguration {
+        packages = packages: {
           environment.systemPackages = packages;
         };
 
-        fonts = fonts: systemConfiguration {
-          fonts.fonts = packages;
+        fonts = fonts: {
+          fonts.fonts = fonts;
         };
 
         enabled = attributes: attributes // {
-          enabled = true;
+          enable = true;
         };
 
         normalUser = attributes: attributes // {
diff --git a/machines/asus/platform.nix b/machines/asus/platform.nix
new file mode 100644
index 0000000..132026a
--- /dev/null
+++ b/machines/asus/platform.nix
@@ -0,0 +1 @@
+"x86_64-linux"
diff --git a/rebuild.sh b/rebuild.sh
index 9f00fcd..4c5ae6a 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -3,13 +3,13 @@
 if [[ $1 == "-h" || $1 == "--help" ]]; then
     echo "Usage: $0 [-h | --help] [-c | --clean-garbage] [machine]"
     exit
-fi<
+fi
 
-if [[ -n $1 ]]; then
+if [[ $1 != "" ]]; then
   if [[ $1 != "-c" && $1 != "--clean-garbage" ]]; then
-    machine = $1
-  elif [[ -n $2 ]]; then
-    machine = $1
+    machine=$1
+  elif [[ $2 != "" ]]; then
+    machine=$2
   else
     read -p "What machine would you want to build? [$(ls --format=commas machines)]: " machine
   fi