irssi: format using nixfmt

format

@@ -12,12 +12,9 @@ case $1 in
         ;;
 esac
 
-# The first block of excludes are files where nixfmt does a poor job,
+# The excludes are for files touched by open pull requests and we want
-# IMHO. The second block of excludes are files touched by open pull
+# to avoid merge conflicts.
-# requests and we want to avoid merge conflicts.
 find . -name '*.nix' \
-  ! -path ./modules/programs/irssi.nix \
-  \
   ! -path ./home-manager/home-manager.nix \
   ! -path ./modules/default.nix \
   ! -path ./modules/files.nix \

modules/programs/irssi.nix

@@ -7,15 +7,18 @@ let
   cfg = config.programs.irssi;
 
   boolStr = b: if b then "yes" else "no";
-  quoteStr = s: escape ["\""] s;
+  quoteStr = s: escape [ ''"'' ] s;
+
+  # Comma followed by newline.
+  cnl = ''
+    ,
+  '';
 
   assignFormat = set:
     concatStringsSep "\n"
     (mapAttrsToList (k: v: "  ${k} = \"${quoteStr v}\";") set);
 
-  chatnetString =
+  chatnetString = concatStringsSep "\n" (flip mapAttrsToList cfg.networks
-    concatStringsSep "\n"
-      (flip mapAttrsToList cfg.networks
     (k: v: ''
       ${k} = {
         type = "${v.type}";
@@ -24,9 +27,7 @@ let
       };
     ''));
 
-  serversString =
+  serversString = concatStringsSep cnl (flip mapAttrsToList cfg.networks
-    concatStringsSep ",\n"
-      (flip mapAttrsToList cfg.networks
     (k: v: ''
       {
         chatnet = "${k}";
@@ -35,19 +36,16 @@ let
         use_ssl = "${boolStr v.server.ssl.enable}";
         ssl_verify = "${boolStr v.server.ssl.verify}";
         autoconnect = "${boolStr v.server.autoConnect}";
-          ${lib.optionalString (v.server.ssl.certificateFile != null) ''
+        ${
+          lib.optionalString (v.server.ssl.certificateFile != null) ''
             ssl_cert = "${v.server.ssl.certificateFile}";
-          ''}
+          ''
+        }
       }
     ''));
 
-  channelString =
+  channelString = concatStringsSep cnl (flip mapAttrsToList cfg.networks (k: v:
-    concatStringsSep ",\n"
+    concatStringsSep cnl (flip mapAttrsToList v.channels (c: cv: ''
-      (flip mapAttrsToList cfg.networks
-      (k: v:
-        concatStringsSep ",\n"
-          (flip mapAttrsToList v.channels
-          (c: cv: ''
       {
         chatnet = "${k}";
         name = "${c}";
@@ -72,7 +70,7 @@ let
     };
   };
 
-  networkType = types.submodule ({ name, ...}: {
+  networkType = types.submodule ({ name, ... }: {
     options = {
       name = mkOption {
         visible = false;
@@ -93,7 +91,7 @@ let
 
       autoCommands = mkOption {
         type = types.listOf types.str;
-        default = [];
+        default = [ ];
         description = "List of commands to execute on connect.";
       };
 
@@ -142,14 +140,12 @@ let
       channels = mkOption {
         description = "Channels for the given network.";
         type = types.attrsOf channelType;
-        default = {};
+        default = { };
       };
     };
   });
 
-in
+in {
-
-{
 
   options = {
     programs.irssi = {
@@ -162,14 +158,17 @@ in
       };
 
       aliases = mkOption {
-        default = {};
+        default = { };
-        example = { J = "join"; BYE = "quit";};
+        example = {
+          J = "join";
+          BYE = "quit";
+        };
         description = "An attribute set that maps aliases to commands.";
         type = types.attrsOf types.str;
       };
 
       networks = mkOption {
-        default = {};
+        default = { };
         example = literalExpression ''
           {
             freenode = {