build(nix): accent -> accentColor, use removeAttrs

catppuccin · Sep 12, 2023 · 818e4b5 · 818e4b5
1 parent f5993c2
commit 818e4b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ This means that you will have to either
   programs.vscode.extensions = [
     # all the theme options will be available as overrides:
     (pkgs.catppuccin-vsc.override {
-      accent = "mauve";
+      accentColor = "mauve";
       boldKeywords = true;
       italicComments = true;
       italicKeywords = true;

diff --git a/default.nix b/default.nix
@@ -1,6 +1,6 @@
 {
   pkgs ? import <nixpkgs> {},
-  accent ? "mauve",
+  accentColor ? "mauve",
   boldKeywords ? true,
   italicComments ? true,
   italicKeywords ? true,
@@ -9,7 +9,7 @@
   bracketMode ? "rainbow",
   colorOverrides ? {},
   customUIColors ? {},
-}: let
+} @ inputs: let
   inherit (pkgs) lib;
 
   packageJSON = builtins.fromJSON (builtins.readFile ./package.json);
@@ -21,9 +21,7 @@
   inherit (packageJSON) name version;
   pname = "${name}-${version}";
 
-  options = {
-    inherit accent boldKeywords italicComments italicKeywords colorOverrides workbenchMode bracketMode extraBordersEnabled customUIColors;
-  };
+  options = builtins.removeAttrs inputs ["pkgs"];
   project =
     (pkgs.callPackage ./yarn-project.nix {} {
       src = pkgs.nix-gitignore.gitignoreSource [] ./.;
@@ -46,7 +44,7 @@
       '';
     });
 in
-  (lib.checkListOfEnum "${pname}: accent" validAccents [accent])
+  (lib.checkListOfEnum "${pname}: accent" validAccents [accentColor])
   (lib.checkListOfEnum "${pname}: workbenchMode" validWorkbenchModes [workbenchMode])
   (lib.checkListOfEnum "${pname}: bracketMode" validBracketModes [bracketMode])
   pkgs.vscode-utils.buildVscodeMarketplaceExtension {