From d6450db07efe55655525a67384a6470e7f1e3c6d Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Wed, 13 Nov 2024 17:26:13 -0600 Subject: [PATCH] added nixpkgs-small for the servers --- flake.lock | 51 ++++++++++++++++++++++++++++++++++----------------- flake.nix | 19 +++++++++++-------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 8124399..2b0199f 100644 --- a/flake.lock +++ b/flake.lock @@ -345,6 +345,22 @@ "type": "github" } }, + "nixpkgs-chrome": { + "locked": { + "lastModified": 1720494119, + "narHash": "sha256-IE7PZn9bSjxI4/MugjAEx49oPoxu0uKXdfC+X7HcRuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "05bbf675397d5366259409139039af8077d695ce", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "05bbf675397d5366259409139039af8077d695ce", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1730504152, @@ -357,6 +373,22 @@ "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, @@ -405,22 +437,6 @@ "type": "github" } }, - "nixpkgsC": { - "locked": { - "lastModified": 1720494119, - "narHash": "sha256-IE7PZn9bSjxI4/MugjAEx49oPoxu0uKXdfC+X7HcRuQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "05bbf675397d5366259409139039af8077d695ce", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "05bbf675397d5366259409139039af8077d695ce", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730958623, @@ -516,7 +532,8 @@ "nix-gaming": "nix-gaming", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_3", - "nixpkgsC": "nixpkgsC", + "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 32fd8e1..977880d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "JawZ NixOS flake setup"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgsC.url = "github:nixos/nixpkgs?rev=05bbf675397d5366259409139039af8077d695ce"; + 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"; hyprland.url = "github:hyprwm/Hyprland"; @@ -37,12 +38,14 @@ config.allowUnfree = true; }; pkgs = makePkgs inputs.nixpkgs; - pkgsC = makePkgs inputs.nixpkgsC; - overlays = [ (import ./overlay.nix { inherit pkgs pkgsC; }) ]; - createConfig = name: { + pkgs-small = makePkgs inputs.nixpkgs-small; + pkgs-chrome = makePkgs inputs.nixpkgs-chrome; + overlays = [ (import ./overlay.nix { inherit pkgs pkgs-chrome; }) ]; + createConfig = name: packageSet: { inherit system; specialArgs = { inherit inputs outputs; + pkgs = packageSet; }; modules = [ (_: { nixpkgs.overlays = overlays; }) @@ -53,12 +56,12 @@ }; in { - inherit lib pkgs; + inherit lib; formatter = pkgs.alejandra; nixosConfigurations = { - workstation = lib.nixosSystem (createConfig "workstation"); - miniserver = lib.nixosSystem (createConfig "miniserver"); - server = lib.nixosSystem (createConfig "server"); + workstation = lib.nixosSystem (createConfig "workstation" pkgs); + miniserver = lib.nixosSystem (createConfig "miniserver" pkgs-small); + server = lib.nixosSystem (createConfig "server" pkgs-small); }; }; }