Namespace palette

common/components/applications.user.nix

@@ -144,7 +144,7 @@ in
     xdg.configFile."gdu/gdu.yaml".text = "no-cross: true";
     home.file.".npmrc".text = toKeyValue { } { fund = false; update-notifier = false; };
     home.file.".ssh/config.d/.keep".text = "";
-    dconf.settings."org/gnome/gnome-system-monitor" = with palette; {
+    dconf.settings."org/gnome/gnome-system-monitor" = with palette.hex; {
       cpu-colors = imap0 (i: c: mkTuple [ (mkUint32 i) c ]) (
         {
           "6" = [ red orange yellow green blue purple ];

common/components/desktop.user.nix

@@ -33,7 +33,7 @@ in
   dconf.settings."org/gnome/desktop/background".picture-uri = host.background;
   dconf.settings."org/gnome/desktop/background".picture-uri-dark = host.background;
   dconf.settings."org/gnome/desktop/screensaver".picture-uri = host.background;
-  dconf.settings."org/gtk/settings/color-chooser".custom-colors = with palette.asFloat;
+  dconf.settings."org/gtk/settings/color-chooser".custom-colors = with palette.rgb;
     map (rgb: mkTuple (rgb ++ [ 1.0 ]))
       [ red green yellow blue orange purple ];
 

common/components/editor.user.nix

@@ -86,7 +86,7 @@ in
       { when = "isInDiffEditor"; key = "ctrl+t"; command = "git.stageSelectedRanges"; }
     ];
 
-    userSettings = with palette; {
+    userSettings = with palette.hex; {
       # Dependencies
       "flow.pathToFlow" = "${pkgs.flow}/bin/flow";
       "hadolint.hadolintPath" = "${pkgs.hadolint}/bin/hadolint";

common/components/git.user.nix

@@ -51,7 +51,7 @@ in
     delta = {
       enable = true;
       options =
-        with palette; {
+        with palette.hex; {
           file-renamed-label = "moved:";
           line-numbers-left-format = "{nm:>1} ";
           line-numbers-left-style = "${dark-gray} bold";

common/components/terminal.user.nix

@@ -64,7 +64,7 @@ in
       "ctrl+shift+u" = "kitten unicode_input";
     };
 
-    settings = with palette; {
+    settings = with palette.hex; {
       # API
       allow_remote_control = true;
 

common/resources/palette.nix

@@ -7,7 +7,7 @@ let
 
   ansiNames = [ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ];
 
-  asHex = {
+  hex = {
     # Monokai
     black = "#1b1b1b";
     blue = "#66d9ef";
@@ -41,7 +41,9 @@ let
     light-gray = "#dddddd";
   };
 in
-asHex // rec {
+rec {
+  inherit hex;
+
   ansi =
     let
       base = listToAttrs (imap0 (i: n: nameValuePair n (toString (30 + i))) ansiNames);
@@ -51,7 +53,5 @@ asHex // rec {
 
   ansiFormat = mapAttrsRecursive (_: a: t: "[${a}m${t}") ansi;
 
-  asFloat = mapAttrs (_: cs: map (c: c / 255.0) cs) asInt;
-
-  asInt = mapAttrs (_: h: hexToRGB (substring 1 6 h)) asHex;
+  rgb = mapAttrs (_: h: map (c: c / 255.0) (hexToRGB (substring 1 6 h))) hex;
 }

common/system.nix

@@ -72,7 +72,7 @@ in
     # Console
     console.packages = with pkgs; [ terminus_font ];
     console.font = "ter-v32n";
-    console.colors = map (removePrefix "#") (with palette; [
+    console.colors = map (removePrefix "#") (with palette.hex; [
       "#000000" red green yellow blue orange purple light-gray
       gray red green yellow blue orange purple white
     ]);