From 0f2162169ce38696b07d6440cc02ff55b7abc136 Mon Sep 17 00:00:00 2001
From: Alex <alexmat2on@protonmail.com>
Date: Fri, 26 Jul 2024 19:17:37 -0400
Subject: [PATCH] thelio76: cleanup

---
 flake.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index a8365db..341cf73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,11 +21,13 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, firefox-addons, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, firefox-addons, ... }@flake-inputs:
     let
       pcUser = "alex";
       pcSystem = "x86_64-linux";
-      mkPcSystem = { user, hostname, system, inputs }: nixpkgs.lib.nixosSystem {
+
+      # This helper function generates a nixos system for a linux PC setup. It defaults the username, architecture, and flake inputs if not provided.
+      mkPcSystem = { user ? pcUser, hostname, system ? pcSystem, inputs ? flake-inputs }: nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
           ./config/hosts/${hostname}
@@ -37,19 +39,8 @@
     {
       nixosConfigurations = {
         ## ---- personal computers (linux) ----
-        nixos76 = mkPcSystem {
-          hostname = "nixos76";
-          user = pcUser;
-          system = pcSystem;
-          inherit inputs;
-        };
-
-        thelio76 = mkPcSystem {
-          hostname = "thelio76";
-          user = pcUser;
-          system = pcSystem;
-          inherit inputs;
-        };
+        nixos76 = mkPcSystem { hostname = "nixos76"; };
+        thelio76 = mkPcSystem { hostname = "thelio76"; };
 
         ## ---- servers ----
         ursa-minor = nixpkgs.lib.nixosSystem {