treewide: use remove when possible

See https://github.com/nix-community/home-manager/pull/2566.

modules/programs/hexchat.nix

@@ -212,7 +212,7 @@ let
   # Note: Missing option `D=`.
   transformChannel = channelName:
     let channel = cfg.channels.${channelName};
-    in concatStringsSep "\n" (filter (v: v != null) [
+    in concatStringsSep "\n" (remove null [
       "" # leave a space between one server and another
       (transformField "N" channelName)
       (loginMethod channel)

modules/programs/lf.nix

@@ -180,9 +180,8 @@ in {
             "${k} ${if isInt v then toString v else ''"${v}"''}"
         }";
 
-      settingsStr = concatStringsSep "\n" (filter (x: x != "")
+      settingsStr = concatStringsSep "\n" (remove "" (mapAttrsToList fmtSetting
-        (mapAttrsToList fmtSetting
+        (builtins.intersectAttrs knownSettings cfg.settings)));
-          (builtins.intersectAttrs knownSettings cfg.settings)));
 
       fmtCmdMap = before: k: v:
         "${before} ${k}${optionalString (v != null && v != "") " ${v}"}";

modules/programs/mbsync.nix

@@ -158,8 +158,8 @@ let
       genGroupsChannels = group:
         concatStringsSep "\n" (genChannelStrings group.name group.channels);
       # Generate all channel configurations for all groups for this account.
-    in concatStringsSep "\n" (filter (s: s != "")
+    in concatStringsSep "\n"
-      (mapAttrsToList (name: group: genGroupsChannels group) groups));
+    (remove "" (mapAttrsToList (name: group: genGroupsChannels group) groups));
 
   # Given the attr set of groups, return a string which maps channels to groups
   genAccountGroups = groups:
@@ -177,9 +177,9 @@ let
       # of the groups and its consituent channels.
       genGroupsStrings = mapAttrsToList (name: info:
         concatStringsSep "\n" (genGroupChannelString groups.${name})) groups;
-    in concatStringsSep "\n\n" (filter (s: s != "")
+      # Join all non-empty groups.
-      genGroupsStrings) # filter for the cases of empty groups
+      combined = concatStringsSep "\n\n" (remove "" genGroupsStrings) + "\n";
-    + "\n"; # Put all strings together.
+    in combined;
 
   genGroupConfig = name: channels:
     let

modules/programs/neovim.nix

@@ -46,10 +46,10 @@ let
 
   moduleConfigure = {
     packages.home-manager = {
-      start = filter (f: f != null) (map
+      start = remove null (map
         (x: if x ? plugin && x.optional == true then null else (x.plugin or x))
         cfg.plugins);
-      opt = filter (f: f != null)
+      opt = remove null
         (map (x: if x ? plugin && x.optional == true then x.plugin else null)
           cfg.plugins);
     };

modules/programs/vim.nix

@@ -136,7 +136,7 @@ in {
 
   config = (let
     customRC = ''
-      ${concatStringsSep "\n" (filter (v: v != "") (mapAttrsToList setExpr
+      ${concatStringsSep "\n" (remove "" (mapAttrsToList setExpr
         (builtins.intersectAttrs knownSettings cfg.settings)))}
 
       ${cfg.extraConfig}

modules/services/fnott.nix

@@ -5,8 +5,7 @@ with lib;
 let
   cfg = config.services.fnott;
 
-  concatStringsSep' = sep: list:
+  concatStringsSep' = sep: list: concatStringsSep sep (remove "" list);
-    concatStringsSep sep (filter (x: x != "") list);
 
   iniFormat = pkgs.formats.ini { };
 in {

modules/services/window-managers/i3-sway/lib/functions.nix

@@ -56,12 +56,8 @@ rec {
 
   fontConfigStr = let
     toFontStr = { names, style ? "", size ? "" }:
-      optionalString (names != [ ]) concatStringsSep " " (filter (x: x != "") [
+      optionalString (names != [ ]) concatStringsSep " "
-        "font"
+      (remove "" [ "font" "pango:${concatStringsSep ", " names}" style size ]);
-        "pango:${concatStringsSep ", " names}"
-        style
-        size
-      ]);
   in fontCfg:
   if isList fontCfg then
     toFontStr { names = fontCfg; }