treewide: alejandra -> nixfmt-rfc-style

assets/default.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   options.assets = lib.mkOption {
     type = lib.types.unspecified;
     readOnly = true;

effects.nix

@@ -4,23 +4,28 @@
   withSystem,
   self,
   ...
-}: let
+}:
-  collectFlakeOutputs = {
+let
-    config,
+  collectFlakeOutputs =
-    pkgs,
+    { config, pkgs }:
-  }: let
+    let
       inherit (pkgs) lib;
-    collectDrvs = prefix: attrs: let
+      collectDrvs =
+        prefix: attrs:
+        let
           drvs = lib.pipe attrs [
             (lib.filterAttrs (_: lib.isDerivation))
-        (lib.mapAttrsToList (name: drv: {
+            (lib.mapAttrsToList (
+              name: drv: {
                 name = lib.concatStringsSep "." (prefix ++ [ name ]);
                 inherit drv;
-        }))
+              }
+            ))
           ];
           recursed = lib.pipe attrs [
-        (lib.filterAttrs (_: val:
+            (lib.filterAttrs (
-            (!lib.isDerivation val) && (lib.isAttrs val) && (val.recurseForDerivations or true)))
+              _: val: (!lib.isDerivation val) && (lib.isAttrs val) && (val.recurseForDerivations or true)
+            ))
             (lib.mapAttrsToList (name: collectDrvs (prefix ++ [ name ])))
           ];
         in
@@ -28,7 +33,8 @@
       rootOutputs = builtins.removeAttrs config.onPush.default.outputs [ "effects" ];
     in
     collectDrvs [ ] rootOutputs;
-in {
+in
+{
   defaultEffectSystem = "aarch64-linux";
 
   hercules-ci = {
@@ -41,25 +47,20 @@ in {
   herculesCI = herculesCI: {
     onPush.default = {
       outputs.effects = {
-        pin-cache = withSystem config.defaultEffectSystem ({
+        pin-cache = withSystem config.defaultEffectSystem (
-          pkgs,
+          { pkgs, hci-effects, ... }:
-          hci-effects,
+          let
-          ...
-        }: let
             collected = collectFlakeOutputs {
               inherit (herculesCI) config;
               inherit pkgs;
             };
             cachixCommands =
-            lib.concatMapStringsSep
+              lib.concatMapStringsSep "\n"
-            "\n"
+                ({ name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}")
-            ({
-              name,
-              drv,
-            }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}")
                 collected;
           in
-          hci-effects.runIf (herculesCI.config.repo.branch == "main") (hci-effects.mkEffect {
+          hci-effects.runIf (herculesCI.config.repo.branch == "main") (
+            hci-effects.mkEffect {
               secretsMap."cachix-token" = "cachix-token";
               inputs = [ pkgs.cachix ];
               userSetupScript = ''
@@ -69,17 +70,18 @@ in {
               # They have already been built as part of this job,
               # we only want to pin them to make sure cachix doesn't GC them.
               effectScript = builtins.unsafeDiscardStringContext cachixCommands;
-          }));
+            }
+          )
+        );
       };
     };
   };
 
-  perSystem = {
+  perSystem =
-    pkgs,
+    { pkgs, lib, ... }:
-    lib,
+    rec {
-    ...
+      legacyPackages.outputsList =
-  }: rec {
+        let
-    legacyPackages.outputsList = let
           config = self.herculesCI {
             primaryRepo = { };
             herculesCI = { };
@@ -87,14 +89,17 @@ in {
         in
         collectFlakeOutputs { inherit config pkgs; };
 
-    legacyPackages.github-matrix = let
+      legacyPackages.github-matrix =
+        let
           systems = lib.groupBy ({ drv, ... }: drv.system) legacyPackages.outputsList;
         in
-      lib.concatMapStringsSep "\n" ({
+        lib.concatMapStringsSep "\n"
-        name,
+          (
-        value,
+            { name, value }:
-      }: ''
+            ''
               ${name}=${builtins.toJSON (map (d: d.name) value)}
-      '') (lib.attrsToList systems);
+            ''
+          )
+          (lib.attrsToList systems);
     };
 }

flake.nix

@@ -1,5 +1,6 @@
 {
-  outputs = inputs @ {flake-parts, ...}:
+  outputs =
+    inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
@@ -18,13 +19,15 @@
         ./pkgs
       ];
 
-      perSystem = {
+      perSystem =
+        {
           inputs',
           self',
           pkgs,
           lib,
           ...
-      }: {
+        }:
+        {
           devShells.default = pkgs.mkShellNoCC {
             packages = [
               inputs'.agenix.packages.agenix
@@ -45,7 +48,7 @@
           # Re-export it for convenience and for caching
           packages.attic = inputs'.attic.packages.attic;
 
-        formatter = pkgs.alejandra;
+          formatter = pkgs.nixfmt-rfc-style;
         };
     };
 
@@ -126,8 +129,7 @@
     };
   };
 
-  /*
+  /* TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
-  TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
      nixConfig = {
        extra-substituters = [
          "https://hyprland.cachix.org"

hosts/default.nix

@@ -3,7 +3,8 @@
   self,
   inputs,
   ...
-}: {
+}:
+{
   imports = [
     ./kazuki
     ./hijiri-vm
@@ -15,15 +16,20 @@
     ./kogata
   ];
 
-  builders = let
+  builders =
+    let
       sharedOptions = {
         _file = ./default.nix;
 
         settei.sane-defaults.allSshKeys = config.assets.sshKeys.user;
-      settei.flake-qol.inputs = inputs // {settei = self;};
+        settei.flake-qol.inputs = inputs // {
+          settei = self;
         };
-  in {
+      };
-    nixos = name: module:
+    in
+    {
+      nixos =
+        name: module:
         inputs.nixpkgs.lib.nixosSystem {
           modules = [
             inputs.agenix.nixosModules.age
@@ -40,7 +46,8 @@
           specialArgs.configurationName = name;
         };
 
-    darwin = name: module:
+      darwin =
+        name: module:
         inputs.darwin.lib.darwinSystem {
           modules = [
             inputs.agenix.darwinModules.age

hosts/hijiri-vm/default.nix

@@ -1,10 +1,12 @@
 {
-  configurations.nixos.hijiri-vm = {
+  configurations.nixos.hijiri-vm =
+    {
       modulesPath,
       lib,
       username,
       ...
-  }: {
+    }:
+    {
       imports = [
         "${modulesPath}/profiles/qemu-guest.nix"
         ./disks.nix

hosts/hijiri-vm/disks.nix

@@ -1,6 +1,8 @@
-args: let
+args:
+let
   bootDevice = args.bootDevice or "/dev/vda";
-in {
+in
+{
   disko.devices.disk.bootDisk = {
     type = "disk";
     device = bootDevice;
@@ -27,9 +29,14 @@ in {
           content = {
             type = "btrfs";
             extraArgs = [ "-f" ];
-            subvolumes = let
+            subvolumes =
-              mountOptions = ["compress=zstd" "noatime"];
+              let
-            in {
+                mountOptions = [
+                  "compress=zstd"
+                  "noatime"
+                ];
+              in
+              {
                 "/root" = {
                   inherit mountOptions;
                   mountpoint = "/";

hosts/hijiri/default.nix

@@ -1,5 +1,7 @@
 {
-  configurations.darwin.hijiri = {pkgs, ...}: {
+  configurations.darwin.hijiri =
+    { pkgs, ... }:
+    {
       imports = [
         ./skhd.nix
         ./yabai.nix

hosts/hijiri/skhd.nix

@@ -1,13 +1,22 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   services.skhd = {
     enable = true;
-    skhdConfig = let
+    skhdConfig =
+      let
         spaceCount = 6;
         spaceBindings =
           lib.genList
-        (i: let num = toString (i + 1); in "cmd - ${num} : yabai -m space --focus ${num}")
+            (
+              i:
+              let
+                num = toString (i + 1);
+              in
+              "cmd - ${num} : yabai -m space --focus ${num}"
+            )
             spaceCount;
-    in ''
+      in
+      ''
         cmd - return : wezterm
         cmd + shift - return : qutebrowser
 

hosts/hijiri/yabai.nix

@@ -1,8 +1,5 @@
+{ lib, pkgs, ... }:
 {
-  lib,
-  pkgs,
-  ...
-}: {
   services.yabai = {
     enable = true;
     enableScriptingAddition = true;

hosts/installer/default.nix

@@ -1,14 +1,26 @@
-{lib, ...}: {
+{ lib, ... }:
-  configurations.nixos = let
+{
-    mkInstaller = system: ({pkgs, ...}: {
+  configurations.nixos =
-      nixpkgs = {inherit system;};
+    let
+      mkInstaller =
+        system:
+        (
+          { pkgs, ... }:
+          {
+            nixpkgs = {
+              inherit system;
+            };
 
             environment.systemPackages = [ pkgs.nixos-install-tools ];
 
             # Make nixos-anywhere treat this as a installer iso
             system.nixos.variant_id = "installer";
-    });
+          }
-    systems = ["aarch64-linux" "x86_64-linux"];
+        );
+      systems = [
+        "aarch64-linux"
+        "x86_64-linux"
+      ];
       installers = map (system: lib.nameValuePair "installer-${system}" (mkInstaller system)) systems;
     in
     lib.listToAttrs installers;

hosts/kazuki/attic.nix

@@ -1,10 +1,8 @@
-{
+{ config, lib, ... }:
-  config,
+let
-  lib,
-  ...
-}: let
   atticPort = 9476;
-in {
+in
+{
   age.secrets.attic-creds = {
     file = ../../secrets/attic-creds.age;
     owner = config.services.atticd.user;
@@ -58,7 +56,10 @@ in {
   };
 
   users.users.nginx.extraGroups = [ "acme" ];
-  networking.firewall.allowedTCPPorts = [80 443];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   services.nginx = {
     enable = true;

hosts/kazuki/conduit.nix

@@ -3,10 +3,12 @@
   pkgs,
   inputs',
   ...
-}: let
+}:
+let
   formatJson = pkgs.formats.json { };
   serverDomain = "matrix.nrab.lol";
-in {
+in
+{
   services.matrix-conduit = {
     enable = true;
     package = inputs'.settei.packages.conduit-next;
@@ -24,7 +26,12 @@ in {
   };
 
   users.users.nginx.extraGroups = [ "acme" ];
-  networking.firewall.allowedTCPPorts = [80 443 8448 2222];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+    8448
+    2222
+  ];
 
   services.nginx = {
     enable = true;
@@ -35,9 +42,7 @@ in {
         enableACME = true;
 
         locations."=/.well-known/matrix/server" = {
-          alias = formatJson.generate "well-known-matrix-server" {
+          alias = formatJson.generate "well-known-matrix-server" { "m.server" = serverDomain; };
-            "m.server" = serverDomain;
-          };
           extraConfig = ''
             default_type application/json;
             add_header Access-Control-Allow-Origin "*";

hosts/kazuki/default.nix

@@ -1,10 +1,12 @@
 {
-  configurations.nixos.kazuki = {
+  configurations.nixos.kazuki =
+    {
       config,
       modulesPath,
       lib,
       ...
-  }: {
+    }:
+    {
       imports = [
         "${modulesPath}/profiles/qemu-guest.nix"
         ./disks.nix

hosts/kazuki/disks.nix

@@ -1,6 +1,8 @@
-args: let
+args:
+let
   bootDevice = args.bootDevice or "/dev/sda";
-in {
+in
+{
   disko.devices.disk.bootDisk = {
     type = "disk";
     device = bootDevice;
@@ -27,9 +29,14 @@ in {
           content = {
             type = "btrfs";
             extraArgs = [ "-f" ];
-            subvolumes = let
+            subvolumes =
-              mountOptions = ["compress=zstd" "noatime"];
+              let
-            in {
+                mountOptions = [
+                  "compress=zstd"
+                  "noatime"
+                ];
+              in
+              {
                 "/root" = {
                   inherit mountOptions;
                   mountpoint = "/";

hosts/kazuki/mail.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   # nix shell nixpkgs#apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2
   age.secrets = {
     leet-nrab-lol.file = ../../secrets/leet-nrab-lol-pass.age;
@@ -6,7 +7,12 @@
   };
 
   users.users.nginx.extraGroups = [ "acme" ];
-  networking.firewall.allowedTCPPorts = [80 443 8448 2222];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+    8448
+    2222
+  ];
 
   mailserver = {
     enable = true;

hosts/kazuki/ntfy.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   age.secrets.nrab-lol-cf = {
     file = ../../secrets/nrab-lol-cf.age;
     owner = config.services.nginx.user;
@@ -16,7 +17,10 @@
   };
 
   users.users.nginx.extraGroups = [ "acme" ];
-  networking.firewall.allowedTCPPorts = [80 443];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   services.nginx = {
     enable = true;

hosts/kazuki/storage.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   age.secrets.storage-box-webdav = {
     file = ../../secrets/storage-box-webdav.age;
   };

hosts/kazuki/vault.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   age.secrets.vault-cert-env = {
     file = ../../secrets/vault-cert-env.age;
     owner = config.services.nginx.user;
@@ -12,7 +13,12 @@
   };
 
   users.users.nginx.extraGroups = [ "acme" ];
-  networking.firewall.allowedTCPPorts = [80 443 8448 2222];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+    8448
+    2222
+  ];
 
   services.nginx = {
     enable = true;

hosts/kogata/default.nix

@@ -1,16 +1,13 @@
 {
-  configurations.darwin.kogata = {
+  configurations.darwin.kogata =
-    pkgs,
+    { pkgs, lib, ... }:
-    lib,
+    {
-    ...
-  }: {
       nixpkgs.system = "aarch64-darwin";
 
       settei.user.config.common.desktop.enable = true;
 
       # TODO: Make it a settei module so it's easy to concatenate which pkgs are allowed
-    nixpkgs.config.allowUnfreePredicate = pkg:
+      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "teams" ];
-      builtins.elem (lib.getName pkg) ["teams"];
       environment.systemPackages = with pkgs; [ teams ];
 
       common.hercules.enable = true;

hosts/legion/default.nix

@@ -1,10 +1,12 @@
 {
-  configurations.nixos.legion = {
+  configurations.nixos.legion =
+    {
       config,
       lib,
       username,
       ...
-  }: {
+    }:
+    {
       imports = [
         ./hardware.nix
         # ./disks.nix

hosts/legion/desktop.nix

@@ -5,13 +5,17 @@
   lib,
   username,
   ...
-}: {
+}:
+{
   # Needed for nvidia and steam
   nixpkgs.config.allowUnfree = true;
 
   settei.user.config = {
     common.desktop.enable = true;
-    home.packages = with pkgs; [brightnessctl dmenu];
+    home.packages = with pkgs; [
+      brightnessctl
+      dmenu
+    ];
 
     xsession.windowManager.i3 = {
       enable = true;
@@ -39,7 +43,11 @@
 
   services.logind =
     lib.genAttrs
-    ["lidSwitch" "lidSwitchDocked" "lidSwitchExternalPower"]
+      [
+        "lidSwitch"
+        "lidSwitchDocked"
+        "lidSwitchExternalPower"
+      ]
       (_: "ignore");
 
   services.pipewire = {
@@ -51,7 +59,10 @@
   programs.dconf.enable = true;
   services.dbus.enable = true;
 
-  users.users.${username}.extraGroups = ["video" "input"];
+  users.users.${username}.extraGroups = [
+    "video"
+    "input"
+  ];
 
   # NVIDIA stuff
   services.xserver = {

hosts/legion/disks.nix

@@ -1,6 +1,5 @@
 args:
-/*
+/* let
-let
      bootDevice = args.bootDevice or "/dev/nvme0n1";
    in
 */

hosts/legion/hardware.nix

@@ -1,7 +1,19 @@
-{config, ...}: {
+{ config, ... }:
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas"];
+{
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "uas"
+  ];
   boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
-  boot.kernelModules = ["kvm-intel" "i2c-dev" "acpi_call"];
+  boot.kernelModules = [
+    "kvm-intel"
+    "i2c-dev"
+    "acpi_call"
+  ];
   boot.blacklistedKernelModules = [ "nouveau" ];
 
   # Needed for enableAllFirmware
@@ -21,31 +33,51 @@
   fileSystems."/" = {
     device = "/dev/disk/by-label/LINUX";
     fsType = "btrfs";
-    options = ["subvol=root" "compress=zstd" "noatime"];
+    options = [
+      "subvol=root"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/home" = {
     device = "/dev/disk/by-label/LINUX";
     fsType = "btrfs";
-    options = ["subvol=home" "compress=zstd" "noatime"];
+    options = [
+      "subvol=home"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-label/LINUX";
     fsType = "btrfs";
-    options = ["subvol=nix" "compress=zstd" "noatime"];
+    options = [
+      "subvol=nix"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/persist" = {
     device = "/dev/disk/by-label/LINUX";
     fsType = "btrfs";
-    options = ["subvol=persist" "compress=zstd" "noatime"];
+    options = [
+      "subvol=persist"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/var/log" = {
     device = "/dev/disk/by-label/LINUX";
     fsType = "btrfs";
-    options = ["subvol=log" "compress=zstd" "noatime"];
+    options = [
+      "subvol=log"
+      "compress=zstd"
+      "noatime"
+    ];
     neededForBoot = true;
   };
 
@@ -54,7 +86,5 @@
     fsType = "vfat";
   };
 
-  swapDevices = [
+  swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ];
-    {device = "/dev/disk/by-label/SWAP";}
-  ];
 }

hosts/legion/msmtp.nix

@@ -4,13 +4,15 @@
   config,
   username,
   ...
-}: let
+}:
+let
   mail = "alert@nrab.lol";
   aliases = pkgs.writeText "mail-aliases" ''
     ${username}: nikodem@rabulinski.com
     root: ${mail}
   '';
-in {
+in
+{
   age.secrets.alert-plaintext.file = ../../secrets/alert-plain-pass.age;
 
   programs.msmtp = {

hosts/legion/nas/default.nix

@@ -3,12 +3,14 @@
   lib,
   username,
   ...
-}: {
+}:
-  imports = [
+{
-    ./media.nix
+  imports = [ ./media.nix ];
-  ];
 
-  boot.supportedFilesystems = ["ext4" "zfs"];
+  boot.supportedFilesystems = [
+    "ext4"
+    "zfs"
+  ];
 
   boot.zfs.extraPools = [ "yottapool" ];
   services.zfs = {

hosts/legion/nas/media.nix

@@ -1,4 +1,5 @@
-{username, ...}: {
+{ username, ... }:
+{
   services.jellyfin.enable = true;
   services.radarr.enable = true;
   services.sonarr.enable = true;
@@ -10,7 +11,10 @@
   };
 
   users.users = {
-    jellyfin.extraGroups = ["radarr" "sonarr"];
+    jellyfin.extraGroups = [
+      "radarr"
+      "sonarr"
+    ];
     radarr.extraGroups = [ "deluge" ];
     sonarr.extraGroups = [ "deluge" ];
     ${username}.extraGroups = [ "deluge" ];

hosts/ude/default.nix

@@ -1,10 +1,12 @@
 {
-  configurations.nixos.ude = {
+  configurations.nixos.ude =
+    {
       config,
       modulesPath,
       lib,
       ...
-  }: {
+    }:
+    {
       imports = [
         "${modulesPath}/profiles/qemu-guest.nix"
         ./disks.nix

hosts/ude/disks.nix

@@ -1,6 +1,8 @@
-args: let
+args:
+let
   bootDevice = args.bootDevice or "/dev/sda";
-in {
+in
+{
   disko.devices = {
     disk = {
       vdb = {
@@ -25,9 +27,14 @@ in {
               content = {
                 type = "btrfs";
                 extraArgs = [ "-f" ];
-                subvolumes = let
+                subvolumes =
-                  mountOptions = ["compress=zstd" "noatime"];
+                  let
-                in {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                    ];
+                  in
+                  {
                     "/root" = {
                       mountpoint = "/";
                       inherit mountOptions;

modules/flake/configurations.nix

@@ -2,13 +2,15 @@
   nixpkgs,
   darwin,
   home-manager,
-}: {
+}:
+{
   config,
   lib,
   flake-parts-lib,
   ...
 }:
-with lib; {
+with lib;
+{
   _file = ./configurations.nix;
 
   options = {
@@ -46,17 +48,8 @@ with lib; {
   };
 
   config.flake = {
-    nixosConfigurations =
+    nixosConfigurations = mapAttrs config.builders.nixos config.configurations.nixos;
-      mapAttrs
+    darwinConfigurations = mapAttrs config.builders.darwin config.configurations.darwin;
-      config.builders.nixos
+    homeConfigurations = mapAttrs config.builders.home config.configurations.home;
-      config.configurations.nixos;
-    darwinConfigurations =
-      mapAttrs
-      config.builders.darwin
-      config.configurations.darwin;
-    homeConfigurations =
-      mapAttrs
-      config.builders.home
-      config.configurations.home;
   };
 }

modules/flake/default.nix

@@ -3,13 +3,17 @@
   lib,
   inputs,
   ...
-}: let
+}:
+let
   inherit (flake-parts-lib) importApply;
   flakeModules = {
     configurations = importApply ./configurations.nix { inherit (inputs) nixpkgs darwin home-manager; };
   };
-in {
+in
+{
   imports = lib.attrValues flakeModules;
 
-  flake = {inherit flakeModules;};
+  flake = {
+    inherit flakeModules;
+  };
 }

modules/home/common/default.nix

@@ -6,13 +6,15 @@
   inputs',
   machineName,
   ...
-} @ args: let
+}@args:
+let
   # TODO: Conditionally define based on whether we're in a system configuration or not
   fishOverlayModule = lib.mkIf (!args ? osConfig) {
     # See modules/system/common/default.nix for reasoning.
     nixpkgs.overlays = [ (_: _: { inherit (inputs'.settei.packages) fish; }) ];
   };
-in {
+in
+{
   _file = ./default.nix;
 
   imports = [
@@ -49,7 +51,10 @@ in {
     };
   };
 
-  home.packages = [inputs'.settei.packages.base-packages pkgs.nh];
+  home.packages = [
+    inputs'.settei.packages.base-packages
+    pkgs.nh
+  ];
 
   home.sessionVariables.EDITOR = "hx";
 }

modules/home/common/desktop/default.nix

@@ -5,7 +5,8 @@
   inputs,
   inputs',
   ...
-}: {
+}:
+{
   _file = ./default.nix;
 
   options.common.desktop = {
@@ -23,7 +24,8 @@
 
     programs.firefox = {
       enable = true;
-      package = let
+      package =
+        let
           firefox-pkgs = pkgs.extend inputs.firefox-darwin.overlay;
         in
         lib.mkIf pkgs.stdenv.isDarwin firefox-pkgs.firefox-bin;
@@ -32,9 +34,7 @@
     programs.qutebrowser = {
       enable = true;
       package =
-        if pkgs.stdenv.isDarwin
+        if pkgs.stdenv.isDarwin then inputs'.niko-nur.packages.qutebrowser-bin else pkgs.qutebrowser;
-        then inputs'.niko-nur.packages.qutebrowser-bin
-        else pkgs.qutebrowser;
     };
 
     programs.zellij = {

modules/system/common/default.nix

@@ -1,4 +1,5 @@
-{isLinux}: {
+{ isLinux }:
+{
   config,
   configurationName,
   lib,
@@ -7,7 +8,8 @@
   inputs',
   username,
   ...
-}: let
+}:
+let
   sharedConfig = {
     settei = {
       username = lib.mkDefault "niko";
@@ -55,7 +57,8 @@
     # Every macOS ARM machine can emulate x86.
     nix.settings.extra-platforms = lib.mkIf pkgs.stdenv.isAarch64 [ "x86_64-darwin" ];
   };
-in {
+in
+{
   _file = ./default.nix;
 
   imports = [

modules/system/common/github-runner.nix

@@ -1,9 +1,11 @@
-{isLinux}: {
+{ isLinux }:
+{
   config,
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   inherit (lib) mkOption types;
   github-runner-user = "github-runner";
 
@@ -20,10 +22,10 @@
     services.github-runners = lib.pipe cfg.runners [
       (lib.mapAttrsToList (
         name: cfg:
-          lib.genList (i:
+        lib.genList
-            lib.nameValuePair
+          (
-            "${name}-${toString i}"
+            i:
-            {
+            lib.nameValuePair "${name}-${toString i}" {
               enable = true;
               tokenFile = config.age.secrets.github-token.path;
               inherit (cfg) url;
@@ -33,7 +35,8 @@
                 DynamicUser = false;
               };
               extraLabels = [ "nix" ];
-            })
+            }
+          )
           cfg.instances
       ))
       lib.flatten
@@ -52,34 +55,41 @@
   darwinConfig = lib.optionalAttrs (!isLinux) {
     warnings = lib.singleton "common.github-runner doesn't do anything on darwin yet";
   };
-in {
+in
+{
   _file = ./github-runner.nix;
 
   options.common.github-runner = {
     enable = lib.mkEnableOption "using this machine as a self-hosted github runner";
     runners = mkOption {
-      type = with types;
+      type =
-        attrsOf (submodule ({name, ...}: {
+        with types;
+        attrsOf (
+          submodule (
+            { name, ... }:
+            {
               options = {
                 name = mkOption {
                   type = types.str;
                   default = "${name}-${config.networking.hostName}";
                 };
-            url = mkOption {
+                url = mkOption { type = types.str; };
-              type = types.str;
-            };
                 instances = mkOption {
                   type = types.int;
                   default = 1;
                 };
               };
-        }));
+            }
+          )
+        );
     };
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
       sharedConfig
       linuxConfig
       darwinConfig
-  ]);
+    ]
+  );
 }

modules/system/common/hercules.nix

@@ -1,27 +1,29 @@
-{isLinux}: {
+{ isLinux }:
+{
   config,
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   options = {
     common.hercules.enable = lib.mkEnableOption "Enables hercules-ci-agent with my configuration";
   };
 
   herculesUser =
-    if isLinux
+    if isLinux then
-    then config.systemd.services.hercules-ci-agent.serviceConfig.User
+      config.systemd.services.hercules-ci-agent.serviceConfig.User
-    else config.launchd.daemons.hercules-ci-agent.serviceConfig.UserName;
+    else
-in {
+      config.launchd.daemons.hercules-ci-agent.serviceConfig.UserName;
+in
+{
   _file = ./hercules.nix;
 
   inherit options;
 
   config =
     lib.mkIf false
-    /*
+      # config.common.hercules.enable
-    config.common.hercules.enable
-    */
       {
         age.secrets.hercules-token = {
           file = ../../../secrets/hercules-token.age;

modules/system/common/user.nix

@@ -1,15 +1,11 @@
-{isLinux}: {
+{ isLinux }:
-  config,
+{ config, lib, ... }:
-  lib,
+let
-  ...
-}: let
   sharedConfig = {
     settei.programs.podman.enable = true;
   };
 
-  linuxConfig = lib.optionalAttrs isLinux {
+  linuxConfig = lib.optionalAttrs isLinux { boot.kernel.sysctl."kernel.yama.ptrace_scope" = 0; };
-    boot.kernel.sysctl."kernel.yama.ptrace_scope" = 0;
-  };
 
   darwinConfig = lib.optionalAttrs (!isLinux) { };
 
@@ -18,7 +14,8 @@
     linuxConfig
     darwinConfig
   ];
-in {
+in
+{
   _file = ./user.nix;
 
   config = lib.mkIf config.settei.user.enable finalConfig;

modules/system/default.nix

@@ -1,17 +1,22 @@
+{ config, lib, ... }:
 {
-  config,
+  flake =
-  lib,
+    lib.genAttrs
-  ...
+      [
-}: {
+        "nixosModules"
-  flake = lib.genAttrs ["nixosModules" "darwinModules"] (attr: let
+        "darwinModules"
+      ]
+      (
+        attr:
+        let
           isLinux = lib.hasPrefix "nixos" attr;
-  in {
+        in
+        {
           settei = import ./settei {
             inherit (config) perInput;
             inherit isLinux;
           };
-    common = import ./common {
+          common = import ./common { inherit isLinux; };
-      inherit isLinux;
+        }
-    };
+      );
-  });
 }

modules/system/settei/default.nix

@@ -2,13 +2,15 @@
   perInput,
   # TODO: Figure out a nicer way of doing this without infrec?
   isLinux,
-}: {
+}:
+{
   lib,
   pkgs,
   config,
   options,
   ...
-}: {
+}:
+{
   _file = ./default.nix;
 
   imports = [
@@ -19,8 +21,6 @@
   ];
 
   options.settei = with lib; {
-    username = mkOption {
+    username = mkOption { type = types.str; };
-      type = types.str;
-    };
   };
 }

modules/system/settei/flake-qol.nix

@@ -1,11 +1,14 @@
-{perInput}: {
+{ perInput }:
+{
   config,
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.settei.flake-qol;
-in {
+in
+{
   _file = ./flake-qol.nix;
 
   options.settei.flake-qol = with lib; {
@@ -14,9 +17,7 @@ in {
       type = types.bool;
       default = true;
     };
-    inputs = mkOption {
+    inputs = mkOption { type = types.unspecified; };
-      type = types.unspecified;
-    };
     inputs-flakes = mkOption {
       type = types.attrs;
       readOnly = true;
@@ -27,10 +28,9 @@ in {
     };
   };
 
-  config = let
+  config =
-    reexportedArgs = lib.mkIf cfg.reexportAsArgs {
+    let
-      inherit (cfg) inputs inputs-flakes inputs';
+      reexportedArgs = lib.mkIf cfg.reexportAsArgs { inherit (cfg) inputs inputs-flakes inputs'; };
-    };
     in
     lib.mkIf cfg.enable {
       settei.flake-qol = {

modules/system/settei/programs/default.nix

@@ -1,7 +1,6 @@
-{isLinux}: {
+{ isLinux }:
+{
   _file = ./default.nix;
 
-  imports = [
+  imports = [ (import ./podman.nix { inherit isLinux; }) ];
-    (import ./podman.nix {inherit isLinux;})
-  ];
 }

modules/system/settei/programs/podman.nix

@@ -1,9 +1,11 @@
-{isLinux}: {
+{ isLinux }:
+{
   config,
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   sharedConfig = {
     environment.systemPackages = [ pkgs.podman-compose ];
   };
@@ -16,16 +18,15 @@
     };
   };
 
-  darwinConfig = lib.optionalAttrs (!isLinux) {
+  darwinConfig = lib.optionalAttrs (!isLinux) { environment.systemPackages = [ pkgs.podman ]; };
-    environment.systemPackages = [pkgs.podman];
-  };
 
   finalConfig = lib.mkMerge [
     sharedConfig
     linuxConfig
     darwinConfig
   ];
-in {
+in
+{
   _file = ./podman.nix;
 
   options.settei.programs.podman.enable = lib.mkEnableOption "Podman";

modules/system/settei/sane-defaults.nix

@@ -1,8 +1,6 @@
-{isLinux}: {
+{ isLinux }:
-  config,
+{ config, lib, ... }@args:
-  lib,
+let
-  ...
-} @ args: let
   cfg = config.settei.sane-defaults;
   inherit (config.settei) username;
 
@@ -20,9 +18,11 @@
     };
   };
 
-  sharedConfig = let
+  sharedConfig =
+    let
       adminNeedsPassword = isLinux -> config.security.sudo.wheelNeedsPassword;
-  in {
+    in
+    {
       _module.args = {
         username = lib.mkDefault username;
       };
@@ -39,17 +39,24 @@
       settei.user.config.programs.git.enable = lib.mkDefault true;
 
       # FIXME: Move to common
-    users.users.${username}.openssh.authorizedKeys.keys = let
+      users.users.${username}.openssh.authorizedKeys.keys =
+        let
           configName' =
             args.configurationName
-        or (throw "pass configurationName to module arguments or set users.users.${username}.openssh.authorizedKeys yourself");
+              or (throw "pass configurationName to module arguments or set users.users.${username}.openssh.authorizedKeys yourself"
+              );
           filteredKeys = lib.filterAttrs (name: _: name != configName') cfg.allSshKeys;
         in
         lib.mkDefault (lib.attrValues filteredKeys);
 
       nix = {
         settings = {
-        experimental-features = ["nix-command" "flakes" "repl-flake" "auto-allocate-uids"];
+          experimental-features = [
+            "nix-command"
+            "flakes"
+            "repl-flake"
+            "auto-allocate-uids"
+          ];
           trusted-users = lib.optionals (!adminNeedsPassword) [ username ];
           auto-allocate-uids = true;
           extra-substituters = [
@@ -72,9 +79,11 @@
       };
     };
 
-  linuxConfig = lib.optionalAttrs isLinux (let
+  linuxConfig = lib.optionalAttrs isLinux (
+    let
       nmEnabled = config.networking.networkmanager.enable;
-  in {
+    in
+    {
       hardware.enableRedistributableFirmware = true;
 
       services.openssh.enable = true;
@@ -108,10 +117,9 @@
       };
 
       # NetworkManager probably means desktop system so we don't want to slow down boot times
-    systemd.services = lib.mkIf nmEnabled {
+      systemd.services = lib.mkIf nmEnabled { NetworkManager-wait-online.enable = false; };
-      NetworkManager-wait-online.enable = false;
+    }
-    };
+  );
-  });
 
   darwinConfig = lib.optionalAttrs (!isLinux) {
     services.nix-daemon.enable = true;
@@ -120,14 +128,17 @@
 
     users.users.${username}.home = "/Users/${username}";
   };
-in {
+in
+{
   _file = ./sane-defaults.nix;
 
   inherit options;
 
-  config = lib.mkIf config.settei.sane-defaults.enable (lib.mkMerge [
+  config = lib.mkIf config.settei.sane-defaults.enable (
+    lib.mkMerge [
       sharedConfig
       linuxConfig
       darwinConfig
-  ]);
+    ]
+  );
 }

modules/system/settei/user.nix

@@ -3,11 +3,13 @@
   options,
   lib,
   ...
-} @ args: let
+}@args:
+let
   hasHomeManager = options ? home-manager;
   cfg = config.settei.user;
   inherit (config.settei) username;
-in {
+in
+{
   _file = ./user.nix;
 
   options.settei.user = with lib; {
@@ -22,15 +24,14 @@ in {
     };
   };
 
-  config = let
+  config =
+    let
       hmConfig = lib.optionalAttrs hasHomeManager {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs =
+        home-manager.extraSpecialArgs = {
-        {
           inherit (args) inputs inputs';
-        }
+        } // cfg.extraArgs;
-        // cfg.extraArgs;
 
         home-manager.users.${username} = {
           _file = ./user.nix;
@@ -47,7 +48,8 @@ in {
         };
       };
     in
-    lib.mkIf cfg.enable (lib.mkMerge [
+    lib.mkIf cfg.enable (
+      lib.mkMerge [
         {
           assertions = [
             {
@@ -57,5 +59,6 @@ in {
           ];
         }
         hmConfig
-    ]);
+      ]
+    );
 }

pkgs/conduit/default.nix

@@ -8,8 +8,10 @@
   rocksdb,
   darwin,
   rustPlatform,
-}: let
+}:
-  rust = with fenix;
+let
+  rust =
+    with fenix;
     combine [
       stable.cargo
       stable.rustc

pkgs/default.nix

@@ -1,10 +1,13 @@
-{inputs, ...}: {
+{ inputs, ... }:
-  perSystem = {
+{
+  perSystem =
+    {
       pkgs,
       system,
       inputs',
       ...
-  }: {
+    }:
+    {
       packages.conduit-next = pkgs.callPackage ./conduit {
         src = inputs.conduit-src;
         crane = inputs.crane.lib.${system};

secrets/secrets.nix

@@ -1,6 +1,7 @@
 let
   keys = import ../assets/ssh.nix;
-in {
+in
+{
   "leet-nrab-lol-pass.age".publicKeys = [
     keys.system.kazuki
     keys.other.bootstrap

wrappers/default.nix

@@ -1,9 +1,8 @@
-{inputs, ...}: {
+{ inputs, ... }:
-  perSystem = {
+{
-    pkgs,
+  perSystem =
-    inputs',
+    { pkgs, inputs', ... }:
-    ...
+    let
-  }: let
       wrapped = inputs.wrapper-manager-hm-compat.lib {
         inherit pkgs;
         modules = [
@@ -19,8 +18,8 @@
         };
       };
       all-packages = wrapped.config.build.packages;
-  in {
+    in
-    packages =
+    {
-      all-packages;
+      packages = all-packages;
     };
 }

wrappers/fish/default.nix

@@ -1,20 +1,19 @@
+{ lib, pkgs, ... }:
 {
-  lib,
-  pkgs,
-  ...
-}: {
   wrappers.fish = {
     basePackage = pkgs.fish;
     wrapByDefault = false;
 
-    programs.fish = {config, ...}: {
+    programs.fish =
+      { config, ... }:
+      {
         extraWrapperFlags = "--inherit-argv0";
 
-      prependFlags = let
+        prependFlags =
+          let
             # Can't rely on pathAdd because fish used as login shell will ignore the variables the wrapper sets up
             path-add-lines =
-          lib.concatMapStringsSep "\n"
+              lib.concatMapStringsSep "\n" (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
-          (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
                 config.pathAdd;
             config-fish = pkgs.writeText "config.fish" ''
               ${path-add-lines}
@@ -22,12 +21,20 @@
               source ${./prompt.fish}
               source ${./config.fish}
             '';
-      in [
+          in
+          [
             "-C"
             "source ${config-fish}"
           ];
 
-      pathAdd = with pkgs; [eza bat fzf ripgrep zoxide direnv];
+        pathAdd = with pkgs; [
+          eza
+          bat
+          fzf
+          ripgrep
+          zoxide
+          direnv
+        ];
       };
   };
 }

wrappers/helix/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.helix = {
     enable = true;
     settings = {

wrappers/rash/default.nix

@@ -3,8 +3,10 @@
   inputs',
   config,
   ...
-}: {
+}:
-  wrappers.rash = let
+{
+  wrappers.rash =
+    let
       readlinePatched = pkgs.fetchFromGitHub {
         owner = "nrabulinski";
         repo = "readline";
@@ -12,12 +14,10 @@
         hash = "sha256-1yU0ZUBQqYEn85j4T2pLs02MTyJnO5BbYALIa88iomY=";
       };
       racket-with-libs = inputs'.racket.packages.racket.newLayer {
-      withRacketPackages = ps:
+        withRacketPackages =
-        with ps; [
+          ps: with ps; [
             readline-gpl
-          (readline-lib.override {
+            (readline-lib.override { src = "${readlinePatched}/readline-lib"; })
-            src = "${readlinePatched}/readline-lib";
-          })
             rash
             threading
             functional
@@ -39,7 +39,8 @@
           ];
         buildInputs = with pkgs; [ readline ];
       };
-  in {
+    in
+    {
       basePackage = pkgs.writeShellScriptBin "rash-repl" ''
         exec "${racket-with-libs}/bin/rash-repl" "$@"
       '';

wrappers/wezterm/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   wrappers.wezterm = {
     basePackage = pkgs.wezterm;
     env.WEZTERM_CONFIG_FILE.value = ./config.lua;