From 6f0bf969a82db394dd15353079b2140b5f7f3de1 Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Sun, 14 May 2023 13:18:37 +0300
Subject: [PATCH] Rename packages to systemPackages and add homePackages for
 better handling of packages

---
 flake.nix                         | 28 +++++++++++++++++-----------
 machines/asus/discord/default.nix |  4 ++--
 machines/asus/fonts.nix           |  4 ++--
 machines/asus/openttd/default.nix |  4 ++--
 machines/asus/packages.nix        |  4 ++--
 machines/asus/python/default.nix  |  4 ++--
 6 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index 60d26b1..687968d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,25 +51,31 @@
           ];
         };
 
-        # Helper functions for readability & DRY.
+        # SYSTEM
         systemConfiguration = attributes: attributes;
 
-        homeConfiguration = userName: attributes: {
-          home-manager.users.${userName} = attributes;
-        };
-
-        imports = importPaths: {
-          imports = importPaths;
-        };
-
-        packages = packages: {
+        systemPackages = packages: systemConfiguration {
           environment.systemPackages = packages;
         };
 
-        fonts = fonts: {
+        systemFonts = fonts: systemConfiguration {
           fonts.fonts = fonts;
         };
 
+        # HOME
+        homeConfiguration = userName: attributes: systemConfiguration {
+          home-manager.users.${userName} = attributes;
+        };
+
+        homePackages = userName: packages: homeConfiguration userName {
+          home.packages = packages;
+        };
+
+        # GENERAL
+        imports = importPaths: {
+          imports = importPaths;
+        };
+
         enabled = attributes: attributes // {
           enable = true;
         };
diff --git a/machines/asus/discord/default.nix b/machines/asus/discord/default.nix
index a226aa5..2c5054e 100644
--- a/machines/asus/discord/default.nix
+++ b/machines/asus/discord/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, packages, ... }:
+{ pkgs, systemPackages, ... }:
 
-with pkgs; packages [
+with pkgs; systemPackages [
     discord
 ]
diff --git a/machines/asus/fonts.nix b/machines/asus/fonts.nix
index 7de55f7..2531817 100644
--- a/machines/asus/fonts.nix
+++ b/machines/asus/fonts.nix
@@ -1,6 +1,6 @@
-{ pkgs, fonts, ... }:
+{ pkgs, systemFonts, ... }:
 
-with pkgs; fonts [
+with pkgs; systemFonts [
   (nerdfonts.override {
     fonts = [
       "JetBrainsMono"
diff --git a/machines/asus/openttd/default.nix b/machines/asus/openttd/default.nix
index a2e00b3..af57383 100644
--- a/machines/asus/openttd/default.nix
+++ b/machines/asus/openttd/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, packages, ... }:
+{ pkgs, systemPackages, ... }:
 
-with pkgs; packages [
+with pkgs; systemPackages [
     openttd
 ]
diff --git a/machines/asus/packages.nix b/machines/asus/packages.nix
index 0cdd5a5..f202431 100644
--- a/machines/asus/packages.nix
+++ b/machines/asus/packages.nix
@@ -1,6 +1,6 @@
-{ pkgs, packages, ... }:
+{ pkgs, systemPackages, ... }:
 
-with pkgs; packages [
+with pkgs; systemPackages [
   bat
   htop
   neofetch
diff --git a/machines/asus/python/default.nix b/machines/asus/python/default.nix
index e7e348b..36d3f2b 100644
--- a/machines/asus/python/default.nix
+++ b/machines/asus/python/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, homeConfiguration, packages, enabled, ... }:
+{ pkgs, homeConfiguration, systemPackages, enabled, ... }:
 
-(with pkgs; packages [
+(with pkgs; systemPackages [
   (python311.withPackages (pkgs: with pkgs; [
     pip
     requests