From 7b9a528d6ce61feef42ef3ede42792438e59e205 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:01:21 +0200
Subject: [PATCH] treewide: replace builtins.toString with toString (#1657)

Link: https://github.com/nix-community/stylix/pull/1657

Reviewed-by: awwpotato <awwpotato@voidq.com>
---
 flake/deprecation/per-system-option.nix  | 2 +-
 modules/bemenu/hm.nix                    | 2 +-
 modules/glance/testbeds/glance-hm.nix    | 2 +-
 modules/glance/testbeds/glance-nixos.nix | 2 +-
 modules/neovim/neovim.nix                | 2 +-
 modules/rofi/hm.nix                      | 2 +-
 modules/swaync/hm.nix                    | 2 +-
 modules/waybar/hm.nix                    | 4 ++--
 modules/wezterm/hm.nix                   | 6 +++---
 modules/zathura/hm.nix                   | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake/deprecation/per-system-option.nix b/flake/deprecation/per-system-option.nix
index 39af0511..38dd38d9 100644
--- a/flake/deprecation/per-system-option.nix
+++ b/flake/deprecation/per-system-option.nix
@@ -66,7 +66,7 @@
             ]) { inherit old new; };
             names = builtins.mapAttrs (_: lib.showAttrPath) paths // {
               until = lib.pipe until [
-                builtins.toString
+                toString
                 (builtins.match "([[:digit:]]{2})([[:digit:]]{2})")
                 (lib.concatStringsSep ".")
               ];
diff --git a/modules/bemenu/hm.nix b/modules/bemenu/hm.nix
index 68f1653d..ca0d5a6a 100644
--- a/modules/bemenu/hm.nix
+++ b/modules/bemenu/hm.nix
@@ -31,7 +31,7 @@ mkTarget {
         programs.bemenu.settings = {
           # Font name
           fn = "${fonts.sansSerif.name} ${
-            lib.optionalString (cfg.fontSize != null) (builtins.toString cfg.fontSize)
+            lib.optionalString (cfg.fontSize != null) (toString cfg.fontSize)
           }";
         };
       }
diff --git a/modules/glance/testbeds/glance-hm.nix b/modules/glance/testbeds/glance-hm.nix
index 77e743c5..264e2057 100644
--- a/modules/glance/testbeds/glance-hm.nix
+++ b/modules/glance/testbeds/glance-hm.nix
@@ -3,7 +3,7 @@ let
   host = "127.0.0.1";
 
   package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
-    extraPolicies.OverrideFirstRunPage = "http://${host}:${builtins.toString port}";
+    extraPolicies.OverrideFirstRunPage = "http://${host}:${toString port}";
   };
 
   port = 1234;
diff --git a/modules/glance/testbeds/glance-nixos.nix b/modules/glance/testbeds/glance-nixos.nix
index 3bc6e02e..ca39b204 100644
--- a/modules/glance/testbeds/glance-nixos.nix
+++ b/modules/glance/testbeds/glance-nixos.nix
@@ -3,7 +3,7 @@ let
   host = "127.0.0.1";
 
   package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
-    extraPolicies.OverrideFirstRunPage = "http://${host}:${builtins.toString port}";
+    extraPolicies.OverrideFirstRunPage = "http://${host}:${toString port}";
   };
 
   port = 1234;
diff --git a/modules/neovim/neovim.nix b/modules/neovim/neovim.nix
index 23a74a93..5eae8c31 100644
--- a/modules/neovim/neovim.nix
+++ b/modules/neovim/neovim.nix
@@ -28,7 +28,7 @@
         programs.neovim =
           let
             cfg = config.stylix.targets.neovim;
-            transparencyCfg = builtins.toString (
+            transparencyCfg = toString (
               lib.optional cfg.transparentBackground.main ''
                 vim.cmd.highlight({ "Normal", "guibg=NONE", "ctermbg=NONE" })
                 vim.cmd.highlight({ "NonText", "guibg=NONE", "ctermbg=NONE" })
diff --git a/modules/rofi/hm.nix b/modules/rofi/hm.nix
index 4a2f872f..a0b03942 100644
--- a/modules/rofi/hm.nix
+++ b/modules/rofi/hm.nix
@@ -24,7 +24,7 @@ mkTarget {
           in
           mkLiteral "rgba ( ${r}, ${g}, ${b}, ${opacity'} % )";
         mkRgb = mkRgba "100";
-        rofiOpacity = builtins.toString (builtins.ceil (opacity.popups * 100));
+        rofiOpacity = toString (builtins.ceil (opacity.popups * 100));
       in
       {
         programs.rofi.theme = {
diff --git a/modules/swaync/hm.nix b/modules/swaync/hm.nix
index f8979f70..271a437d 100644
--- a/modules/swaync/hm.nix
+++ b/modules/swaync/hm.nix
@@ -10,7 +10,7 @@ mkTarget {
         services.swaync.style = ''
           * {
               font-family: "${fonts.sansSerif.name}";
-              font-size: ${builtins.toString fonts.sizes.desktop}pt;
+              font-size: ${toString fonts.sizes.desktop}pt;
           }
         '';
       }
diff --git a/modules/waybar/hm.nix b/modules/waybar/hm.nix
index ff06eb4a..1d205a9d 100644
--- a/modules/waybar/hm.nix
+++ b/modules/waybar/hm.nix
@@ -57,7 +57,7 @@ mkTarget {
     (
       { opacity, _colors }:
       {
-        stylix.targets.waybar.background = "alpha(@base00, ${builtins.toString opacity.desktop})";
+        stylix.targets.waybar.background = "alpha(@base00, ${toString opacity.desktop})";
       }
     )
     (
@@ -66,7 +66,7 @@ mkTarget {
         programs.waybar.style = ''
           * {
               font-family: "${fonts.${cfg.font}.name}";
-              font-size: ${builtins.toString fonts.sizes.desktop}pt;
+              font-size: ${toString fonts.sizes.desktop}pt;
           }
         '';
       }
diff --git a/modules/wezterm/hm.nix b/modules/wezterm/hm.nix
index b9350568..cd26a74e 100644
--- a/modules/wezterm/hm.nix
+++ b/modules/wezterm/hm.nix
@@ -130,15 +130,15 @@ mkTarget {
               "${fonts.monospace.name}",
               "${fonts.emoji.name}",
           },
-          font_size = ${builtins.toString fonts.sizes.terminal},
-          command_palette_font_size = ${builtins.toString fonts.sizes.popups},
+          font_size = ${toString fonts.sizes.terminal},
+          command_palette_font_size = ${toString fonts.sizes.popups},
         '';
       }
     )
     (
       { opacity }:
       {
-        stylix.targets.wezterm.luaBody = "window_background_opacity = ${builtins.toString opacity.terminal},";
+        stylix.targets.wezterm.luaBody = "window_background_opacity = ${toString opacity.terminal},";
       }
     )
     (
diff --git a/modules/zathura/hm.nix b/modules/zathura/hm.nix
index b1aa3cb2..cfaec37e 100644
--- a/modules/zathura/hm.nix
+++ b/modules/zathura/hm.nix
@@ -15,7 +15,7 @@ mkTarget {
             ''rgb(${getColorCh color "r"}, ${getColorCh color "g"}, ${getColorCh color "b"})'';
           rgba =
             color: alpha:
-            ''rgba(${getColorCh color "r"}, ${getColorCh color "g"}, ${getColorCh color "b"}, ${builtins.toString alpha})'';
+            ''rgba(${getColorCh color "r"}, ${getColorCh color "g"}, ${getColorCh color "b"}, ${toString alpha})'';
         in
         {
           # Taken from here: