Use nixfmt/nixpkgs-fmt instead of nixfmt-classic, reformat code

.zed/settings.json

@@ -0,0 +1,8 @@
+{
+  "formatter": {
+    "external": {
+      "command": "direnv",
+      "arguments": ["exec", ".", "treefmt", "--stdin", "{buffer_path}"]
+    }
+  }
+}

flake.nix

@@ -70,9 +70,13 @@
     flake-compat.flake = false;
   };
 
-  outputs = inputs@{ self, flake-parts, ... }:
+  outputs =
+    inputs@{ self, flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-darwin" ];
+      systems = [
+        "x86_64-linux"
+        "aarch64-darwin"
+      ];
 
       imports = [
         ./lib

hosts/default.nix

@@ -1,6 +1,8 @@
 { self, ... }:
-let inherit (self.lib.darwin) mkDarwinConfiguration;
-in {
+let
+  inherit (self.lib.darwin) mkDarwinConfiguration;
+in
+{
   flake.darwinConfigurations = {
     eMac = mkDarwinConfiguration {
       system = "aarch64-darwin";

hosts/eMac/configuration.nix

@@ -1,6 +1,16 @@
-{ lib, suites, profiles, ... }: {
-  imports = with suites;
-    base ++ fonts ++ identity ++ [
+{
+  lib,
+  suites,
+  profiles,
+  ...
+}:
+{
+  imports =
+    with suites;
+    base
+    ++ fonts
+    ++ identity
+    ++ [
       profiles.users.ethan
       profiles.builders.builder
       profiles.builders.darwin-linux
@@ -24,7 +34,12 @@
 
     taps = [ "homebrew/services" ];
 
-    casks = [ "steam" "utm" "vlc" "zoom" ];
+    casks = [
+      "steam"
+      "utm"
+      "vlc"
+      "zoom"
+    ];
 
     masApps = {
       "Paprika Recipe Manager 3" = 1303222628;

hosts/mercury/configuration.nix

@@ -1,7 +1,13 @@
-{ suites, profiles, secrets, ... }: {
-  imports = with suites;
-    base ++ fonts ++ [ secrets.hosts.mercury.configuration ]
-    ++ [ profiles.users.et ];
+{
+  suites,
+  profiles,
+  secrets,
+  ...
+}:
+{
+  imports =
+    with suites;
+    base ++ fonts ++ [ secrets.hosts.mercury.configuration ] ++ [ profiles.users.et ];
 
   tilde.host.directory = "/Users/et/Workspace/tilde";
 
@@ -15,7 +21,14 @@
   };
 
   homebrew = {
-    casks = [ "bruno" "figma" "jabra-direct" "linear" "loom" "postico" ];
+    casks = [
+      "bruno"
+      "figma"
+      "jabra-direct"
+      "linear"
+      "loom"
+      "postico"
+    ];
 
     masApps = {
       "Flow" = 1423210932;

lib/compat/default.nix

@@ -1,6 +1,9 @@
-(import (let lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
-in fetchTarball {
-  url =
-    "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-  sha256 = lock.nodes.flake-compat.locked.narHash;
-}) { src = ../../.; })
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
+  in
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }
+) { src = ../../.; })

lib/default.nix

@@ -1,4 +1,9 @@
-{ inputs, self, withSystem, ... }:
+{
+  inputs,
+  self,
+  withSystem,
+  ...
+}:
 let
   haumea = inputs.haumea.lib;
   lib = haumea.load {
@@ -8,4 +13,7 @@ let
       flake = self;
     };
   };
-in { flake.lib = lib; }
+in
+{
+  flake.lib = lib;
+}

lib/src/darwin.nix

@@ -5,21 +5,34 @@ let
 
   l = inputs.nixpkgs.lib // builtins;
 
-  sharedModules = (l.attrValues flake.darwinModules) ++ (with inputs; [
-    home-manager.darwinModules.home-manager
-    sops-nix.darwinModules.sops
-  ]);
+  sharedModules =
+    (l.attrValues flake.darwinModules)
+    ++ (with inputs; [
+      home-manager.darwinModules.home-manager
+      sops-nix.darwinModules.sops
+    ]);
 
   specialArgs = {
-    inherit flake inputs secrets homeConfigurations;
+    inherit
+      flake
+      inputs
+      secrets
+      homeConfigurations
+      ;
     suites = flake.suites.darwin;
     profiles = flake.profiles.darwin;
   };
 
-  mkDarwinConfiguration = { system, configuration }:
-    withSystem system ({ pkgs, ... }:
+  mkDarwinConfiguration =
+    { system, configuration }:
+    withSystem system (
+      { pkgs, ... }:
       inputs.nix-darwin.lib.darwinSystem {
         inherit pkgs system specialArgs;
         modules = sharedModules ++ [ configuration ];
-      });
-in { inherit mkDarwinConfiguration; }
+      }
+    );
+in
+{
+  inherit mkDarwinConfiguration;
+}

lib/src/hm.nix

@@ -5,20 +5,26 @@ let
 
   l = inputs.nixpkgs.lib // builtins;
 
-  sharedModules = l.attrValues flake.homeModules
-    ++ (with inputs; [ sops-nix.homeManagerModules.sops ]);
+  sharedModules =
+    l.attrValues flake.homeModules ++ (with inputs; [ sops-nix.homeManagerModules.sops ]);
 
   extraSpecialArgs = {
     inherit flake inputs secrets;
     suites = flake.suites.home;
     profiles = flake.profiles.home;
   };
 
-  mkHomeManagerConfiguration = { system, configuration }:
-    withSystem system ({ pkgs, ... }:
+  mkHomeManagerConfiguration =
+    { system, configuration }:
+    withSystem system (
+      { pkgs, ... }:
       inputs.home-manager.lib.homeManagerConfiguration {
         inherit pkgs extraSpecialArgs;
         modules = sharedModules ++ [ configuration ];
-      });
+      }
+    );
 
-in { inherit sharedModules extraSpecialArgs mkHomeManagerConfiguration; }
+in
+{
+  inherit sharedModules extraSpecialArgs mkHomeManagerConfiguration;
+}

lib/src/utils.nix

@@ -7,23 +7,31 @@ let
   #
   # Type:
   #   tree :: { [ name :: string ] :: ( leaf :: (T | ( branch :: ( leaf | tree )))), ... } -> { string -> leaf }
-  flattenTree = tree:
+  flattenTree =
+    tree:
     let
-      inherit (builtins) concatStringsSep isPath isAttrs foldl' attrNames;
+      inherit (builtins)
+        concatStringsSep
+        isPath
+        isAttrs
+        foldl'
+        attrNames
+        ;
 
       # Takes an accumulator attribute set, a path in the form of a list of strings, and a value of what is at that
       # path (either an attribute set, meaning a subdirectory; a path, meaning it's a file; or nothing, meaning it's an
       # empty directory). Will turn the path into a dot-separated string (`foo/bar/biz` turns into `foo.bar.biz`) and
       # will recurse over the subdirectory if it's an attribute set, add to our accumulator if it's a file, or just
       # return the accumulator if it's neither
-      flatten = acc: path: leaf:
+      flatten =
+        acc: path: leaf:
         # If the value is a path, then format the path as a dot-separated string and add this path and value to the
         if isPath leaf then
           (acc // { "${concatStringsSep "." path}" = leaf; })
-          # If the value is a set of attributes, this means there is a subtree -- run again for those attributes
+        # If the value is a set of attributes, this means there is a subtree -- run again for those attributes
         else if isAttrs leaf then
           (recurse acc path leaf)
-          # If it's not a value or a path (meaning null), just return the accumulated results without doing anything
+        # If it's not a value or a path (meaning null), just return the accumulated results without doing anything
         else
           acc;
 
@@ -34,12 +42,13 @@ let
       #   # `flatten` against that path and leaf
       #   let op = acc: leaf: (flatten (acc (path ++ [ leaf ]) tree.${leaf}));
       #   in foldl' (op acc (attrNames tree));
-      recurse = acc: path: leaf:
-        foldl' (acc: key: flatten acc (path ++ [ key ]) leaf.${key}) acc
-        (attrNames leaf);
+      recurse =
+        acc: path: leaf:
+        foldl' (acc: key: flatten acc (path ++ [ key ]) leaf.${key}) acc (attrNames leaf);
 
       # Call `recurse`, starting with an empty accumulator, an empty path, and a tree to run the function against
-    in recurse { } [ ] tree;
+    in
+    recurse { } [ ] tree;
 
   # Flattens attribute set of modules into a key-value set of dot-separated paths as keys and imported paths as values
   #
@@ -50,6 +59,8 @@ let
   #   attrset :: {
   #     [ name :: string ] :: ( leaf :: (T | ( branch :: ( leaf | tree )))), ...
   #   } -> { string -> path }
-  importModules = attrset:
-    builtins.mapAttrs (_: value: (import value)) (flattenTree attrset);
-in { inherit importModules; }
+  importModules = attrset: builtins.mapAttrs (_: value: (import value)) (flattenTree attrset);
+in
+{
+  inherit importModules;
+}

modules/darwin/default.nix

@@ -2,9 +2,12 @@
 let
   inherit (self.lib) utils;
   inherit (self.inputs) haumea;
-in {
-  flake.darwinModules = utils.importModules (haumea.lib.load {
-    src = ./src;
-    loader = haumea.lib.loaders.path;
-  });
+in
+{
+  flake.darwinModules = utils.importModules (
+    haumea.lib.load {
+      src = ./src;
+      loader = haumea.lib.loaders.path;
+    }
+  );
 }