From ada6443dd57ce87a2f85ca779affe593f25bc53f Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 14 Jun 2024 11:07:06 -0500 Subject: [PATCH] colors: simplify --- flake.nix | 4 ++-- lib/colors.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 8da5307..ff6b459 100644 --- a/flake.nix +++ b/flake.nix @@ -47,8 +47,9 @@ ]; forAllSystems = nixpkgs.lib.genAttrs systems; + pkgsFor = system: import nixpkgs {inherit system;}; in { - colors = (import ./lib/colors.nix {inherit nixpkgs;}).schemes.catppuccin-mocha-sapphire; + colors = (import ./lib/colors.nix {inherit (nixpkgs) lib;}).schemes.catppuccin-mocha-sapphire; # colors = (import ./lib/colors.nix inputs).color-schemes.donokai; font = { @@ -60,7 +61,6 @@ # Acessible through 'nix build', 'nix shell', etc packages = forAllSystems (system: import ./packages { - pkgs = nixpkgs.legacyPackages.${system}; }); # Formatter for your nix files, available through 'nix fmt' diff --git a/lib/colors.nix b/lib/colors.nix index 2a3c1d4..6e61945 100644 --- a/lib/colors.nix +++ b/lib/colors.nix @@ -1,4 +1,4 @@ -{nixpkgs, ...}: { +{lib, ...}: { schemes = let mkColorScheme = scheme @ { scheme-name, @@ -51,7 +51,7 @@ // scheme; in { - withHashPrefix = nixpkgs.lib.mapAttrs (_: value: "#${value}") base; + withHashPrefix = lib.mapAttrs (_: value: "#${value}") base; } // base; in {