[𝚫] (shell): zsh -> fish

Icy-Thought · Oct 2, 2023 · 33965bf · 33965bf
1 parent 4afbe77
commit 33965bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/shell/fish.nix b/modules/shell/fish.nix
@@ -85,7 +85,8 @@ in {
       fish-theme = {
         target = "fish/conf.d/${active}.fish";
         text = let
-          inherit (config.modules.themes.colors) fishColor;
+          inherit (lib.strings) removePrefix;
+          fishColor = hexColor: removePrefix "#" hexColor;
         in ''
           # --> General
           set -l foreground ${fishColor types.fg}

diff --git a/modules/themes/default.nix b/modules/themes/default.nix
@@ -9,7 +9,7 @@
   inherit (lib.attrsets) attrValues mapAttrsToList;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.strings) concatStringsSep optionalString removePrefix;
+  inherit (lib.strings) concatStringsSep optionalString;
 
   cfg = config.modules.themes;
   envProto = config.modules.desktop.envProto;
@@ -121,8 +121,6 @@ in {
         };
       };
 
-      fishColor = hexColor: removePrefix "#" hexColor;
-
       rofi = {
         bg = {
           main = mkOpt str "#FFFFFF";