nix fmt

inventories/default.nix

@@ -190,7 +190,7 @@
               binds = [ "wlp1s0" ];
               disks.m3 = {
                 uuid = "105D-319E";
-                mountOptions = ["utf8"];
+                mountOptions = [ "utf8" ];
               };
             };
           };

machines/neptune/configuration.nix

@@ -30,20 +30,24 @@
     '';
   };
 
-  networking.wireless = let
+  networking.wireless =
-    credentials = config.clan.core.vars.generators.wireless-credentials.files;
+    let
-  in {
+      credentials = config.clan.core.vars.generators.wireless-credentials.files;
-    enable = true;
+    in
-    secretsFile = credentials.psk.path;
+    {
-    networks.${credentials.essid.value}.pskRaw = "ext:psk";
+      enable = true;
-  };
+      secretsFile = credentials.psk.path;
+      networks.${credentials.essid.value}.pskRaw = "ext:psk";
+    };
 
   networking.interfaces.wlp1s0 = {
     useDHCP = false;
-    ipv4.addresses = [{
+    ipv4.addresses = [
-      address = "10.0.0.9";
+      {
-      prefixLength = 24;
+        address = "10.0.0.9";
-    }];
+        prefixLength = 24;
+      }
+    ];
   };
 
   services.yggdrasil.settings.Peers = lib.mkForce [

modules/clan/jukebox/default.nix

@@ -16,25 +16,32 @@
           };
           binds = lib.mkOption {
             type = with lib.types; listOf str;
-            default = [];
+            default = [ ];
           };
           disks = lib.mkOption {
-            type = with lib.types; attrsOf (submodule ({name, ... }: {
+            type =
-              options = {
+              with lib.types;
-                name = lib.mkOption {
+              attrsOf (
-                  type = str;
+                submodule (
-                  default = name;
+                  { name, ... }:
-                };
+                  {
-                uuid = lib.mkOption {
+                    options = {
-                  type = str;
+                      name = lib.mkOption {
-                };
+                        type = str;
-                mountOptions = lib.mkOption {
+                        default = name;
-                  type = listOf str;
+                      };
-                  default = [];
+                      uuid = lib.mkOption {
-                };
+                        type = str;
-              };
+                      };
-            }));
+                      mountOptions = lib.mkOption {
-            default = {};
+                        type = listOf str;
+                        default = [ ];
+                      };
+                    };
+                  }
+                )
+              );
+            default = { };
             description = "disks comprising library";
           };
         };
@@ -46,14 +53,19 @@
       }:
       {
         nixosModule =
-          { config, lib, pkgs, ... }:
+          {
+            config,
+            lib,
+            pkgs,
+            ...
+          }:
           {
             services.pulseaudio.enable = true;
 
             # workaround cookie permissions
             services.pulseaudio.tcp.enable = true;
             services.pulseaudio.tcp.anonymousClients = {
-              allowedIpRanges = ["127.0.0.1"];
+              allowedIpRanges = [ "127.0.0.1" ];
               allowAll = true;
             };
 
@@ -61,33 +73,41 @@
               "d ${settings.baseDir} 0755 root root"
             ];
 
-            fileSystems = let
+            fileSystems =
-              disk2fs =
+              let
-                { name, uuid, mountOptions, ... }:
+                disk2fs =
-                lib.nameValuePair "${settings.baseDir}/${name}" {
+                  {
-                  device = "/dev/disk/by-uuid/${uuid}";
+                    name,
-                  fsType = "auto";
+                    uuid,
-                  options = ["noauto" "nofail"] ++ mountOptions;
+                    mountOptions,
-                };
+                    ...
-            in lib.listToAttrs
+                  }:
-              (lib.mapAttrsToList (_: disk2fs) settings.disks);
+                  lib.nameValuePair "${settings.baseDir}/${name}" {
+                    device = "/dev/disk/by-uuid/${uuid}";
+                    fsType = "auto";
+                    options = [
+                      "noauto"
+                      "nofail"
+                    ]
+                    ++ mountOptions;
+                  };
+              in
+              lib.listToAttrs (lib.mapAttrsToList (_: disk2fs) settings.disks);
 
-            services.udev.extraRules = let
+            services.udev.extraRules =
-              translate-prefix = path:
+              let
-                (lib.removePrefix "-"
+                translate-prefix = path: (lib.removePrefix "-" (lib.replaceStrings [ "/" ] [ "-" ] path));
-                  (lib.replaceStrings ["/"] ["-"] path));
+                mount-name = name: "${translate-prefix settings.baseDir}-${name}.mount";
-              mount-name = name:
+                disk2rule =
-                "${translate-prefix settings.baseDir}-${name}.mount";
+                  { name, uuid, ... }:
-              disk2rule =
+                  lib.concatStringsSep ", " [
-                { name, uuid, ... }:
+                    ''ACTION=="add"''
-                lib.concatStringsSep ", " [
+                    ''SUBSYSTEM=="block"''
-                  ''ACTION=="add"''
+                    ''ENV{DEVLINKS}=="*/dev/disk/by-uuid/${uuid}*"''
-                  ''SUBSYSTEM=="block"''
+                    ''ENV{SYSTEMD_WANTS}="${mount-name name}"''
-                  ''ENV{DEVLINKS}=="*/dev/disk/by-uuid/${uuid}*"''
+                  ];
-                  ''ENV{SYSTEMD_WANTS}="${mount-name name}"''
+              in
-                ];
+              lib.concatMapStringsSep "\n" disk2rule (lib.attrValues settings.disks);
-            in lib.concatMapStringsSep "\n" disk2rule
-              (lib.attrValues settings.disks);
 
             services.mpd = {
               enable = true;
@@ -102,10 +122,11 @@
               '';
             };
 
-            networking.firewall.interfaces = lib.genAttrs settings.binds
+            networking.firewall.interfaces = lib.genAttrs settings.binds (_: {
-              (_: { allowedTCPPorts = [config.services.mpd.network.port]; });
+              allowedTCPPorts = [ config.services.mpd.network.port ];
+            });
 
-            environment.systemPackages = [pkgs.mpc];
+            environment.systemPackages = [ pkgs.mpc ];
           };
       };
   };

modules/clan/phonebox/default.nix

@@ -325,7 +325,10 @@
               requires = [ "asterisk.service" ];
               after = [ "network.target" ];
               wantedBy = [ "multi-user.target" ];
-              path = with pkgs; [ inotify-tools asterisk ];
+              path = with pkgs; [
+                inotify-tools
+                asterisk
+              ];
               script = ''
                 inotifywait -m -e move /etc/asterisk |
                 while read path action file; do

modules/clan/pulse-stream/default.nix

@@ -12,7 +12,7 @@
         options.client-ip-ranges = lib.mkOption {
           type = lib.types.listOf lib.types.str;
           description = "ip subnets permitted to stream to the server";
-          default = [];
+          default = [ ];
         };
       };
     perInstance =
@@ -30,8 +30,7 @@
               systemWide = true;
               tcp = {
                 enable = true;
-                anonymousClients.allowedIpRanges =
+                anonymousClients.allowedIpRanges = settings.client-ip-ranges;
-                  settings.client-ip-ranges;
                 anonymousClients.allowAll = true;
               };
               zeroconf.publish.enable = true;