format

home/dev/all/extra.nix

@@ -1,11 +1,3 @@
 { pkgs, inputs, ... }: {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ jq ripgrep fd pv tmux socat file ];
-    jq
-    ripgrep
-    fd
-    pv
-    tmux
-    socat
-    file
-  ];
 }

home/gui/xdg.nix

@@ -1,3 +1 @@
-{ pkgs, ... }: {
+{ pkgs, ... }: { home.packages = with pkgs; [ xdg-utils ]; }
-  home.packages = with pkgs; [ xdg-utils ];
-}

hosts/hetzner-vm/services/mpd-broadcast/broadcast.nix

@@ -1,11 +1,10 @@
 { tree, ... }: {
-  imports = with tree; [
+  imports = with tree;
+    [
       # systemwide pulseaudio w/ recv native localhost
       # to broadcast to all speakers over rtp
       profiles.sound.pulseaudio.pulse-systemwide
       profiles.sound.pulseaudio.pulse-recv-native-localhost
-  ] ++ [
+    ] ++ [ ./hosts/lappy.nix ];
-      ./hosts/lappy.nix
-  ];
 
 }

hosts/hetzner-vm/services/mpd.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, tree, ... }: {
-  imports = [
+  imports = [ ./mpd-broadcast/broadcast.nix ];
-    ./mpd-broadcast/broadcast.nix
-  ];
 
   environment.systemPackages = with pkgs; [ mpc_cli ];
 
@@ -32,7 +30,7 @@
     '';
   };
 
-  systemd.services.mpd.serviceConfig.After = ["pulseaudio.service"];
+  systemd.services.mpd.serviceConfig.After = [ "pulseaudio.service" ];
   systemd.services.mpd.serviceConfig.StateDirectory = [ "/mpd" ];
 
   services.nginx.virtualHosts."stream.owo.monster" = {

hosts/hetzner-vm/services/storage-sftp.nix

@@ -9,14 +9,17 @@
     '';
     localUsers = true;
     userlistEnable = true;
-    userlist = ["ftp-user"];
+    userlist = [ "ftp-user" ];
     localRoot = "/storage";
   };
   users.users.ftp-user = {
     isSystemUser = true;
     group = "ftp-user";
   };
-  users.groups.ftp-user = {};
+  users.groups.ftp-user = { };
-  networking.firewall.allowedTCPPortRanges = [ { from = 51000; to = 51999; } ];
+  networking.firewall.allowedTCPPortRanges = [{
+    from = 51000;
+    to = 51999;
+  }];
   networking.firewall.allowedTCPPorts = [ 4220 ];
 }

hosts/lappy/profiles/mpd-music-sync.nix

@@ -1,5 +1,5 @@
-{ pkgs, ... }:  let
+{ pkgs, ... }:
-  passwordFile = "/secrets/mpd-music-sync-password";
+let passwordFile = "/secrets/mpd-music-sync-password";
 in {
   systemd.tmpfiles.rules = [ "d /music 0755 mpd users -" ];
   systemd.services.mpd-music-sync = {

hosts/lappy/profiles/mpd.nix

@@ -9,7 +9,8 @@
   systemd.tmpfiles.rules = [
     "d /var/lib/mpd 0755 mpd mpd -"
     "d /var/lib/mpd/data 0755 mpd mpd -"
-    "d /var/lib/mpd/playlists 0755 mpd mpd -" ];
+    "d /var/lib/mpd/playlists 0755 mpd mpd -"
+  ];
 
   services.mpd = {
     enable = true;
@@ -26,5 +27,6 @@
     '';
   };
 
-  systemd.services.mpd.serviceConfig.StateDirectory = [ "/music" "/var/lib/mpd" ];
+  systemd.services.mpd.serviceConfig.StateDirectory =
+    [ "/music" "/var/lib/mpd" ];
 }

hosts/raspberry/boot.nix

@@ -7,8 +7,7 @@
   # The serial ports listed here are:
   # - ttyS0: for Tegra (Jetson TX1)
   # - ttyAMA0: for QEMU's -machine virt
-  boot.kernelParams =
+  boot.kernelParams = [ "console=tty0" ];
-    [ "console=tty0" ];
 
   sdImage = {
     populateFirmwareCommands = let

hosts/raspberry/services/btattach.nix

@@ -4,8 +4,7 @@
     after = [ "dev-ttyAMA0.device" ];
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
-      ExecStart =
+      ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyS1 -P bcm -S 3000000";
-        "${pkgs.bluez}/bin/btattach -B /dev/ttyS1 -P bcm -S 3000000";
     };
   };
 }

profiles/sound/pulseaudio/pulse-bluetooth.nix

@@ -1,7 +1,5 @@
 { pkgs, tree, lib, ... }: {
-  imports = with tree; [
+  imports = with tree; [ profiles.connectivity.bluetooth ];
-    profiles.connectivity.bluetooth
-  ];
 
   hardware.pulseaudio = {
     extraModules = with pkgs; [ pkgs.pulseaudio-modules-bt ];

profiles/sound/pulseaudio/pulse-systemwide.nix

@@ -1,4 +1,4 @@
-{tree, ...}: {
+{ tree, ... }: {
   imports = with tree; [ profiles.sound.pulseaudio.pulse ];
   hardware.pulseaudio = {
     systemWide = true;

profiles/sound/pulseaudio/pulse.nix

@@ -1,7 +1,5 @@
 { config, pkgs, ... }: {
   sound.enable = true;
   nixpkgs.config.pulseaudio = true;
-  hardware.pulseaudio = {
+  hardware.pulseaudio = { enable = true; };
-    enable = true;
-  };
 }