Switch to alejandra for nix formatting

I mostly wanted a formatter that would format `inherit` blocks
vertically, because otherwise they are super hard to read when diffing
or even just editing.  Both alejandra and the new nixos/nixfmt format
verically like this, but alejandra has slightly better format (I guess)
and for some reason nixfmt did not respect my `GLOBIGNORE` setting when
doing `nixfmt **/*.nix` so it was trying to format stuff in `_/nix`, and
failed. So anyway I went with alejandra.

- https://github.com/kamadorueda/alejandra
- https://discourse.nixos.org/t/enforcing-nix-formatting-in-nixpkgs/49506

2 files changed, 23 insertions, 24 deletions

diff --git a/Omni/Dev/Lithium/Configuration.nix b/Omni/Dev/Lithium/Configuration.nix
index 91b7f59..e050d48 100644
--- a/Omni/Dev/Lithium/Configuration.nix
+++ b/Omni/Dev/Lithium/Configuration.nix
@@ -1,6 +1,8 @@
-{ lib, pkgs, ... }:
-
-let
+{
+  lib,
+  pkgs,
+  ...
+}: let
   ghcCompiler = (import ../../Bild/Constants.nix).ghcCompiler;
   ports = import ../../Cloud/Ports.nix;
 in {
@@ -24,8 +26,7 @@ in {
     fira-code-symbols
   ];
 
-  environment.systemPackages =
-    [ pkgs.nvtop pkgs.k3s pkgs.wemux pkgs.tmux pkgs.wireguard-tools ];
+  environment.systemPackages = [pkgs.nvtop pkgs.k3s pkgs.wemux pkgs.tmux pkgs.wireguard-tools];
 
   hardware.opengl.enable = true;
 
@@ -68,13 +69,11 @@ in {
   services.tor.settings.Nickname = "ydeee3q1cjo83tsuqcz";
   services.tor.settings.AccountingMax = "10 GBytes";
   services.tor.settings.AccountingStart = "month 1 1:00";
-  services.tor.settings.ContactInfo =
-    "ContactInfo pgp:66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD ciissversion:2";
+  services.tor.settings.ContactInfo = "ContactInfo pgp:66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD ciissversion:2";
 
   services.bitcoind.mainnet.enable = true;
   services.bitcoind.mainnet.dataDir = "/mnt/campbell/bitcoind-mainnet/data";
-  services.bitcoind.mainnet.configFile =
-    "/mnt/campbell/bitcoind-mainnet/bitcoin.conf";
+  services.bitcoind.mainnet.configFile = "/mnt/campbell/bitcoind-mainnet/bitcoin.conf";
   services.bitcoind.mainnet.prune = 10000;
 
   services.pcscd.enable = true;
@@ -118,18 +117,17 @@ in {
   services.xserver.windowManager.xmonad.enable = true;
   services.xserver.libinput.enable = true;
   services.xserver.libinput.touchpad.tapping = true;
-  services.xserver.modules = [ pkgs.xf86_input_wacom ];
+  services.xserver.modules = [pkgs.xf86_input_wacom];
   services.xserver.wacom.enable = true;
 
   services.jupyter.enable = true;
   services.jupyter.port = ports.jupyter;
   services.jupyter.ip = "*";
   users.users.jupyter.group = "jupyter";
-  users.groups.jupyter = { };
-  services.jupyter.password =
-    "'argon2:$argon2id$v=19$m=10240,t=10,p=8$nvQhgk+htbIYi961YYAf1w$ekpwiTT5L4+OAods0K7EDw'";
+  users.groups.jupyter = {};
+  services.jupyter.password = "'argon2:$argon2id$v=19$m=10240,t=10,p=8$nvQhgk+htbIYi961YYAf1w$ekpwiTT5L4+OAods0K7EDw'";
   services.jupyter.kernels.python3 = let
-    env = (pkgs.python3.withPackages (p:
+    env = pkgs.python3.withPackages (p:
       with p; [
         ipykernel
         pandas
@@ -138,7 +136,7 @@ in {
         matplotlib
         sympy
         ipywidgets
-      ]));
+      ]);
   in {
     displayName = "py3";
     argv = [
@@ -193,7 +191,7 @@ in {
     (lib.strings.splitString "\n")
     (lib.filter (s: s != ""))
   ];
-  nix.settings.trusted-users = [ "root" "ben" ];
+  nix.settings.trusted-users = ["root" "ben"];
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
diff --git a/Omni/Dev/Lithium/Hardware.nix b/Omni/Dev/Lithium/Hardware.nix
index 54c07f5..80d4e54 100644
--- a/Omni/Dev/Lithium/Hardware.nix
+++ b/Omni/Dev/Lithium/Hardware.nix
@@ -1,15 +1,16 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
-
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/f08dd8f9-787c-4e2a-a0cc-7019edc2ce2b";
@@ -26,7 +27,7 @@
     fsType = "ext4";
   };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }