vivid: running at evaluation time

Co-authored-by: NAHO <[email protected]>

Author: arunoruto

modules/programs/vivid.nix

@@ -7,34 +7,51 @@
 let
   inherit (lib)
     mkIf
+    mkMerge
     mkEnableOption
     mkPackageOption
     mkOption
     types
     ;
 
-  inherit (lib.hm.shell)
-    mkBashIntegrationOption
-    mkZshIntegrationOption
-    mkFishIntegrationOption
-    ;
-
   cfg = config.programs.vivid;
   yamlFormat = pkgs.formats.yaml { };
 in
 {
-  meta.maintainers = with lib.hm.maintainers; [ aguirre-matteo ];
+  meta.maintainers = [
+    lib.hm.maintainers.aguirre-matteo
+    lib.maintainers.arunoruto
+  ];
+
+  imports = [
+    (lib.mkRemovedOptionModule [
+      "programs"
+      "vivid"
+      "enableBashIntegration"
+    ] "Now the shell integration is always enabled.")
+    (lib.mkRemovedOptionModule [
+      "programs"
+      "vivid"
+      "enableZshIntegration"
+    ] "Now the shell integration is always enabled.")
+    (lib.mkRemovedOptionModule [
+      "programs"
+      "vivid"
+      "enableFishIntegration"
+    ] "Now the shell integration is always enabled.")
+  ];
 
   options.programs.vivid = {
     enable = mkEnableOption "vivid";
     package = mkPackageOption pkgs "vivid" { nullable = true; };
 
-    enableBashIntegration = mkBashIntegrationOption { inherit config; };
-    enableZshIntegration = mkZshIntegrationOption { inherit config; };
-    enableFishIntegration = mkFishIntegrationOption { inherit config; };
-
     colorMode = mkOption {
-      type = with types; nullOr str;
+      type =
+        with types;
+        nullOr (enum [
+          "8-bit"
+          "24-bit"
+        ]);
       default = null;
       example = "8-bit";
       description = ''
@@ -71,8 +88,8 @@ in
     };
 
     activeTheme = mkOption {
-      type = with types; nullOr str;
-      default = null;
+      type = types.str;
+      default = "";
       example = "molokai";
       description = ''
         Active theme for vivid.
@@ -116,16 +133,30 @@ in
 
   };
 
-  config =
-    let
-      vividCommand = "vivid ${
-        lib.optionalString (cfg.colorMode != null) "-m ${cfg.colorMode}"
-      } generate ${lib.optionalString (cfg.activeTheme != null) cfg.activeTheme}";
-    in
-    mkIf cfg.enable {
-      home.packages = mkIf (cfg.package != null) [ cfg.package ];
-
-      home.sessionVariables = mkIf (cfg.activeTheme != null) { VIVID_THEME = cfg.activeTheme; };
+  config = mkMerge [
+    (mkIf (cfg.enable || cfg.themes != { }) {
+      home.sessionVariables.LS_COLORS =
+        let
+          colorMode = lib.optionalString (cfg.colorMode != null) "-m ${cfg.colorMode}";
+          filetypes = lib.optionalString (
+            cfg.filetypes != { }
+          ) "-d ${yamlFormat.generate "vivid-filetypes" cfg.filetypes}";
+          themePath =
+            if builtins.isAttrs cfg.themes.${cfg.activeTheme} then
+              pkgs.writeText "${cfg.activeTheme}.json" (builtins.toJSON cfg.themes.${cfg.activeTheme})
+            else if config.xdg.configFile ? "vivid/themes/${cfg.activeTheme}.yml" then
+              config.xdg.configFile."vivid/themes/${cfg.activeTheme}.yml".source
+            else
+              cfg.activeTheme;
+        in
+        "$(cat ${
+          pkgs.runCommand "ls-colors" {
+            nativeBuildInputs = [ cfg.package ];
+          } "vivid ${colorMode} ${filetypes} generate ${themePath} >$out"
+        })";
+    })
+    (mkIf cfg.enable {
+      home.sessionVariables = mkIf (cfg.activeTheme != "") { VIVID_THEME = cfg.activeTheme; };
 
       xdg.configFile = {
         "vivid/filetypes.yml" = mkIf (cfg.filetypes != { }) {
@@ -135,20 +166,12 @@ in
       // (lib.mapAttrs' (
         name: value:
         lib.nameValuePair "vivid/themes/${name}.yml" {
-          source = if lib.isAttrs value then yamlFormat.generate "${name}.yml" value else value;
+          # Since JSON is a YAML subset, it can be used to populate the config file
+          # JSON has better support in Nix than YAML
+          # Values like 1e2030 will be treated as a string by Nix, but in YAML are read as a number in scientific notation
+          source = if lib.isAttrs value then pkgs.writeText "${name}.json" (builtins.toJSON value) else value;
         }
       ) cfg.themes);
-
-      programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
-        export LS_COLORS="$(${vividCommand})"
-      '';
-
-      programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
-        export LS_COLORS="$(${vividCommand})"
-      '';
-
-      programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
-        set -gx LS_COLORS "$(${vividCommand})"
-      '';
-    };
+    })
+  ];
 }

tests/modules/programs/vivid/themes/tiny.yml

@@ -1,9 +1 @@
-colors:
-  primary: 00aaff
-  secondary: ff00aa
-core:
-  directory:
-    foreground: primary
-  executable-file:
-    font-style: bold
-    foreground: secondary
+{"colors":{"primary":"00aaff","secondary":"ff00aa"},"core":{"directory":{"foreground":"primary"},"executable-file":{"font-style":"bold","foreground":"secondary"}}}