From 4644c20b2f4710d3b3ed51ab06abe88517ad337d Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Sat, 6 May 2023 15:39:55 +0300
Subject: [PATCH] Packages: Add rust, attempt 2

---
 flake.nix                          | 12 ++++--------
 machines/asus/nixpkgs/default.nix  |  6 +++---
 machines/asus/nixpkgs/fonts.nix    |  2 +-
 machines/asus/nixpkgs/packages.nix |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 426c191..3d016d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,19 +43,19 @@
     {
       nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem {
         specialArgs = {
-          lib = nixpkgs.lib;
-
           pkgs = import nixpkgs {
             system = hostPlatform;
             config.allowUnfree = true;
+
+            overlays = [
+              fenix.overlays.default
+            ];
           };
 
           # Helper function for DRY.
           homeManagerConfiguration = attrs: {
             home-manager.users.${userName} = attrs;
           };
-
-          inherit fenix;
         };
 
         modules = [
@@ -64,11 +64,7 @@
 
           {
             networking.hostName = builtins.baseNameOf directory;
-
             nixpkgs.hostPlatform = hostPlatform;
-            nixpkgs.overlays = [
-              fenix.overlays.default
-            ];
 
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
diff --git a/machines/asus/nixpkgs/default.nix b/machines/asus/nixpkgs/default.nix
index ebd9960..d85b174 100644
--- a/machines/asus/nixpkgs/default.nix
+++ b/machines/asus/nixpkgs/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, fenix, ... } @ args:
+{ pkgs, ... }:
 
 {
-  environment.systemPackages = import ./packages.nix args;
-  fonts.fonts = import ./fonts.nix args;
+  environment.systemPackages = import ./packages.nix pkgs;
+  fonts.fonts = import ./fonts.nix pkgs;
 }
diff --git a/machines/asus/nixpkgs/fonts.nix b/machines/asus/nixpkgs/fonts.nix
index 3ad1880..2148d89 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 8c5f0bf..5b405c0 100644
--- a/machines/asus/nixpkgs/packages.nix
+++ b/machines/asus/nixpkgs/packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, fenix, ... }: with pkgs; []
+pkgs: with pkgs; []
 
 ++ [ # APPLICATIONS
   firefox