From cc4e8b86cd39126bf8dc10f08ade3b39923439be Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Wed, 13 Nov 2024 23:33:49 -0600
Subject: [PATCH] removed nixpkgs-small, trying env var

---
 base.nix   |  1 -
 flake.lock | 17 -----------------
 flake.nix  | 39 +++++++++++++++------------------------
 3 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/base.nix b/base.nix
index cd0f422..0c61a9c 100644
--- a/base.nix
+++ b/base.nix
@@ -48,7 +48,6 @@
   console = {
     font = "Lat2-Terminus16";
     keyMap = "us";
-    #  useXkbConfig = true; # use xkbOptions in tty.
   };
   security = {
     polkit.enable = true;
diff --git a/flake.lock b/flake.lock
index 6a6a480..f3ca676 100644
--- a/flake.lock
+++ b/flake.lock
@@ -373,22 +373,6 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
       }
     },
-    "nixpkgs-small": {
-      "locked": {
-        "lastModified": 1731518944,
-        "narHash": "sha256-tmzIz0iCCnnqXFS/lGkl1/+lGMn8lTiMshzd0v8LwYk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "18979df9f0be9d69f0e4d35059914c1a868c79b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1730741070,
@@ -517,7 +501,6 @@
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-chrome": "nixpkgs-chrome",
-        "nixpkgs-small": "nixpkgs-small",
         "sops-nix": "sops-nix",
         "ucodenix": "ucodenix",
         "zen-browser": "zen-browser"
diff --git a/flake.nix b/flake.nix
index 03aadbc..32b541a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
   description = "JawZ NixOS flake setup";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
     nixpkgs-chrome.url = "github:nixos/nixpkgs?rev=05bbf675397d5366259409139039af8077d695ce";
     ucodenix.url = "github:e-tho/ucodenix";
     nix-gaming.url = "github:fufexan/nix-gaming";
@@ -23,10 +22,7 @@
   };
 
   outputs =
-    {
-      self,
-      ...
-    }@inputs:
+    { self, ... }@inputs:
     let
       inherit (self) outputs;
       lib = inputs.nixpkgs.lib // inputs.home-manager.lib;
@@ -37,26 +33,21 @@
           inherit system;
           config.allowUnfree = true;
         };
-      makePkgsMain =
-        name: makePkgs (if name == "workstation" then inputs.nixpkgs else inputs.nixpkgs-small);
-      createConfig =
-        name:
-        let
-          pkgs = makePkgsMain name;
-          pkgs-chrome = makePkgs inputs.nixpkgs-chrome;
-        in
-        {
-          inherit system;
-          specialArgs = {
-            inherit inputs outputs pkgs;
-          };
-          modules = [
-            { nixpkgs.overlays = [ (import ./overlay.nix { inherit pkgs pkgs-chrome; }) ]; }
-            ./hosts/${name}/configuration.nix
-            inputs.sops-nix.nixosModules.sops
-            inputs.nixos-cosmic.nixosModules.default
-          ];
+      pkgs = makePkgs inputs.nixpkgs;
+      pkgs-chrome = makePkgs inputs.nixpkgs-chrome;
+      overlayFile = import ./overlay.nix { inherit pkgs pkgs-chrome; };
+      createConfig = name: {
+        inherit system;
+        specialArgs = {
+          inherit inputs outputs;
         };
+        modules = [
+          { nixpkgs.overlays = [ overlayFile ]; }
+          ./hosts/${name}/configuration.nix
+          inputs.sops-nix.nixosModules.sops
+          inputs.nixos-cosmic.nixosModules.default
+        ];
+      };
     in
     {
       inherit lib;