formatting

host/roam/default.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ ... }:
 {
   networking.hostName = "roam";
 

lib.nix

@@ -9,7 +9,7 @@ rec {
       name = lib.removeSuffix ".nix" name;
       value =
         if value == "regular" then
-          builtins.toPath (path + "/${name}")
+          path + "/${name}"
         else if value == "directory" then
           walk-dir (path + "/${name}")
         else

mod/boot.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
-  boot.loader = {
+  boot = {
+    loader = {
       efi.canTouchEfiVariables = true;
       grub = {
         enable = true;
@@ -11,8 +12,9 @@
 
     # otherwise /tmp is on disk. This *may* be problematic as nix
     # builds in /tmp but I think my swap is large enough...
-  boot.tmp.useTmpfs = true;
+    tmp.useTmpfs = true;
 
-  boot.kernelPackages = pkgs.linuxPackages_6_13;
-  boot.kernel.sysctl."kernel.sysrq" = 1;
+    kernelPackages = pkgs.linuxPackages_6_13;
+    kernel.sysctl."kernel.sysrq" = 1;
+  };
 }

mod/fonts.nix

@@ -1,11 +1,13 @@
 { pkgs, ... }:
 {
-  fonts.packages = with pkgs; [
+  fonts = {
+    packages = with pkgs; [
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
       nerd-fonts.noto
     ];
-  fonts.fontDir.enable = true;
-  fonts.fontconfig.defaultFonts.monospace = [ "Noto Nerd Font Mono" ];
+    fontDir.enable = true;
+    fontconfig.defaultFonts.monospace = [ "Noto Nerd Font Mono" ];
+  };
 }

mod/network.nix

@@ -11,9 +11,10 @@
 
   networking = {
     enableIPv6 = true;
-    networkmanager.enable = true;
-    networkmanager.wifi.macAddress = "random";
-    networkmanager.ensureProfiles.profiles = {
+    networkmanager = {
+      enable = true;
+      wifi.macAddress = "random";
+      ensureProfiles.profiles = {
         "tuda-vpn" = {
           connection = {
             autoconnect = "false";
@@ -50,4 +51,5 @@
         };
       };
     };
+  };
 }

mod/services.nix

@@ -1,11 +1,13 @@
 { ... }:
 {
-  services.printing.enable = true;
-  services.avahi = {
+  services = {
+    printing.enable = true;
+    avahi = {
       enable = true;
       nssmdns4 = true;
       openFirewall = true;
     };
-  services.udisks2.enable = true;
-  services.emacs.enable = true;
+    udisks2.enable = true;
+    emacs.enable = true;
+  };
 }