refactor: remove unused library functions, start removing with lib

home/firefox/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, nixos, kw, ... }: with lib;
+{ config, lib, pkgs, nixos, kw, ... }:
 
 let
   commonSettings = {
@@ -127,7 +127,7 @@ in
       };
       extraNativeMessagingHosts = with pkgs; [
         tridactyl-native
-      ] ++ optional config.programs.buku.enable bukubrow;
+      ] ++ lib.optional config.programs.buku.enable bukubrow;
     };
     extensions = with pkgs.nur.repos.rycee.firefox-addons; [
       sponsorblock

home/mpv.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }: with lib;
+{ config, lib, pkgs, ... }:
 
-{
+let
+  inherit (lib.modules) mkMerge mkIf;
+  inherit (lib.attrsets) mapAttrsToList;
+in {
   programs.mpv = {
     enable = true;
     scripts = [ pkgs.mpvScripts.sponsorblock pkgs.mpvScripts.paused ];
@@ -98,8 +101,8 @@
       osd-bar-h = 2.5; # 3.125 default
       osd-border-size = 2; # font border pixels, default 3
       term-osd-bar = true;
-      script-opts = lib.concatStringsSep ","
-      (lib.mapAttrsToList (k: v: "${k}=${toString v}") {
+      script-opts = builtins.concatStringsSep ","
+      (mapAttrsToList (k: v: "${k}=${toString v}") {
           ytdl_hook-ytdl_path = "${pkgs.yt-dlp}/bin/yt-dlp";
           osc-layout = "slimbox";
           osc-vidscale = "no";

home/shell/zsh.nix

@@ -36,7 +36,7 @@
           "listrowsfirst"
         ]; in
       ''
-	${if lib.hasSuffix "darwin" pkgs.stdenv.system then ''
+	${if lib.hasSuffix "linux" pkgs.stdenv.system then ''
         eval $(dircolors)
 	'' else ''
 	''}

home/syncplay.nix

@@ -1,8 +1,8 @@
 { config, lib, tf, ... }:
 
-with lib;
-
-{
+let
+  inherit (lib.modules) mkForce;
+in {
   kw.secrets.variables = {
     syncplay-pass = {
       path = "services/media/syncplay";