treewide: theme module refactor

I decided to refactor how the theme module works. The idea is, that I
wanted originally a module that I could give a base16 scheme name to,
and use that globally in my config. However, scheme only took the base16
scheme name without any checks, which was pretty bad. I ended up
creating a new option, schemeName, that scheme is computed from. It then
makes the whole configuration cleaner, and avoids long inputs
interpolations with the scheme name.

flake.nix

@@ -24,10 +24,7 @@
       };
     });
     formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
-    nixosConfigurations = let
+    nixosConfigurations = import ./hosts {inherit inputs;};
-      lib' = import ./lib {inherit inputs lib';};
-    in
-      import ./hosts {inherit inputs lib';};
     packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;});
     deploy.nodes = import ./nodes {inherit inputs;};
     checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;

home/programs/fuzzel.nix

@@ -15,7 +15,7 @@
         font = "monospace:size=14";
       };
       colors = let
-        inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
+        inherit (osConfig.theme.scheme) palette;
       in {
         background = "${palette.base00}ff";
         text = "${palette.base05}ff";

home/programs/gtk.nix

@@ -1,12 +1,11 @@
 {
-  inputs,
   pkgs,
   config,
   osConfig,
   lib,
   ...
 }: let
-  isDark = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.variant == "dark";
+  isDark = osConfig.theme.scheme.variant == "dark";
 in {
   home.pointerCursor = {
     inherit (osConfig.theme.cursorTheme) name package size;

home/programs/niri/default.nix

@@ -1,13 +1,11 @@
 {
-  inputs,
   lib,
   pkgs,
   config,
   osConfig,
   ...
 }: let
-  inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
+  inherit (osConfig.theme.scheme) palette;
-  inherit (lib) getExe mkIf;
 in {
   imports = [./binds.nix];
 

home/programs/swaylock.nix

@@ -1,10 +1,9 @@
 {
-  inputs,
   pkgs,
   osConfig,
   ...
 }: let
-  inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
+  inherit (osConfig.theme.scheme) palette;
 in {
   # requires `security.pam.services.swaylock = { };` at the system level or else
   # unlock will not work.

home/programs/waybar/style.nix

@@ -1,10 +1,9 @@
 {
-  inputs,
   lib,
   osConfig,
   ...
 }: let
-  inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
+  inherit (osConfig.theme.scheme) palette;
   inherit (builtins) concatStringsSep;
   inherit (lib) mapAttrsToList;
 

home/terminal/emulators/foot.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   osConfig,
   config,
   lib,
@@ -17,7 +16,7 @@
         inherit (lib) mapAttrs;
         inherit (lib.strings) removePrefix;
         # because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
-        palette = mapAttrs (_: color: removePrefix "#" color) inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
+        palette = mapAttrs (_: color: removePrefix "#" color) osConfig.theme.scheme.palette;
       in {
         background = palette.base00;
         foreground = palette.base05;

hosts/default.nix

@@ -1,12 +1,12 @@
-{
+{inputs, ...}: let
-  inputs,
+  lib' = import ../lib;
-  lib',
+  mkSystem = args:
-  ...
+    inputs.nixpkgs.lib.nixosSystem {
-}: let
+      specialArgs = {inherit inputs lib';};
-  inherit (lib') mkSystem;
+      modules = args.modules or [];
+    };
 in {
   vamos = mkSystem {
-    system = "x86_64-linux";
     modules = [
       ./vamos
       ../modules
@@ -15,7 +15,6 @@ in {
   };
 
   solaire = mkSystem {
-    system = "x86_64-linux";
     modules = [
       ./solaire
       ../modules
@@ -23,7 +22,6 @@ in {
   };
 
   anastacia = mkSystem {
-    system = "x86_64-linux";
     modules = [
       ./anastacia
     ];

lib/default.nix

@@ -1,9 +1,4 @@
-{
+{lib, ...}: let
-  inputs,
-  lib',
-  ...
-}: let
-  inherit (inputs.nixpkgs) lib;
   # convert rrggbb hex to rgba(r, g, b, a)
   rgba = c: let
     r = toString (hexToDec (builtins.substring 0 2 c));
@@ -89,23 +84,6 @@
   # Create a KDE konsole color scheme from base16 colors
   mkKonsoleColorScheme = pkgs: scheme:
     pkgs.writeText "${scheme.name}.colorscheme" (schemeToKonsole scheme);
-
-  # https://github.com/diniamo/niqs/blob/caf396bb470619fa06936a379eec6e283c3c3d95/lib/default.nix#L13-L35C7
-  mkSystem = {system, ...} @ args:
-    lib.nixosSystem {
-      system = null;
-      specialArgs = {inherit inputs;};
-      modules =
-        [
-          {
-            _module.args = {
-              inherit system lib';
-            };
-            nixpkgs = {inherit system;};
-          }
-        ]
-        ++ args.modules or [];
-    };
 in {
-  inherit mkKonsoleColorScheme rgba mkSystem;
+  inherit mkKonsoleColorScheme rgba;
 }

modules/theme/default.nix

@@ -1,22 +1,33 @@
 {
+  inputs,
+  config,
   lib,
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkOption;
+  inherit (lib) mkEnableOption mkOption mkIf attrNames;
-  inherit (lib.types) string path package;
+  inherit (lib.types) path package enum;
+  cfg = config.theme;
 in {
   imports = [./gtk.nix];
   options.theme = {
     enable = mkEnableOption "theme";
-    scheme = mkOption {
+    schemeName = mkOption {
       description = ''
         Name of the tinted-scheming color scheme to use.
       '';
-      type = string;
+      type = enum (attrNames inputs.basix.schemeData.base16);
-      example = lib.literalExpression "catppuccin-macchiato";
+      example = "catppuccin-macchiato";
       default = "catppuccin-macchiato";
     };
+
+    scheme = mkOption {
+      description = ''
+        Resolved scheme from the tinted-scheming library.
+      '';
+      type = lib.types.attrs;
+    };
+
     wallpaper = mkOption {
       description = ''
         Location of the wallpaper that will be used throughout the system.
@@ -51,4 +62,7 @@ in {
       };
     };
   };
+  config.theme = mkIf cfg.enable {
+    scheme = inputs.basix.schemeData.base16.${config.theme.schemeName};
+  };
 }