From 469c42c16585827cc4d85993ae454d4f549989fd Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Sat, 6 May 2023 15:11:16 +0300
Subject: [PATCH] Packages: Add go, fix formatting, make packages.nix and
 fonts.nix take attrsets as args

---
 flake.lock                         | 10 +++++-----
 flake.nix                          | 20 ++++++++++----------
 machines/asus/nixpkgs/default.nix  |  6 +++---
 machines/asus/nixpkgs/fonts.nix    |  2 +-
 machines/asus/nixpkgs/packages.nix |  6 +++++-
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 43aa145..713eeae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,17 +1,17 @@
 {
   "nodes": {
-    "home-manager": {
+    "homeManager": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1682977601,
-        "narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=",
+        "lastModified": 1683276747,
+        "narHash": "sha256-T3st1VBg3wmhHyBQb0z12sTSGsQgiu3mxkS61nLO8Xs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6",
+        "rev": "669669fcb403e3137dfe599bbcc26e60502c3543",
         "type": "github"
       },
       "original": {
@@ -38,7 +38,7 @@
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
+        "homeManager": "homeManager",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 9a11ed1..eb1df02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    home-manager = {
+    homeManager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -21,20 +21,20 @@
 
   outputs = {
     nixpkgs,
-    home-manager,
+    homeManager,
     ...
   }:
   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
+    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 = {
           lib =  nixpkgs.lib;
@@ -52,7 +52,7 @@
 
         modules = [
           directory
-          home-manager.nixosModules.home-manager
+          homeManager.nixosModules.home-manager
 
           # Extra configuration derived from the metadata.
           {
diff --git a/machines/asus/nixpkgs/default.nix b/machines/asus/nixpkgs/default.nix
index d85b174..4200ba0 100644
--- a/machines/asus/nixpkgs/default.nix
+++ b/machines/asus/nixpkgs/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, ... } @ args:
 
 {
-  environment.systemPackages = import ./packages.nix pkgs;
-  fonts.fonts = import ./fonts.nix pkgs;
+  environment.systemPackages = import ./packages.nix args;
+  fonts.fonts = import ./fonts.nix args;
 }
diff --git a/machines/asus/nixpkgs/fonts.nix b/machines/asus/nixpkgs/fonts.nix
index 2148d89..3ad1880 100644
--- a/machines/asus/nixpkgs/fonts.nix
+++ b/machines/asus/nixpkgs/fonts.nix
@@ -1,4 +1,4 @@
-pkgs: with pkgs; []
+{ pkgs, ... }: with pkgs; []
 
 ++ [ (nerdfonts.override { fonts = [ # NERD FONTS
   "JetBrainsMono"
diff --git a/machines/asus/nixpkgs/packages.nix b/machines/asus/nixpkgs/packages.nix
index c33fb91..93b058e 100644
--- a/machines/asus/nixpkgs/packages.nix
+++ b/machines/asus/nixpkgs/packages.nix
@@ -1,4 +1,4 @@
-pkgs: with pkgs; []
+{ pkgs, ... }: with pkgs; []
 
 ++ [ # APPLICATIONS
   firefox
@@ -40,6 +40,10 @@ pkgs: with pkgs; []
   lightly-qt
 ]
 
+++ [ # PROGRAMMING LANGUAGES
+  go
+]
+
 ++ [ # PYTHON
   (python311.withPackages (pkgs: with pkgs; [
     pip