diff --git a/apps/default.nix b/apps/default.nix
index 659628c..83ddbc9 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: rec {
+{ pkgs, ... }:
+rec {
 
   # Show quick helper
   default = import ./help.nix { inherit pkgs; };
@@ -30,5 +31,4 @@
   # Run neovim as an app
   neovim = import ./neovim.nix { inherit pkgs; };
   nvim = neovim;
-
 }
diff --git a/apps/encrypt-secret.nix b/apps/encrypt-secret.nix
index 3a6838a..19f6f32 100644
--- a/apps/encrypt-secret.nix
+++ b/apps/encrypt-secret.nix
@@ -1,19 +1,19 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # nix run github:nmasur/dotfiles#encrypt-secret > private/mysecret.age
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "encrypt-secret" ''
-    printf "\nEnter the secret data to encrypt for all hosts...\n\n" 1>&2
-    read -p "Secret: " secret
-    printf "\nEncrypting...\n\n" 1>&2
-    tmpfile=$(mktemp)
-    echo "''${secret}" > ''${tmpfile}
-    ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-      builtins.toString ../misc/public-keys
-    } $tmpfile
-    rm $tmpfile
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "encrypt-secret" ''
+      printf "\nEnter the secret data to encrypt for all hosts...\n\n" 1>&2
+      read -p "Secret: " secret
+      printf "\nEncrypting...\n\n" 1>&2
+      tmpfile=$(mktemp)
+      echo "''${secret}" > ''${tmpfile}
+      ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile
+      rm $tmpfile
+    ''
+  );
 }
diff --git a/apps/format-root.nix b/apps/format-root.nix
index c7449b4..59927c9 100644
--- a/apps/format-root.nix
+++ b/apps/format-root.nix
@@ -1,39 +1,41 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # This script will partition and format drives; use at your own risk!
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "format-root" ''
-    set -e
+  program = builtins.toString (
+    pkgs.writeShellScript "format-root" ''
+      set -e
 
-    DISK=$1
+      DISK=$1
 
-    if [ -z "''${DISK}" ]; then
-        ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
-            --foreground "#fb4934" \
-            "Missing required parameter." \
-            "Usage: format-root -- <disk>" \
-            "Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
-        echo "(exiting)"
-        exit 1
-    fi
+      if [ -z "''${DISK}" ]; then
+          ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
+              --foreground "#fb4934" \
+              "Missing required parameter." \
+              "Usage: format-root -- <disk>" \
+              "Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
+          echo "(exiting)"
+          exit 1
+      fi
 
-    ${pkgs.disko-packaged}/bin/disko \
-        --mode create \
-        --dry-run \
-        --flake "path:$(pwd)#root" \
-        --arg disk \""/dev/''${DISK}"\"
+      ${pkgs.disko-packaged}/bin/disko \
+          --mode create \
+          --dry-run \
+          --flake "path:$(pwd)#root" \
+          --arg disk \""/dev/''${DISK}"\"
 
-    ${pkgs.gum}/bin/gum confirm \
-        "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
-        --default=false
+      ${pkgs.gum}/bin/gum confirm \
+          "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
+          --default=false
 
-    ${pkgs.disko-packaged}/bin/disko \
-        --mode create \
-        --flake "path:$(pwd)#root" \
-        --arg disk "/dev/''${DISK}"
-
-  '');
+      ${pkgs.disko-packaged}/bin/disko \
+          --mode create \
+          --flake "path:$(pwd)#root" \
+          --arg disk "/dev/''${DISK}"
 
+    ''
+  );
 }
diff --git a/apps/help.nix b/apps/help.nix
index cb31b37..5ac7102 100644
--- a/apps/help.nix
+++ b/apps/help.nix
@@ -1,23 +1,25 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "default" ''
-    ${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
-    ${pkgs.gum}/bin/gum format --type=template -- '  {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
-    echo ""
-    echo ""
-    ${pkgs.gum}/bin/gum format --type=template -- \
-        '  • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
-        '  • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
-        '  • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
-        '  • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
-        '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
-        '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
-        '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
-        '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
-    echo ""
-    echo ""
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "default" ''
+      ${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
+      ${pkgs.gum}/bin/gum format --type=template -- '  {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
+      echo ""
+      echo ""
+      ${pkgs.gum}/bin/gum format --type=template -- \
+          '  • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
+          '  • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
+          '  • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
+          '  • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
+          '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
+          '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
+          '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
+          '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
+      echo ""
+      echo ""
+    ''
+  );
 }
diff --git a/apps/installer.nix b/apps/installer.nix
index 69e1b7e..4609c52 100644
--- a/apps/installer.nix
+++ b/apps/installer.nix
@@ -1,48 +1,50 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # Inspired by https://github.com/cleverca22/nix-tests/blob/master/kexec/justdoit.nix
   # This script will partition and format drives; use at your own risk!
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "installer" ''
-    set -e
+  program = builtins.toString (
+    pkgs.writeShellScript "installer" ''
+      set -e
 
-    DISK=$1
-    FLAKE=$2
-    PARTITION_PREFIX=""
+      DISK=$1
+      FLAKE=$2
+      PARTITION_PREFIX=""
 
-    if [ -z "$DISK" ] || [ -z "$FLAKE" ]; then
-        ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
-            --foreground "#fb4934" \
-            "Missing required parameter." \
-            "Usage: installer -- <disk> <host>" \
-            "Example: installer -- nvme0n1 tempest" \
-            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
-        echo "(exiting)"
-        exit 1
-    fi
+      if [ -z "$DISK" ] || [ -z "$FLAKE" ]; then
+          ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
+              --foreground "#fb4934" \
+              "Missing required parameter." \
+              "Usage: installer -- <disk> <host>" \
+              "Example: installer -- nvme0n1 tempest" \
+              "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
+          echo "(exiting)"
+          exit 1
+      fi
 
-    case "$DISK" in nvme*)
-        PARTITION_PREFIX="p"
-    esac
+      case "$DISK" in nvme*)
+          PARTITION_PREFIX="p"
+      esac
 
-    ${pkgs.gum}/bin/gum confirm \
-        "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
-        --default=false
+      ${pkgs.gum}/bin/gum confirm \
+          "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
+          --default=false
 
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
-    mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
-    mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}2
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
+      mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
+      mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}2
 
-    mount /dev/disk/by-label/nixos /mnt
-    mkdir --parents /mnt/boot
-    mount /dev/disk/by-label/boot /mnt/boot
-
-    ${pkgs.nixos-install-tools}/bin/nixos-install --flake github:nmasur/dotfiles#''${FLAKE}
-  '');
+      mount /dev/disk/by-label/nixos /mnt
+      mkdir --parents /mnt/boot
+      mount /dev/disk/by-label/boot /mnt/boot
 
+      ${pkgs.nixos-install-tools}/bin/nixos-install --flake github:nmasur/dotfiles#''${FLAKE}
+    ''
+  );
 }
diff --git a/apps/loadkey.nix b/apps/loadkey.nix
index 14cbf9c..3d2831a 100644
--- a/apps/loadkey.nix
+++ b/apps/loadkey.nix
@@ -1,13 +1,15 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "loadkey" ''
-    printf "\nEnter the seed phrase for your SSH key...\n"
-    printf "\nThen press ^D when complete.\n\n"
-    mkdir -p ~/.ssh/
-    ${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
-    printf "\n\nContinuing activation.\n\n"
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "loadkey" ''
+      printf "\nEnter the seed phrase for your SSH key...\n"
+      printf "\nThen press ^D when complete.\n\n"
+      mkdir -p ~/.ssh/
+      ${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
+      printf "\n\nContinuing activation.\n\n"
+    ''
+  );
 }
diff --git a/apps/neovim.nix b/apps/neovim.nix
index aa4e608..b027fb2 100644
--- a/apps/neovim.nix
+++ b/apps/neovim.nix
@@ -1,12 +1,12 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
   program = "${
-      (import ../modules/common/neovim/package {
-        inherit pkgs;
-        colors = (import ../colorscheme/nord).dark;
-      })
-    }/bin/nvim";
-
+    (import ../modules/common/neovim/package {
+      inherit pkgs;
+      colors = (import ../colorscheme/nord).dark;
+    })
+  }/bin/nvim";
 }
diff --git a/apps/netdata-cloud.nix b/apps/netdata-cloud.nix
index f98dbd7..9275df7 100644
--- a/apps/netdata-cloud.nix
+++ b/apps/netdata-cloud.nix
@@ -1,19 +1,21 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "netdata-cloud" ''
-    if [ "$EUID" -ne 0 ]; then
-      echo "Please run as root"
-      exit 1
-    fi
-    mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
-    printf "\nEnter the claim token for netdata cloud...\n\n"
-    read -p "Token: " token
-    echo "''${token}" > /var/lib/netdata/cloud.d/token
-    chown -R netdata:netdata /var/lib/netdata
-    ${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
-    printf "\n\nNow restart netdata service.\n\n"
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "netdata-cloud" ''
+      if [ "$EUID" -ne 0 ]; then
+        echo "Please run as root"
+        exit 1
+      fi
+      mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
+      printf "\nEnter the claim token for netdata cloud...\n\n"
+      read -p "Token: " token
+      echo "''${token}" > /var/lib/netdata/cloud.d/token
+      chown -R netdata:netdata /var/lib/netdata
+      ${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
+      printf "\n\nNow restart netdata service.\n\n"
+    ''
+  );
 }
diff --git a/apps/readme.nix b/apps/readme.nix
index 9507513..51ad625 100644
--- a/apps/readme.nix
+++ b/apps/readme.nix
@@ -1,9 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "readme" ''
-    ${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "readme" ''
+      ${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
+    ''
+  );
 }
diff --git a/apps/rebuild.nix b/apps/rebuild.nix
index 973be25..90e69d5 100644
--- a/apps/rebuild.nix
+++ b/apps/rebuild.nix
@@ -1,15 +1,17 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "rebuild" ''
-    echo ${pkgs.system}
-    SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
-    if [ "$SYSTEM" == "darwin" ]; then
-        sudo darwin-rebuild switch --flake ${builtins.toString ../.}
-    else
-        doas nixos-rebuild switch --flake ${builtins.toString ../.}
-    fi
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "rebuild" ''
+      echo ${pkgs.system}
+      SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
+      if [ "$SYSTEM" == "darwin" ]; then
+          sudo darwin-rebuild switch --flake ${builtins.toString ../.}
+      else
+          doas nixos-rebuild switch --flake ${builtins.toString ../.}
+      fi
+    ''
+  );
 }
diff --git a/apps/reencrypt-secrets.nix b/apps/reencrypt-secrets.nix
index b6f1a52..0094c8d 100644
--- a/apps/reencrypt-secrets.nix
+++ b/apps/reencrypt-secrets.nix
@@ -1,27 +1,27 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # nix run github:nmasur/dotfiles#reencrypt-secrets ./private
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "reencrypt-secrets" ''
-    if [ $# -eq 0 ]; then
-      echo "Must provide directory to reencrypt."
-      exit 1
-    fi
-    encrypted=$1
-    for encryptedfile in ''${1}/*; do
-      tmpfile=$(mktemp)
-      echo "Decrypting ''${encryptedfile}..."
-      ${pkgs.age}/bin/age --decrypt \
-        --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
-      echo "Encrypting ''${encryptedfile}..."
-      ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-        builtins.toString ../misc/public-keys
-      } $tmpfile > $encryptedfile
-      rm $tmpfile
-    done
-    echo "Finished."
-  '');
-
+  program = builtins.toString (
+    pkgs.writeShellScript "reencrypt-secrets" ''
+      if [ $# -eq 0 ]; then
+        echo "Must provide directory to reencrypt."
+        exit 1
+      fi
+      encrypted=$1
+      for encryptedfile in ''${1}/*; do
+        tmpfile=$(mktemp)
+        echo "Decrypting ''${encryptedfile}..."
+        ${pkgs.age}/bin/age --decrypt \
+          --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
+        echo "Encrypting ''${encryptedfile}..."
+        ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile > $encryptedfile
+        rm $tmpfile
+      done
+      echo "Finished."
+    ''
+  );
 }
diff --git a/colorscheme/everforest/default.nix b/colorscheme/everforest/default.nix
index 3287ee2..ef9d299 100644
--- a/colorscheme/everforest/default.nix
+++ b/colorscheme/everforest/default.nix
@@ -16,9 +16,7 @@
     base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
     base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
     base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-    base0E =
-      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-    base0F =
-      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+    base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
   };
 }
diff --git a/colorscheme/gruvbox-dark/default.nix b/colorscheme/gruvbox-dark/default.nix
index d8d84ef..6d01fa2 100644
--- a/colorscheme/gruvbox-dark/default.nix
+++ b/colorscheme/gruvbox-dark/default.nix
@@ -2,8 +2,7 @@
 
 {
   name = "gruvbox-dark"; # Dark, Medium
-  author =
-    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
+  author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
   dark = {
     base00 = "#1D2122"; # ---- This is the change from normal gruvbox
     base01 = "#3c3836"; # ---
diff --git a/colorscheme/gruvbox/default.nix b/colorscheme/gruvbox/default.nix
index 945ba49..a969cda 100644
--- a/colorscheme/gruvbox/default.nix
+++ b/colorscheme/gruvbox/default.nix
@@ -1,7 +1,6 @@
 {
   name = "gruvbox"; # Dark, Medium
-  author =
-    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
+  author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
   dark = {
     base00 = "#282828"; # ----
     base01 = "#3c3836"; # ---
diff --git a/modules/common/applications/1password.nix b/modules/common/applications/1password.nix
index 008d9ab..6d56653 100644
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     _1password = {
@@ -10,9 +16,16 @@
   };
 
   config = lib.mkIf (config.gui.enable && config._1password.enable) {
-    unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
+    unfreePackages = [
+      "1password"
+      "_1password-gui"
+      "1password-cli"
+    ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ _1password-gui _1password ];
+      home.packages = with pkgs; [
+        _1password-gui
+        _1password
+      ];
     };
 
     # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
@@ -26,5 +39,4 @@
       firefox
     '';
   };
-
 }
diff --git a/modules/common/applications/alacritty.nix b/modules/common/applications/alacritty.nix
index e5e5310..9641f49 100644
--- a/modules/common/applications/alacritty.nix
+++ b/modules/common/applications/alacritty.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     alacritty = {
@@ -28,7 +34,9 @@
             opacity = 1.0;
           };
           scrolling.history = 10000;
-          font = { size = 14.0; };
+          font = {
+            size = 14.0;
+          };
           key_bindings = [
             # Used for word completion in fish_user_key_bindings
             {
diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix
index c43a324..b48a61f 100644
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
 
   imports = [
     ./1password.nix
@@ -12,5 +13,4 @@
     ./slack.nix
     ./yt-dlp.nix
   ];
-
 }
diff --git a/modules/common/applications/discord.nix b/modules/common/applications/discord.nix
index 1e3193c..d4978b6 100644
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     discord = {
diff --git a/modules/common/applications/firefox.nix b/modules/common/applications/firefox.nix
index 7968c38..f866ace 100644
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
 
@@ -22,8 +27,7 @@
 
       programs.firefox = {
         enable = true;
-        package =
-          if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
+        package = if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
         profiles.default = {
           id = 0;
           name = "default";
@@ -49,32 +53,24 @@
             "app.update.auto" = false;
             "browser.aboutConfig.showWarning" = false;
             "browser.warnOnQuit" = false;
-            "browser.quitShortcut.disabled" =
-              if pkgs.stdenv.isLinux then true else false;
+            "browser.quitShortcut.disabled" = if pkgs.stdenv.isLinux then true else false;
             "browser.theme.dark-private-windows" = true;
             "browser.toolbars.bookmarks.visibility" = false;
             "browser.startup.page" = 3; # Restore previous session
             "browser.newtabpage.enabled" = false; # Make new tabs blank
-            "trailhead.firstrun.didSeeAboutWelcome" =
-              true; # Disable welcome splash
+            "trailhead.firstrun.didSeeAboutWelcome" = true; # Disable welcome splash
             "dom.forms.autocomplete.formautofill" = false; # Disable autofill
-            "extensions.formautofill.creditCards.enabled" =
-              false; # Disable credit cards
+            "extensions.formautofill.creditCards.enabled" = false; # Disable credit cards
             "dom.payments.defaults.saveAddress" = false; # Disable address save
             "general.autoScroll" = true; # Drag middle-mouse to scroll
-            "services.sync.prefs.sync.general.autoScroll" =
-              false; # Prevent disabling autoscroll
+            "services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll
             "extensions.pocket.enabled" = false;
-            "toolkit.legacyUserProfileCustomizations.stylesheets" =
-              true; # Allow userChrome.css
+            "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Allow userChrome.css
             "layout.css.color-mix.enabled" = true;
-            "ui.systemUsesDarkTheme" =
-              if config.theme.dark == true then 1 else 0;
-            "media.ffmpeg.vaapi.enabled" =
-              true; # Enable hardware video acceleration
+            "ui.systemUsesDarkTheme" = if config.theme.dark == true then 1 else 0;
+            "media.ffmpeg.vaapi.enabled" = true; # Enable hardware video acceleration
             "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "devtools.command-button-screenshot.enabled" =
-              true; # Scrolling screenshot of entire page
+            "devtools.command-button-screenshot.enabled" = true; # Scrolling screenshot of entire page
             "svg.context-properties.content.enabled" = true; # Sidebery styling
           };
           userChrome = ''
@@ -160,33 +156,34 @@
 
           extraConfig = "";
         };
-
       };
 
       xdg.mimeApps = {
-        associations.added = { "text.html" = [ "firefox.desktop" ]; };
-        defaultApplications = { "text.html" = [ "firefox.desktop" ]; };
+        associations.added = {
+          "text.html" = [ "firefox.desktop" ];
+        };
+        defaultApplications = {
+          "text.html" = [ "firefox.desktop" ];
+        };
       };
 
-      xsession.windowManager.i3.config.keybindings =
-        lib.mkIf pkgs.stdenv.isLinux {
-          "${
-            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-          }+Shift+b" = "exec ${
-            # Don't name the script `firefox` or it will affect grep
-              builtins.toString (pkgs.writeShellScript "focus-ff.sh" ''
-                count=$(ps aux | grep -c firefox)
-                if [ "$count" -eq 1 ]; then
-                    i3-msg "exec --no-startup-id firefox"
-                    sleep 0.5
-                fi
-                i3-msg "[class=firefox] focus"
-              '')
-            }";
-        };
-
+      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
+        "${
+          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+        }+Shift+b" = "exec ${
+          # Don't name the script `firefox` or it will affect grep
+          builtins.toString (
+            pkgs.writeShellScript "focus-ff.sh" ''
+              count=$(ps aux | grep -c firefox)
+              if [ "$count" -eq 1 ]; then
+                  i3-msg "exec --no-startup-id firefox"
+                  sleep 0.5
+              fi
+              i3-msg "[class=firefox] focus"
+            ''
+          )
+        }";
+      };
     };
-
   };
-
 }
diff --git a/modules/common/applications/kitty.nix b/modules/common/applications/kitty.nix
index bab7e90..4eb9d1f 100644
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     kitty = {
@@ -13,20 +19,19 @@
 
     # Set the Rofi-Systemd terminal for viewing logs
     # Using optionalAttrs because only available in NixOS
-    environment = { } // lib.attrsets.optionalAttrs
-      (builtins.hasAttr "sessionVariables" config.environment) {
+    environment =
+      { }
+      // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
         sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
       };
 
     home-manager.users.${config.user} = {
 
       # Set the i3 terminal
-      xsession.windowManager.i3.config.terminal =
-        lib.mkIf pkgs.stdenv.isLinux "kitty";
+      xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
 
       # Set the Rofi terminal for running programs
-      programs.rofi.terminal =
-        lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
 
       # Display images in the terminal
       programs.fish.shellAliases = {
@@ -48,16 +53,14 @@
 
           # Kitty scrollback nvim
           "kitty_mod+h" = "kitty_scrollback_nvim";
-          "kitty_mod+g" =
-            "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
+          "kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
         };
         settings = {
 
           # Required for kitty-scrollback.nvim
           allow_remote_control = "socket-only";
           listen_on = "unix:/tmp/kitty";
-          action_alias =
-            "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
+          action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
 
           # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
           background = config.theme.colors.base00;
diff --git a/modules/common/applications/media.nix b/modules/common/applications/media.nix
index 7ea70e3..8d819ae 100644
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     media = {
@@ -44,7 +50,10 @@
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
-          "application/pdf" = [ "mupdf.desktop" "wine-extension-pdf.desktop" ];
+          "application/pdf" = [
+            "mupdf.desktop"
+            "wine-extension-pdf.desktop"
+          ];
         };
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
@@ -53,9 +62,6 @@
           "image/*" = [ "nsxiv.desktop" ];
         };
       };
-
     };
-
   };
-
 }
diff --git a/modules/common/applications/obsidian.nix b/modules/common/applications/obsidian.nix
index 189078a..bfe93a3 100644
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     obsidian = {
@@ -18,7 +24,5 @@
     # Broken on 2023-12-11
     # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
     nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
-
   };
-
 }
diff --git a/modules/common/applications/qbittorrent.nix b/modules/common/applications/qbittorrent.nix
index 9750648..1f9adc7 100644
--- a/modules/common/applications/qbittorrent.nix
+++ b/modules/common/applications/qbittorrent.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     qbittorrent = {
@@ -14,8 +20,6 @@
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [ qbittorrent ];
-
     };
   };
-
 }
diff --git a/modules/common/applications/slack.nix b/modules/common/applications/slack.nix
index 4bd866f..ee44440 100644
--- a/modules/common/applications/slack.nix
+++ b/modules/common/applications/slack.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     slack = {
@@ -15,5 +21,4 @@
       home.packages = with pkgs; [ slack ];
     };
   };
-
 }
diff --git a/modules/common/applications/yt-dlp.nix b/modules/common/applications/yt-dlp.nix
index 33fab4c..553c43d 100644
--- a/modules/common/applications/yt-dlp.nix
+++ b/modules/common/applications/yt-dlp.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     yt-dlp = {
@@ -27,9 +33,6 @@
       };
 
       programs.fish.shellAbbrs.yt = "yt-dlp";
-
     };
-
   };
-
 }
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 7cf9c64..a885847 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,7 +1,19 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
 
-  imports =
-    [ ./applications ./mail ./neovim ./programming ./repositories ./shell ];
+  imports = [
+    ./applications
+    ./mail
+    ./neovim
+    ./programming
+    ./repositories
+    ./shell
+  ];
 
   options = {
     user = lib.mkOption {
@@ -17,8 +29,7 @@
       download = lib.mkOption {
         type = lib.types.str;
         description = "XDG directory for downloads";
-        default =
-          if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
+        default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
       };
     };
     identityFile = lib.mkOption {
@@ -47,10 +58,9 @@
     homePath = lib.mkOption {
       type = lib.types.path;
       description = "Path of user's home directory.";
-      default = builtins.toPath (if pkgs.stdenv.isDarwin then
-        "/Users/${config.user}"
-      else
-        "/home/${config.user}");
+      default = builtins.toPath (
+        if pkgs.stdenv.isDarwin then "/Users/${config.user}" else "/home/${config.user}"
+      );
     };
     dotfilesPath = lib.mkOption {
       type = lib.types.path;
@@ -122,28 +132,33 @@
     };
   };
 
-  config = let stateVersion = "23.05";
-  in {
+  config =
+    let
+      stateVersion = "23.05";
+    in
+    {
 
-    # Basic common system packages for all devices
-    environment.systemPackages = with pkgs; [ git vim wget curl ];
+      # Basic common system packages for all devices
+      environment.systemPackages = with pkgs; [
+        git
+        vim
+        wget
+        curl
+      ];
 
-    # Use the system-level nixpkgs instead of Home Manager's
-    home-manager.useGlobalPkgs = true;
+      # Use the system-level nixpkgs instead of Home Manager's
+      home-manager.useGlobalPkgs = true;
 
-    # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
-    # using multiple profiles for one user
-    home-manager.useUserPackages = true;
+      # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
+      # using multiple profiles for one user
+      home-manager.useUserPackages = true;
 
-    # Allow specified unfree packages (identified elsewhere)
-    # Retrieves package object based on string name
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) config.unfreePackages;
-
-    # Pin a state version to prevent warnings
-    home-manager.users.${config.user}.home.stateVersion = stateVersion;
-    home-manager.users.root.home.stateVersion = stateVersion;
-
-  };
+      # Allow specified unfree packages (identified elsewhere)
+      # Retrieves package object based on string name
+      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;
 
+      # Pin a state version to prevent warnings
+      home-manager.users.${config.user}.home.stateVersion = stateVersion;
+      home-manager.users.root.home.stateVersion = stateVersion;
+    };
 }
diff --git a/modules/common/mail/aerc.nix b/modules/common/mail/aerc.nix
index 15f5bcc..308c2aa 100644
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
 
@@ -75,7 +81,9 @@
             "<Esc>" = ":clear<Enter>";
           };
 
-          "messages:folder=Drafts" = { "<Enter>" = ":recall<Enter>"; };
+          "messages:folder=Drafts" = {
+            "<Enter>" = ":recall<Enter>";
+          };
 
           view = {
             "/" = ":toggle-key-passthrough <Enter> /";
@@ -148,21 +156,19 @@
             "<C-p>" = ":prev-tab<Enter>";
             "<C-n>" = ":next-tab<Enter>";
           };
-
         };
         extraConfig = {
           general.unsafe-accounts-conf = true;
-          viewer = { pager = "${pkgs.less}/bin/less -R"; };
+          viewer = {
+            pager = "${pkgs.less}/bin/less -R";
+          };
           filters = {
             "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
-            "text/calendar" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
-            "text/html" =
-              "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
+            "text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
+            "text/html" = "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
             # "text/*" =
             #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
-            "message/delivery-status" =
-              "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
             "application/pdf" = "${pkgs.zathura}/bin/zathura -";
@@ -184,26 +190,27 @@
         name = "aerc";
         exec = "kitty aerc %u";
       };
-      xsession.windowManager.i3.config.keybindings =
-        lib.mkIf pkgs.stdenv.isLinux {
-          "${
-            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-          }+Shift+e" = "exec ${
-            # Don't name the script `aerc` or it will affect grep
-              builtins.toString (pkgs.writeShellScript "focus-mail.sh" ''
-                count=$(ps aux | grep -c aerc)
-                if [ "$count" -eq 1 ]; then
-                    i3-msg "exec --no-startup-id kitty --class aerc aerc"
-                    sleep 0.25
-                fi
-                i3-msg "[class=aerc] focus"
-              '')
-            }";
-        };
-
-      programs.fish.shellAbbrs = { ae = "aerc"; };
+      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
+        "${
+          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+        }+Shift+e" = "exec ${
+          # Don't name the script `aerc` or it will affect grep
+          builtins.toString (
+            pkgs.writeShellScript "focus-mail.sh" ''
+              count=$(ps aux | grep -c aerc)
+              if [ "$count" -eq 1 ]; then
+                  i3-msg "exec --no-startup-id kitty --class aerc aerc"
+                  sleep 0.25
+              fi
+              i3-msg "[class=aerc] focus"
+            ''
+          )
+        }";
+      };
 
+      programs.fish.shellAbbrs = {
+        ae = "aerc";
+      };
     };
-
   };
 }
diff --git a/modules/common/mail/default.nix b/modules/common/mail/default.nix
index 82b2995..bb05316 100644
--- a/modules/common/mail/default.nix
+++ b/modules/common/mail/default.nix
@@ -1,6 +1,16 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  imports = [ ./himalaya.nix ./aerc.nix ./system.nix ];
+  imports = [
+    ./himalaya.nix
+    ./aerc.nix
+    ./system.nix
+  ];
 
   options = {
     mail.enable = lib.mkEnableOption "Mail service.";
@@ -26,7 +36,9 @@
   config = lib.mkIf config.mail.enable {
 
     home-manager.users.${config.user} = {
-      programs.mbsync = { enable = true; };
+      programs.mbsync = {
+        enable = true;
+      };
 
       # Automatically check for mail and keep files synced locally
       services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
@@ -44,8 +56,11 @@
       # Better local mail search
       programs.notmuch = {
         enable = true;
-        new.ignore =
-          [ ".mbsyncstate.lock" ".mbsyncstate.journal" ".mbsyncstate.new" ];
+        new.ignore = [
+          ".mbsyncstate.lock"
+          ".mbsyncstate.journal"
+          ".mbsyncstate.new"
+        ];
       };
 
       accounts.email = {
@@ -54,72 +69,71 @@
         maildirBasePath = "${config.homePath}/mail";
 
         accounts = {
-          home = let address = "${config.mail.user}@${config.mail.server}";
-          in {
-            userName = address;
-            realName = config.fullName;
-            primary = true;
-            inherit address;
-            aliases = map (user: "${user}@${config.mail.server}") [
-              "me"
-              "hey"
-              "admin"
-            ];
+          home =
+            let
+              address = "${config.mail.user}@${config.mail.server}";
+            in
+            {
+              userName = address;
+              realName = config.fullName;
+              primary = true;
+              inherit address;
+              aliases = map (user: "${user}@${config.mail.server}") [
+                "me"
+                "hey"
+                "admin"
+              ];
 
-            # Options for contact completion
-            alot = { };
+              # Options for contact completion
+              alot = { };
 
-            imap = {
-              host = config.mail.imapHost;
-              port = 993;
-              tls.enable = true;
-            };
+              imap = {
+                host = config.mail.imapHost;
+                port = 993;
+                tls.enable = true;
+              };
 
-            # Watch for mail and run notifications or sync
-            imapnotify = {
-              enable = true;
-              boxes = [ "Inbox" ];
-              onNotify = "${pkgs.isync}/bin/mbsync -a";
-              onNotifyPost = lib.mkIf
-                config.home-manager.users.${config.user}.services.dunst.enable
-                "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
-            };
+              # Watch for mail and run notifications or sync
+              imapnotify = {
+                enable = true;
+                boxes = [ "Inbox" ];
+                onNotify = "${pkgs.isync}/bin/mbsync -a";
+                onNotifyPost =
+                  lib.mkIf config.home-manager.users.${config.user}.services.dunst.enable
+                    "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
+              };
 
-            # Name of the directory in maildir for this account
-            maildir = { path = "main"; };
+              # Name of the directory in maildir for this account
+              maildir = {
+                path = "main";
+              };
 
-            # Bi-directional syncing options for local files
-            mbsync = {
-              enable = true;
-              create = "both";
-              expunge = "both";
-              remove = "both";
-              patterns = [ "*" ];
-              extraConfig.channel = {
-                CopyArrivalDate = "yes"; # Sync time of original message
+              # Bi-directional syncing options for local files
+              mbsync = {
+                enable = true;
+                create = "both";
+                expunge = "both";
+                remove = "both";
+                patterns = [ "*" ];
+                extraConfig.channel = {
+                  CopyArrivalDate = "yes"; # Sync time of original message
+                };
+              };
+
+              # Enable indexing
+              notmuch.enable = true;
+
+              # Used to login and send and receive emails
+              passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
+
+              smtp = {
+                host = config.mail.smtpHost;
+                port = 465;
+                tls.enable = true;
               };
             };
-
-            # Enable indexing
-            notmuch.enable = true;
-
-            # Used to login and send and receive emails
-            passwordCommand =
-              "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${
-                pkgs.writeText "mailpass.age"
-                (builtins.readFile ../../../private/mailpass.age)
-              }";
-
-            smtp = {
-              host = config.mail.smtpHost;
-              port = 465;
-              tls.enable = true;
-            };
-          };
         };
       };
-
     };
-
   };
 }
diff --git a/modules/common/mail/himalaya.nix b/modules/common/mail/himalaya.nix
index f906222..c3f1d98 100644
--- a/modules/common/mail/himalaya.nix
+++ b/modules/common/mail/himalaya.nix
@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
 
@@ -6,7 +7,9 @@
 
     home-manager.users.${config.user} = {
 
-      programs.himalaya = { enable = true; };
+      programs.himalaya = {
+        enable = true;
+      };
       accounts.email.accounts.home.himalaya = {
         enable = true;
         settings = {
@@ -15,9 +18,9 @@
         };
       };
 
-      programs.fish.shellAbbrs = { hi = "himalaya"; };
-
+      programs.fish.shellAbbrs = {
+        hi = "himalaya";
+      };
     };
-
   };
 }
diff --git a/modules/common/mail/system.nix b/modules/common/mail/system.nix
index 81476f0..aab3d69 100644
--- a/modules/common/mail/system.nix
+++ b/modules/common/mail/system.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (config.mail.enable || config.server) {
 
@@ -8,17 +14,15 @@
 
       # The system user for sending automatic notifications
       accounts.email.accounts.system =
-        let address = "system@${config.mail.server}";
-        in {
+        let
+          address = "system@${config.mail.server}";
+        in
+        {
           userName = address;
           realName = "NixOS System";
           primary = !config.mail.enable; # Only primary if mail not enabled
           inherit address;
-          passwordCommand =
-            "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
-              pkgs.writeText "mailpass-system.age"
-              (builtins.readFile ../../../private/mailpass-system.age)
-            }";
+          passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${pkgs.writeText "mailpass-system.age" (builtins.readFile ../../../private/mailpass-system.age)}";
           msmtp.enable = true;
           smtp = {
             host = config.mail.smtpHost;
@@ -26,9 +30,6 @@
             tls.enable = true;
           };
         };
-
     };
-
   };
-
 }
diff --git a/modules/common/neovim/config/align.nix b/modules/common/neovim/config/align.nix
index 382f75e..96da51d 100644
--- a/modules/common/neovim/config/align.nix
+++ b/modules/common/neovim/config/align.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # Plugin for aligning text programmatically
 
diff --git a/modules/common/neovim/config/bufferline.nix b/modules/common/neovim/config/bufferline.nix
index c52f21f..aa3c0f1 100644
--- a/modules/common/neovim/config/bufferline.nix
+++ b/modules/common/neovim/config/bufferline.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # Shows buffers in a VSCode-style tab layout
 
@@ -11,7 +12,7 @@
       diagnostics = "nvim_lsp";
       always_show_bufferline = false;
       separator_style = "slant";
-      offsets = [{ filetype = "NvimTree"; }];
+      offsets = [ { filetype = "NvimTree"; } ];
     };
   };
   lua = ''
diff --git a/modules/common/neovim/config/colors.nix b/modules/common/neovim/config/colors.nix
index 9ee4222..7aa048c 100644
--- a/modules/common/neovim/config/colors.nix
+++ b/modules/common/neovim/config/colors.nix
@@ -1,4 +1,10 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
 
   # Sets Neovim colors based on Nix colorscheme
 
@@ -18,5 +24,4 @@
       }
     '';
   };
-
 }
diff --git a/modules/common/neovim/config/completion.nix b/modules/common/neovim/config/completion.nix
index ba4eae9..7d8f1de 100644
--- a/modules/common/neovim/config/completion.nix
+++ b/modules/common/neovim/config/completion.nix
@@ -1,4 +1,5 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, ... }:
+{
 
   plugins = [
     pkgs.vimPlugins.cmp-nvim-lsp
@@ -25,21 +26,15 @@
 
     # Basic completion keybinds
     mapping = {
-      "['<C-n>']" = dsl.rawLua
-        "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
-      "['<C-p>']" = dsl.rawLua
-        "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
-      "['<Down>']" = dsl.rawLua
-        "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
-      "['<Up>']" = dsl.rawLua
-        "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
       "['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
       "['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
       "['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
-      "['<CR>']" = dsl.rawLua
-        "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
-      "['<C-r>']" = dsl.rawLua
-        "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<CR>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
       "['<Esc>']" = dsl.rawLua ''
         function(_)
             cmp.mapping({
@@ -72,13 +67,19 @@
         name = "rg"; # Grep for text from the current directory
         keyword_length = 6;
         max_item_count = 10;
-        option = { additional_arguments = "--ignore-case"; };
+        option = {
+          additional_arguments = "--ignore-case";
+        };
       }
     ];
 
     # Styling of the completion menu
     formatting = {
-      fields = [ "kind" "abbr" "menu" ];
+      fields = [
+        "kind"
+        "abbr"
+        "menu"
+      ];
       format = dsl.rawLua ''
         function(entry, vim_item)
             local kind_icons = {
@@ -125,7 +126,6 @@
       native_menu = false; # Use cmp menu instead of Vim menu
       ghost_text = true; # Show preview auto-completion
     };
-
   };
 
   lua = ''
@@ -145,5 +145,4 @@
         }),
     })
   '';
-
 }
diff --git a/modules/common/neovim/config/gitsigns.nix b/modules/common/neovim/config/gitsigns.nix
index 06777cf..fe36ec3 100644
--- a/modules/common/neovim/config/gitsigns.nix
+++ b/modules/common/neovim/config/gitsigns.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   plugins = [ pkgs.vimPlugins.gitsigns-nvim ];
   setup.gitsigns = { };
   lua = builtins.readFile ./gitsigns.lua;
diff --git a/modules/common/neovim/config/misc.nix b/modules/common/neovim/config/misc.nix
index 74f365a..10a1c6d 100644
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@@ -1,4 +1,10 @@
-{ pkgs, dsl, lib, ... }: {
+{
+  pkgs,
+  dsl,
+  lib,
+  ...
+}:
+{
   plugins = [
     pkgs.vimPlugins.vim-surround # Keybinds for surround characters
     pkgs.vimPlugins.vim-eunuch # File manipulation commands
@@ -13,7 +19,11 @@
 
   # Initialize some plugins
   setup.Comment = { };
-  setup.colorizer = { user_default_options = { names = false; }; };
+  setup.colorizer = {
+    user_default_options = {
+      names = false;
+    };
+  };
   setup.glow = { };
   setup.which-key = { };
   setup.kitty-scrollback = { };
@@ -54,12 +64,15 @@
   vim.o.backup = true; # Easier to recover and more secure
   vim.bo.swapfile = false; # Instead of swaps, create backups
   vim.bo.undofile = true; # Keeps undos after quit
-  vim.o.backupdir =
-    dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
+  vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
   vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
 
   # Required for nvim-cmp completion
-  vim.opt.completeopt = [ "menu" "menuone" "noselect" ];
+  vim.opt.completeopt = [
+    "menu"
+    "menuone"
+    "noselect"
+  ];
 
   lua = lib.mkBefore ''
     vim.loader.enable()
diff --git a/modules/common/neovim/config/statusline.nix b/modules/common/neovim/config/statusline.nix
index 8771d15..39a8310 100644
--- a/modules/common/neovim/config/statusline.nix
+++ b/modules/common/neovim/config/statusline.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   plugins = [ pkgs.vimPlugins.lualine-nvim ];
   setup.lualine = {
     options = {
diff --git a/modules/common/neovim/config/syntax.nix b/modules/common/neovim/config/syntax.nix
index 7814c9f..ec59eaa 100644
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@@ -1,8 +1,9 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
 
   plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
-      with pkgs.tree-sitter-grammars; [
+    (pkgs.vimPlugins.nvim-treesitter.withPlugins (
+      _plugins: with pkgs.tree-sitter-grammars; [
         tree-sitter-bash
         tree-sitter-c
         tree-sitter-fish
@@ -19,7 +20,8 @@
         tree-sitter-toml
         tree-sitter-vimdoc
         tree-sitter-yaml
-      ]))
+      ]
+    ))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
@@ -34,9 +36,15 @@
   ];
 
   setup."nvim-treesitter.configs" = {
-    highlight = { enable = true; };
-    indent = { enable = true; };
-    matchup = { enable = true; }; # Uses vim-matchup
+    highlight = {
+      enable = true;
+    };
+    indent = {
+      enable = true;
+    };
+    matchup = {
+      enable = true;
+    }; # Uses vim-matchup
 
     textobjects = {
       select = {
@@ -70,5 +78,4 @@
     -- Use HCL parser with .tf files
     vim.treesitter.language.register('hcl', 'terraform')
   '';
-
 }
diff --git a/modules/common/neovim/config/telescope.nix b/modules/common/neovim/config/telescope.nix
index 01c29a4..edad0b8 100644
--- a/modules/common/neovim/config/telescope.nix
+++ b/modules/common/neovim/config/telescope.nix
@@ -1,4 +1,5 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, ... }:
+{
 
   # Telescope is a fuzzy finder that can work with different sub-plugins
 
@@ -20,9 +21,15 @@
       };
     };
     pickers = {
-      find_files = { theme = "ivy"; };
-      oldfiles = { theme = "ivy"; };
-      buffers = { theme = "dropdown"; };
+      find_files = {
+        theme = "ivy";
+      };
+      oldfiles = {
+        theme = "ivy";
+      };
+      buffers = {
+        theme = "dropdown";
+      };
     };
     extensions = {
       fzy_native = { };
@@ -33,5 +40,4 @@
   setup.project_nvim = { };
 
   lua = builtins.readFile ./telescope.lua;
-
 }
diff --git a/modules/common/neovim/config/toggleterm.nix b/modules/common/neovim/config/toggleterm.nix
index 42fbe73..fbd45f3 100644
--- a/modules/common/neovim/config/toggleterm.nix
+++ b/modules/common/neovim/config/toggleterm.nix
@@ -1,4 +1,10 @@
-{ pkgs, dsl, config, ... }: {
+{
+  pkgs,
+  dsl,
+  config,
+  ...
+}:
+{
 
   # Toggleterm provides a floating terminal inside the editor for quick access
 
@@ -15,5 +21,4 @@
     ${if config.github then (builtins.readFile ./github.lua) else ""}
     ${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
   '';
-
 }
diff --git a/modules/common/neovim/config/tree.nix b/modules/common/neovim/config/tree.nix
index 53e413b..5da7bfd 100644
--- a/modules/common/neovim/config/tree.nix
+++ b/modules/common/neovim/config/tree.nix
@@ -1,8 +1,12 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, ... }:
+{
 
   # This plugin creates a side drawer for navigating the current project
 
-  plugins = [ pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-web-devicons ];
+  plugins = [
+    pkgs.vimPlugins.nvim-tree-lua
+    pkgs.vimPlugins.nvim-web-devicons
+  ];
 
   # Disable netrw eagerly
   # https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
@@ -16,12 +20,14 @@
     hijack_netrw = true; # Works as the file manager
     sync_root_with_cwd = true; # Change project whenever currend dir changes
     respect_buf_cwd = true; # Change to exact location of focused buffer
-    update_focused_file = { # Change project based on the focused buffer
+    update_focused_file = {
+      # Change project based on the focused buffer
       enable = true;
       update_root = true;
       ignore_list = { };
     };
-    diagnostics = { # Enable LSP and linter integration
+    diagnostics = {
+      # Enable LSP and linter integration
       enable = true;
       icons = {
         hint = "";
@@ -30,7 +36,8 @@
         error = "";
       };
     };
-    renderer = { # Show files with changes vs. current commit
+    renderer = {
+      # Show files with changes vs. current commit
       icons = {
         glyphs = {
           git = {
@@ -61,7 +68,8 @@
         vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
       end
     '';
-    view = { # Set look and feel
+    view = {
+      # Set look and feel
       width = 30;
       side = "left";
       number = false;
@@ -73,5 +81,4 @@
   lua = ''
     vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
   '';
-
 }
diff --git a/modules/common/neovim/default.nix b/modules/common/neovim/default.nix
index 36311dc..712243e 100644
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
@@ -9,8 +14,8 @@ let
     github = true;
     kubernetes = config.kubernetes.enable;
   };
-
-in {
+in
+{
 
   options.neovim.enable = lib.mkEnableOption "Neovim.";
 
@@ -33,7 +38,9 @@ in {
 
         # Create quick aliases for launching Neovim
         programs.fish = {
-          shellAliases = { vim = "nvim"; };
+          shellAliases = {
+            vim = "nvim";
+          };
           shellAbbrs = {
             v = lib.mkForce "nvim";
             vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
@@ -45,23 +52,22 @@ in {
         # Requires removing some of the ANSI escape codes that are sent to the
         # scrollback using sed and baleia, as well as removing several
         # unnecessary features.
-        programs.kitty.settings.scrollback_pager =
-          "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
+        programs.kitty.settings.scrollback_pager = "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
 
         # Create a desktop option for launching Neovim from a file manager
         # (Requires launching the terminal and then executing Neovim)
         xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
           name = "Neovim wrapper";
           exec = "kitty nvim %F";
-          mimeType = [ "text/plain" "text/markdown" ];
+          mimeType = [
+            "text/plain"
+            "text/markdown"
+          ];
         };
         xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
           "text/plain" = [ "nvim.desktop" ];
           "text/markdown" = [ "nvim.desktop" ];
         };
-
       };
-
   };
-
 }
diff --git a/modules/common/neovim/package/default.nix b/modules/common/neovim/package/default.nix
index 806df38..471f581 100644
--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@@ -26,13 +26,25 @@
 #   ] ++ extraConfig;
 # }
 
-{ pkgs, colors, terraform ? false, github ? false, kubernetes ? false, ... }:
+{
+  pkgs,
+  colors,
+  terraform ? false,
+  github ? false,
+  kubernetes ? false,
+  ...
+}:
 
 # Comes from nix2vim overlay:
 # https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
-  inherit colors terraform github kubernetes;
+  inherit
+    colors
+    terraform
+    github
+    kubernetes
+    ;
   imports = [
     ../config/align.nix
     ../config/bufferline.nix
diff --git a/modules/common/programming/default.nix b/modules/common/programming/default.nix
index 7e2593b..f79f364 100644
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
 
   imports = [
     ./haskell.nix
@@ -9,5 +10,4 @@
     ./rust.nix
     ./terraform.nix
   ];
-
 }
diff --git a/modules/common/programming/haskell.nix b/modules/common/programming/haskell.nix
index 203a7c0..4074b99 100644
--- a/modules/common/programming/haskell.nix
+++ b/modules/common/programming/haskell.nix
@@ -1,14 +1,12 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options.haskell.enable = lib.mkEnableOption "Haskell programming language.";
 
   config = lib.mkIf config.haskell.enable {
 
     # Binary Cache for Haskell.nix
-    nix.settings.trusted-public-keys =
-      [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
+    nix.settings.trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
     nix.settings.substituters = [ "https://cache.iog.io" ];
-
   };
-
 }
diff --git a/modules/common/programming/kubernetes.nix b/modules/common/programming/kubernetes.nix
index 8b764d6..895b98b 100644
--- a/modules/common/programming/kubernetes.nix
+++ b/modules/common/programming/kubernetes.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
 
@@ -99,12 +105,16 @@
               views = {
                 charts = {
                   bgColor = "default";
-                  defaultDialColors =
-                    [ config.theme.colors.base0D config.theme.colors.base08 ];
+                  defaultDialColors = [
+                    config.theme.colors.base0D
+                    config.theme.colors.base08
+                  ];
                   # - *blue
                   # - *red
-                  defaultChartColors =
-                    [ config.theme.colors.base0D config.theme.colors.base08 ];
+                  defaultChartColors = [
+                    config.theme.colors.base0D
+                    config.theme.colors.base08
+                  ];
                   # - *blue
                   # - *red
                 };
@@ -149,9 +159,6 @@
           };
         };
       };
-
     };
-
   };
-
 }
diff --git a/modules/common/programming/lua.nix b/modules/common/programming/lua.nix
index 127623d..5ff03a6 100644
--- a/modules/common/programming/lua.nix
+++ b/modules/common/programming/lua.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.lua.enable = lib.mkEnableOption "Lua programming language.";
 
@@ -8,5 +14,4 @@
       sumneko-lua-language-server # Lua LSP
     ];
   };
-
 }
diff --git a/modules/common/programming/nix.nix b/modules/common/programming/nix.nix
index 6ad9b57..3aee56f 100644
--- a/modules/common/programming/nix.nix
+++ b/modules/common/programming/nix.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.nixlang.enable = lib.mkEnableOption "Nix programming language.";
 
diff --git a/modules/common/programming/python.nix b/modules/common/programming/python.nix
index e3d435f..256ec04 100644
--- a/modules/common/programming/python.nix
+++ b/modules/common/programming/python.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.python.enable = lib.mkEnableOption "Python programming language.";
 
@@ -13,10 +19,9 @@
         python310Packages.flake8 # Python linter
       ];
 
-      programs.fish.shellAbbrs = { py = "python3"; };
-
+      programs.fish.shellAbbrs = {
+        py = "python3";
+      };
     };
-
   };
-
 }
diff --git a/modules/common/programming/rust.nix b/modules/common/programming/rust.nix
index 30eb403..232f5b8 100644
--- a/modules/common/programming/rust.nix
+++ b/modules/common/programming/rust.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.rust.enable = lib.mkEnableOption "Rust programming language.";
 
@@ -6,12 +12,16 @@
 
     home-manager.users.${config.user} = {
 
-      programs.fish.shellAbbrs = { ca = "cargo"; };
-
-      home.packages = with pkgs; [ cargo rustc clippy gcc ];
+      programs.fish.shellAbbrs = {
+        ca = "cargo";
+      };
 
+      home.packages = with pkgs; [
+        cargo
+        rustc
+        clippy
+        gcc
+      ];
     };
-
   };
-
 }
diff --git a/modules/common/programming/terraform.nix b/modules/common/programming/terraform.nix
index e156a34..89ec115 100644
--- a/modules/common/programming/terraform.nix
+++ b/modules/common/programming/terraform.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.terraform.enable = lib.mkEnableOption "Terraform tools.";
 
@@ -15,9 +21,6 @@
         terraform-ls # Language server
         tflint # Linter
       ];
-
     };
-
   };
-
 }
diff --git a/modules/common/repositories/default.nix b/modules/common/repositories/default.nix
index f3cec00..a1af845 100644
--- a/modules/common/repositories/default.nix
+++ b/modules/common/repositories/default.nix
@@ -1,5 +1,8 @@
-{ ... }: {
-
-  imports = [ ./dotfiles.nix ./notes.nix ];
+{ ... }:
+{
 
+  imports = [
+    ./dotfiles.nix
+    ./notes.nix
+  ];
 }
diff --git a/modules/common/repositories/dotfiles.nix b/modules/common/repositories/dotfiles.nix
index eabb1e5..ae3ccc7 100644
--- a/modules/common/repositories/dotfiles.nix
+++ b/modules/common/repositories/dotfiles.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Allows me to make sure I can work on my dotfiles locally
 
@@ -11,23 +17,17 @@
       home.activation = {
 
         # Always clone dotfiles repository if it doesn't exist
-        cloneDotfiles =
-          config.home-manager.users.${config.user}.lib.dag.entryAfter
-          [ "writeBoundary" ] ''
-            if [ ! -d "${config.dotfilesPath}" ]; then
-                $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
-                $DRY_RUN_CMD ${pkgs.git}/bin/git \
-                    clone ${config.dotfilesRepo} "${config.dotfilesPath}"
-            fi
-          '';
-
+        cloneDotfiles = config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
+          if [ ! -d "${config.dotfilesPath}" ]; then
+              $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
+              $DRY_RUN_CMD ${pkgs.git}/bin/git \
+                  clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+          fi
+        '';
       };
 
       # Set a variable for dotfiles repo, not necessary but convenient
       home.sessionVariables.DOTS = config.dotfilesPath;
-
     };
-
   };
-
 }
diff --git a/modules/common/shell/atuin.nix b/modules/common/shell/atuin.nix
index ad5acd8..07b8de9 100644
--- a/modules/common/shell/atuin.nix
+++ b/modules/common/shell/atuin.nix
@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   # Shell history sync
 
@@ -10,7 +11,10 @@
 
       programs.atuin = {
         enable = true;
-        flags = [ "--disable-up-arrow" "--disable-ctrl-r" ];
+        flags = [
+          "--disable-up-arrow"
+          "--disable-ctrl-r"
+        ];
         settings = {
           auto_sync = true;
           update_check = false;
@@ -27,13 +31,9 @@
           keymap_mode = "vim-normal";
         };
       };
-
     };
 
     # Give root user the same setup
-    home-manager.users.root.programs.atuin =
-      config.home-manager.users.${config.user}.programs.atuin;
-
+    home-manager.users.root.programs.atuin = config.home-manager.users.${config.user}.programs.atuin;
   };
-
 }
diff --git a/modules/common/shell/bash/default.nix b/modules/common/shell/bash/default.nix
index 06a8367..13b2ee2 100644
--- a/modules/common/shell/bash/default.nix
+++ b/modules/common/shell/bash/default.nix
@@ -1,12 +1,17 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = {
     home-manager.users.${config.user} = {
 
       programs.bash = {
         enable = true;
-        shellAliases =
-          config.home-manager.users.${config.user}.programs.fish.shellAliases;
+        shellAliases = config.home-manager.users.${config.user}.programs.fish.shellAliases;
         initExtra = "";
         profileExtra = "";
       };
@@ -14,7 +19,6 @@
       programs.starship.enableBashIntegration = false;
       programs.zoxide.enableBashIntegration = true;
       programs.fzf.enableBashIntegration = true;
-
     };
   };
 }
diff --git a/modules/common/shell/charm.nix b/modules/common/shell/charm.nix
index 9b7d574..fd18b1b 100644
--- a/modules/common/shell/charm.nix
+++ b/modules/common/shell/charm.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Convenience utilities from charm.sh
 
@@ -12,7 +18,5 @@
       charm # Manage account and filesystem
       pop # Send emails from a TUI
     ];
-
   };
-
 }
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index 4ac2f1d..1d47947 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   imports = [
     ./atuin.nix
     ./bash
diff --git a/modules/common/shell/direnv.nix b/modules/common/shell/direnv.nix
index 37877e1..9a62b45 100644
--- a/modules/common/shell/direnv.nix
+++ b/modules/common/shell/direnv.nix
@@ -1,10 +1,15 @@
-{ config, ... }: {
+{ config, ... }:
+{
 
   # Enables quickly entering Nix shells when changing directories
   home-manager.users.${config.user}.programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
-    config = { whitelist = { prefix = [ config.dotfilesPath ]; }; };
+    config = {
+      whitelist = {
+        prefix = [ config.dotfilesPath ];
+      };
+    };
   };
 
   # programs.direnv.direnvrcExtra = ''
@@ -28,5 +33,4 @@
     keep-outputs = true
     keep-derivations = true
   '';
-
 }
diff --git a/modules/common/shell/fish/default.nix b/modules/common/shell/fish/default.nix
index 3a09ddb..ade0666 100644
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   users.users.${config.user}.shell = pkgs.fish;
   programs.fish.enable = true; # Needed for LightDM to remember username
@@ -46,7 +52,9 @@
         fish_user_key_bindings = {
           body = builtins.readFile ./functions/fish_user_key_bindings.fish;
         };
-        ip = { body = builtins.readFile ./functions/ip.fish; };
+        ip = {
+          body = builtins.readFile ./functions/ip.fish;
+        };
         json = {
           description = "Tidy up JSON using jq";
           body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
@@ -112,8 +120,7 @@
         moon = "curl wttr.in/Moon";
 
         # Cheat Sheets
-        ssl =
-          "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
+        ssl = "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
         fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -";
         publickey = "ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub";
         forloop = "for i in (seq 1 100)";
@@ -122,7 +129,6 @@
         dc = "$DOTS/bin/docker_cleanup";
         dr = "docker run --rm -it";
         db = "docker build . -t";
-
       };
       shellInit = "";
     };
@@ -132,6 +138,5 @@
     programs.starship.enableFishIntegration = true;
     programs.zoxide.enableFishIntegration = true;
     programs.fzf.enableFishIntegration = true;
-
   };
 }
diff --git a/modules/common/shell/fzf.nix b/modules/common/shell/fzf.nix
index a62f5df..3cf55ec 100644
--- a/modules/common/shell/fzf.nix
+++ b/modules/common/shell/fzf.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
 
   # FZF is a fuzzy-finder for the terminal
 
@@ -25,17 +26,20 @@
           '';
         };
       };
-      shellAbbrs = { lsf = "ls -lh | fzf"; };
+      shellAbbrs = {
+        lsf = "ls -lh | fzf";
+      };
     };
 
     # Global fzf configuration
-    home.sessionVariables = let fzfCommand = "fd --type file";
-    in {
-      FZF_DEFAULT_COMMAND = fzfCommand;
-      FZF_CTRL_T_COMMAND = fzfCommand;
-      FZF_DEFAULT_OPTS = "-m --height 50% --border";
-    };
-
+    home.sessionVariables =
+      let
+        fzfCommand = "fd --type file";
+      in
+      {
+        FZF_DEFAULT_COMMAND = fzfCommand;
+        FZF_CTRL_T_COMMAND = fzfCommand;
+        FZF_DEFAULT_OPTS = "-m --height 50% --border";
+      };
   };
-
 }
diff --git a/modules/common/shell/git.nix b/modules/common/shell/git.nix
index 0d97dab..ecd595f 100644
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@@ -1,8 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-let home-packages = config.home-manager.users.${config.user}.home.packages;
-
-in {
+let
+  home-packages = config.home-manager.users.${config.user}.home.packages;
+in
+{
 
   options = {
     gitName = lib.mkOption {
@@ -28,16 +34,26 @@ in {
         userName = config.gitName;
         userEmail = config.gitEmail;
         extraConfig = {
-          core.pager =
-            "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
-          interactive.difffilter =
-            "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
-          pager = { branch = "false"; };
-          safe = { directory = config.dotfilesPath; };
-          pull = { ff = "only"; };
-          push = { autoSetupRemote = "true"; };
-          init = { defaultBranch = "master"; };
-          rebase = { autosquash = "true"; };
+          core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
+          interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
+          pager = {
+            branch = "false";
+          };
+          safe = {
+            directory = config.dotfilesPath;
+          };
+          pull = {
+            ff = "only";
+          };
+          push = {
+            autoSetupRemote = "true";
+          };
+          init = {
+            defaultBranch = "master";
+          };
+          rebase = {
+            autosquash = "true";
+          };
           gpg = {
             format = "ssh";
             ssh.allowedSignersFile = "~/.config/git/allowed-signers";
@@ -45,11 +61,16 @@ in {
           # commit.gpgsign = true;
           # tag.gpgsign = true;
         };
-        ignores = [ ".direnv/**" "result" ];
-        includes = [{
-          path = "~/.config/git/personal";
-          condition = "gitdir:~/dev/personal/";
-        }];
+        ignores = [
+          ".direnv/**"
+          "result"
+        ];
+        includes = [
+          {
+            path = "~/.config/git/personal";
+            condition = "gitdir:~/dev/personal/";
+          }
+        ];
       };
 
       # Personal git config
@@ -86,8 +107,7 @@ in {
         gl = "git log --graph --decorate --oneline -20";
         gll = "git log --graph --decorate --oneline";
         gco = "git checkout";
-        gcom = ''
-          git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
+        gcom = ''git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
         gcob = "git switch -c";
         gb = "git branch";
         gpd = "git push origin -d";
@@ -101,58 +121,63 @@ in {
       };
 
       # Required for fish commands
-      home.packages = with pkgs; [ fish fzf bat ];
+      home.packages = with pkgs; [
+        fish
+        fzf
+        bat
+      ];
 
-      programs.fish.functions = lib.mkIf (builtins.elem pkgs.fzf home-packages
-        && builtins.elem pkgs.bat home-packages) {
-          git = { body = builtins.readFile ./fish/functions/git.fish; };
-          git-add-fuzzy = {
-            body = builtins.readFile ./fish/functions/git-add-fuzzy.fish;
+      programs.fish.functions =
+        lib.mkIf (builtins.elem pkgs.fzf home-packages && builtins.elem pkgs.bat home-packages)
+          {
+            git = {
+              body = builtins.readFile ./fish/functions/git.fish;
+            };
+            git-add-fuzzy = {
+              body = builtins.readFile ./fish/functions/git-add-fuzzy.fish;
+            };
+            git-fuzzy-branch = {
+              argumentNames = "header";
+              body = builtins.readFile ./fish/functions/git-fuzzy-branch.fish;
+            };
+            git-checkout-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "checkout branch...")
+                and git checkout $branch
+              '';
+            };
+            git-delete-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "delete branch...")
+                and git branch -d $branch
+              '';
+            };
+            git-force-delete-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "force delete branch...")
+                and git branch -D $branch
+              '';
+            };
+            git-merge-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "merge from...")
+                and git merge $branch
+              '';
+            };
+            git-show-fuzzy = {
+              body = builtins.readFile ./fish/functions/git-show-fuzzy.fish;
+            };
+            git-commits = {
+              body = builtins.readFile ./fish/functions/git-commits.fish;
+            };
+            git-history = {
+              body = builtins.readFile ./fish/functions/git-history.fish;
+            };
+            uncommitted = {
+              description = "Find uncommitted git repos";
+              body = builtins.readFile ./fish/functions/uncommitted.fish;
+            };
           };
-          git-fuzzy-branch = {
-            argumentNames = "header";
-            body = builtins.readFile ./fish/functions/git-fuzzy-branch.fish;
-          };
-          git-checkout-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "checkout branch...")
-              and git checkout $branch
-            '';
-          };
-          git-delete-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "delete branch...")
-              and git branch -d $branch
-            '';
-          };
-          git-force-delete-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "force delete branch...")
-              and git branch -D $branch
-            '';
-          };
-          git-merge-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "merge from...")
-              and git merge $branch
-            '';
-          };
-          git-show-fuzzy = {
-            body = builtins.readFile ./fish/functions/git-show-fuzzy.fish;
-          };
-          git-commits = {
-            body = builtins.readFile ./fish/functions/git-commits.fish;
-          };
-          git-history = {
-            body = builtins.readFile ./fish/functions/git-history.fish;
-          };
-          uncommitted = {
-            description = "Find uncommitted git repos";
-            body = builtins.readFile ./fish/functions/uncommitted.fish;
-          };
-        };
     };
-
   };
-
 }
diff --git a/modules/common/shell/github.nix b/modules/common/shell/github.nix
index 2cc25f9..8a0aadb 100644
--- a/modules/common/shell/github.nix
+++ b/modules/common/shell/github.nix
@@ -1,40 +1,43 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   home-manager.users.${config.user} = {
 
-    programs.gh =
-      lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
-        enable = true;
-        gitCredentialHelper.enable = true;
-        settings.git_protocol = "https";
-        extensions = [ pkgs.gh-collaborators ];
+    programs.gh = lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
+      enable = true;
+      gitCredentialHelper.enable = true;
+      settings.git_protocol = "https";
+      extensions = [ pkgs.gh-collaborators ];
+    };
+
+    programs.fish = lib.mkIf config.home-manager.users.${config.user}.programs.gh.enable {
+      shellAbbrs = {
+        ghr = "gh repo view -w";
+        gha = "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
+        grw = "gh run watch";
+        grf = "gh run view --log-failed";
+        grl = "gh run view --log";
+        ghpr = "gh pr create && sleep 3 && gh run watch";
+
+        # https://github.com/cli/cli/discussions/4067
+        prs = "gh search prs --state=open --review-requested=@me";
       };
-
-    programs.fish =
-      lib.mkIf config.home-manager.users.${config.user}.programs.gh.enable {
-        shellAbbrs = {
-          ghr = "gh repo view -w";
-          gha =
-            "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
-          grw = "gh run watch";
-          grf = "gh run view --log-failed";
-          grl = "gh run view --log";
-          ghpr = "gh pr create && sleep 3 && gh run watch";
-
-          # https://github.com/cli/cli/discussions/4067
-          prs = "gh search prs --state=open --review-requested=@me";
-        };
-        functions = {
-          repos = {
-            description = "Clone GitHub repositories";
-            argumentNames = "organization";
-            body = ''
-              set directory (gh-repos $organization)
-              and cd $directory
-            '';
-          };
+      functions = {
+        repos = {
+          description = "Clone GitHub repositories";
+          argumentNames = "organization";
+          body = ''
+            set directory (gh-repos $organization)
+            and cd $directory
+          '';
         };
       };
+    };
 
     home.packages = [
       (pkgs.writeShellScriptBin "gh-repos" ''
@@ -76,7 +79,5 @@
         }
       '')
     ];
-
   };
-
 }
diff --git a/modules/common/shell/jujutsu.nix b/modules/common/shell/jujutsu.nix
index 38563ec..52948ad 100644
--- a/modules/common/shell/jujutsu.nix
+++ b/modules/common/shell/jujutsu.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
 
   config = {
 
@@ -9,12 +10,9 @@
       settings = {
         user = {
           name = config.home-manager.users.${config.user}.programs.git.userName;
-          email =
-            config.home-manager.users.${config.user}.programs.git.userEmail;
+          email = config.home-manager.users.${config.user}.programs.git.userEmail;
         };
       };
     };
-
   };
-
 }
diff --git a/modules/common/shell/nixpkgs.nix b/modules/common/shell/nixpkgs.nix
index 5e10602..d08c8be 100644
--- a/modules/common/shell/nixpkgs.nix
+++ b/modules/common/shell/nixpkgs.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   home-manager.users.${config.user} = {
 
     programs.fish = {
@@ -62,22 +68,22 @@
 
     # Create nix-index if doesn't exist
     home.activation.createNixIndex =
-      let cacheDir = "${config.homePath}/.cache/nix-index";
-      in lib.mkIf
-      config.home-manager.users.${config.user}.programs.nix-index.enable
-      (config.home-manager.users.${config.user}.lib.dag.entryAfter
-        [ "writeBoundary" ] ''
+      let
+        cacheDir = "${config.homePath}/.cache/nix-index";
+      in
+      lib.mkIf config.home-manager.users.${config.user}.programs.nix-index.enable (
+        config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
           if [ ! -d ${cacheDir} ]; then
               $DRY_RUN_CMD ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
           fi
-        '');
+        ''
+      );
 
     # Set automatic generation cleanup for home-manager
     nix.gc = {
       automatic = config.nix.gc.automatic;
       options = config.nix.gc.options;
     };
-
   };
 
   nix = {
@@ -92,7 +98,10 @@
     };
 
     # For security, only allow specific users
-    settings.allowed-users = [ "@wheel" config.user ];
+    settings.allowed-users = [
+      "@wheel"
+      config.user
+    ];
 
     # Enable features in Nix commands
     extraOptions = ''
@@ -110,8 +119,7 @@
       # Add community Cachix to binary cache
       # Don't use with macOS because blocked by corporate firewall
       builders-use-substitutes = true;
-      substituters =
-        lib.mkIf (!pkgs.stdenv.isDarwin) [ "https://nix-community.cachix.org" ];
+      substituters = lib.mkIf (!pkgs.stdenv.isDarwin) [ "https://nix-community.cachix.org" ];
       trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
@@ -119,9 +127,6 @@
       # Scans and hard links identical files in the store
       # Not working with macOS: https://github.com/NixOS/nix/issues/7273
       auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
-
     };
-
   };
-
 }
diff --git a/modules/common/shell/starship.nix b/modules/common/shell/starship.nix
index 0b34535..6ef3ecf 100644
--- a/modules/common/shell/starship.nix
+++ b/modules/common/shell/starship.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   home-manager.users.${config.user}.programs.starship = {
     enable = true;
@@ -29,7 +35,9 @@
         truncate_to_repo = true;
         truncation_length = 100;
       };
-      git_branch = { format = "[$symbol$branch]($style)"; };
+      git_branch = {
+        format = "[$symbol$branch]($style)";
+      };
       git_commit = {
         format = "( @ [$hash]($style) )";
         only_detached = false;
@@ -56,8 +64,9 @@
         format = "[$symbol $name]($style)";
         symbol = "❄️";
       };
-      python = { format = "[\${version}\\(\${virtualenv}\\)]($style)"; };
+      python = {
+        format = "[\${version}\\(\${virtualenv}\\)]($style)";
+      };
     };
   };
-
 }
diff --git a/modules/common/shell/utilities.nix b/modules/common/shell/utilities.nix
index 00ec551..d1b80e8 100644
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@@ -10,8 +10,8 @@ let
     .terraform/
     .target/
     /Library/'';
-
-in {
+in
+{
 
   config = {
 
@@ -70,9 +70,6 @@ in {
           body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
         };
       };
-
     };
-
   };
-
 }
diff --git a/modules/common/shell/work.nix b/modules/common/shell/work.nix
index b8b6544..2b79d6d 100644
--- a/modules/common/shell/work.nix
+++ b/modules/common/shell/work.nix
@@ -1,46 +1,52 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
 
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
-    home.packages = let
-      ldap_scheme = "ldaps";
-      magic_number = "2";
-      magic_end_seq = "corp";
-      magic_prefix = "take";
-      ldap_host =
-        "${magic_prefix}${magic_number}.t${magic_number}.${magic_end_seq}";
-      ldap_port = 636;
-      ldap_dc_1 = "${magic_prefix}${magic_number}";
-      ldap_dc_2 = "t${magic_number}";
-      ldap_dc_3 = magic_end_seq;
-      ldap_script = pkgs.writeShellScriptBin "ldap" ''
-        # if ! [ "$LDAP_HOST" ]; then
-        #     echo "No LDAP_HOST specified!"
-        #     exit 1
-        # fi
-        SEARCH_FILTER="$@"
-        ldapsearch -LLL \
-            -B -o ldif-wrap=no \
-            -H "${ldap_scheme}://${ldap_host}:${builtins.toString ldap_port}" \
-            -D "${pkgs.lib.toUpper magic_prefix}${magic_number}\\${
-              pkgs.lib.toLower config.user
-            }" \
-            -w "$(${pkgs._1password}/bin/op item get T${magic_number} --fields label=password)" \
-            -b "DC=${ldap_dc_1},DC=${ldap_dc_2},DC=${ldap_dc_3}" \
-            -s "sub" -x "(cn=$SEARCH_FILTER)" \
-            | jq --slurp \
-                --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
-      '';
-      ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
-        ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
-      '';
-      ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
-        ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
-      '';
-    in [ ldap_script ldapm_script ldapg_script ];
-
+    home.packages =
+      let
+        ldap_scheme = "ldaps";
+        magic_number = "2";
+        magic_end_seq = "corp";
+        magic_prefix = "take";
+        ldap_host = "${magic_prefix}${magic_number}.t${magic_number}.${magic_end_seq}";
+        ldap_port = 636;
+        ldap_dc_1 = "${magic_prefix}${magic_number}";
+        ldap_dc_2 = "t${magic_number}";
+        ldap_dc_3 = magic_end_seq;
+        ldap_script = pkgs.writeShellScriptBin "ldap" ''
+          # if ! [ "$LDAP_HOST" ]; then
+          #     echo "No LDAP_HOST specified!"
+          #     exit 1
+          # fi
+          SEARCH_FILTER="$@"
+          ldapsearch -LLL \
+              -B -o ldif-wrap=no \
+              -H "${ldap_scheme}://${ldap_host}:${builtins.toString ldap_port}" \
+              -D "${pkgs.lib.toUpper magic_prefix}${magic_number}\\${pkgs.lib.toLower config.user}" \
+              -w "$(${pkgs._1password}/bin/op item get T${magic_number} --fields label=password)" \
+              -b "DC=${ldap_dc_1},DC=${ldap_dc_2},DC=${ldap_dc_3}" \
+              -s "sub" -x "(cn=$SEARCH_FILTER)" \
+              | jq --slurp \
+                  --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
+        '';
+        ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
+          ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
+        '';
+        ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
+          ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
+        '';
+      in
+      [
+        ldap_script
+        ldapm_script
+        ldapg_script
+      ];
   };
-
 }
diff --git a/modules/darwin/alacritty.nix b/modules/darwin/alacritty.nix
index 0dcab47..9c099ed 100644
--- a/modules/darwin/alacritty.nix
+++ b/modules/darwin/alacritty.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # MacOS-specific settings for Alacritty
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
@@ -647,5 +653,4 @@
       ];
     };
   };
-
 }
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 04e385b..5a783d4 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
 
   imports = [
     ./alacritty.nix
@@ -14,5 +15,4 @@
     ./user.nix
     ./utilities.nix
   ];
-
 }
diff --git a/modules/darwin/fish.nix b/modules/darwin/fish.nix
index 139568b..2d87722 100644
--- a/modules/darwin/fish.nix
+++ b/modules/darwin/fish.nix
@@ -1,11 +1,10 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   config = {
 
     # MacOS-specific settings for Fish
     programs.fish.useBabelfish = true;
     programs.fish.babelfishPackage = pkgs.babelfish;
-
   };
-
 }
diff --git a/modules/darwin/fonts.nix b/modules/darwin/fonts.nix
index 1edf526..f09a482 100644
--- a/modules/darwin/fonts.nix
+++ b/modules/darwin/fonts.nix
@@ -1,17 +1,22 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
-    home.packages = with pkgs;
-      [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ];
+    home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ];
 
-    programs.alacritty.settings = { font.normal.family = "VictorMono"; };
+    programs.alacritty.settings = {
+      font.normal.family = "VictorMono";
+    };
 
     programs.kitty.font = {
       package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; });
       name = "VictorMono Nerd Font Mono";
     };
-
   };
-
 }
diff --git a/modules/darwin/hammerspoon.nix b/modules/darwin/hammerspoon.nix
index 90315b5..b2db2fe 100644
--- a/modules/darwin/hammerspoon.nix
+++ b/modules/darwin/hammerspoon.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Hammerspoon - MacOS custom automation scripting
 
@@ -6,30 +12,25 @@
 
     home-manager.users.${config.user} = {
       xdg.configFile."hammerspoon/init.lua".source = ./hammerspoon/init.lua;
-      xdg.configFile."hammerspoon/Spoons/ControlEscape.spoon".source =
-        ./hammerspoon/Spoons/ControlEscape.spoon;
-      xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source =
-        ./hammerspoon/Spoons/DismissAlerts.spoon;
-      xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source =
-        pkgs.substituteAll {
-          src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
-          firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
-          discord = "${pkgs.discord}/Applications/Discord.app";
-          kitty = "${pkgs.kitty}/Applications/kitty.app";
-          obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
-          slack = "${pkgs.slack}/Applications/Slack.app";
-        };
-      xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source =
-        ./hammerspoon/Spoons/MoveWindow.spoon;
+      xdg.configFile."hammerspoon/Spoons/ControlEscape.spoon".source = ./hammerspoon/Spoons/ControlEscape.spoon;
+      xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source = ./hammerspoon/Spoons/DismissAlerts.spoon;
+      xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source = pkgs.substituteAll {
+        src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
+        firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
+        discord = "${pkgs.discord}/Applications/Discord.app";
+        kitty = "${pkgs.kitty}/Applications/kitty.app";
+        obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
+        slack = "${pkgs.slack}/Applications/Slack.app";
+      };
+      xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source = ./hammerspoon/Spoons/MoveWindow.spoon;
 
       home.activation.reloadHammerspoon =
-        config.home-manager.users.${config.user}.lib.dag.entryAfter
-        [ "writeBoundary" ] ''
-          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
-          $DRY_RUN_CMD sleep 1
-          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
-        '';
-
+        config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ]
+          ''
+            $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
+            $DRY_RUN_CMD sleep 1
+            $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
+          '';
     };
 
     homebrew.casks = [ "hammerspoon" ];
@@ -38,7 +39,5 @@
       defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
       sudo killall Dock
     '';
-
   };
-
 }
diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index fc1f2b6..47501d7 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Homebrew - Mac-specific packages that aren't in Nix
   config = lib.mkIf pkgs.stdenv.isDarwin {
@@ -14,8 +20,7 @@
     '';
 
     # Add homebrew paths to CLI path
-    home-manager.users.${config.user}.home.sessionPath =
-      [ "/opt/homebrew/bin/" ];
+    home-manager.users.${config.user}.home.sessionPath = [ "/opt/homebrew/bin/" ];
 
     homebrew = {
       enable = true;
@@ -43,7 +48,5 @@
         # "epic-games" # Not packaged for Nix
       ];
     };
-
   };
-
 }
diff --git a/modules/darwin/kitty.nix b/modules/darwin/kitty.nix
index c19419f..c0b03e1 100644
--- a/modules/darwin/kitty.nix
+++ b/modules/darwin/kitty.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # MacOS-specific settings for Kitty
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
@@ -13,5 +19,4 @@
       };
     };
   };
-
 }
diff --git a/modules/darwin/networking.nix b/modules/darwin/networking.nix
index 34faf73..dca3caf 100644
--- a/modules/darwin/networking.nix
+++ b/modules/darwin/networking.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
     networking = {
@@ -7,5 +13,4 @@
       # hostName = "";
     };
   };
-
 }
diff --git a/modules/darwin/nixpkgs.nix b/modules/darwin/nixpkgs.nix
index adbbd3d..fb9b823 100644
--- a/modules/darwin/nixpkgs.nix
+++ b/modules/darwin/nixpkgs.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -27,7 +33,5 @@
         };
       };
     };
-
   };
-
 }
diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix
index 5c83c4b..371c392 100644
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -102,7 +108,6 @@
             "${pkgs.kitty}/Applications/kitty.app"
             "/System/Applications/System Settings.app"
           ];
-
         };
 
         finder = {
@@ -118,7 +123,6 @@
 
           # Allow quitting of Finder application
           QuitMenuItem = true;
-
         };
 
         # Disable "Are you sure you want to open" dialog
@@ -165,12 +169,9 @@
             eventTimeFormat = ''"show"'';
             eventTitleFormat = ''"none"'';
             eventTitleIconFormat = ''"iconCalendar"'';
-            slackBrowser =
-              ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
-            zoomBrowser =
-              ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
-            KeyboardShortcuts_joinEventShortcut =
-              ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
+            slackBrowser = ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
+            zoomBrowser = ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
+            KeyboardShortcuts_joinEventShortcut = ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
             timeFormat = ''"12-hour"'';
           };
         };
@@ -178,7 +179,6 @@
         CustomSystemPreferences = {
 
         };
-
       };
 
       # Settings that don't have an option in nix-darwin
@@ -199,9 +199,6 @@
         defaults write -globalDomain NSStatusItemSelectionPadding -int 6
         defaults write -globalDomain NSStatusItemSpacing -int 6
       '';
-
     };
-
   };
-
 }
diff --git a/modules/darwin/tmux.nix b/modules/darwin/tmux.nix
index 252e70e..ae8f27f 100644
--- a/modules/darwin/tmux.nix
+++ b/modules/darwin/tmux.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.tmux.enable = lib.mkEnableOption "Tmux terminal multiplexer";
 
@@ -127,7 +133,5 @@
       tan = "tmux attach-session -t noah";
       tnn = "tmux new-session -s noah";
     };
-
   };
-
 }
diff --git a/modules/darwin/user.nix b/modules/darwin/user.nix
index d11414e..c457f93 100644
--- a/modules/darwin/user.nix
+++ b/modules/darwin/user.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -6,22 +12,20 @@
       # macOS user
       home = config.homePath;
       shell = pkgs.fish; # Default shell
-
     };
 
     home-manager.users.${config.user} = {
 
       # Default shell setting doesn't work
-      home.sessionVariables = { SHELL = "${pkgs.fish}/bin/fish"; };
+      home.sessionVariables = {
+        SHELL = "${pkgs.fish}/bin/fish";
+      };
 
       # Used for aerc
       xdg.enable = true;
-
     };
 
     # Fix for: 'Error: HOME is set to "/var/root" but we expect "/var/empty"'
     home-manager.users.root.home.homeDirectory = lib.mkForce "/var/root";
-
   };
-
 }
diff --git a/modules/darwin/utilities.nix b/modules/darwin/utilities.nix
index ae57843..2a8e7cc 100644
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@@ -1,8 +1,16 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
 
-  unfreePackages = [ "consul" "vault-bin" ];
+  unfreePackages = [
+    "consul"
+    "vault-bin"
+  ];
 
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -38,7 +46,5 @@
       # Shortcut to edit hosts file
       hosts = "sudo nvim /etc/hosts";
     };
-
   };
-
 }
diff --git a/modules/nixos/applications/calibre.nix b/modules/nixos/applications/calibre.nix
index 4a95223..b8f44d8 100644
--- a/modules/nixos/applications/calibre.nix
+++ b/modules/nixos/applications/calibre.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     calibre = {
@@ -16,6 +22,8 @@
     };
 
     # Forces Calibre to use dark mode
-    environment.sessionVariables = { CALIBRE_USE_DARK_PALETTE = "1"; };
+    environment.sessionVariables = {
+      CALIBRE_USE_DARK_PALETTE = "1";
+    };
   };
 }
diff --git a/modules/nixos/applications/default.nix b/modules/nixos/applications/default.nix
index 4b80379..c81296e 100644
--- a/modules/nixos/applications/default.nix
+++ b/modules/nixos/applications/default.nix
@@ -1,5 +1,8 @@
-{ ... }: {
-
-  imports = [ ./calibre.nix ./nautilus.nix ];
+{ ... }:
+{
 
+  imports = [
+    ./calibre.nix
+    ./nautilus.nix
+  ];
 }
diff --git a/modules/nixos/applications/nautilus.nix b/modules/nixos/applications/nautilus.nix
index 6e13cc2..12b8beb 100644
--- a/modules/nixos/applications/nautilus.nix
+++ b/modules/nixos/applications/nautilus.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     nautilus = {
@@ -28,18 +34,15 @@
       # Generates a QR code and previews it with sushi
       programs.fish.functions = {
         qr = {
-          body =
-            "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
         };
       };
 
       # Set Nautilus as default for opening directories
       xdg.mimeApps = {
         associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-        defaultApplications."inode/directory" =
-          lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
+        defaultApplications."inode/directory" = lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
       };
-
     };
 
     # Delete Trash files older than 1 week
@@ -48,7 +51,5 @@
       wantedBy = [ "default.target" ];
       script = "${pkgs.trash-cli}/bin/trash-empty 7";
     };
-
   };
-
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 6fe5346..af38f80 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,6 +1,12 @@
-{ ... }: {
-
-  imports =
-    [ ./applications ./gaming ./graphical ./hardware ./services ./system ];
+{ ... }:
+{
 
+  imports = [
+    ./applications
+    ./gaming
+    ./graphical
+    ./hardware
+    ./services
+    ./system
+  ];
 }
diff --git a/modules/nixos/gaming/chiaki.nix b/modules/nixos/gaming/chiaki.nix
index 520e636..6a30a5c 100644
--- a/modules/nixos/gaming/chiaki.nix
+++ b/modules/nixos/gaming/chiaki.nix
@@ -1,10 +1,14 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  options.gaming.chiaki.enable =
-    lib.mkEnableOption "Chiaki PlayStation remote play client.";
+  options.gaming.chiaki.enable = lib.mkEnableOption "Chiaki PlayStation remote play client.";
 
   config = lib.mkIf config.gaming.chiaki.enable {
     environment.systemPackages = with pkgs; [ chiaki ];
   };
-
 }
diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix
index 1e47dc5..edd0e5b 100644
--- a/modules/nixos/gaming/default.nix
+++ b/modules/nixos/gaming/default.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   imports = [
     ./chiaki.nix
diff --git a/modules/nixos/gaming/dwarf-fortress.nix b/modules/nixos/gaming/dwarf-fortress.nix
index f48b552..bccb198 100644
--- a/modules/nixos/gaming/dwarf-fortress.nix
+++ b/modules/nixos/gaming/dwarf-fortress.nix
@@ -1,29 +1,34 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  options.gaming.dwarf-fortress.enable =
-    lib.mkEnableOption "Dwarf Fortress free edition.";
+  options.gaming.dwarf-fortress.enable = lib.mkEnableOption "Dwarf Fortress free edition.";
 
   config = lib.mkIf config.gaming.dwarf-fortress.enable {
     unfreePackages = [ "dwarf-fortress" ];
-    environment.systemPackages = let
-      dfDesktopItem = pkgs.makeDesktopItem {
-        name = "dwarf-fortress";
-        desktopName = "Dwarf Fortress";
-        exec = "${pkgs.dwarf-fortress-packages.dwarf-fortress-full}/bin/dfhack";
-        terminal = false;
-      };
-      dtDesktopItem = pkgs.makeDesktopItem {
-        name = "dwarftherapist";
-        desktopName = "Dwarf Therapist";
-        exec =
-          "${pkgs.dwarf-fortress-packages.dwarf-fortress-full}/bin/dwarftherapist";
-        terminal = false;
-      };
-    in [
-      pkgs.dwarf-fortress-packages.dwarf-fortress-full
-      dfDesktopItem
-      dtDesktopItem
-    ];
+    environment.systemPackages =
+      let
+        dfDesktopItem = pkgs.makeDesktopItem {
+          name = "dwarf-fortress";
+          desktopName = "Dwarf Fortress";
+          exec = "${pkgs.dwarf-fortress-packages.dwarf-fortress-full}/bin/dfhack";
+          terminal = false;
+        };
+        dtDesktopItem = pkgs.makeDesktopItem {
+          name = "dwarftherapist";
+          desktopName = "Dwarf Therapist";
+          exec = "${pkgs.dwarf-fortress-packages.dwarf-fortress-full}/bin/dwarftherapist";
+          terminal = false;
+        };
+      in
+      [
+        pkgs.dwarf-fortress-packages.dwarf-fortress-full
+        dfDesktopItem
+        dtDesktopItem
+      ];
   };
-
 }
diff --git a/modules/nixos/gaming/legendary.nix b/modules/nixos/gaming/legendary.nix
index ead410f..e8ee270 100644
--- a/modules/nixos/gaming/legendary.nix
+++ b/modules/nixos/gaming/legendary.nix
@@ -1,11 +1,16 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-let home-packages = config.home-manager.users.${config.user}.home.packages;
+let
+  home-packages = config.home-manager.users.${config.user}.home.packages;
+in
+{
 
-in {
-
-  options.gaming.legendary.enable =
-    lib.mkEnableOption "Legendary Epic Games launcher.";
+  options.gaming.legendary.enable = lib.mkEnableOption "Legendary Epic Games launcher.";
 
   config = lib.mkIf config.gaming.legendary.enable {
     environment.systemPackages = with pkgs; [
@@ -28,29 +33,28 @@ in {
         log_level = error
       '';
 
-      home.file = let
-        ignorePatterns = ''
-          .wine/
-          drive_c/'';
-      in {
-        ".rgignore".text = ignorePatterns;
-        ".fdignore".text = ignorePatterns;
-      };
-
-      programs.fish.functions =
-        lib.mkIf (builtins.elem pkgs.fzf home-packages) {
-          epic-games = {
-            body = ''
-              set game (legendary list 2>/dev/null \
-                  | awk '/^ \* / { print $0; }' \
-                  | sed -e 's/ (.*)$//' -e 's/ \* //' \
-                  | fzf)
-              and legendary launch "$game" &> /dev/null
-            '';
-          };
+      home.file =
+        let
+          ignorePatterns = ''
+            .wine/
+            drive_c/'';
+        in
+        {
+          ".rgignore".text = ignorePatterns;
+          ".fdignore".text = ignorePatterns;
         };
 
+      programs.fish.functions = lib.mkIf (builtins.elem pkgs.fzf home-packages) {
+        epic-games = {
+          body = ''
+            set game (legendary list 2>/dev/null \
+                | awk '/^ \* / { print $0; }' \
+                | sed -e 's/ (.*)$//' -e 's/ \* //' \
+                | fzf)
+            and legendary launch "$game" &> /dev/null
+          '';
+        };
+      };
     };
   };
-
 }
diff --git a/modules/nixos/gaming/lutris.nix b/modules/nixos/gaming/lutris.nix
index d2783e3..7d11f4e 100644
--- a/modules/nixos/gaming/lutris.nix
+++ b/modules/nixos/gaming/lutris.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.gaming.lutris.enable = lib.mkEnableOption "Lutris game installer.";
 
@@ -9,5 +15,4 @@
       wineWowPackages.stable # 32-bit and 64-bit wineWowPackages
     ];
   };
-
 }
diff --git a/modules/nixos/gaming/minecraft-server.nix b/modules/nixos/gaming/minecraft-server.nix
index 869934d..fef0c7a 100644
--- a/modules/nixos/gaming/minecraft-server.nix
+++ b/modules/nixos/gaming/minecraft-server.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
@@ -6,8 +11,8 @@ let
   publicPort = 49732;
   rconPort = 25575;
   rconPassword = "thiscanbeanything";
-
-in {
+in
+{
 
   config = lib.mkIf config.services.minecraft-server.enable {
 
@@ -52,7 +57,9 @@ in {
     # https://dataswamp.org/~solene/2022-08-20-on-demand-minecraft-with-systemd.html
 
     # Prevent Minecraft from starting by default
-    systemd.services.minecraft-server = { wantedBy = pkgs.lib.mkForce [ ]; };
+    systemd.services.minecraft-server = {
+      wantedBy = pkgs.lib.mkForce [ ];
+    };
 
     # Listen for connections on the public port, to trigger the actual
     # listen-minecraft service.
@@ -65,18 +72,25 @@ in {
     # Proxy traffic to local port, and trigger hook-minecraft
     systemd.services.listen-minecraft = {
       path = [ pkgs.systemd ];
-      requires = [ "hook-minecraft.service" "listen-minecraft.socket" ];
-      after = [ "hook-minecraft.service" "listen-minecraft.socket" ];
-      serviceConfig.ExecStart =
-        "${pkgs.systemd.out}/lib/systemd/systemd-socket-proxyd 127.0.0.1:${
-          toString localPort
-        }";
+      requires = [
+        "hook-minecraft.service"
+        "listen-minecraft.socket"
+      ];
+      after = [
+        "hook-minecraft.service"
+        "listen-minecraft.socket"
+      ];
+      serviceConfig.ExecStart = "${pkgs.systemd.out}/lib/systemd/systemd-socket-proxyd 127.0.0.1:${toString localPort}";
     };
 
     # Start Minecraft if required and wait for it to be available
     # Then unlock the listen-minecraft.service
     systemd.services.hook-minecraft = {
-      path = with pkgs; [ systemd libressl busybox ];
+      path = with pkgs; [
+        systemd
+        libressl
+        busybox
+      ];
 
       # Start Minecraft and the auto-shutdown timer
       script = ''
@@ -87,9 +101,7 @@ in {
       # Keep checking until the service is available
       postStart = ''
         for i in $(seq 60); do
-          if ${pkgs.libressl.nc}/bin/nc -z 127.0.0.1 ${
-            toString localPort
-          } > /dev/null ; then
+          if ${pkgs.libressl.nc}/bin/nc -z 127.0.0.1 ${toString localPort} > /dev/null ; then
             exit 0
           fi
           ${pkgs.busybox.out}/bin/sleep 1
@@ -144,7 +156,5 @@ in {
         fi
       '';
     };
-
   };
-
 }
diff --git a/modules/nixos/gaming/ryujinx.nix b/modules/nixos/gaming/ryujinx.nix
index d31df5a..1bd1191 100644
--- a/modules/nixos/gaming/ryujinx.nix
+++ b/modules/nixos/gaming/ryujinx.nix
@@ -1,17 +1,19 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  options.gaming.ryujinx.enable =
-    lib.mkEnableOption "Ryujinx Nintendo Switch application.";
+  options.gaming.ryujinx.enable = lib.mkEnableOption "Ryujinx Nintendo Switch application.";
 
   config = lib.mkIf config.gaming.ryujinx.enable {
     environment.systemPackages = with pkgs; [ ryujinx ];
 
-    home-manager.users.${config.user}.xdg.desktopEntries.ryujinx =
-      lib.mkIf pkgs.stdenv.isLinux {
-        name = "Ryujinx";
-        exec =
-          "env DOTNET_EnableAlternateStackCheck=1 Ryujinx -r /home/${config.user}/media/games/ryujinx/ %f";
-      };
+    home-manager.users.${config.user}.xdg.desktopEntries.ryujinx = lib.mkIf pkgs.stdenv.isLinux {
+      name = "Ryujinx";
+      exec = "env DOTNET_EnableAlternateStackCheck=1 Ryujinx -r /home/${config.user}/media/games/ryujinx/ %f";
+    };
   };
-
 }
diff --git a/modules/nixos/gaming/steam.nix b/modules/nixos/gaming/steam.nix
index 51758ce..3393455 100644
--- a/modules/nixos/gaming/steam.nix
+++ b/modules/nixos/gaming/steam.nix
@@ -1,10 +1,21 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.gaming.steam.enable = lib.mkEnableOption "Steam game launcher.";
 
   config = lib.mkIf (config.gaming.steam.enable && pkgs.stdenv.isLinux) {
     hardware.steam-hardware.enable = true;
-    unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
+    unfreePackages = [
+      "steam"
+      "steam-original"
+      "steamcmd"
+      "steam-run"
+    ];
 
     programs.steam = {
       enable = true;
@@ -13,8 +24,7 @@
         # Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix
         # Based on: https://github.com/NixOS/nixpkgs/issues/73323
         extraEnv = {
-          STEAM_EXTRA_COMPAT_TOOLS_PATHS =
-            lib.makeBinPath [ pkgs.proton-ge-custom ];
+          STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeBinPath [ pkgs.proton-ge-custom ];
         };
       };
     };
@@ -27,13 +37,10 @@
 
       # Allow downloading of GE-Proton and other versions
       protonup-qt
-
     ];
 
     # Seems like NetworkManager can help speed up Steam launch
     # https://www.reddit.com/r/archlinux/comments/qguhco/steam_startup_time_arch_1451_seconds_fedora_34/hi8opet/
     networking.networkmanager.enable = true;
-
   };
-
 }
diff --git a/modules/nixos/graphical/default.nix b/modules/nixos/graphical/default.nix
index 85196de..372abb6 100644
--- a/modules/nixos/graphical/default.nix
+++ b/modules/nixos/graphical/default.nix
@@ -1,4 +1,5 @@
-{ lib, ... }: {
+{ lib, ... }:
+{
 
   imports = [
     ./dunst.nix
@@ -49,7 +50,5 @@
       type = lib.types.path;
       description = "Wallpaper background image file";
     };
-
   };
-
 }
diff --git a/modules/nixos/graphical/dmenu.nix b/modules/nixos/graphical/dmenu.nix
index 962f8ae..0895a69 100644
--- a/modules/nixos/graphical/dmenu.nix
+++ b/modules/nixos/graphical/dmenu.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
 
@@ -8,7 +13,5 @@
 
     home-manager.users.${config.user}.home.packages = [ pkgs.dmenu ];
     gui.launcherCommand = "${pkgs.dmenu}/bin/dmenu_run";
-
   };
-
 }
diff --git a/modules/nixos/graphical/dunst.nix b/modules/nixos/graphical/dunst.nix
index 7700dbf..8926d48 100644
--- a/modules/nixos/graphical/dunst.nix
+++ b/modules/nixos/graphical/dunst.nix
@@ -25,7 +25,5 @@
         };
       };
     };
-
   };
-
 }
diff --git a/modules/nixos/graphical/fonts.nix b/modules/nixos/graphical/fonts.nix
index 470f492..896b3ac 100644
--- a/modules/nixos/graphical/fonts.nix
+++ b/modules/nixos/graphical/fonts.nix
@@ -1,8 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-let fontName = "Victor Mono";
-
-in {
+let
+  fontName = "Victor Mono";
+in
+{
 
   config = lib.mkIf (config.gui.enable && pkgs.stdenv.isLinux) {
 
@@ -24,7 +30,5 @@ in {
       programs.kitty.font.name = fontName;
       services.dunst.settings.global.font = "Hack Nerd Font 14";
     };
-
   };
-
 }
diff --git a/modules/nixos/graphical/gtk.nix b/modules/nixos/graphical/gtk.nix
index 5afdc11..3ebef73 100644
--- a/modules/nixos/graphical/gtk.nix
+++ b/modules/nixos/graphical/gtk.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     gtk.theme = {
@@ -18,20 +24,21 @@
 
     home-manager.users.${config.user} = {
 
-      gtk = let
-        gtkExtraConfig = {
-          gtk-application-prefer-dark-theme = config.theme.dark;
+      gtk =
+        let
+          gtkExtraConfig = {
+            gtk-application-prefer-dark-theme = config.theme.dark;
+          };
+        in
+        {
+          enable = true;
+          theme = {
+            name = config.gtk.theme.name;
+            package = config.gtk.theme.package;
+          };
+          gtk3.extraConfig = gtkExtraConfig;
+          gtk4.extraConfig = gtkExtraConfig;
         };
-      in {
-        enable = true;
-        theme = {
-          name = config.gtk.theme.name;
-          package = config.gtk.theme.package;
-        };
-        gtk3.extraConfig = gtkExtraConfig;
-        gtk4.extraConfig = gtkExtraConfig;
-      };
-
     };
 
     # Required for setting GTK theme (for preferred-color-scheme in browser)
@@ -44,8 +51,8 @@
       package = config.gtk.theme.package;
     };
 
-    environment.sessionVariables = { GTK_THEME = config.gtk.theme.name; };
-
+    environment.sessionVariables = {
+      GTK_THEME = config.gtk.theme.name;
+    };
   };
-
 }
diff --git a/modules/nixos/graphical/i3.nix b/modules/nixos/graphical/i3.nix
index c596827..8dba045 100644
--- a/modules/nixos/graphical/i3.nix
+++ b/modules/nixos/graphical/i3.nix
@@ -1,18 +1,23 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
-  lockCmd =
-    "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
-  lockUpdate =
-    "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
-
-in {
+  lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
+  lockUpdate = "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
+in
+{
 
   config = lib.mkIf pkgs.stdenv.isLinux {
 
     services.xserver.windowManager = {
-      i3 = { enable = config.services.xserver.enable; };
+      i3 = {
+        enable = config.services.xserver.enable;
+      };
     };
 
     environment.systemPackages = with pkgs; [
@@ -23,237 +28,221 @@ in {
     home-manager.users.${config.user} = {
       xsession.windowManager.i3 = {
         enable = config.services.xserver.enable;
-        config = let
-          modifier = "Mod4"; # Super key
-          ws1 = "1:I";
-          ws2 = "2:II";
-          ws3 = "3:III";
-          ws4 = "4:IV";
-          ws5 = "5:V";
-          ws6 = "6:VI";
-          ws7 = "7:VII";
-          ws8 = "8:VIII";
-          ws9 = "9:IX";
-          ws10 = "10:X";
-        in {
-          modifier = modifier;
-          assigns = {
-            "${ws1}" = [{ class = "Firefox"; }];
-            "${ws2}" = [
-              { class = "kitty"; }
-              { class = "aerc"; }
-              { class = "obsidian"; }
+        config =
+          let
+            modifier = "Mod4"; # Super key
+            ws1 = "1:I";
+            ws2 = "2:II";
+            ws3 = "3:III";
+            ws4 = "4:IV";
+            ws5 = "5:V";
+            ws6 = "6:VI";
+            ws7 = "7:VII";
+            ws8 = "8:VIII";
+            ws9 = "9:IX";
+            ws10 = "10:X";
+          in
+          {
+            modifier = modifier;
+            assigns = {
+              "${ws1}" = [ { class = "Firefox"; } ];
+              "${ws2}" = [
+                { class = "kitty"; }
+                { class = "aerc"; }
+                { class = "obsidian"; }
+              ];
+              "${ws3}" = [ { class = "discord"; } ];
+              "${ws4}" = [
+                { class = "steam"; }
+                { class = "Steam"; }
+              ];
+            };
+            bars = [ { command = "echo"; } ]; # Disable i3bar
+            colors =
+              let
+                background = config.theme.colors.base00;
+                inactiveBackground = config.theme.colors.base01;
+                border = config.theme.colors.base01;
+                inactiveBorder = config.theme.colors.base01;
+                text = config.theme.colors.base07;
+                inactiveText = config.theme.colors.base04;
+                urgentBackground = config.theme.colors.base08;
+                indicator = "#00000000";
+              in
+              {
+                background = config.theme.colors.base00;
+                focused = {
+                  inherit
+                    background
+                    indicator
+                    text
+                    border
+                    ;
+                  childBorder = background;
+                };
+                focusedInactive = {
+                  inherit indicator;
+                  background = inactiveBackground;
+                  border = inactiveBorder;
+                  childBorder = inactiveBackground;
+                  text = inactiveText;
+                };
+                # placeholder = { };
+                unfocused = {
+                  inherit indicator;
+                  background = inactiveBackground;
+                  border = inactiveBorder;
+                  childBorder = inactiveBackground;
+                  text = inactiveText;
+                };
+                urgent = {
+                  inherit text indicator;
+                  background = urgentBackground;
+                  border = urgentBackground;
+                  childBorder = urgentBackground;
+                };
+              };
+            floating.modifier = modifier;
+            focus = {
+              mouseWarping = true;
+              newWindow = "urgent";
+              followMouse = false;
+            };
+            keybindings = {
+
+              # Adjust screen brightness
+              "Shift+F12" =
+                # Disable dynamic sleep
+                # https://github.com/rockowitz/ddcutil/issues/323
+                "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
+              "Shift+F11" = "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
+              "XF86MonBrightnessUp" = "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
+              "XF86MonBrightnessDown" = "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
+
+              # Media player controls
+              "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
+              "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
+              "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
+              "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
+
+              # Launchers
+              "${modifier}+Return" = "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
+              "${modifier}+space" = "exec --no-startup-id ${config.launcherCommand}";
+              "${modifier}+Shift+s" = "exec --no-startup-id ${config.systemdSearch}";
+              "${modifier}+Shift+a" = "exec --no-startup-id ${config.audioSwitchCommand}";
+              "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
+              "${modifier}+Shift+period" = "exec --no-startup-id ${config.powerCommand}";
+              "${modifier}+Shift+m" = "exec --no-startup-id ${config.brightnessCommand}";
+              "${modifier}+c" = "exec --no-startup-id ${config.calculatorCommand}";
+              "${modifier}+Shift+c" = "reload";
+              "${modifier}+Shift+r" = "restart";
+              "${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
+              "${modifier}+Shift+x" = "exec ${lockCmd}";
+              "${modifier}+Mod1+h" = "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+              "${modifier}+Mod1+r" = "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+
+              # Window options
+              "${modifier}+q" = "kill";
+              "${modifier}+b" = "exec ${config.toggleBarCommand}";
+              "${modifier}+f" = "fullscreen toggle";
+              "${modifier}+h" = "focus left";
+              "${modifier}+j" = "focus down";
+              "${modifier}+k" = "focus up";
+              "${modifier}+l" = "focus right";
+              "${modifier}+Left" = "focus left";
+              "${modifier}+Down" = "focus down";
+              "${modifier}+Up" = "focus up";
+              "${modifier}+Right" = "focus right";
+              "${modifier}+Shift+h" = "move left";
+              "${modifier}+Shift+j" = "move down";
+              "${modifier}+Shift+k" = "move up";
+              "${modifier}+Shift+l" = "move right";
+              "${modifier}+Shift+Left" = "move left";
+              "${modifier}+Shift+Down" = "move down";
+              "${modifier}+Shift+Up" = "move up";
+              "${modifier}+Shift+Right" = "move right";
+
+              # Tiling
+              "${modifier}+i" = "split h";
+              "${modifier}+v" = "split v";
+              "${modifier}+s" = "layout stacking";
+              "${modifier}+t" = "layout tabbed";
+              "${modifier}+e" = "layout toggle split";
+              "${modifier}+Shift+space" = "floating toggle";
+              "${modifier}+Control+space" = "focus mode_toggle";
+              "${modifier}+a" = "focus parent";
+
+              # Workspaces
+              "${modifier}+1" = "workspace ${ws1}";
+              "${modifier}+2" = "workspace ${ws2}";
+              "${modifier}+3" = "workspace ${ws3}";
+              "${modifier}+4" = "workspace ${ws4}";
+              "${modifier}+5" = "workspace ${ws5}";
+              "${modifier}+6" = "workspace ${ws6}";
+              "${modifier}+7" = "workspace ${ws7}";
+              "${modifier}+8" = "workspace ${ws8}";
+              "${modifier}+9" = "workspace ${ws9}";
+              "${modifier}+0" = "workspace ${ws10}";
+
+              # Move windows
+              "${modifier}+Shift+1" = "move container to workspace ${ws1}; workspace ${ws1}";
+              "${modifier}+Shift+2" = "move container to workspace ${ws2}; workspace ${ws2}";
+              "${modifier}+Shift+3" = "move container to workspace ${ws3}; workspace ${ws3}";
+              "${modifier}+Shift+4" = "move container to workspace ${ws4}; workspace ${ws4}";
+              "${modifier}+Shift+5" = "move container to workspace ${ws5}; workspace ${ws5}";
+              "${modifier}+Shift+6" = "move container to workspace ${ws6}; workspace ${ws6}";
+              "${modifier}+Shift+7" = "move container to workspace ${ws7}; workspace ${ws7}";
+              "${modifier}+Shift+8" = "move container to workspace ${ws8}; workspace ${ws8}";
+              "${modifier}+Shift+9" = "move container to workspace ${ws9}; workspace ${ws9}";
+              "${modifier}+Shift+0" = "move container to workspace ${ws10}; workspace ${ws10}";
+
+              # Move screens
+              "${modifier}+Control+l" = "move workspace to output right";
+              "${modifier}+Control+h" = "move workspace to output left";
+
+              # Resizing
+              "${modifier}+r" = ''mode "resize"'';
+              "${modifier}+Control+Shift+h" = "resize shrink width 10 px or 10 ppt";
+              "${modifier}+Control+Shift+j" = "resize grow height 10 px or 10 ppt";
+              "${modifier}+Control+Shift+k" = "resize shrink height 10 px or 10 ppt";
+              "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
+            };
+            modes = { };
+            startup = [
+              {
+                command = "feh --bg-fill ${config.wallpaper}";
+                always = true;
+                notification = false;
+              }
+              {
+                command = "i3-msg workspace ${ws2}, move workspace to output right";
+                notification = false;
+              }
+              {
+                command = "i3-msg workspace ${ws1}, move workspace to output left";
+                notification = false;
+              }
             ];
-            "${ws3}" = [{ class = "discord"; }];
-            "${ws4}" = [ { class = "steam"; } { class = "Steam"; } ];
-          };
-          bars = [{ command = "echo"; }]; # Disable i3bar
-          colors = let
-            background = config.theme.colors.base00;
-            inactiveBackground = config.theme.colors.base01;
-            border = config.theme.colors.base01;
-            inactiveBorder = config.theme.colors.base01;
-            text = config.theme.colors.base07;
-            inactiveText = config.theme.colors.base04;
-            urgentBackground = config.theme.colors.base08;
-            indicator = "#00000000";
-          in {
-            background = config.theme.colors.base00;
-            focused = {
-              inherit background indicator text border;
-              childBorder = background;
-            };
-            focusedInactive = {
-              inherit indicator;
-              background = inactiveBackground;
-              border = inactiveBorder;
-              childBorder = inactiveBackground;
-              text = inactiveText;
-            };
-            # placeholder = { };
-            unfocused = {
-              inherit indicator;
-              background = inactiveBackground;
-              border = inactiveBorder;
-              childBorder = inactiveBackground;
-              text = inactiveText;
-            };
-            urgent = {
-              inherit text indicator;
-              background = urgentBackground;
-              border = urgentBackground;
-              childBorder = urgentBackground;
+            window = {
+              border = 0;
+              hideEdgeBorders = "smart";
+              titlebar = false;
             };
+            workspaceAutoBackAndForth = false;
+            workspaceOutputAssign = [ ];
+            # gaps = {
+            # bottom = 8;
+            # top = 8;
+            # left = 8;
+            # right = 8;
+            # horizontal = 15;
+            # vertical = 15;
+            # inner = 15;
+            # outer = 0;
+            # smartBorders = "off";
+            # smartGaps = false;
+            # };
           };
-          floating.modifier = modifier;
-          focus = {
-            mouseWarping = true;
-            newWindow = "urgent";
-            followMouse = false;
-          };
-          keybindings = {
-
-            # Adjust screen brightness
-            "Shift+F12" =
-              # Disable dynamic sleep
-              # https://github.com/rockowitz/ddcutil/issues/323
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-            "Shift+F11" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-            "XF86MonBrightnessUp" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-            "XF86MonBrightnessDown" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-
-            # Media player controls
-            "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
-            "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
-            "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
-            "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-
-            # Launchers
-            "${modifier}+Return" =
-              "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
-            "${modifier}+space" =
-              "exec --no-startup-id ${config.launcherCommand}";
-            "${modifier}+Shift+s" =
-              "exec --no-startup-id ${config.systemdSearch}";
-            "${modifier}+Shift+a" =
-              "exec --no-startup-id ${config.audioSwitchCommand}";
-            "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
-            "${modifier}+Shift+period" =
-              "exec --no-startup-id ${config.powerCommand}";
-            "${modifier}+Shift+m" =
-              "exec --no-startup-id ${config.brightnessCommand}";
-            "${modifier}+c" =
-              "exec --no-startup-id ${config.calculatorCommand}";
-            "${modifier}+Shift+c" = "reload";
-            "${modifier}+Shift+r" = "restart";
-            "${modifier}+Shift+q" = ''
-              exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
-            "${modifier}+Shift+x" = "exec ${lockCmd}";
-            "${modifier}+Mod1+h" =
-              "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-            "${modifier}+Mod1+r" =
-              "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-
-            # Window options
-            "${modifier}+q" = "kill";
-            "${modifier}+b" = "exec ${config.toggleBarCommand}";
-            "${modifier}+f" = "fullscreen toggle";
-            "${modifier}+h" = "focus left";
-            "${modifier}+j" = "focus down";
-            "${modifier}+k" = "focus up";
-            "${modifier}+l" = "focus right";
-            "${modifier}+Left" = "focus left";
-            "${modifier}+Down" = "focus down";
-            "${modifier}+Up" = "focus up";
-            "${modifier}+Right" = "focus right";
-            "${modifier}+Shift+h" = "move left";
-            "${modifier}+Shift+j" = "move down";
-            "${modifier}+Shift+k" = "move up";
-            "${modifier}+Shift+l" = "move right";
-            "${modifier}+Shift+Left" = "move left";
-            "${modifier}+Shift+Down" = "move down";
-            "${modifier}+Shift+Up" = "move up";
-            "${modifier}+Shift+Right" = "move right";
-
-            # Tiling
-            "${modifier}+i" = "split h";
-            "${modifier}+v" = "split v";
-            "${modifier}+s" = "layout stacking";
-            "${modifier}+t" = "layout tabbed";
-            "${modifier}+e" = "layout toggle split";
-            "${modifier}+Shift+space" = "floating toggle";
-            "${modifier}+Control+space" = "focus mode_toggle";
-            "${modifier}+a" = "focus parent";
-
-            # Workspaces
-            "${modifier}+1" = "workspace ${ws1}";
-            "${modifier}+2" = "workspace ${ws2}";
-            "${modifier}+3" = "workspace ${ws3}";
-            "${modifier}+4" = "workspace ${ws4}";
-            "${modifier}+5" = "workspace ${ws5}";
-            "${modifier}+6" = "workspace ${ws6}";
-            "${modifier}+7" = "workspace ${ws7}";
-            "${modifier}+8" = "workspace ${ws8}";
-            "${modifier}+9" = "workspace ${ws9}";
-            "${modifier}+0" = "workspace ${ws10}";
-
-            # Move windows
-            "${modifier}+Shift+1" =
-              "move container to workspace ${ws1}; workspace ${ws1}";
-            "${modifier}+Shift+2" =
-              "move container to workspace ${ws2}; workspace ${ws2}";
-            "${modifier}+Shift+3" =
-              "move container to workspace ${ws3}; workspace ${ws3}";
-            "${modifier}+Shift+4" =
-              "move container to workspace ${ws4}; workspace ${ws4}";
-            "${modifier}+Shift+5" =
-              "move container to workspace ${ws5}; workspace ${ws5}";
-            "${modifier}+Shift+6" =
-              "move container to workspace ${ws6}; workspace ${ws6}";
-            "${modifier}+Shift+7" =
-              "move container to workspace ${ws7}; workspace ${ws7}";
-            "${modifier}+Shift+8" =
-              "move container to workspace ${ws8}; workspace ${ws8}";
-            "${modifier}+Shift+9" =
-              "move container to workspace ${ws9}; workspace ${ws9}";
-            "${modifier}+Shift+0" =
-              "move container to workspace ${ws10}; workspace ${ws10}";
-
-            # Move screens
-            "${modifier}+Control+l" = "move workspace to output right";
-            "${modifier}+Control+h" = "move workspace to output left";
-
-            # Resizing
-            "${modifier}+r" = ''mode "resize"'';
-            "${modifier}+Control+Shift+h" =
-              "resize shrink width 10 px or 10 ppt";
-            "${modifier}+Control+Shift+j" =
-              "resize grow height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+k" =
-              "resize shrink height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
-          };
-          modes = { };
-          startup = [
-            {
-              command = "feh --bg-fill ${config.wallpaper}";
-              always = true;
-              notification = false;
-            }
-            {
-              command =
-                "i3-msg workspace ${ws2}, move workspace to output right";
-              notification = false;
-            }
-            {
-              command =
-                "i3-msg workspace ${ws1}, move workspace to output left";
-              notification = false;
-            }
-          ];
-          window = {
-            border = 0;
-            hideEdgeBorders = "smart";
-            titlebar = false;
-          };
-          workspaceAutoBackAndForth = false;
-          workspaceOutputAssign = [ ];
-          # gaps = {
-          # bottom = 8;
-          # top = 8;
-          # left = 8;
-          # right = 8;
-          # horizontal = 15;
-          # vertical = 15;
-          # inner = 15;
-          # outer = 0;
-          # smartBorders = "off";
-          # smartGaps = false;
-          # };
-        };
         extraConfig = "";
       };
 
@@ -266,22 +255,26 @@ in {
 
       # Update lock screen cache only if cache is empty
       home.activation.updateLockScreenCache =
-        let cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
-        in lib.mkIf config.services.xserver.enable
-        (config.home-manager.users.${config.user}.lib.dag.entryAfter
-          [ "writeBoundary" ] ''
+        let
+          cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
+        in
+        lib.mkIf config.services.xserver.enable (
+          config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
             if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
                 $DRY_RUN_CMD ${lockUpdate}
             fi
-          '');
-
+          ''
+        );
     };
 
     # Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service
     systemd.services.lock = {
       enable = config.services.xserver.enable;
       description = "Lock the screen on resume from suspend";
-      before = [ "sleep.target" "suspend.target" ];
+      before = [
+        "sleep.target"
+        "suspend.target"
+      ];
       serviceConfig = {
         User = config.user;
         Type = "simple";
@@ -290,9 +283,10 @@ in {
         ExecStart = lockCmd;
         ExecStartPost = "${pkgs.coreutils-full}/bin/sleep 1";
       };
-      wantedBy = [ "sleep.target" "suspend.target" ];
+      wantedBy = [
+        "sleep.target"
+        "suspend.target"
+      ];
     };
-
   };
-
 }
diff --git a/modules/nixos/graphical/picom.nix b/modules/nixos/graphical/picom.nix
index 102d4d5..062fa53 100644
--- a/modules/nixos/graphical/picom.nix
+++ b/modules/nixos/graphical/picom.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
     home-manager.users.${config.user} = {
@@ -31,18 +37,21 @@
         ];
         shadow = false;
         shadowExclude = [ ];
-        shadowOffsets = [ (-10) (-10) ];
+        shadowOffsets = [
+          (-10)
+          (-10)
+        ];
         shadowOpacity = 0.5;
         vSync = true;
       };
 
-      xsession.windowManager.i3.config.startup = [{
-        command = "systemctl --user restart picom";
-        always = true;
-        notification = false;
-      }];
-
+      xsession.windowManager.i3.config.startup = [
+        {
+          command = "systemctl --user restart picom";
+          always = true;
+          notification = false;
+        }
+      ];
     };
   };
-
 }
diff --git a/modules/nixos/graphical/polybar.nix b/modules/nixos/graphical/polybar.nix
index 9a1f73e..0f4f9e1 100644
--- a/modules/nixos/graphical/polybar.nix
+++ b/modules/nixos/graphical/polybar.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
 
@@ -46,33 +52,36 @@
             # wm-restack = "i3";
             # override-redirect = true;
           };
-          "module/i3" = let padding = 2;
-          in {
-            type = "internal/i3";
-            pin-workspaces = false;
-            show-urgent = true;
-            strip-wsnumbers = true;
-            index-sort = true;
-            enable-click = true;
-            wrapping-scroll = true;
-            fuzzy-match = true;
-            format = "<label-state> <label-mode>";
-            label-focused = "%name%";
-            label-focused-foreground = config.theme.colors.base01;
-            label-focused-background = config.theme.colors.base05;
-            label-focused-underline = config.theme.colors.base03;
-            label-focused-padding = padding;
-            label-unfocused = "%name%";
-            label-unfocused-padding = padding;
-            label-visible = "%name%";
-            label-visible-underline = config.theme.colors.base01;
-            label-visible-padding = padding;
-            label-urgent = "%name%";
-            label-urgent-foreground = config.theme.colors.base00;
-            label-urgent-background = config.theme.colors.base08;
-            label-urgent-underline = config.theme.colors.base0F;
-            label-urgent-padding = padding;
-          };
+          "module/i3" =
+            let
+              padding = 2;
+            in
+            {
+              type = "internal/i3";
+              pin-workspaces = false;
+              show-urgent = true;
+              strip-wsnumbers = true;
+              index-sort = true;
+              enable-click = true;
+              wrapping-scroll = true;
+              fuzzy-match = true;
+              format = "<label-state> <label-mode>";
+              label-focused = "%name%";
+              label-focused-foreground = config.theme.colors.base01;
+              label-focused-background = config.theme.colors.base05;
+              label-focused-underline = config.theme.colors.base03;
+              label-focused-padding = padding;
+              label-unfocused = "%name%";
+              label-unfocused-padding = padding;
+              label-visible = "%name%";
+              label-visible-underline = config.theme.colors.base01;
+              label-visible-padding = padding;
+              label-urgent = "%name%";
+              label-urgent-foreground = config.theme.colors.base00;
+              label-urgent-background = config.theme.colors.base08;
+              label-urgent-underline = config.theme.colors.base0F;
+              label-urgent-padding = padding;
+            };
           "module/xworkspaces" = {
             type = "internal/xworkspaces";
             label-active = "%name%";
@@ -105,24 +114,24 @@
             type = "custom/script";
             interval = 10;
             format = "<label>";
-            exec = builtins.toString (pkgs.writeShellScript "mailcount.sh" ''
-              ${pkgs.notmuch}/bin/notmuch new --quiet 2>&1>/dev/null
-              UNREAD=$(
-                  ${pkgs.notmuch}/bin/notmuch count \
-                      is:inbox and \
-                      is:unread and \
-                      folder:main/Inbox \
-                      2>/dev/null
-              )
-              if [ $UNREAD = "0" ]; then
-                echo ""
-              else
-                echo "%{T2}%{T-} $UNREAD "
-              fi
-            '');
-            click-left =
-              "i3-msg 'exec --no-startup-id kitty --class aerc aerc'; sleep 0.15; i3-msg '[class=aerc] focus'";
-
+            exec = builtins.toString (
+              pkgs.writeShellScript "mailcount.sh" ''
+                ${pkgs.notmuch}/bin/notmuch new --quiet 2>&1>/dev/null
+                UNREAD=$(
+                    ${pkgs.notmuch}/bin/notmuch count \
+                        is:inbox and \
+                        is:unread and \
+                        folder:main/Inbox \
+                        2>/dev/null
+                )
+                if [ $UNREAD = "0" ]; then
+                  echo ""
+                else
+                  echo "%{T2}%{T-} $UNREAD "
+                fi
+              ''
+            );
+            click-left = "i3-msg 'exec --no-startup-id kitty --class aerc aerc'; sleep 0.15; i3-msg '[class=aerc] focus'";
           };
           "module/network" = {
             type = "internal/network";
@@ -220,13 +229,13 @@
         };
       };
 
-      xsession.windowManager.i3.config.startup = [{
-        command = "pkill polybar; polybar -r main";
-        always = true;
-        notification = false;
-      }];
-
+      xsession.windowManager.i3.config.startup = [
+        {
+          command = "pkill polybar; polybar -r main";
+          always = true;
+          notification = false;
+        }
+      ];
     };
   };
-
 }
diff --git a/modules/nixos/graphical/rofi.nix b/modules/nixos/graphical/rofi.nix
index b4befcb..511dd5b 100644
--- a/modules/nixos/graphical/rofi.nix
+++ b/modules/nixos/graphical/rofi.nix
@@ -1,148 +1,167 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
   rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
+in
+{
 
-in {
-
-  imports = [ ./rofi/power.nix ./rofi/brightness.nix ];
+  imports = [
+    ./rofi/power.nix
+    ./rofi/brightness.nix
+  ];
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
 
     # Set the Rofi-Systemd terminal for viewing logs
-    environment.sessionVariables.ROFI_SYSTEMD_TERM =
-      lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
+    environment.sessionVariables.ROFI_SYSTEMD_TERM = lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
 
     home-manager.users.${config.user} = {
 
-      home.packages = with pkgs;
-        [
-          jq # Required for rofi-systemd
-        ];
+      home.packages = with pkgs; [
+        jq # Required for rofi-systemd
+      ];
 
       programs.rofi = {
         enable = true;
         cycle = true;
         location = "center";
         pass = { };
-        plugins = [ pkgs.rofi-calc pkgs.rofi-emoji pkgs.rofi-systemd ];
-        theme = let
-          inherit (config.home-manager.users.${config.user}.lib.formats.rasi)
-            mkLiteral;
-        in {
+        plugins = [
+          pkgs.rofi-calc
+          pkgs.rofi-emoji
+          pkgs.rofi-systemd
+        ];
+        theme =
+          let
+            inherit (config.home-manager.users.${config.user}.lib.formats.rasi) mkLiteral;
+          in
+          {
 
-          # Inspired by https://github.com/sherubthakur/dotfiles/blob/master/users/modules/desktop-environment/rofi/launcher.rasi
+            # Inspired by https://github.com/sherubthakur/dotfiles/blob/master/users/modules/desktop-environment/rofi/launcher.rasi
 
-          "*" = {
-            background-color = mkLiteral config.theme.colors.base00;
-            foreground-color = mkLiteral config.theme.colors.base07;
-            text-color = mkLiteral config.theme.colors.base07;
-            border-color = mkLiteral config.theme.colors.base04;
-          };
+            "*" = {
+              background-color = mkLiteral config.theme.colors.base00;
+              foreground-color = mkLiteral config.theme.colors.base07;
+              text-color = mkLiteral config.theme.colors.base07;
+              border-color = mkLiteral config.theme.colors.base04;
+            };
 
-          # Holds the entire window
-          "#window" = {
-            transparency = "real";
-            background-color = mkLiteral config.theme.colors.base00;
-            text-color = mkLiteral config.theme.colors.base07;
-            border = mkLiteral "4px";
-            border-color = mkLiteral config.theme.colors.base04;
-            border-radius = mkLiteral "4px";
-            width = mkLiteral "850px";
-            padding = mkLiteral "15px";
-          };
+            # Holds the entire window
+            "#window" = {
+              transparency = "real";
+              background-color = mkLiteral config.theme.colors.base00;
+              text-color = mkLiteral config.theme.colors.base07;
+              border = mkLiteral "4px";
+              border-color = mkLiteral config.theme.colors.base04;
+              border-radius = mkLiteral "4px";
+              width = mkLiteral "850px";
+              padding = mkLiteral "15px";
+            };
 
-          # Wrapper around bar and results
-          "#mainbox" = {
-            background-color = mkLiteral config.theme.colors.base00;
-            border = mkLiteral "0px";
-            border-radius = mkLiteral "0px";
-            border-color = mkLiteral config.theme.colors.base04;
-            children = map mkLiteral [ "inputbar" "message" "listview" ];
-            spacing = mkLiteral "10px";
-            padding = mkLiteral "10px";
-          };
+            # Wrapper around bar and results
+            "#mainbox" = {
+              background-color = mkLiteral config.theme.colors.base00;
+              border = mkLiteral "0px";
+              border-radius = mkLiteral "0px";
+              border-color = mkLiteral config.theme.colors.base04;
+              children = map mkLiteral [
+                "inputbar"
+                "message"
+                "listview"
+              ];
+              spacing = mkLiteral "10px";
+              padding = mkLiteral "10px";
+            };
 
-          # Unknown
-          "#textbox-prompt-colon" = {
-            expand = false;
-            str = ":";
-            margin = mkLiteral "0px 0.3em 0em 0em";
-            text-color = mkLiteral config.theme.colors.base07;
-          };
+            # Unknown
+            "#textbox-prompt-colon" = {
+              expand = false;
+              str = ":";
+              margin = mkLiteral "0px 0.3em 0em 0em";
+              text-color = mkLiteral config.theme.colors.base07;
+            };
 
-          # Command prompt left of the input
-          "#prompt" = { enabled = false; };
+            # Command prompt left of the input
+            "#prompt" = {
+              enabled = false;
+            };
 
-          # Actual text box
-          "#entry" = {
-            placeholder-color = mkLiteral config.theme.colors.base03;
-            expand = true;
-            horizontal-align = "0";
-            placeholder = "";
-            padding = mkLiteral "0px 0px 0px 5px";
-            blink = true;
-          };
+            # Actual text box
+            "#entry" = {
+              placeholder-color = mkLiteral config.theme.colors.base03;
+              expand = true;
+              horizontal-align = "0";
+              placeholder = "";
+              padding = mkLiteral "0px 0px 0px 5px";
+              blink = true;
+            };
 
-          # Top bar
-          "#inputbar" = {
-            children = map mkLiteral [ "prompt" "entry" ];
-            border = mkLiteral "1px";
-            border-radius = mkLiteral "4px";
-            padding = mkLiteral "6px";
-          };
+            # Top bar
+            "#inputbar" = {
+              children = map mkLiteral [
+                "prompt"
+                "entry"
+              ];
+              border = mkLiteral "1px";
+              border-radius = mkLiteral "4px";
+              padding = mkLiteral "6px";
+            };
 
-          # Results
-          "#listview" = {
-            background-color = mkLiteral config.theme.colors.base00;
-            padding = mkLiteral "0px";
-            columns = 1;
-            lines = 12;
-            spacing = "5px";
-            cycle = true;
-            dynamic = true;
-            layout = "vertical";
-          };
+            # Results
+            "#listview" = {
+              background-color = mkLiteral config.theme.colors.base00;
+              padding = mkLiteral "0px";
+              columns = 1;
+              lines = 12;
+              spacing = "5px";
+              cycle = true;
+              dynamic = true;
+              layout = "vertical";
+            };
 
-          # Each result
-          "#element" = {
-            orientation = "vertical";
-            border-radius = mkLiteral "0px";
-            padding = mkLiteral "5px 0px 5px 5px";
-          };
-          "#element.selected" = {
-            border = mkLiteral "1px";
-            border-radius = mkLiteral "4px";
-            border-color = mkLiteral config.theme.colors.base07;
-            background-color = mkLiteral config.theme.colors.base04;
-            text-color = mkLiteral config.theme.colors.base00;
-          };
+            # Each result
+            "#element" = {
+              orientation = "vertical";
+              border-radius = mkLiteral "0px";
+              padding = mkLiteral "5px 0px 5px 5px";
+            };
+            "#element.selected" = {
+              border = mkLiteral "1px";
+              border-radius = mkLiteral "4px";
+              border-color = mkLiteral config.theme.colors.base07;
+              background-color = mkLiteral config.theme.colors.base04;
+              text-color = mkLiteral config.theme.colors.base00;
+            };
 
-          "#element-text" = {
-            expand = true;
-            # horizontal-align = mkLiteral "0.5";
-            vertical-align = mkLiteral "0.5";
-            margin = mkLiteral "0px 2.5px 0px 2.5px";
-          };
-          "#element-text.selected" = {
-            background-color = mkLiteral config.theme.colors.base04;
-            text-color = mkLiteral config.theme.colors.base00;
-          };
+            "#element-text" = {
+              expand = true;
+              # horizontal-align = mkLiteral "0.5";
+              vertical-align = mkLiteral "0.5";
+              margin = mkLiteral "0px 2.5px 0px 2.5px";
+            };
+            "#element-text.selected" = {
+              background-color = mkLiteral config.theme.colors.base04;
+              text-color = mkLiteral config.theme.colors.base00;
+            };
 
-          # Not sure how to get icons
-          "#element-icon" = {
-            size = mkLiteral "18px";
-            border = mkLiteral "0px";
-            padding = mkLiteral "2px 5px 2px 2px";
-            background-color = mkLiteral config.theme.colors.base00;
+            # Not sure how to get icons
+            "#element-icon" = {
+              size = mkLiteral "18px";
+              border = mkLiteral "0px";
+              padding = mkLiteral "2px 5px 2px 2px";
+              background-color = mkLiteral config.theme.colors.base00;
+            };
+            "#element-icon.selected" = {
+              background-color = mkLiteral config.theme.colors.base04;
+              text-color = mkLiteral config.theme.colors.base00;
+            };
           };
-          "#element-icon.selected" = {
-            background-color = mkLiteral config.theme.colors.base04;
-            text-color = mkLiteral config.theme.colors.base00;
-          };
-
-        };
         xoffset = 0;
         yoffset = -20;
         extraConfig = {
@@ -158,21 +177,21 @@ in {
         recursive = true;
         source = ./rofi/themes;
       };
-
     };
 
-    launcherCommand = ''
-      ${rofi}/bin/rofi -modes drun -show drun -theme-str '@import "launcher.rasi"' '';
+    launcherCommand = ''${rofi}/bin/rofi -modes drun -show drun -theme-str '@import "launcher.rasi"' '';
     systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
     altTabCommand = "${rofi}/bin/rofi -show window -modi window";
     calculatorCommand = "${rofi}/bin/rofi -modes calc -show calc";
     audioSwitchCommand = "${
-        (pkgs.writeShellApplication {
-          name = "switch-audio";
-          runtimeInputs = [ pkgs.ponymix rofi ];
-          text = builtins.readFile ./rofi/pulse-sink.sh;
-        })
-      }/bin/switch-audio";
+      (pkgs.writeShellApplication {
+        name = "switch-audio";
+        runtimeInputs = [
+          pkgs.ponymix
+          rofi
+        ];
+        text = builtins.readFile ./rofi/pulse-sink.sh;
+      })
+    }/bin/switch-audio";
   };
-
 }
diff --git a/modules/nixos/graphical/rofi/brightness.nix b/modules/nixos/graphical/rofi/brightness.nix
index ff538c6..5ea54ef 100755
--- a/modules/nixos/graphical/rofi/brightness.nix
+++ b/modules/nixos/graphical/rofi/brightness.nix
@@ -2,14 +2,14 @@
 let
 
   rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
-
-in {
+in
+{
 
   # Adapted from:
   # A rofi powered menu to execute brightness choices.
 
-  config.brightnessCommand = builtins.toString
-    (pkgs.writeShellScript "brightness" ''
+  config.brightnessCommand = builtins.toString (
+    pkgs.writeShellScript "brightness" ''
 
       dimmer="󰃝"
       medium="󰃟"
@@ -45,6 +45,6 @@ in {
           *) exit 1 ;;
       esac
 
-    '');
-
+    ''
+  );
 }
diff --git a/modules/nixos/graphical/rofi/power.nix b/modules/nixos/graphical/rofi/power.nix
index d700ec8..7af928c 100755
--- a/modules/nixos/graphical/rofi/power.nix
+++ b/modules/nixos/graphical/rofi/power.nix
@@ -2,62 +2,63 @@
 let
 
   rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
-
-in {
+in
+{
 
   # Adapted from:
   # https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/scripts/rofi-power
   # A rofi powered menu to execute power related action.
 
-  config.powerCommand = builtins.toString (pkgs.writeShellScript "powermenu" ''
-    power_off=''
-    reboot=''
-    lock=''
-    suspend='󰒲'
-    log_out=''
+  config.powerCommand = builtins.toString (
+    pkgs.writeShellScript "powermenu" ''
+      power_off=''
+      reboot=''
+      lock=''
+      suspend='󰒲'
+      log_out=''
 
-    chosen=$(printf '%s;%s;%s;%s;%s\n' \
-        "$power_off" \
-        "$reboot" \
-        "$lock" \
-        "$suspend" \
-        "$log_out" \
-        | ${rofi}/bin/rofi \
-            -theme-str '@import "power.rasi"' \
-            -hover-select \
-            -me-select-entry "" \
-            -me-accept-entry MousePrimary \
-            -dmenu \
-            -sep ';' \
-            -selected-row 2)
+      chosen=$(printf '%s;%s;%s;%s;%s\n' \
+          "$power_off" \
+          "$reboot" \
+          "$lock" \
+          "$suspend" \
+          "$log_out" \
+          | ${rofi}/bin/rofi \
+              -theme-str '@import "power.rasi"' \
+              -hover-select \
+              -me-select-entry "" \
+              -me-accept-entry MousePrimary \
+              -dmenu \
+              -sep ';' \
+              -selected-row 2)
 
-    confirm () {
-        ${builtins.readFile ./rofi-prompt.sh}
-    }
+      confirm () {
+          ${builtins.readFile ./rofi-prompt.sh}
+      }
 
-    case "$chosen" in
-        "$power_off")
-            confirm 'Shutdown?' && doas shutdown now
-            ;;
+      case "$chosen" in
+          "$power_off")
+              confirm 'Shutdown?' && doas shutdown now
+              ;;
 
-        "$reboot")
-            confirm 'Reboot?' && doas reboot
-            ;;
+          "$reboot")
+              confirm 'Reboot?' && doas reboot
+              ;;
 
-        "$lock")
-            ${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span
-            ;;
+          "$lock")
+              ${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span
+              ;;
 
-        "$suspend")
-            systemctl suspend
-            ;;
+          "$suspend")
+              systemctl suspend
+              ;;
 
-        "$log_out")
-            confirm 'Logout?' && i3-msg exit
-            ;;
-
-        *) exit 1 ;;
-    esac
-  '');
+          "$log_out")
+              confirm 'Logout?' && i3-msg exit
+              ;;
 
+          *) exit 1 ;;
+      esac
+    ''
+  );
 }
diff --git a/modules/nixos/graphical/xorg.nix b/modules/nixos/graphical/xorg.nix
index a414db6..df2717f 100644
--- a/modules/nixos/graphical/xorg.nix
+++ b/modules/nixos/graphical/xorg.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.gui.enable {
 
@@ -20,16 +26,13 @@
           extraSeatDefaults = ''
             greeter-hide-users = false
           '';
-
         };
       };
-
     };
 
-    environment.systemPackages = with pkgs;
-      [
-        xclip # Clipboard
-      ];
+    environment.systemPackages = with pkgs; [
+      xclip # Clipboard
+    ];
 
     home-manager.users.${config.user} = {
 
@@ -37,9 +40,6 @@
         pbcopy = "xclip -selection clipboard -in";
         pbpaste = "xclip -selection clipboard -out";
       };
-
     };
-
   };
-
 }
diff --git a/modules/nixos/hardware/audio.nix b/modules/nixos/hardware/audio.nix
index 72e32cd..a854558 100644
--- a/modules/nixos/hardware/audio.nix
+++ b/modules/nixos/hardware/audio.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
@@ -27,8 +32,8 @@ let
         ${pkgs.volnoti}/bin/volnoti-show $volume
     fi
   '';
-
-in {
+in
+{
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
     sound.enable = true;
@@ -57,28 +62,23 @@ in {
 
         # Make sure that Volnoti actually starts (home-manager doesn't start
         # user daemon's automatically)
-        startup = [{
-          command =
-            "systemctl --user restart volnoti --alpha 0.15 --radius 40 --timeout 0.2";
-          always = true;
-          notification = false;
-        }];
+        startup = [
+          {
+            command = "systemctl --user restart volnoti --alpha 0.15 --radius 40 --timeout 0.2";
+            always = true;
+            notification = false;
+          }
+        ];
 
         # i3 keybinds for changing the volume
         keybindings = {
-          "XF86AudioRaiseVolume" =
-            "exec --no-startup-id ${increaseVolume}/bin/increaseVolume";
-          "XF86AudioLowerVolume" =
-            "exec --no-startup-id ${decreaseVolume}/bin/decreaseVolume";
+          "XF86AudioRaiseVolume" = "exec --no-startup-id ${increaseVolume}/bin/increaseVolume";
+          "XF86AudioLowerVolume" = "exec --no-startup-id ${decreaseVolume}/bin/decreaseVolume";
           "XF86AudioMute" = "exec --no-startup-id ${toggleMute}/bin/toggleMute";
           # We can mute the mic by adding "--default-source"
-          "XF86AudioMicMute" =
-            "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer --default-source --toggle-mute";
+          "XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer --default-source --toggle-mute";
         };
-
       };
-
     };
   };
-
 }
diff --git a/modules/nixos/hardware/boot.nix b/modules/nixos/hardware/boot.nix
index c205d54..4237d9c 100644
--- a/modules/nixos/hardware/boot.nix
+++ b/modules/nixos/hardware/boot.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   boot.loader = lib.mkIf (config.physical && !config.server) {
     grub = {
@@ -44,5 +50,4 @@
 
   # Use latest released Linux kernel by default
   boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-
 }
diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix
index 1353ec9..7274525 100644
--- a/modules/nixos/hardware/default.nix
+++ b/modules/nixos/hardware/default.nix
@@ -1,4 +1,5 @@
-{ lib, ... }: {
+{ lib, ... }:
+{
 
   imports = [
     ./audio.nix
@@ -18,5 +19,4 @@
     physical = lib.mkEnableOption "Whether this machine is a physical device.";
     server = lib.mkEnableOption "Whether this machine is a server.";
   };
-
 }
diff --git a/modules/nixos/hardware/disk.nix b/modules/nixos/hardware/disk.nix
index 079823d..bf183a0 100644
--- a/modules/nixos/hardware/disk.nix
+++ b/modules/nixos/hardware/disk.nix
@@ -1,7 +1,12 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Enable fstrim, which tracks free space on SSDs for garbage collection
   # More info: https://www.reddit.com/r/NixOS/comments/rbzhb1/if_you_have_a_ssd_dont_forget_to_enable_fstrim/
   services.fstrim.enable = true;
-
 }
diff --git a/modules/nixos/hardware/iso.nix b/modules/nixos/hardware/iso.nix
index c6114cb..fd499b2 100644
--- a/modules/nixos/hardware/iso.nix
+++ b/modules/nixos/hardware/iso.nix
@@ -1,4 +1,9 @@
-{ config, lib, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
 {
 
   # options.iso.enable = lib.mkEnableOption "Enable creating as an ISO.";
@@ -14,6 +19,4 @@
   #   isoImage.makeUsbBootable = true;
   #
   # };
-
 }
-
diff --git a/modules/nixos/hardware/keyboard.nix b/modules/nixos/hardware/keyboard.nix
index a3686e6..a818660 100644
--- a/modules/nixos/hardware/keyboard.nix
+++ b/modules/nixos/hardware/keyboard.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.physical {
 
@@ -9,7 +15,6 @@
       # Keyboard responsiveness
       autoRepeatDelay = 250;
       autoRepeatInterval = 40;
-
     };
 
     # Use capslock as escape and/or control
@@ -18,18 +23,19 @@
       keyboards = {
         default = {
           ids = [ "*" ];
-          settings = { main = { capslock = "overload(control, esc)"; }; };
+          settings = {
+            main = {
+              capslock = "overload(control, esc)";
+            };
+          };
         };
       };
     };
 
     # For some reason, keyd doesn't restart properly when updating
-    system.activationScripts.keyd.text =
-      "${pkgs.systemd}/bin/systemctl restart keyd.service";
+    system.activationScripts.keyd.text = "${pkgs.systemd}/bin/systemctl restart keyd.service";
 
     # Enable num lock on login
     home-manager.users.${config.user}.xsession.numlock.enable = true;
-
   };
-
 }
diff --git a/modules/nixos/hardware/monitors.nix b/modules/nixos/hardware/monitors.nix
index 26f497a..7d7f73f 100644
--- a/modules/nixos/hardware/monitors.nix
+++ b/modules/nixos/hardware/monitors.nix
@@ -1,11 +1,16 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.gui.enable {
 
-    environment.systemPackages = with pkgs;
-      [
-        ddcutil # Monitor brightness control
-      ];
+    environment.systemPackages = with pkgs; [
+      ddcutil # Monitor brightness control
+    ];
 
     # Reduce blue light at night
     services.redshift = {
@@ -44,7 +49,5 @@
                                         --output DVI-1 --off \
       '';
     };
-
   };
-
 }
diff --git a/modules/nixos/hardware/mouse.nix b/modules/nixos/hardware/mouse.nix
index cb3d7f5..50d7cf6 100644
--- a/modules/nixos/hardware/mouse.nix
+++ b/modules/nixos/hardware/mouse.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.gui.enable {
 
@@ -15,7 +21,5 @@
       accelProfile = "flat";
       accelSpeed = "1.15";
     };
-
   };
-
 }
diff --git a/modules/nixos/hardware/networking.nix b/modules/nixos/hardware/networking.nix
index 6c4e89a..206a6e3 100644
--- a/modules/nixos/hardware/networking.nix
+++ b/modules/nixos/hardware/networking.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.physical {
 
@@ -22,10 +28,7 @@
     };
 
     environment.systemPackages = [
-      (pkgs.writeShellScriptBin "wake-tempest"
-        "${pkgs.wakeonlan}/bin/wakeonlan --ip=192.168.1.255 74:56:3C:40:37:5D")
+      (pkgs.writeShellScriptBin "wake-tempest" "${pkgs.wakeonlan}/bin/wakeonlan --ip=192.168.1.255 74:56:3C:40:37:5D")
     ];
-
   };
-
 }
diff --git a/modules/nixos/hardware/server.nix b/modules/nixos/hardware/server.nix
index fee76cd..00829b2 100644
--- a/modules/nixos/hardware/server.nix
+++ b/modules/nixos/hardware/server.nix
@@ -1,11 +1,10 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   config = lib.mkIf config.server {
 
     # Servers need a bootloader or they won't start
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
-
   };
-
 }
diff --git a/modules/nixos/hardware/sleep.nix b/modules/nixos/hardware/sleep.nix
index 6821549..cd794a4 100644
--- a/modules/nixos/hardware/sleep.nix
+++ b/modules/nixos/hardware/sleep.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (config.physical && !config.server) {
 
@@ -22,7 +28,5 @@
       ACTION=="add", SUBSYSTEM=="usb", DRIVER=="usb", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="i2c", ATTR{power/wakeup}="disabled"
     '';
-
   };
-
 }
diff --git a/modules/nixos/hardware/wifi.nix b/modules/nixos/hardware/wifi.nix
index 810274e..54c4056 100644
--- a/modules/nixos/hardware/wifi.nix
+++ b/modules/nixos/hardware/wifi.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (config.physical && pkgs.stdenv.isLinux) {
 
@@ -7,7 +13,5 @@
 
     # Allows the user to control the WiFi settings.
     networking.wireless.userControlled.enable = true;
-
   };
-
 }
diff --git a/modules/nixos/hardware/zfs.nix b/modules/nixos/hardware/zfs.nix
index 243c79c..f157915 100644
--- a/modules/nixos/hardware/zfs.nix
+++ b/modules/nixos/hardware/zfs.nix
@@ -1,6 +1,9 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
-  options = { zfs.enable = lib.mkEnableOption "ZFS file system."; };
+  options = {
+    zfs.enable = lib.mkEnableOption "ZFS file system.";
+  };
 
   config = lib.mkIf (config.server && config.zfs.enable) {
 
@@ -8,14 +11,9 @@
     boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
     boot.kernelParams = [ "nohibernate" ];
     boot.supportedFilesystems = [ "zfs" ];
-    services.prometheus.exporters.zfs.enable =
-      config.prometheus.exporters.enable;
+    services.prometheus.exporters.zfs.enable = config.prometheus.exporters.enable;
     prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.zfs.port
-      }"
+      "127.0.0.1:${builtins.toString config.services.prometheus.exporters.zfs.port}"
     ];
-
   };
-
 }
diff --git a/modules/nixos/services/arr.nix b/modules/nixos/services/arr.nix
index c3805b9..69c07cb 100644
--- a/modules/nixos/services/arr.nix
+++ b/modules/nixos/services/arr.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
@@ -25,10 +30,12 @@ let
       apiKey = config.secrets.sabnzbdApiKey.dest;
     };
   };
+in
+{
 
-in {
-
-  options = { arrs.enable = lib.mkEnableOption "Arr services"; };
+  options = {
+    arrs.enable = lib.mkEnableOption "Arr services";
+  };
 
   config = lib.mkIf config.arrs.enable {
 
@@ -74,76 +81,95 @@ in {
         # Group means that routes with the same name are mutually exclusive,
         # so they are split between the appropriate services.
         group = "download";
-        match = [{
-          host = [ config.hostnames.download ];
-          path = [ "/sonarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          # We're able to reference the url and port of the service dynamically 
-          upstreams = [{ dial = arrConfig.sonarr.url; }];
-        }];
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/sonarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            # We're able to reference the url and port of the service dynamically 
+            upstreams = [ { dial = arrConfig.sonarr.url; } ];
+          }
+        ];
       }
       {
         group = "download";
-        match = [{
-          host = [ config.hostnames.download ];
-          path = [ "/radarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = arrConfig.radarr.url; }];
-        }];
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/radarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = arrConfig.radarr.url; } ];
+          }
+        ];
       }
       {
         group = "download";
-        match = [{
-          host = [ config.hostnames.download ];
-          path = [ "/prowlarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          # Prowlarr doesn't offer a dynamic config, so we have to hardcode it
-          upstreams = [{ dial = "localhost:9696"; }];
-        }];
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/prowlarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            # Prowlarr doesn't offer a dynamic config, so we have to hardcode it
+            upstreams = [ { dial = "localhost:9696"; } ];
+          }
+        ];
       }
       {
         group = "download";
-        match = [{
-          host = [ config.hostnames.download ];
-          path = [ "/bazarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{
-            # Bazarr only dynamically sets the port, not the host
-            dial = "localhost:${
-                builtins.toString config.services.bazarr.listenPort
-              }";
-          }];
-        }];
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/bazarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              {
+                # Bazarr only dynamically sets the port, not the host
+                dial = "localhost:${builtins.toString config.services.bazarr.listenPort}";
+              }
+            ];
+          }
+        ];
       }
       {
         group = "download";
-        match = [{
-          host = [ config.hostnames.download ];
-          path = [ "/sabnzbd*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = arrConfig.sabnzbd.url; }];
-        }];
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/sabnzbd*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = arrConfig.sabnzbd.url; } ];
+          }
+        ];
       }
       {
         group = "download";
-        match = [{ host = [ config.hostnames.download ]; }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{
-            dial =
-              "localhost:${builtins.toString config.services.jellyseerr.port}";
-          }];
-        }];
+        match = [ { host = [ config.hostnames.download ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.jellyseerr.port}"; } ];
+          }
+        ];
       }
     ];
 
@@ -160,19 +186,17 @@ in {
         serviceConfig = {
           Type = "simple";
           DynamicUser = true;
-          ExecStart = let
-            # Sabnzbd doesn't accept the URI path, unlike the others
-            url = if name != "sabnzbd" then
-              "http://${attrs.url}/${name}"
-            else
-              "http://${attrs.url}";
+          ExecStart =
+            let
+              # Sabnzbd doesn't accept the URI path, unlike the others
+              url = if name != "sabnzbd" then "http://${attrs.url}/${name}" else "http://${attrs.url}";
+            in
             # Exportarr is trained to pull from the arr services
-          in ''
-            ${pkgs.exportarr}/bin/exportarr ${name} \
-                        --url ${url} \
-                        --port ${attrs.exportarrPort}'';
-          EnvironmentFile =
-            lib.mkIf (builtins.hasAttr "apiKey" attrs) attrs.apiKey;
+            ''
+              ${pkgs.exportarr}/bin/exportarr ${name} \
+                          --url ${url} \
+                          --port ${attrs.exportarrPort}'';
+          EnvironmentFile = lib.mkIf (builtins.hasAttr "apiKey" attrs) attrs.apiKey;
           Restart = "on-failure";
           ProtectHome = true;
           ProtectSystem = "strict";
@@ -216,11 +240,14 @@ in {
     };
 
     # Prometheus scrape targets (expose Exportarr to Prometheus)
-    prometheus.scrapeTargets = map (key:
+    prometheus.scrapeTargets = map (
+      key:
       "127.0.0.1:${
-        lib.attrsets.getAttrFromPath [ key "exportarrPort" ] arrConfig
-      }") (builtins.attrNames arrConfig);
-
+        lib.attrsets.getAttrFromPath [
+          key
+          "exportarrPort"
+        ] arrConfig
+      }"
+    ) (builtins.attrNames arrConfig);
   };
-
 }
diff --git a/modules/nixos/services/backups.nix b/modules/nixos/services/backups.nix
index 939783e..70c0a7f 100644
--- a/modules/nixos/services/backups.nix
+++ b/modules/nixos/services/backups.nix
@@ -1,7 +1,8 @@
 # This is my setup for backing up SQlite databases and other systems to S3 or
 # S3-equivalent services (like Backblaze B2).
 
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options = {
 
@@ -22,7 +23,6 @@
         default = null;
       };
     };
-
   };
 
   config = lib.mkIf (config.backup.s3.endpoint != null) {
@@ -65,7 +65,5 @@
     #   timerConfig = { OnCalendar = "00:05:00"; };
     #   environmentFile = backup.s3File;
     # };
-
   };
-
 }
diff --git a/modules/nixos/services/caddy.nix b/modules/nixos/services/caddy.nix
index 75850e2..5caf123 100644
--- a/modules/nixos/services/caddy.nix
+++ b/modules/nixos/services/caddy.nix
@@ -9,7 +9,13 @@
 # (compiled with an overlay) to insert a plugin for managing DNS validation
 # with Cloudflare's DNS API.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     caddy = {
@@ -40,51 +46,59 @@
 
     # Force Caddy to 403 if not coming from allowlisted source
     caddy.cidrAllowlist = [ "127.0.0.1/32" ];
-    caddy.routes = [{
-      match = [{ not = [{ remote_ip.ranges = config.caddy.cidrAllowlist; }]; }];
-      handle = [{
-        handler = "static_response";
-        status_code = "403";
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [ { not = [ { remote_ip.ranges = config.caddy.cidrAllowlist; } ]; } ];
+        handle = [
+          {
+            handler = "static_response";
+            status_code = "403";
+          }
+        ];
+      }
+    ];
 
     services.caddy = {
       adapter = "''"; # Required to enable JSON
-      configFile = pkgs.writeText "Caddyfile" (builtins.toJSON {
-        apps.http.servers.main = {
-          listen = [ ":443" ];
+      configFile = pkgs.writeText "Caddyfile" (
+        builtins.toJSON {
+          apps.http.servers.main = {
+            listen = [ ":443" ];
 
-          # These routes are pulled from the rest of this repo
-          routes = config.caddy.routes;
-          errors.routes = config.caddy.blocks;
+            # These routes are pulled from the rest of this repo
+            routes = config.caddy.routes;
+            errors.routes = config.caddy.blocks;
 
-          logs = { }; # Uncommenting collects access logs
-        };
-        apps.http.servers.metrics = { }; # Enables Prometheus metrics
-        apps.tls.automation.policies = config.caddy.tlsPolicies;
-
-        # Setup logging to file
-        logging.logs.main = {
-          encoder = { format = "console"; };
-          writer = {
-            output = "file";
-            filename = "${config.services.caddy.logDir}/caddy.log";
-            roll = true;
-            roll_size_mb = 1;
+            logs = { }; # Uncommenting collects access logs
           };
-          level = "INFO";
-        };
-
-      });
+          apps.http.servers.metrics = { }; # Enables Prometheus metrics
+          apps.tls.automation.policies = config.caddy.tlsPolicies;
 
+          # Setup logging to file
+          logging.logs.main = {
+            encoder = {
+              format = "console";
+            };
+            writer = {
+              output = "file";
+              filename = "${config.services.caddy.logDir}/caddy.log";
+              roll = true;
+              roll_size_mb = 1;
+            };
+            level = "INFO";
+          };
+        }
+      );
     };
 
     # Allows Caddy to serve lower ports (443, 80)
-    systemd.services.caddy.serviceConfig.AmbientCapabilities =
-      "CAP_NET_BIND_SERVICE";
+    systemd.services.caddy.serviceConfig.AmbientCapabilities = "CAP_NET_BIND_SERVICE";
 
     # Required for web traffic to reach this machine
-    networking.firewall.allowedTCPPorts = [ 80 443 ];
+    networking.firewall.allowedTCPPorts = [
+      80
+      443
+    ];
 
     # HTTP/3 QUIC uses UDP (not sure if being used)
     networking.firewall.allowedUDPPorts = [ 443 ];
@@ -92,7 +106,5 @@
     # Caddy exposes Prometheus metrics with the admin API
     # https://caddyserver.com/docs/api
     prometheus.scrapeTargets = [ "127.0.0.1:2019" ];
-
   };
-
 }
diff --git a/modules/nixos/services/calibre.nix b/modules/nixos/services/calibre.nix
index 1ea5326..d6a029e 100644
--- a/modules/nixos/services/calibre.nix
+++ b/modules/nixos/services/calibre.nix
@@ -4,13 +4,18 @@
 # - Hostname defined with config.hostnames.books
 # - File directory backed up to S3 on a cron schedule.
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
   libraryPath = "/data/books";
-
-in {
+in
+{
 
   options = {
     backups.calibre = lib.mkOption {
@@ -33,20 +38,22 @@ in {
     };
 
     # Allow web traffic to Caddy
-    caddy.routes = [{
-      match = [{ host = [ config.hostnames.books ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial = "localhost:${
-              builtins.toString config.services.calibre-web.listen.port
-            }";
-        }];
-        # This is required when calibre-web is behind a reverse proxy
-        # https://github.com/janeczku/calibre-web/issues/19
-        headers.request.add."X-Script-Name" = [ "/calibre-web" ];
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.books ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              { dial = "localhost:${builtins.toString config.services.calibre-web.listen.port}"; }
+            ];
+            # This is required when calibre-web is behind a reverse proxy
+            # https://github.com/janeczku/calibre-web/issues/19
+            headers.request.add."X-Script-Name" = [ "/calibre-web" ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.books ];
@@ -80,7 +87,5 @@ in {
             --endpoint-url=https://${config.backup.s3.endpoint}
       '';
     };
-
   };
-
 }
diff --git a/modules/nixos/services/cloudflare-tunnel.nix b/modules/nixos/services/cloudflare-tunnel.nix
index 2446519..3e770f8 100644
--- a/modules/nixos/services/cloudflare-tunnel.nix
+++ b/modules/nixos/services/cloudflare-tunnel.nix
@@ -52,7 +52,9 @@
           # Catch-all if no match (should never happen anyway)
           default = "http_status:404";
           # Match from ingress of any valid server name to SSH access
-          ingress = { "*.masu.rs" = "ssh://localhost:22"; };
+          ingress = {
+            "*.masu.rs" = "ssh://localhost:22";
+          };
         };
       };
     };
@@ -79,8 +81,7 @@
         # if there is no existing AuthenticationMethods
         AuthenticationMethods publickey
     '';
-    services.openssh.settings.Macs =
-      [ "hmac-sha2-512" ]; # Fix for failure to find matching mac
+    services.openssh.settings.Macs = [ "hmac-sha2-512" ]; # Fix for failure to find matching mac
 
     # Create credentials file for Cloudflare
     secrets.cloudflared = {
@@ -91,11 +92,8 @@
       permissions = "0440";
     };
     systemd.services.cloudflared-secret = {
-      requiredBy =
-        [ "cloudflared-tunnel-${config.cloudflareTunnel.id}.service" ];
+      requiredBy = [ "cloudflared-tunnel-${config.cloudflareTunnel.id}.service" ];
       before = [ "cloudflared-tunnel-${config.cloudflareTunnel.id}.service" ];
     };
-
   };
-
 }
diff --git a/modules/nixos/services/cloudflare.nix b/modules/nixos/services/cloudflare.nix
index bb2270c..3ba4fa5 100644
--- a/modules/nixos/services/cloudflare.nix
+++ b/modules/nixos/services/cloudflare.nix
@@ -8,7 +8,12 @@
 # DNS validation plugin to connect to Cloudflare and automatically create
 # validation DNS records for our generated certificates.
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
@@ -39,10 +44,9 @@ let
     "2405:8100::/32"
     "2a06:98c0::/29"
     "2c0f:f248::/32"
-
   ];
-
-in {
+in
+{
 
   options.cloudflare.enable = lib.mkEnableOption "Use Cloudflare.";
 
@@ -59,23 +63,26 @@ in {
 
     # Tell Caddy to use Cloudflare DNS for ACME challenge validation
     services.caddy.package = pkgs.caddy-cloudflare; # Patched overlay
-    caddy.tlsPolicies = [{
-      issuers = [{
-        module = "acme";
-        challenges = {
-          dns = {
-            provider = {
-              name = "cloudflare";
-              api_token = "{env.CLOUDFLARE_API_TOKEN}";
+    caddy.tlsPolicies = [
+      {
+        issuers = [
+          {
+            module = "acme";
+            challenges = {
+              dns = {
+                provider = {
+                  name = "cloudflare";
+                  api_token = "{env.CLOUDFLARE_API_TOKEN}";
+                };
+                resolvers = [ "1.1.1.1" ];
+              };
             };
-            resolvers = [ "1.1.1.1" ];
-          };
-        };
-      }];
-    }];
+          }
+        ];
+      }
+    ];
     # Allow Caddy to read Cloudflare API key for DNS validation
-    systemd.services.caddy.serviceConfig.EnvironmentFile =
-      config.secrets.cloudflare-api.dest;
+    systemd.services.caddy.serviceConfig.EnvironmentFile = config.secrets.cloudflare-api.dest;
 
     # API key must have access to modify Cloudflare DNS records
     secrets.cloudflare-api = {
@@ -95,59 +102,58 @@ in {
     services.nextcloud.settings.trusted_proxies = cloudflareIpRanges;
 
     # Allows Transmission to trust Cloudflare IPs
-    services.transmission.settings.rpc-whitelist =
-      builtins.concatStringsSep "," ([ "127.0.0.1" ] ++ cloudflareIpRanges);
+    services.transmission.settings.rpc-whitelist = builtins.concatStringsSep "," (
+      [ "127.0.0.1" ] ++ cloudflareIpRanges
+    );
 
-    services.cloudflare-dyndns = lib.mkIf
-      ((builtins.length config.services.cloudflare-dyndns.domains) > 0) {
-        enable = true;
-        proxied = true;
-        deleteMissing = true;
-        apiTokenFile = config.secrets.cloudflare-api.dest;
-      };
+    services.cloudflare-dyndns =
+      lib.mkIf ((builtins.length config.services.cloudflare-dyndns.domains) > 0)
+        {
+          enable = true;
+          proxied = true;
+          deleteMissing = true;
+          apiTokenFile = config.secrets.cloudflare-api.dest;
+        };
 
     # Wait for secret to exist to start
-    systemd.services.cloudflare-dyndns =
-      lib.mkIf config.services.cloudflare-dyndns.enable {
-        after = [ "cloudflare-api-secret.service" ];
-        requires = [ "cloudflare-api-secret.service" ];
-      };
+    systemd.services.cloudflare-dyndns = lib.mkIf config.services.cloudflare-dyndns.enable {
+      after = [ "cloudflare-api-secret.service" ];
+      requires = [ "cloudflare-api-secret.service" ];
+    };
 
     # Run a second copy of dyn-dns for non-proxied domains
     # Adapted from: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/networking/cloudflare-dyndns.nix
     systemd.services.cloudflare-dyndns-noproxy =
-      lib.mkIf ((builtins.length config.cloudflare.noProxyDomains) > 0) {
-        description = "CloudFlare Dynamic DNS Client (no proxy)";
-        after = [ "network.target" "cloudflare-api-secret.service" ];
-        requires = [ "cloudflare-api-secret.service" ];
-        wantedBy = [ "multi-user.target" ];
-        startAt = "*:0/5";
+      lib.mkIf ((builtins.length config.cloudflare.noProxyDomains) > 0)
+        {
+          description = "CloudFlare Dynamic DNS Client (no proxy)";
+          after = [
+            "network.target"
+            "cloudflare-api-secret.service"
+          ];
+          requires = [ "cloudflare-api-secret.service" ];
+          wantedBy = [ "multi-user.target" ];
+          startAt = "*:0/5";
 
-        environment = {
-          CLOUDFLARE_DOMAINS = toString config.cloudflare.noProxyDomains;
+          environment = {
+            CLOUDFLARE_DOMAINS = toString config.cloudflare.noProxyDomains;
+          };
+
+          serviceConfig = {
+            Type = "simple";
+            DynamicUser = true;
+            StateDirectory = "cloudflare-dyndns-noproxy";
+            EnvironmentFile = config.services.cloudflare-dyndns.apiTokenFile;
+            ExecStart =
+              let
+                args =
+                  [ "--cache-file /var/lib/cloudflare-dyndns-noproxy/ip.cache" ]
+                  ++ (if config.services.cloudflare-dyndns.ipv4 then [ "-4" ] else [ "-no-4" ])
+                  ++ (if config.services.cloudflare-dyndns.ipv6 then [ "-6" ] else [ "-no-6" ])
+                  ++ lib.optional config.services.cloudflare-dyndns.deleteMissing "--delete-missing";
+              in
+              "${pkgs.cloudflare-dyndns}/bin/cloudflare-dyndns ${toString args}";
+          };
         };
-
-        serviceConfig = {
-          Type = "simple";
-          DynamicUser = true;
-          StateDirectory = "cloudflare-dyndns-noproxy";
-          EnvironmentFile = config.services.cloudflare-dyndns.apiTokenFile;
-          ExecStart = let
-            args =
-              [ "--cache-file /var/lib/cloudflare-dyndns-noproxy/ip.cache" ]
-              ++ (if config.services.cloudflare-dyndns.ipv4 then
-                [ "-4" ]
-              else
-                [ "-no-4" ]) ++ (if config.services.cloudflare-dyndns.ipv6 then
-                  [ "-6" ]
-                else
-                  [ "-no-6" ])
-              ++ lib.optional config.services.cloudflare-dyndns.deleteMissing
-              "--delete-missing";
-
-          in "${pkgs.cloudflare-dyndns}/bin/cloudflare-dyndns ${toString args}";
-        };
-      };
-
   };
 }
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index 011250e..d2bb72a 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,7 +1,8 @@
 # This file imports all the other files in this directory for use as modules in
 # my config.
 
-{ ... }: {
+{ ... }:
+{
 
   imports = [
     ./arr.nix
@@ -36,5 +37,4 @@
     ./victoriametrics.nix
     ./wireguard.nix
   ];
-
 }
diff --git a/modules/nixos/services/gitea-runner.nix b/modules/nixos/services/gitea-runner.nix
index a7b79c2..1ef4be0 100644
--- a/modules/nixos/services/gitea-runner.nix
+++ b/modules/nixos/services/gitea-runner.nix
@@ -4,11 +4,15 @@
 # the Runners don't necessarily need to be running Gitea. All we need is an API
 # key for Gitea to connect to it and register ourselves as a Runner.
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
-  options.giteaRunner.enable =
-    lib.mkEnableOption "Enable Gitea Actions runner.";
+  options.giteaRunner.enable = lib.mkEnableOption "Enable Gitea Actions runner.";
 
   config = lib.mkIf config.giteaRunner.enable {
 
@@ -38,8 +42,7 @@
     };
 
     # Make sure the runner doesn't start until after Gitea
-    systemd.services."gitea-runner-${config.networking.hostName}".after =
-      [ "gitea.service" ];
+    systemd.services."gitea-runner-${config.networking.hostName}".after = [ "gitea.service" ];
 
     # API key needed to connect to Gitea
     secrets.giteaRunnerToken = {
@@ -58,7 +61,5 @@
         }.service"
       ];
     };
-
   };
-
 }
diff --git a/modules/nixos/services/gitea.nix b/modules/nixos/services/gitea.nix
index 240b5c8..8ad2439 100644
--- a/modules/nixos/services/gitea.nix
+++ b/modules/nixos/services/gitea.nix
@@ -1,8 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-let giteaPath = "/var/lib/gitea"; # Default service directory
-
-in {
+let
+  giteaPath = "/var/lib/gitea"; # Default service directory
+in
+{
 
   config = lib.mkIf config.services.gitea.enable {
     services.gitea = {
@@ -54,27 +60,30 @@ in {
     caddy.routes = [
       # Prevent public access to Prometheus metrics.
       {
-        match = [{
-          host = [ config.hostnames.git ];
-          path = [ "/metrics*" ];
-        }];
-        handle = [{
-          handler = "static_response";
-          status_code = "403";
-        }];
+        match = [
+          {
+            host = [ config.hostnames.git ];
+            path = [ "/metrics*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "static_response";
+            status_code = "403";
+          }
+        ];
       }
       # Allow access to primary server.
       {
-        match = [{ host = [ config.hostnames.git ]; }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{
-            dial = "localhost:${
-                builtins.toString
-                config.services.gitea.settings.server.HTTP_PORT
-              }";
-          }];
-        }];
+        match = [ { host = [ config.hostnames.git ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              { dial = "localhost:${builtins.toString config.services.gitea.settings.server.HTTP_PORT}"; }
+            ];
+          }
+        ];
       }
     ];
 
@@ -83,18 +92,14 @@ in {
 
     # Scrape the metrics endpoint for Prometheus.
     prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.gitea.settings.server.HTTP_PORT
-      }"
+      "127.0.0.1:${builtins.toString config.services.gitea.settings.server.HTTP_PORT}"
     ];
 
     ## Backup config
 
     # Open to groups, allowing for backups
-    systemd.services.gitea.serviceConfig.StateDirectoryMode =
-      lib.mkForce "0770";
-    systemd.tmpfiles.rules =
-      [ "f ${giteaPath}/data/gitea.db 0660 gitea gitea" ];
+    systemd.services.gitea.serviceConfig.StateDirectoryMode = lib.mkForce "0770";
+    systemd.tmpfiles.rules = [ "f ${giteaPath}/data/gitea.db 0660 gitea gitea" ];
 
     # Allow litestream and gitea to share a sqlite database
     users.users.litestream.extraGroups = [ "gitea" ];
@@ -103,13 +108,12 @@ in {
     # Backup sqlite database with litestream
     services.litestream = {
       settings = {
-        dbs = [{
-          path = "${giteaPath}/data/gitea.db";
-          replicas = [{
-            url =
-              "s3://${config.backup.s3.bucket}.${config.backup.s3.endpoint}/gitea";
-          }];
-        }];
+        dbs = [
+          {
+            path = "${giteaPath}/data/gitea.db";
+            replicas = [ { url = "s3://${config.backup.s3.bucket}.${config.backup.s3.endpoint}/gitea"; } ];
+          }
+        ];
       };
     };
 
@@ -129,24 +133,21 @@ in {
     };
 
     # Backup Gitea repos to object storage
-    systemd.services.gitea-backup =
-      lib.mkIf (config.backup.s3.endpoint != null) {
-        description = "Backup Gitea data";
-        environment.AWS_ACCESS_KEY_ID = config.backup.s3.accessKeyId;
-        serviceConfig = {
-          Type = "oneshot";
-          User = "gitea";
-          Group = "backup";
-          EnvironmentFile = config.secrets.backup.dest;
-        };
-        script = ''
-          ${pkgs.awscli2}/bin/aws s3 sync --exclude */gitea.db* \
-              ${giteaPath}/ \
-              s3://${config.backup.s3.bucket}/gitea-data/ \
-              --endpoint-url=https://${config.backup.s3.endpoint}
-        '';
+    systemd.services.gitea-backup = lib.mkIf (config.backup.s3.endpoint != null) {
+      description = "Backup Gitea data";
+      environment.AWS_ACCESS_KEY_ID = config.backup.s3.accessKeyId;
+      serviceConfig = {
+        Type = "oneshot";
+        User = "gitea";
+        Group = "backup";
+        EnvironmentFile = config.secrets.backup.dest;
       };
-
+      script = ''
+        ${pkgs.awscli2}/bin/aws s3 sync --exclude */gitea.db* \
+            ${giteaPath}/ \
+            s3://${config.backup.s3.bucket}/gitea-data/ \
+            --endpoint-url=https://${config.backup.s3.endpoint}
+      '';
+    };
   };
-
 }
diff --git a/modules/nixos/services/gnupg.nix b/modules/nixos/services/gnupg.nix
index db02f57..aea61e7 100644
--- a/modules/nixos/services/gnupg.nix
+++ b/modules/nixos/services/gnupg.nix
@@ -1,6 +1,12 @@
 # GPG is an encryption tool. This isn't really in use for me at the moment.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.gpg.enable = lib.mkEnableOption "GnuPG encryption.";
 
@@ -16,5 +22,4 @@
     };
     home = lib.mkIf config.gui.enable { packages = with pkgs; [ pinentry ]; };
   };
-
 }
diff --git a/modules/nixos/services/grafana.nix b/modules/nixos/services/grafana.nix
index 67fdd05..e13a349 100644
--- a/modules/nixos/services/grafana.nix
+++ b/modules/nixos/services/grafana.nix
@@ -1,9 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
 
   promUid = "victoriametrics";
-
-in {
+in
+{
 
   config = lib.mkIf config.services.grafana.enable {
 
@@ -39,2300 +44,2411 @@ in {
       };
       provision = {
         enable = true;
-        datasources.settings.datasources = [{
-          name = "VictoriaMetrics";
-          type = "prometheus";
-          access = "proxy";
-          url =
-            "http://localhost${config.services.victoriametrics.listenAddress}";
-          uid = promUid;
-        }];
-        dashboards.settings.providers = [{
-          name = "test";
-          type = "file";
-          allowUiUpdates = true;
-          options.path = "${
-              (pkgs.writeTextDir "dashboards/dashboard.json" (builtins.toJSON {
-                annotations = {
-                  list = [{
-                    builtIn = 1;
-                    datasource = {
-                      type = "grafana";
-                      uid = "-- Grafana --";
-                    };
-                    enable = true;
-                    hide = true;
-                    iconColor = "rgba(0, 211, 255, 1)";
-                    name = "Annotations & Alerts";
-                    target = {
-                      limit = 100;
-                      matchAny = false;
-                      tags = [ ];
-                      type = "dashboard";
-                    };
-                    type = "dashboard";
-                  }];
-                };
-                editable = true;
-                fiscalYearStartMonth = 0;
-                graphTooltip = 0;
-                id = 1;
-                links = [ ];
-                liveNow = false;
-                panels = [
-                  {
-                    collapsed = false;
-                    gridPos = {
-                      h = 1;
-                      w = 24;
-                      x = 0;
-                      y = 0;
-                    };
-                    id = 20;
-                    panels = [ ];
-                    title = "Services";
-                    type = "row";
-                  }
-
-                  # Uptime (Overall)
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 2;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        noValue = "0";
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [
-                            {
-                              color = "#9d2a37";
-                              value = null;
-                            }
-                            {
-                              color = "#a8663a";
-                              value = 99;
-                            }
-                            {
-                              color = "#bea25c";
-                              value = 99.8;
-                            }
-                            {
-                              color = "#62895d";
-                              value = 100;
-                            }
-                          ];
-                        };
-                        unit = "percentunit";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 3;
-                      x = 0;
-                      y = 1;
-                    };
-                    id = 146;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "area";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      text = { };
-                      textMode = "value_and_name";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = "min(avg_over_time(up))";
-                      instant = false;
-                      legendFormat = "Min";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "Uptime";
-                    type = "stat";
-                  }
-
-                  # Cloudflare Tunnel
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 2;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        noValue = "0";
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [
-                            {
-                              color = "#720d19";
-                              value = null;
-                            }
-                            {
-                              color = "#a8663a";
-                              value = 99;
-                            }
-                            {
-                              color = "semi-dark-orange";
-                              value = 100;
-                            }
-                          ];
-                        };
-                        unit = "percentunit";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 4;
-                      x = 3;
-                      y = 1;
-                    };
-                    id = 157;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "area";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      text = { };
-                      textMode = "value_and_name";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = ''
-                        systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
-                      instant = false;
-                      legendFormat = "{{job}}";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "Tunnel";
-                    type = "stat";
-                  }
-
-                  # Services Uptime
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        mappings = [{
-                          options = {
-                            "0" = {
-                              color = "dark-red";
-                              index = 1;
-                              text = "Down";
-                            };
-                            "1" = {
-                              color = "#305387";
-                              index = 0;
-                              text = "Up";
-                            };
-                          };
-                          type = "value";
-                        }];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [
-                            {
-                              color = "green";
-                              value = null;
-                            }
-                            {
-                              color = "red";
-                              value = 80;
-                            }
-                          ];
-                        };
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 6;
-                      x = 7;
-                      y = 1;
-                    };
-                    id = 13;
-                    links = [ ];
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
+        datasources.settings.datasources = [
+          {
+            name = "VictoriaMetrics";
+            type = "prometheus";
+            access = "proxy";
+            url = "http://localhost${config.services.victoriametrics.listenAddress}";
+            uid = promUid;
+          }
+        ];
+        dashboards.settings.providers = [
+          {
+            name = "test";
+            type = "file";
+            allowUiUpdates = true;
+            options.path = "${
+              (pkgs.writeTextDir "dashboards/dashboard.json" (
+                builtins.toJSON {
+                  annotations = {
+                    list = [
                       {
+                        builtIn = 1;
                         datasource = {
-                          type = "prometheus";
-                          uid = promUid;
+                          type = "grafana";
+                          uid = "-- Grafana --";
                         };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "nextcloud_up";
-                        instant = false;
-                        interval = "";
-                        legendFormat = "Nextcloud";
-                        range = true;
-                        refId = "A";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
+                        enable = true;
+                        hide = true;
+                        iconColor = "rgba(0, 211, 255, 1)";
+                        name = "Annotations & Alerts";
+                        target = {
+                          limit = 100;
+                          matchAny = false;
+                          tags = [ ];
+                          type = "dashboard";
                         };
-                        editorMode = "code";
-                        expr = "sabnzbd_status";
-                        hide = false;
-                        legendFormat = "Sabnzbd";
-                        range = true;
-                        refId = "B";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = "radarr_system_status";
-                        hide = false;
-                        legendFormat = "Radarr";
-                        range = true;
-                        refId = "C";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = "sonarr_system_status";
-                        hide = false;
-                        legendFormat = "Sonarr";
-                        range = true;
-                        refId = "D";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = "prowlarr_system_status";
-                        hide = false;
-                        legendFormat = "Prowlarr";
-                        range = true;
-                        refId = "E";
+                        type = "dashboard";
                       }
                     ];
-                    title = "Services";
-                    transparent = true;
-                    type = "stat";
-                  }
+                  };
+                  editable = true;
+                  fiscalYearStartMonth = 0;
+                  graphTooltip = 0;
+                  id = 1;
+                  links = [ ];
+                  liveNow = false;
+                  panels = [
+                    {
+                      collapsed = false;
+                      gridPos = {
+                        h = 1;
+                        w = 24;
+                        x = 0;
+                        y = 0;
+                      };
+                      id = 20;
+                      panels = [ ];
+                      title = "Services";
+                      type = "row";
+                    }
 
-                  # Gitea Actions (disabled?)
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "#5d664a";
-                            value = null;
-                          }];
-                        };
-                        unit = "none";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 3;
-                      x = 13;
-                      y = 1;
-                    };
-                    id = 90;
-                    links = [{
-                      targetBlank = true;
-                      title = "";
-                      url = "https://${config.hostnames.git}/admin/runners";
-                    }];
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
+                    # Uptime (Overall)
+                    {
                       datasource = {
                         type = "prometheus";
                         uid = promUid;
                       };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = ''gitea_actions{job="flame"}'';
-                      instant = false;
-                      interval = "";
-                      legendFormat = "__auto";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "Gitea Actions";
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # Video Library
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#5a4c30";
-                          mode = "fixed";
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          decimals = 2;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          noValue = "0";
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "#9d2a37";
+                                value = null;
+                              }
+                              {
+                                color = "#a8663a";
+                                value = 99;
+                              }
+                              {
+                                color = "#bea25c";
+                                value = 99.8;
+                              }
+                              {
+                                color = "#62895d";
+                                value = 100;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
                         };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "dark-blue";
-                            value = null;
-                          }];
-                        };
-                        unit = "bytes";
+                        overrides = [ ];
                       };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 3;
-                      x = 16;
-                      y = 1;
-                    };
-                    id = 18;
-                    links = [{
-                      targetBlank = true;
-                      title = "";
-                      url = "https://${config.hostnames.stream}";
-                    }];
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
+                      gridPos = {
+                        h = 4;
+                        w = 3;
+                        x = 0;
+                        y = 1;
                       };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
+                      id = 146;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "area";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        text = { };
+                        textMode = "value_and_name";
                       };
-                      editorMode = "code";
-                      "expr" = ''
-                        zfs_dataset_used_bytes{name="tank/video",job="swan"}'';
-                      legendFormat = "__auto";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "Video Library";
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # NAS Storage
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 0;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [{
-                            color = "super-light-green";
-                            value = null;
-                          }];
-                        };
-                        unit = "percentunit";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 2;
-                      w = 4;
-                      x = 19;
-                      y = 1;
-                    };
-                    id = 38;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      expr = ''
-                        zfs_dataset_used_bytes{name="tank"} / zfs_dataset_available_bytes{name="tank"}'';
-                      hide = false;
-                      legendFormat = "{{name}}";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "NAS Storage";
-                    transformations = [ ];
-                    transparent = true;
-                    type = "bargauge";
-                  }
-
-                  # NAS Growth
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#2b462f";
-                          mode = "fixed";
-                        };
-                        decimals = 0;
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "super-light-green";
-                            value = null;
-                          }];
-                        };
-                        unit = "bytes";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 10;
-                      w = 4;
-                      x = 19;
-                      y = 3;
-                    };
-                    id = 55;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "area";
-                      justifyMode = "auto";
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        "expr" =
-                          ''increase(zfs_dataset_used_bytes{name="tank"}[1d])'';
-                        hide = false;
-                        instant = false;
-                        interval = "";
-                        legendFormat = "Past Day";
-                        range = true;
-                        refId = "A";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        "expr" =
-                          ''increase(zfs_dataset_used_bytes{name="tank"}[7d])'';
-                        hide = false;
-                        legendFormat = "Past Week";
-                        range = true;
-                        refId = "B";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        "expr" = ''
-                          increase(zfs_dataset_used_bytes{name="tank"}[30d])'';
-                        hide = false;
-                        legendFormat = "Past Month";
-                        range = true;
-                        refId = "C";
-                      }
-                    ];
-                    title = "NAS Growth";
-                    transformations = [ ];
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # Caddy Upstreams
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "palette-classic"; };
-                        custom = {
-                          fillOpacity = 69;
-                          lineWidth = 2;
-                          spanNulls = false;
-                        };
-                        mappings = [{
-                          options = {
-                            "0" = {
-                              color = "#d13b4d";
-                              index = 1;
-                              text = "Down";
-                            };
-                            "1" = {
-                              color = "#33372c";
-                              index = 0;
-                              text = "Up";
-                            };
-                          };
-                          type = "value";
-                        }];
-                        noValue = "0";
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "green";
-                            value = null;
-                          }];
-                        };
-                      };
-                      overrides = [
+                      pluginVersion = "10.0.2";
+                      targets = [
                         {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:${
-                                builtins.toString
-                                config.services.jellyseerr.port
-                              }";
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
                           };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Jellyseerr";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.download}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:${
-                                builtins.toString
-                                config.services.bazarr.listenPort
-                              }";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Bazarr";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url =
-                                  "https://${config.hostnames.download}/bazarr";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:7878";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Radarr";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url =
-                                  "https://${config.hostnames.download}/radarr";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "unix//run/phpfpm/nextcloud.sock";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Nextcloud";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.content}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:${
-                                builtins.toString
-                                config.services.calibre-web.listen.port
-                              }";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Calibre";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.books}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:8085";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Sabnzbd";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url =
-                                  "https://${config.hostnames.download}/sabnzbd";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:8096";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Jellyfin";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.stream}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:8989";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Sonarr";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url =
-                                  "https://${config.hostnames.download}/sonarr";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:9696";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Prowlarr";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url =
-                                  "https://${config.hostnames.download}/prowlarr";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:${
-                                builtins.toString
-                                config.services.grafana.settings.server.http_port
-                              }";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Grafana";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.metrics}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:${
-                                builtins.toString
-                                config.services.gitea.settings.server.HTTP_PORT
-                              }";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Gitea";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.git}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:${
-                                builtins.toString
-                                config.services.vaultwarden.config.ROCKET_PORT
-                              }";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "Vaultwarden";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url = "https://${config.hostnames.secrets}";
-                              }];
-                            }
-                          ];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "localhost:8427";
-                          };
-                          properties = [
-                            {
-                              id = "displayName";
-                              value = "VictoriaMetrics";
-                            }
-                            {
-                              id = "links";
-                              value = [{
-                                targetBlank = true;
-                                title = "";
-                                url =
-                                  "https://${config.hostnames.prometheus}/vmui";
-                              }];
-                            }
-                          ];
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "min(avg_over_time(up))";
+                          instant = false;
+                          legendFormat = "Min";
+                          range = true;
+                          refId = "A";
                         }
                       ];
-                    };
-                    gridPos = {
-                      h = 8;
-                      w = 7;
-                      x = 0;
-                      y = 5;
-                    };
-                    id = 21;
-                    options = {
-                      alignValue = "left";
-                      legend = {
-                        displayMode = "list";
-                        placement = "bottom";
-                        showLegend = false;
-                      };
-                      mergeValues = true;
-                      rowHeight = 0.65;
-                      showValue = "never";
-                      tooltip = {
-                        mode = "single";
-                        sort = "none";
-                      };
-                    };
-                    pluginVersion = "9.5.3";
-                    targets = [{
+                      title = "Uptime";
+                      type = "stat";
+                    }
+
+                    # Cloudflare Tunnel
+                    {
                       datasource = {
                         type = "prometheus";
                         uid = promUid;
                       };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = "caddy_reverse_proxy_upstreams_healthy{}";
-                      instant = false;
-                      legendFormat = "{{upstream}}";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "Caddy Upstreams";
-                    transparent = true;
-                    type = "state-timeline";
-                  }
-
-                  # Stream Stats
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#5b79b0";
-                          mode = "fixed";
-                        };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "green";
-                            value = null;
-                          }];
-                        };
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 6;
-                      x = 7;
-                      y = 5;
-                    };
-                    id = 108;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = ''
-                          increase(http_requests_received_total{endpoint="Sessions/Playing"}[1d])'';
-                        instant = false;
-                        legendFormat = "Past Day";
-                        range = true;
-                        refId = "A";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = ''
-                          increase(http_requests_received_total{endpoint="Sessions/Playing"}[7d])'';
-                        hide = false;
-                        legendFormat = "Past Week";
-                        range = true;
-                        refId = "B";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = ''
-                          increase(http_requests_received_total{endpoint="Sessions/Playing"}[30d])'';
-                        hide = false;
-                        legendFormat = "Past Month";
-                        range = true;
-                        refId = "C";
-                      }
-                    ];
-                    title = "Streams";
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # Media Stats
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#895d3a";
-                          mode = "fixed";
-                        };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "green";
-                            value = null;
-                          }];
-                        };
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 6;
-                      x = 13;
-                      y = 5;
-                    };
-                    id = 105;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "radarr_movie_downloaded_total";
-                        hide = false;
-                        instant = true;
-                        legendFormat = "Movies";
-                        range = false;
-                        refId = "C";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "sonarr_series_downloaded_total";
-                        hide = false;
-                        instant = true;
-                        legendFormat = "TV Shows";
-                        range = false;
-                        refId = "B";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "sonarr_episode_downloaded_total";
-                        instant = true;
-                        legendFormat = "TV Episodes";
-                        range = false;
-                        refId = "A";
-                      }
-                    ];
-                    title = "Media";
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # Downloader Status
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "#bc5460";
-                            value = null;
-                          }];
-                        };
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 2;
-                      x = 7;
-                      y = 9;
-                    };
-                    id = 134;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "name";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = "sabnzbd_info";
-                      instant = true;
-                      legendFormat = "{{status}}";
-                      range = false;
-                      refId = "A";
-                    }];
-                    title = "Downloader";
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # Downloader Stats
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#895d3a";
-                          mode = "fixed";
-                        };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "green";
-                            value = null;
-                          }];
-                        };
-                        unit = "bytes";
-                      };
-                      overrides = [
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "Queue";
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
                           };
-                          properties = [{
-                            id = "unit";
-                            value = "none";
-                          }];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "Completed";
+                          decimals = 2;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          noValue = "0";
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "#720d19";
+                                value = null;
+                              }
+                              {
+                                color = "#a8663a";
+                                value = 99;
+                              }
+                              {
+                                color = "semi-dark-orange";
+                                value = 100;
+                              }
+                            ];
                           };
-                          properties = [{
-                            id = "unit";
-                            value = "none";
-                          }];
+                          unit = "percentunit";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 4;
+                        x = 3;
+                        y = 1;
+                      };
+                      id = 157;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "area";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        text = { };
+                        textMode = "value_and_name";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
+                          instant = false;
+                          legendFormat = "{{job}}";
+                          range = true;
+                          refId = "A";
                         }
                       ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 8;
-                      x = 9;
-                      y = 9;
-                    };
-                    id = 106;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = "sabnzbd_queue_length";
-                        hide = false;
-                        legendFormat = "Queue";
-                        range = true;
-                        refId = "C";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = "sum(prowlarr_indexer_grabs_total[$__range])";
-                        hide = false;
-                        legendFormat = "Completed";
-                        range = true;
-                        refId = "D";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "increase(sabnzbd_downloaded_bytes[7d])";
-                        hide = false;
-                        instant = true;
-                        legendFormat = "Week";
-                        range = false;
-                        refId = "A";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "sabnzbd_downloaded_bytes";
-                        hide = false;
-                        instant = true;
-                        legendFormat = "Total";
-                        range = false;
-                        refId = "B";
-                      }
-                    ];
-                    title = "Downloads";
-                    transparent = true;
-                    type = "stat";
-                  }
+                      title = "Tunnel";
+                      type = "stat";
+                    }
 
-                  # Download Requests
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#723f3f";
-                          mode = "fixed";
-                        };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "green";
-                            value = null;
-                          }];
-                        };
+                    # Services Uptime
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
                       };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 2;
-                      x = 17;
-                      y = 9;
-                    };
-                    id = 135;
-                    options = {
-                      colorMode = "background";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = "radarr_movie_missing_total";
-                        instant = true;
-                        legendFormat = "Movies";
-                        range = false;
-                        refId = "A";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        expr = "sonarr_episode_missing_total";
-                        hide = false;
-                        legendFormat = "Episodes";
-                        range = true;
-                        refId = "B";
-                      }
-                    ];
-                    title = "Requests";
-                    transparent = true;
-                    type = "stat";
-                  }
-
-                  # CPU by Host
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 2;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          mappings = [
                             {
-                              color = "#a82e3c";
-                              value = null;
-                            }
-                            {
-                              color = "red";
-                              value = 90;
+                              options = {
+                                "0" = {
+                                  color = "dark-red";
+                                  index = 1;
+                                  text = "Down";
+                                };
+                                "1" = {
+                                  color = "#305387";
+                                  index = 0;
+                                  text = "Up";
+                                };
+                              };
+                              type = "value";
                             }
                           ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                              {
+                                color = "red";
+                                value = 80;
+                              }
+                            ];
+                          };
                         };
-                        unit = "percentunit";
+                        overrides = [ ];
                       };
-                      overrides = [
+                      gridPos = {
+                        h = 4;
+                        w = 6;
+                        x = 7;
+                        y = 1;
+                      };
+                      id = 13;
+                      links = [ ];
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
                         {
-                          matcher = {
-                            id = "byName";
-                            options = "flame";
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
                           };
-                          properties = [{
-                            id = "displayName";
-                            value = "Flame 🔥";
-                          }];
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "nextcloud_up";
+                          instant = false;
+                          interval = "";
+                          legendFormat = "Nextcloud";
+                          range = true;
+                          refId = "A";
                         }
                         {
-                          matcher = {
-                            id = "byName";
-                            options = "swan";
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
                           };
-                          properties = [{
-                            id = "displayName";
-                            value = "Swan 🦢";
-                          }];
+                          editorMode = "code";
+                          expr = "sabnzbd_status";
+                          hide = false;
+                          legendFormat = "Sabnzbd";
+                          range = true;
+                          refId = "B";
                         }
                         {
-                          matcher = {
-                            id = "byName";
-                            options = "tempest";
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
                           };
-                          properties = [{
-                            id = "displayName";
-                            value = "Tempest 🌊";
-                          }];
+                          editorMode = "code";
+                          expr = "radarr_system_status";
+                          hide = false;
+                          legendFormat = "Radarr";
+                          range = true;
+                          refId = "C";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "sonarr_system_status";
+                          hide = false;
+                          legendFormat = "Sonarr";
+                          range = true;
+                          refId = "D";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "prowlarr_system_status";
+                          hide = false;
+                          legendFormat = "Prowlarr";
+                          range = true;
+                          refId = "E";
                         }
                       ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 7;
-                      x = 0;
-                      y = 13;
-                    };
-                    id = 72;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
+                      title = "Services";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # Gitea Actions (disabled?)
+                    {
                       datasource = {
                         type = "prometheus";
                         uid = promUid;
                       };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = ''
-                        sort_desc(max(irate(node_cpu_seconds_total{instance="127.0.0.1:${
-                          builtins.toString
-                          config.services.prometheus.exporters.node.port
-                        }",mode=~"system|user"}[$__range])) by (job))'';
-                      instant = true;
-                      legendFormat = "__auto";
-                      range = false;
-                      refId = "A";
-                    }];
-                    title = "CPU";
-                    transformations = [ ];
-                    transparent = true;
-                    type = "bargauge";
-                  }
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "#5d664a";
+                                value = null;
+                              }
+                            ];
+                          };
+                          unit = "none";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 3;
+                        x = 13;
+                        y = 1;
+                      };
+                      id = 90;
+                      links = [
+                        {
+                          targetBlank = true;
+                          title = "";
+                          url = "https://${config.hostnames.git}/admin/runners";
+                        }
+                      ];
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''gitea_actions{job="flame"}'';
+                          instant = false;
+                          interval = "";
+                          legendFormat = "__auto";
+                          range = true;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Gitea Actions";
+                      transparent = true;
+                      type = "stat";
+                    }
 
-                  # Memory by Host
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 2;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [
+                    # Video Library
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#5a4c30";
+                            mode = "fixed";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "dark-blue";
+                                value = null;
+                              }
+                            ];
+                          };
+                          unit = "bytes";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 3;
+                        x = 16;
+                        y = 1;
+                      };
+                      id = 18;
+                      links = [
+                        {
+                          targetBlank = true;
+                          title = "";
+                          url = "https://${config.hostnames.stream}";
+                        }
+                      ];
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          "expr" = ''zfs_dataset_used_bytes{name="tank/video",job="swan"}'';
+                          legendFormat = "__auto";
+                          range = true;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Video Library";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # NAS Storage
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          decimals = 0;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "super-light-green";
+                                value = null;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 2;
+                        w = 4;
+                        x = 19;
+                        y = 1;
+                      };
+                      id = 38;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = ''zfs_dataset_used_bytes{name="tank"} / zfs_dataset_available_bytes{name="tank"}'';
+                          hide = false;
+                          legendFormat = "{{name}}";
+                          range = true;
+                          refId = "A";
+                        }
+                      ];
+                      title = "NAS Storage";
+                      transformations = [ ];
+                      transparent = true;
+                      type = "bargauge";
+                    }
+
+                    # NAS Growth
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#2b462f";
+                            mode = "fixed";
+                          };
+                          decimals = 0;
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "super-light-green";
+                                value = null;
+                              }
+                            ];
+                          };
+                          unit = "bytes";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 10;
+                        w = 4;
+                        x = 19;
+                        y = 3;
+                      };
+                      id = 55;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "area";
+                        justifyMode = "auto";
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[1d])'';
+                          hide = false;
+                          instant = false;
+                          interval = "";
+                          legendFormat = "Past Day";
+                          range = true;
+                          refId = "A";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[7d])'';
+                          hide = false;
+                          legendFormat = "Past Week";
+                          range = true;
+                          refId = "B";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[30d])'';
+                          hide = false;
+                          legendFormat = "Past Month";
+                          range = true;
+                          refId = "C";
+                        }
+                      ];
+                      title = "NAS Growth";
+                      transformations = [ ];
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # Caddy Upstreams
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "palette-classic";
+                          };
+                          custom = {
+                            fillOpacity = 69;
+                            lineWidth = 2;
+                            spanNulls = false;
+                          };
+                          mappings = [
                             {
-                              color = "#ce95ca";
-                              value = null;
-                            }
-                            {
-                              color = "semi-dark-red";
-                              value = 90;
+                              options = {
+                                "0" = {
+                                  color = "#d13b4d";
+                                  index = 1;
+                                  text = "Down";
+                                };
+                                "1" = {
+                                  color = "#33372c";
+                                  index = 0;
+                                  text = "Up";
+                                };
+                              };
+                              type = "value";
                             }
                           ];
+                          noValue = "0";
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                            ];
+                          };
                         };
-                        unit = "percentunit";
-                      };
-                      overrides = [
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "tempest";
-                          };
-                          properties = [{
-                            id = "displayName";
-                            value = "Tempest 🌊";
-                          }];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "swan";
-                          };
-                          properties = [{
-                            id = "displayName";
-                            value = "Swan 🦢";
-                          }];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "flame";
-                          };
-                          properties = [{
-                            id = "displayName";
-                            value = "Flame 🔥";
-                          }];
-                        }
-                      ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 7;
-                      x = 7;
-                      y = 13;
-                    };
-                    id = 73;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      "expr" =
-                        "sort_desc(node_memory_Active_bytes/node_memory_MemTotal_bytes)";
-                      instant = true;
-                      legendFormat = "{{job}}";
-                      range = false;
-                      refId = "A";
-                    }];
-                    title = "Memory";
-                    transformations = [{
-                      id = "sortBy";
-                      options = { };
-                    }];
-                    transparent = true;
-                    type = "bargauge";
-                  }
-
-                  # Storage by Host
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 2;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [
-                            {
-                              color = "#dbda61";
-                              value = null;
-                            }
-                            {
-                              color = "semi-dark-red";
-                              value = 90;
-                            }
-                          ];
-                        };
-                        unit = "percentunit";
-                      };
-                      overrides = [
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "flame";
-                          };
-                          properties = [{
-                            id = "displayName";
-                            value = "Flame 🔥";
-                          }];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "swan";
-                          };
-                          properties = [{
-                            id = "displayName";
-                            value = "Swan 🦢";
-                          }];
-                        }
-                        {
-                          matcher = {
-                            id = "byName";
-                            options = "tempest";
-                          };
-                          properties = [{
-                            id = "displayName";
-                            value = "Tempest 🌊";
-                          }];
-                        }
-                      ];
-                    };
-                    gridPos = {
-                      h = 4;
-                      w = 7;
-                      x = 14;
-                      y = 13;
-                    };
-                    id = 74;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = ''
-                        sort_desc((node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_avail_bytes{mountpoint="/"}) / node_filesystem_size_bytes{mountpoint="/"})'';
-                      instant = true;
-                      legendFormat = "{{job}}";
-                      range = false;
-                      refId = "A";
-                    }];
-                    title = "Storage";
-                    transformations = [ ];
-                    transparent = true;
-                    type = "bargauge";
-                  }
-
-                  # Host Bar
-                  {
-                    collapsed = false;
-                    gridPos = {
-                      h = 1;
-                      w = 24;
-                      x = 0;
-                      y = 17;
-                    };
-                    id = 16;
-                    panels = [ ];
-                    repeat = "host";
-                    repeatDirection = "h";
-                    title = "Host";
-                    type = "row";
-                  }
-
-                  # Host Label
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        mappings = [{
-                          options = {
-                            flame = {
-                              color = "orange";
-                              index = 2;
-                              text = "Flame 🔥";
+                        overrides = [
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.jellyseerr.port}";
                             };
-                            swan = {
-                              color = "text";
-                              index = 1;
-                              text = "Swan 🦢";
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Jellyseerr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.bazarr.listenPort}";
                             };
-                            tempest = {
-                              color = "#6fa8e1";
-                              index = 0;
-                              text = "Tempest 🌊";
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Bazarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/bazarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:7878";
                             };
-                          };
-                          type = "value";
-                        }];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [{
-                            color = "dark-blue";
-                            value = null;
-                          }];
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Radarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/radarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "unix//run/phpfpm/nextcloud.sock";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Nextcloud";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.content}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.calibre-web.listen.port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Calibre";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.books}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8085";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Sabnzbd";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/sabnzbd";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8096";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Jellyfin";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.stream}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8989";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Sonarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/sonarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:9696";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Prowlarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/prowlarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.grafana.settings.server.http_port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Grafana";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.metrics}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.gitea.settings.server.HTTP_PORT}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Gitea";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.git}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.vaultwarden.config.ROCKET_PORT}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Vaultwarden";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.secrets}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8427";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "VictoriaMetrics";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.prometheus}/vmui";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                        ];
+                      };
+                      gridPos = {
+                        h = 8;
+                        w = 7;
+                        x = 0;
+                        y = 5;
+                      };
+                      id = 21;
+                      options = {
+                        alignValue = "left";
+                        legend = {
+                          displayMode = "list";
+                          placement = "bottom";
+                          showLegend = false;
+                        };
+                        mergeValues = true;
+                        rowHeight = 0.65;
+                        showValue = "never";
+                        tooltip = {
+                          mode = "single";
+                          sort = "none";
                         };
-                        unit = "none";
                       };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 3;
-                      w = 3;
-                      x = 0;
-                      y = 18;
-                    };
-                    id = 19;
-                    options = {
-                      colorMode = "value";
-                      graphMode = "none";
-                      justifyMode = "auto";
-                      orientation = "auto";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "/^job$/";
-                        values = false;
-                      };
-                      textMode = "auto";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
+                      pluginVersion = "9.5.3";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "caddy_reverse_proxy_upstreams_healthy{}";
+                          instant = false;
+                          legendFormat = "{{upstream}}";
+                          range = true;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Caddy Upstreams";
+                      transparent = true;
+                      type = "state-timeline";
+                    }
+
+                    # Stream Stats
+                    {
                       datasource = {
                         type = "prometheus";
                         uid = promUid;
                       };
-                      editorMode = "code";
-                      expr = ''node_os_info{job="$host"}'';
-                      format = "table";
-                      legendFormat = "__auto";
-                      range = true;
-                      refId = "A";
-                    }];
-                    title = "Host";
-                    transparent = true;
-                    type = "stat";
-                  }
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#5b79b0";
+                            mode = "fixed";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                            ];
+                          };
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 6;
+                        x = 7;
+                        y = 5;
+                      };
+                      id = 108;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''increase(http_requests_received_total{endpoint="Sessions/Playing"}[1d])'';
+                          instant = false;
+                          legendFormat = "Past Day";
+                          range = true;
+                          refId = "A";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = ''increase(http_requests_received_total{endpoint="Sessions/Playing"}[7d])'';
+                          hide = false;
+                          legendFormat = "Past Week";
+                          range = true;
+                          refId = "B";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = ''increase(http_requests_received_total{endpoint="Sessions/Playing"}[30d])'';
+                          hide = false;
+                          legendFormat = "Past Month";
+                          range = true;
+                          refId = "C";
+                        }
+                      ];
+                      title = "Streams";
+                      transparent = true;
+                      type = "stat";
+                    }
 
-                  # Vitals
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = { mode = "thresholds"; };
-                        decimals = 0;
-                        mappings = [ ];
-                        max = 1;
-                        min = 0;
-                        thresholds = {
-                          mode = "percentage";
-                          steps = [
+                    # Media Stats
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#895d3a";
+                            mode = "fixed";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                            ];
+                          };
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 6;
+                        x = 13;
+                        y = 5;
+                      };
+                      id = 105;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "radarr_movie_downloaded_total";
+                          hide = false;
+                          instant = true;
+                          legendFormat = "Movies";
+                          range = false;
+                          refId = "C";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "sonarr_series_downloaded_total";
+                          hide = false;
+                          instant = true;
+                          legendFormat = "TV Shows";
+                          range = false;
+                          refId = "B";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "sonarr_episode_downloaded_total";
+                          instant = true;
+                          legendFormat = "TV Episodes";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Media";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # Downloader Status
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "#bc5460";
+                                value = null;
+                              }
+                            ];
+                          };
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 2;
+                        x = 7;
+                        y = 9;
+                      };
+                      id = 134;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "name";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "sabnzbd_info";
+                          instant = true;
+                          legendFormat = "{{status}}";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Downloader";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # Downloader Stats
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#895d3a";
+                            mode = "fixed";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                            ];
+                          };
+                          unit = "bytes";
+                        };
+                        overrides = [
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "Queue";
+                            };
+                            properties = [
+                              {
+                                id = "unit";
+                                value = "none";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "Completed";
+                            };
+                            properties = [
+                              {
+                                id = "unit";
+                                value = "none";
+                              }
+                            ];
+                          }
+                        ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 8;
+                        x = 9;
+                        y = 9;
+                      };
+                      id = 106;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "sabnzbd_queue_length";
+                          hide = false;
+                          legendFormat = "Queue";
+                          range = true;
+                          refId = "C";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "sum(prowlarr_indexer_grabs_total[$__range])";
+                          hide = false;
+                          legendFormat = "Completed";
+                          range = true;
+                          refId = "D";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "increase(sabnzbd_downloaded_bytes[7d])";
+                          hide = false;
+                          instant = true;
+                          legendFormat = "Week";
+                          range = false;
+                          refId = "A";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "sabnzbd_downloaded_bytes";
+                          hide = false;
+                          instant = true;
+                          legendFormat = "Total";
+                          range = false;
+                          refId = "B";
+                        }
+                      ];
+                      title = "Downloads";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # Download Requests
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#723f3f";
+                            mode = "fixed";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                            ];
+                          };
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 2;
+                        x = 17;
+                        y = 9;
+                      };
+                      id = 135;
+                      options = {
+                        colorMode = "background";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = "radarr_movie_missing_total";
+                          instant = true;
+                          legendFormat = "Movies";
+                          range = false;
+                          refId = "A";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "sonarr_episode_missing_total";
+                          hide = false;
+                          legendFormat = "Episodes";
+                          range = true;
+                          refId = "B";
+                        }
+                      ];
+                      title = "Requests";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # CPU by Host
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          decimals = 2;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "#a82e3c";
+                                value = null;
+                              }
+                              {
+                                color = "red";
+                                value = 90;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
+                        };
+                        overrides = [
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "flame";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Flame 🔥";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "swan";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Swan 🦢";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "tempest";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Tempest 🌊";
+                              }
+                            ];
+                          }
+                        ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 7;
+                        x = 0;
+                        y = 13;
+                      };
+                      id = 72;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''sort_desc(max(irate(node_cpu_seconds_total{instance="127.0.0.1:${builtins.toString config.services.prometheus.exporters.node.port}",mode=~"system|user"}[$__range])) by (job))'';
+                          instant = true;
+                          legendFormat = "__auto";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "CPU";
+                      transformations = [ ];
+                      transparent = true;
+                      type = "bargauge";
+                    }
+
+                    # Memory by Host
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          decimals = 2;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "#ce95ca";
+                                value = null;
+                              }
+                              {
+                                color = "semi-dark-red";
+                                value = 90;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
+                        };
+                        overrides = [
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "tempest";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Tempest 🌊";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "swan";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Swan 🦢";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "flame";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Flame 🔥";
+                              }
+                            ];
+                          }
+                        ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 7;
+                        x = 7;
+                        y = 13;
+                      };
+                      id = 73;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          "expr" = "sort_desc(node_memory_Active_bytes/node_memory_MemTotal_bytes)";
+                          instant = true;
+                          legendFormat = "{{job}}";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Memory";
+                      transformations = [
+                        {
+                          id = "sortBy";
+                          options = { };
+                        }
+                      ];
+                      transparent = true;
+                      type = "bargauge";
+                    }
+
+                    # Storage by Host
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          decimals = 2;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "#dbda61";
+                                value = null;
+                              }
+                              {
+                                color = "semi-dark-red";
+                                value = 90;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
+                        };
+                        overrides = [
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "flame";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Flame 🔥";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "swan";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Swan 🦢";
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "tempest";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Tempest 🌊";
+                              }
+                            ];
+                          }
+                        ];
+                      };
+                      gridPos = {
+                        h = 4;
+                        w = 7;
+                        x = 14;
+                        y = 13;
+                      };
+                      id = 74;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''sort_desc((node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_avail_bytes{mountpoint="/"}) / node_filesystem_size_bytes{mountpoint="/"})'';
+                          instant = true;
+                          legendFormat = "{{job}}";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Storage";
+                      transformations = [ ];
+                      transparent = true;
+                      type = "bargauge";
+                    }
+
+                    # Host Bar
+                    {
+                      collapsed = false;
+                      gridPos = {
+                        h = 1;
+                        w = 24;
+                        x = 0;
+                        y = 17;
+                      };
+                      id = 16;
+                      panels = [ ];
+                      repeat = "host";
+                      repeatDirection = "h";
+                      title = "Host";
+                      type = "row";
+                    }
+
+                    # Host Label
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          mappings = [
                             {
-                              color = "super-light-green";
-                              value = null;
-                            }
-                            {
-                              color = "orange";
-                              value = 70;
-                            }
-                            {
-                              color = "red";
-                              value = 90;
+                              options = {
+                                flame = {
+                                  color = "orange";
+                                  index = 2;
+                                  text = "Flame 🔥";
+                                };
+                                swan = {
+                                  color = "text";
+                                  index = 1;
+                                  text = "Swan 🦢";
+                                };
+                                tempest = {
+                                  color = "#6fa8e1";
+                                  index = 0;
+                                  text = "Tempest 🌊";
+                                };
+                              };
+                              type = "value";
                             }
                           ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "dark-blue";
+                                value = null;
+                              }
+                            ];
+                          };
+                          unit = "none";
                         };
-                        unit = "percentunit";
+                        overrides = [ ];
                       };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 5;
-                      w = 6;
-                      x = 3;
-                      y = 18;
-                    };
-                    id = 123;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
+                      gridPos = {
+                        h = 3;
+                        w = 3;
+                        x = 0;
+                        y = 18;
                       };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [
+                      id = 19;
+                      options = {
+                        colorMode = "value";
+                        graphMode = "none";
+                        justifyMode = "auto";
+                        orientation = "auto";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "/^job$/";
+                          values = false;
+                        };
+                        textMode = "auto";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = ''node_os_info{job="$host"}'';
+                          format = "table";
+                          legendFormat = "__auto";
+                          range = true;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Host";
+                      transparent = true;
+                      type = "stat";
+                    }
+
+                    # Vitals
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            mode = "thresholds";
+                          };
+                          decimals = 0;
+                          mappings = [ ];
+                          max = 1;
+                          min = 0;
+                          thresholds = {
+                            mode = "percentage";
+                            steps = [
+                              {
+                                color = "super-light-green";
+                                value = null;
+                              }
+                              {
+                                color = "orange";
+                                value = 70;
+                              }
+                              {
+                                color = "red";
+                                value = 90;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 5;
+                        w = 6;
+                        x = 3;
+                        y = 18;
+                      };
+                      id = 123;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = ''max(irate(node_cpu_seconds_total{job="$host",instance="127.0.0.1:${builtins.toString config.services.prometheus.exporters.node.port}",mode=~"system|user"}[$__range]))'';
+                          hide = false;
+                          legendFormat = "CPU";
+                          range = true;
+                          refId = "C";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = ''(node_memory_Active_bytes{job="$host"})/node_memory_MemTotal_bytes{job="$host"}'';
+                          hide = false;
+                          legendFormat = "Memory";
+                          range = true;
+                          refId = "B";
+                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''(node_filesystem_size_bytes{mountpoint="/",job="$host"} - node_filesystem_avail_bytes{mountpoint=~"/",job="$host"}) / node_filesystem_size_bytes{mountpoint="/",job="$host"}'';
+                          instant = true;
+                          legendFormat = "Storage";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Vitals";
+                      transformations = [ ];
+                      transparent = true;
+                      type = "bargauge";
+                    }
+
+                    # Top Processes by CPU
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      description = "";
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#c4af88";
+                            mode = "fixed";
+                          };
+                          decimals = 2;
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                              {
+                                color = "red";
+                                value = 10000000;
+                              }
+                            ];
+                          };
+                          unit = "percentunit";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 8;
+                        w = 6;
+                        x = 12;
+                        y = 18;
+                      };
+                      id = 14;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''topk(5, irate(namedprocess_namegroup_cpu_seconds_total{job="$host"}[$__range]))'';
+                          instant = true;
+                          legendFormat = "{{groupname}}";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Top Processes - CPU";
+                      transparent = true;
+                      type = "bargauge";
+                    }
+
+                    # Top Processes by Memory
+                    {
+                      datasource = {
+                        type = "prometheus";
+                        uid = promUid;
+                      };
+                      fieldConfig = {
+                        defaults = {
+                          color = {
+                            fixedColor = "#afb091";
+                            mode = "fixed";
+                          };
+                          mappings = [ ];
+                          thresholds = {
+                            mode = "absolute";
+                            steps = [
+                              {
+                                color = "green";
+                                value = null;
+                              }
+                              {
+                                color = "red";
+                                value = 10000000;
+                              }
+                            ];
+                          };
+                          unit = "bytes";
+                        };
+                        overrides = [ ];
+                      };
+                      gridPos = {
+                        h = 8;
+                        w = 6;
+                        x = 18;
+                        y = 18;
+                      };
+                      id = 15;
+                      options = {
+                        displayMode = "basic";
+                        minVizHeight = 10;
+                        minVizWidth = 0;
+                        orientation = "horizontal";
+                        reduceOptions = {
+                          calcs = [ "lastNotNull" ];
+                          fields = "";
+                          values = false;
+                        };
+                        showUnfilled = true;
+                        valueMode = "color";
+                      };
+                      pluginVersion = "10.0.2";
+                      targets = [
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          exemplar = false;
+                          expr = ''topk(5, rate(namedprocess_namegroup_memory_bytes{memtype="resident",job="$host"}[$__range]))'';
+                          instant = true;
+                          legendFormat = "{{groupname}}";
+                          range = false;
+                          refId = "A";
+                        }
+                      ];
+                      title = "Top Processes - Memory";
+                      transparent = true;
+                      type = "bargauge";
+                    }
+                  ];
+
+                  refresh = "10s";
+                  schemaVersion = 38;
+                  style = "dark";
+                  tags = [ ];
+                  templating = {
+                    list = [
                       {
+                        current = {
+                          selected = true;
+                          text = [ "All" ];
+                          value = [ "$__all" ];
+                        };
                         datasource = {
                           type = "prometheus";
                           uid = promUid;
                         };
-                        editorMode = "code";
-                        expr = ''
-                          max(irate(node_cpu_seconds_total{job="$host",instance="127.0.0.1:${
-                            builtins.toString
-                            config.services.prometheus.exporters.node.port
-                          }",mode=~"system|user"}[$__range]))'';
-                        hide = false;
-                        legendFormat = "CPU";
-                        range = true;
-                        refId = "C";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
+                        definition = "label_values(nodename)";
+                        hide = 0;
+                        includeAll = true;
+                        label = "Host";
+                        multi = true;
+                        name = "host";
+                        options = [ ];
+                        query = {
+                          query = "label_values(nodename)";
+                          refId = "PrometheusVariableQueryEditor-VariableQuery";
                         };
-                        editorMode = "code";
-                        expr = ''
-                          (node_memory_Active_bytes{job="$host"})/node_memory_MemTotal_bytes{job="$host"}'';
-                        hide = false;
-                        legendFormat = "Memory";
-                        range = true;
-                        refId = "B";
-                      }
-                      {
-                        datasource = {
-                          type = "prometheus";
-                          uid = promUid;
-                        };
-                        editorMode = "code";
-                        exemplar = false;
-                        expr = ''
-                          (node_filesystem_size_bytes{mountpoint="/",job="$host"} - node_filesystem_avail_bytes{mountpoint=~"/",job="$host"}) / node_filesystem_size_bytes{mountpoint="/",job="$host"}'';
-                        instant = true;
-                        legendFormat = "Storage";
-                        range = false;
-                        refId = "A";
+                        refresh = 1;
+                        regex = "";
+                        skipUrlSync = false;
+                        sort = 1;
+                        type = "query";
                       }
                     ];
-                    title = "Vitals";
-                    transformations = [ ];
-                    transparent = true;
-                    type = "bargauge";
-                  }
-
-                  # Top Processes by CPU
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    description = "";
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#c4af88";
-                          mode = "fixed";
-                        };
-                        decimals = 2;
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [
-                            {
-                              color = "green";
-                              value = null;
-                            }
-                            {
-                              color = "red";
-                              value = 10000000;
-                            }
-                          ];
-                        };
-                        unit = "percentunit";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 8;
-                      w = 6;
-                      x = 12;
-                      y = 18;
-                    };
-                    id = 14;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = ''
-                        topk(5, irate(namedprocess_namegroup_cpu_seconds_total{job="$host"}[$__range]))'';
-                      instant = true;
-                      legendFormat = "{{groupname}}";
-                      range = false;
-                      refId = "A";
-                    }];
-                    title = "Top Processes - CPU";
-                    transparent = true;
-                    type = "bargauge";
-                  }
-
-                  # Top Processes by Memory
-                  {
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    fieldConfig = {
-                      defaults = {
-                        color = {
-                          fixedColor = "#afb091";
-                          mode = "fixed";
-                        };
-                        mappings = [ ];
-                        thresholds = {
-                          mode = "absolute";
-                          steps = [
-                            {
-                              color = "green";
-                              value = null;
-                            }
-                            {
-                              color = "red";
-                              value = 10000000;
-                            }
-                          ];
-                        };
-                        unit = "bytes";
-                      };
-                      overrides = [ ];
-                    };
-                    gridPos = {
-                      h = 8;
-                      w = 6;
-                      x = 18;
-                      y = 18;
-                    };
-                    id = 15;
-                    options = {
-                      displayMode = "basic";
-                      minVizHeight = 10;
-                      minVizWidth = 0;
-                      orientation = "horizontal";
-                      reduceOptions = {
-                        calcs = [ "lastNotNull" ];
-                        fields = "";
-                        values = false;
-                      };
-                      showUnfilled = true;
-                      valueMode = "color";
-                    };
-                    pluginVersion = "10.0.2";
-                    targets = [{
-                      datasource = {
-                        type = "prometheus";
-                        uid = promUid;
-                      };
-                      editorMode = "code";
-                      exemplar = false;
-                      expr = ''
-                        topk(5, rate(namedprocess_namegroup_memory_bytes{memtype="resident",job="$host"}[$__range]))'';
-                      instant = true;
-                      legendFormat = "{{groupname}}";
-                      range = false;
-                      refId = "A";
-                    }];
-                    title = "Top Processes - Memory";
-                    transparent = true;
-                    type = "bargauge";
-                  }
-
-                ];
-
-                refresh = "10s";
-                schemaVersion = 38;
-                style = "dark";
-                tags = [ ];
-                templating = {
-                  list = [{
-                    current = {
-                      selected = true;
-                      text = [ "All" ];
-                      value = [ "$__all" ];
-                    };
-                    datasource = {
-                      type = "prometheus";
-                      uid = promUid;
-                    };
-                    definition = "label_values(nodename)";
-                    hide = 0;
-                    includeAll = true;
-                    label = "Host";
-                    multi = true;
-                    name = "host";
-                    options = [ ];
-                    query = {
-                      query = "label_values(nodename)";
-                      refId = "PrometheusVariableQueryEditor-VariableQuery";
-                    };
-                    refresh = 1;
-                    regex = "";
-                    skipUrlSync = false;
-                    sort = 1;
-                    type = "query";
-                  }];
-                };
-                time = {
-                  from = "now-6h";
-                  to = "now";
-                };
-                timepicker = { };
-                timezone = "";
-                title = "Main";
-                uid = "main";
-                version = 60;
-                weekStart = "";
-              }))
+                  };
+                  time = {
+                    from = "now-6h";
+                    to = "now";
+                  };
+                  timepicker = { };
+                  timezone = "";
+                  title = "Main";
+                  uid = "main";
+                  version = 60;
+                  weekStart = "";
+                }
+              ))
             }/dashboards";
-        }];
+          }
+        ];
 
         alerting = {
 
-          contactPoints.settings.contactPoints = [{
-            name = "grafana-default-email";
-            receivers = [{
-              uid = "basic-email";
-              type = "email";
-              settings.addresses = "grafana@${config.mail.server}";
-            }];
-          }];
+          contactPoints.settings.contactPoints = [
+            {
+              name = "grafana-default-email";
+              receivers = [
+                {
+                  uid = "basic-email";
+                  type = "email";
+                  settings.addresses = "grafana@${config.mail.server}";
+                }
+              ];
+            }
+          ];
 
           muteTimings = { };
-          policies.settings = { resetPolicies = [ 1 ]; };
+          policies.settings = {
+            resetPolicies = [ 1 ];
+          };
 
-          rules.settings.groups = [{
-            name = "Default";
-            interval = "1m";
-            folder = "Alerts";
-            rules = [{
-              uid = "cloudflare-tunnel";
-              title = "Cloudflare Tunnel";
-              condition = "C";
-              data = [
-
-                # Query to retrieve the status data
+          rules.settings.groups = [
+            {
+              name = "Default";
+              interval = "1m";
+              folder = "Alerts";
+              rules = [
                 {
-                  refId = "A";
-                  relativeTimeRange = {
-                    from = 600;
-                    to = 0;
-                  };
-                  datasourceUid = promUid;
-                  model = {
-                    editorMode = "code";
-                    expr = ''
-                      systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
-                    hide = false;
-                    instant = true;
-                    intervalMs = 1000;
-                    maxDataPoints = 43200;
-                    range = false;
-                    refId = "A";
-                  };
-                }
+                  uid = "cloudflare-tunnel";
+                  title = "Cloudflare Tunnel";
+                  condition = "C";
+                  data = [
 
-                # Reduce to the max level, to ensure no false alarms
-                {
-                  refId = "B";
-                  relativeTimeRange = {
-                    from = 600;
-                    to = 0;
-                  };
-                  datasourceUid = "__expr__";
-                  model = {
-                    conditions = [{
-                      evaluator = {
-                        params = [ ];
-                        type = "gt";
+                    # Query to retrieve the status data
+                    {
+                      refId = "A";
+                      relativeTimeRange = {
+                        from = 600;
+                        to = 0;
                       };
-                      operator = { type = "and"; };
-                      query = { params = [ "B" ]; };
-                      reducer = {
-                        params = [ ];
-                        type = "last";
+                      datasourceUid = promUid;
+                      model = {
+                        editorMode = "code";
+                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
+                        hide = false;
+                        instant = true;
+                        intervalMs = 1000;
+                        maxDataPoints = 43200;
+                        range = false;
+                        refId = "A";
                       };
-                      type = "query";
-                    }];
-                    datasource = {
-                      type = "__expr__";
-                      uid = "__expr__";
-                    };
-                    expression = "A";
-                    hide = false;
-                    intervalMs = 1000;
-                    maxDataPoints = 43200;
-                    reducer = "max";
-                    refId = "B";
-                    type = "reduce";
-                  };
-                }
+                    }
 
-                # Threshold to trigger alarm if below 100% uptime
-                {
-                  refId = "C";
-                  relativeTimeRange = {
-                    from = 600;
-                    to = 0;
-                  };
-                  datasourceUid = "__expr__";
-                  model = {
-                    conditions = [{
-                      evaluator = {
-                        params = [ 1 ];
-                        type = "lt";
+                    # Reduce to the max level, to ensure no false alarms
+                    {
+                      refId = "B";
+                      relativeTimeRange = {
+                        from = 600;
+                        to = 0;
                       };
-                      operator = { type = "and"; };
-                      query = { params = [ "C" ]; };
-                      reducer = {
-                        params = [ ];
-                        type = "last";
+                      datasourceUid = "__expr__";
+                      model = {
+                        conditions = [
+                          {
+                            evaluator = {
+                              params = [ ];
+                              type = "gt";
+                            };
+                            operator = {
+                              type = "and";
+                            };
+                            query = {
+                              params = [ "B" ];
+                            };
+                            reducer = {
+                              params = [ ];
+                              type = "last";
+                            };
+                            type = "query";
+                          }
+                        ];
+                        datasource = {
+                          type = "__expr__";
+                          uid = "__expr__";
+                        };
+                        expression = "A";
+                        hide = false;
+                        intervalMs = 1000;
+                        maxDataPoints = 43200;
+                        reducer = "max";
+                        refId = "B";
+                        type = "reduce";
                       };
-                      type = "query";
-                    }];
-                    datasource = {
-                      type = "__expr__";
-                      uid = "__expr__";
-                    };
-                    expression = "B";
-                    hide = false;
-                    intervalMs = 1000;
-                    maxDataPoints = 43200;
-                    refId = "C";
-                    type = "threshold";
-                  };
-                }
+                    }
 
+                    # Threshold to trigger alarm if below 100% uptime
+                    {
+                      refId = "C";
+                      relativeTimeRange = {
+                        from = 600;
+                        to = 0;
+                      };
+                      datasourceUid = "__expr__";
+                      model = {
+                        conditions = [
+                          {
+                            evaluator = {
+                              params = [ 1 ];
+                              type = "lt";
+                            };
+                            operator = {
+                              type = "and";
+                            };
+                            query = {
+                              params = [ "C" ];
+                            };
+                            reducer = {
+                              params = [ ];
+                              type = "last";
+                            };
+                            type = "query";
+                          }
+                        ];
+                        datasource = {
+                          type = "__expr__";
+                          uid = "__expr__";
+                        };
+                        expression = "B";
+                        hide = false;
+                        intervalMs = 1000;
+                        maxDataPoints = 43200;
+                        refId = "C";
+                        type = "threshold";
+                      };
+                    }
+                  ];
+                  noDataState = "Alerting";
+                  execErrState = "Error";
+                  for = "5m";
+                  annotations = {
+                    description = "Cloudflare Tunnel for {{ $job }}.";
+                    summary = "Cloudflare Tunnel is down.";
+                  };
+                  isPaused = false;
+                }
               ];
-              noDataState = "Alerting";
-              execErrState = "Error";
-              for = "5m";
-              annotations = {
-                description = "Cloudflare Tunnel for {{ $job }}.";
-                summary = "Cloudflare Tunnel is down.";
-              };
-              isPaused = false;
-            }];
-          }];
+            }
+          ];
 
           templates = { };
         };
 
         # notifiers = [];
-
       };
     };
 
-    caddy.routes = [{
-      match = [{ host = [ config.hostnames.metrics ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial = "localhost:${
-              builtins.toString
-              config.services.grafana.settings.server.http_port
-            }";
-        }];
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.metrics ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              { dial = "localhost:${builtins.toString config.services.grafana.settings.server.http_port}"; }
+            ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.metrics ];
-
   };
-
 }
diff --git a/modules/nixos/services/honeypot.nix b/modules/nixos/services/honeypot.nix
index d0f6bbf..8b5fb60 100644
--- a/modules/nixos/services/honeypot.nix
+++ b/modules/nixos/services/honeypot.nix
@@ -3,7 +3,12 @@
 
 # Currently has some issues that don't make this viable.
 
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 # Taken from:
 # https://dataswamp.org/~solene/2022-09-29-iblock-implemented-in-nixos.html
@@ -13,9 +18,12 @@
 
 let
 
-  portsToBlock = [ 25545 25565 25570 ];
-  portsString =
-    builtins.concatStringsSep "," (builtins.map builtins.toString portsToBlock);
+  portsToBlock = [
+    25545
+    25565
+    25570
+  ];
+  portsString = builtins.concatStringsSep "," (builtins.map builtins.toString portsToBlock);
 
   # Block IPs for 20 days
   expire = 60 * 60 * 24 * 20;
@@ -27,19 +35,17 @@ let
     "INPUT -i eth0 -p udp -m set --match-set ${table} src -j nixos-fw-refuse"
   ];
 
-  create-rules = lib.concatStringsSep "\n"
-    (builtins.map (rule: "iptables -C " + rule + " || iptables -A " + rule)
-      (rules "blocked") ++ builtins.map
-      (rule: "ip6tables -C " + rule + " || ip6tables -A " + rule)
-      (rules "blocked6"));
+  create-rules = lib.concatStringsSep "\n" (
+    builtins.map (rule: "iptables -C " + rule + " || iptables -A " + rule) (rules "blocked")
+    ++ builtins.map (rule: "ip6tables -C " + rule + " || ip6tables -A " + rule) (rules "blocked6")
+  );
 
-  delete-rules = lib.concatStringsSep "\n"
-    (builtins.map (rule: "iptables -C " + rule + " && iptables -D " + rule)
-      (rules "blocked") ++ builtins.map
-      (rule: "ip6tables -C " + rule + " && ip6tables -D " + rule)
-      (rules "blocked6"));
-
-in {
+  delete-rules = lib.concatStringsSep "\n" (
+    builtins.map (rule: "iptables -C " + rule + " && iptables -D " + rule) (rules "blocked")
+    ++ builtins.map (rule: "ip6tables -C " + rule + " && ip6tables -D " + rule) (rules "blocked6")
+  );
+in
+{
 
   options.honeypot.enable = lib.mkEnableOption "Honeypot fail2ban system.";
 
@@ -54,9 +60,7 @@ in {
       then
           ipset restore -! < /var/lib/ipset.conf
       else
-          ipset -exist create blocked hash:ip ${
-            if expire > 0 then "timeout ${toString expire}" else ""
-          }
+          ipset -exist create blocked hash:ip ${if expire > 0 then "timeout ${toString expire}" else ""}
           ipset -exist create blocked6 hash:ip family inet6 ${
             if expire > 0 then "timeout ${toString expire}" else ""
           }
@@ -66,9 +70,7 @@ in {
 
     # Save list when shutting down
     extraStopCommands = ''
-      ipset -exist create blocked hash:ip ${
-        if expire > 0 then "timeout ${toString expire}" else ""
-      }
+      ipset -exist create blocked hash:ip ${if expire > 0 then "timeout ${toString expire}" else ""}
       ipset -exist create blocked6 hash:ip family inet6 ${
         if expire > 0 then "timeout ${toString expire}" else ""
       }
@@ -76,5 +78,4 @@ in {
       ${delete-rules}
     '';
   };
-
 }
diff --git a/modules/nixos/services/identity.nix b/modules/nixos/services/identity.nix
index dadedd6..9bc761f 100644
--- a/modules/nixos/services/identity.nix
+++ b/modules/nixos/services/identity.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
 
   # Wait for secret to be placed on the machine
   systemd.services.wait-for-identity = {
@@ -18,5 +19,4 @@
       done
     '';
   };
-
 }
diff --git a/modules/nixos/services/influxdb2.nix b/modules/nixos/services/influxdb2.nix
index adef3e0..5eecd4c 100644
--- a/modules/nixos/services/influxdb2.nix
+++ b/modules/nixos/services/influxdb2.nix
@@ -3,7 +3,8 @@
 # infinite retention separate from our other metrics, which can be nice for
 # recording health information, for example.
 
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   config = lib.mkIf config.services.influxdb2.enable {
 
@@ -30,11 +31,10 @@
       group = "influxdb2";
       permissions = "0440";
     };
-    systemd.services.influxdb2Password-secret =
-      lib.mkIf config.services.influxdb2.enable {
-        requiredBy = [ "influxdb2.service" ];
-        before = [ "influxdb2.service" ];
-      };
+    systemd.services.influxdb2Password-secret = lib.mkIf config.services.influxdb2.enable {
+      requiredBy = [ "influxdb2.service" ];
+      before = [ "influxdb2.service" ];
+    };
     secrets.influxdb2Token = lib.mkIf config.services.influxdb2.enable {
       source = ../../../private/influxdb2-token.age;
       dest = "${config.secretsDirectory}/influxdb2-token";
@@ -42,23 +42,24 @@
       group = "influxdb2";
       permissions = "0440";
     };
-    systemd.services.influxdb2Token-secret =
-      lib.mkIf config.services.influxdb2.enable {
-        requiredBy = [ "influxdb2.service" ];
-        before = [ "influxdb2.service" ];
-      };
+    systemd.services.influxdb2Token-secret = lib.mkIf config.services.influxdb2.enable {
+      requiredBy = [ "influxdb2.service" ];
+      before = [ "influxdb2.service" ];
+    };
 
-    caddy.routes = lib.mkIf config.services.influxdb2.enable [{
-      match = [{ host = [ config.hostnames.influxdb ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:8086"; }];
-      }];
-    }];
+    caddy.routes = lib.mkIf config.services.influxdb2.enable [
+      {
+        match = [ { host = [ config.hostnames.influxdb ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:8086"; } ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.influxdb ];
-
   };
-
 }
diff --git a/modules/nixos/services/irc.nix b/modules/nixos/services/irc.nix
index 049dac5..8607c37 100644
--- a/modules/nixos/services/irc.nix
+++ b/modules/nixos/services/irc.nix
@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   config = lib.mkIf config.services.thelounge.enable {
 
@@ -16,20 +17,19 @@
     # sudo su - thelounge -s /bin/sh -c "thelounge add myuser"
 
     # Allow web traffic to Caddy
-    caddy.routes = [{
-      match = [{ host = [ config.hostnames.irc ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial =
-            "localhost:${builtins.toString config.services.thelounge.port}";
-        }];
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.irc ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.thelounge.port}"; } ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.irc ];
-
   };
-
 }
diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix
index 1df6c98..f3c16d4 100644
--- a/modules/nixos/services/jellyfin.nix
+++ b/modules/nixos/services/jellyfin.nix
@@ -1,32 +1,46 @@
 # Jellyfin is a self-hosted video streaming service. This means I can play my
 # server's videos from a webpage, mobile app, or TV client.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.services.jellyfin.enable {
 
     services.jellyfin.group = "media";
-    users.users.jellyfin = { isSystemUser = true; };
+    users.users.jellyfin = {
+      isSystemUser = true;
+    };
 
     caddy.routes = [
       # Prevent public access to Prometheus metrics.
       {
-        match = [{
-          host = [ config.hostnames.stream ];
-          path = [ "/metrics*" ];
-        }];
-        handle = [{
-          handler = "static_response";
-          status_code = "403";
-        }];
+        match = [
+          {
+            host = [ config.hostnames.stream ];
+            path = [ "/metrics*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "static_response";
+            status_code = "403";
+          }
+        ];
       }
       # Allow access to normal route.
       {
-        match = [{ host = [ config.hostnames.stream ]; }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:8096"; }];
-        }];
+        match = [ { host = [ config.hostnames.stream ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:8096"; } ];
+          }
+        ];
       }
     ];
 
@@ -52,15 +66,15 @@
       "VDPAU_DRIVER" = "radeonsi";
       "LIBVA_DRIVER_NAME" = "radeonsi";
     };
-    users.users.jellyfin.extraGroups =
-      [ "render" "video" ]; # Access to /dev/dri
+    users.users.jellyfin.extraGroups = [
+      "render"
+      "video"
+    ]; # Access to /dev/dri
 
     # Fix issue where Jellyfin-created directories don't allow access for media group
     systemd.services.jellyfin.serviceConfig.UMask = lib.mkForce "0007";
 
     # Requires MetricsEnable is true in /var/lib/jellyfin/config/system.xml
     prometheus.scrapeTargets = [ "127.0.0.1:8096" ];
-
   };
-
 }
diff --git a/modules/nixos/services/keybase.nix b/modules/nixos/services/keybase.nix
index 96cb4e0..28ab622 100644
--- a/modules/nixos/services/keybase.nix
+++ b/modules/nixos/services/keybase.nix
@@ -1,7 +1,13 @@
 # Keybase is an encrypted communications tool with a synchronized encrypted
 # filestore that can be mounted onto a machine's filesystem.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.keybase.enable = lib.mkEnableOption "Keybase.";
 
@@ -19,16 +25,16 @@
       systemd.user.services.kbfs.Service.PrivateTmp = lib.mkForce false;
 
       home.packages = [ (lib.mkIf config.gui.enable pkgs.keybase-gui) ];
-      home.file = let
-        ignorePatterns = ''
-          keybase/
-          kbfs/'';
-      in {
-        ".rgignore".text = ignorePatterns;
-        ".fdignore".text = ignorePatterns;
-      };
+      home.file =
+        let
+          ignorePatterns = ''
+            keybase/
+            kbfs/'';
+        in
+        {
+          ".rgignore".text = ignorePatterns;
+          ".fdignore".text = ignorePatterns;
+        };
     };
-
   };
-
 }
diff --git a/modules/nixos/services/mullvad.nix b/modules/nixos/services/mullvad.nix
index a51a8d2..12db447 100644
--- a/modules/nixos/services/mullvad.nix
+++ b/modules/nixos/services/mullvad.nix
@@ -1,6 +1,12 @@
 # Mullvad is a VPN service. This isn't currently in use for me at the moment.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.mullvad.enable = lib.mkEnableOption "Mullvad VPN.";
 
@@ -8,7 +14,5 @@
 
     services.mullvad-vpn.enable = true;
     environment.systemPackages = [ pkgs.mullvad-vpn ];
-
   };
-
 }
diff --git a/modules/nixos/services/n8n.nix b/modules/nixos/services/n8n.nix
index a8213c0..35cbcfb 100644
--- a/modules/nixos/services/n8n.nix
+++ b/modules/nixos/services/n8n.nix
@@ -1,7 +1,8 @@
 # n8n is an automation integration tool for connecting data from services
 # together with triggers.
 
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options = {
     n8nServer = lib.mkOption {
@@ -23,14 +24,16 @@
       };
     };
 
-    caddy.routes = [{
-      match = [{ host = [ config.n8nServer ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:5678"; }];
-      }];
-    }];
-
+    caddy.routes = [
+      {
+        match = [ { host = [ config.n8nServer ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:5678"; } ];
+          }
+        ];
+      }
+    ];
   };
-
 }
diff --git a/modules/nixos/services/netdata.nix b/modules/nixos/services/netdata.nix
index 72056a2..6b13169 100644
--- a/modules/nixos/services/netdata.nix
+++ b/modules/nixos/services/netdata.nix
@@ -1,7 +1,8 @@
 # Netdata is an out-of-the-box monitoring tool that exposes many different
 # metrics. Not currently in use, in favor of VictoriaMetrics and Grafana.
 
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options.netdata.enable = lib.mkEnableOption "Netdata metrics.";
 
@@ -11,9 +12,9 @@
       enable = true;
 
       # Disable local dashboard (unsecured)
-      config = { web.mode = "none"; };
+      config = {
+        web.mode = "none";
+      };
     };
-
   };
-
 }
diff --git a/modules/nixos/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix
index 846afbc..932081e 100644
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf config.services.nextcloud.enable {
 
@@ -46,107 +52,137 @@
     users.users.caddy.extraGroups = [ "nextcloud" ];
 
     # Point Caddy to Nginx
-    caddy.routes = [{
-      match = [{ host = [ config.hostnames.content ]; }];
-      handle = [{
-        handler = "subroute";
-        routes = [
-          # Sets variables and headers
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.content ]; } ];
+        handle = [
           {
-            handle = [
+            handler = "subroute";
+            routes = [
+              # Sets variables and headers
               {
-                handler = "vars";
-                # Grab the webroot out of the written config
-                # The webroot is a symlinked combined Nextcloud directory
-                root =
-                  config.services.nginx.virtualHosts.${config.services.nextcloud.hostName}.root;
+                handle = [
+                  {
+                    handler = "vars";
+                    # Grab the webroot out of the written config
+                    # The webroot is a symlinked combined Nextcloud directory
+                    root = config.services.nginx.virtualHosts.${config.services.nextcloud.hostName}.root;
+                  }
+                  {
+                    handler = "headers";
+                    response.set.Strict-Transport-Security = [ "max-age=31536000;" ];
+                  }
+                ];
               }
+              # Reroute carddav and caldav traffic
               {
-                handler = "headers";
-                response.set.Strict-Transport-Security =
-                  [ "max-age=31536000;" ];
+                match = [
+                  {
+                    path = [
+                      "/.well-known/carddav"
+                      "/.well-known/caldav"
+                    ];
+                  }
+                ];
+                handle = [
+                  {
+                    handler = "static_response";
+                    headers = {
+                      Location = [ "/remote.php/dav" ];
+                    };
+                    status_code = 301;
+                  }
+                ];
               }
+              # Block traffic to sensitive files
+              {
+                match = [
+                  {
+                    path = [
+                      "/.htaccess"
+                      "/data/*"
+                      "/config/*"
+                      "/db_structure"
+                      "/.xml"
+                      "/README"
+                      "/3rdparty/*"
+                      "/lib/*"
+                      "/templates/*"
+                      "/occ"
+                      "/console.php"
+                    ];
+                  }
+                ];
+                handle = [
+                  {
+                    handler = "static_response";
+                    status_code = 404;
+                  }
+                ];
+              }
+              # Redirect index.php to the homepage
+              {
+                match = [
+                  {
+                    file = {
+                      try_files = [ "{http.request.uri.path}/index.php" ];
+                    };
+                    not = [ { path = [ "*/" ]; } ];
+                  }
+                ];
+                handle = [
+                  {
+                    handler = "static_response";
+                    headers = {
+                      Location = [ "{http.request.orig_uri.path}/" ];
+                    };
+                    status_code = 308;
+                  }
+                ];
+              }
+              # Rewrite paths to be relative
+              {
+                match = [
+                  {
+                    file = {
+                      split_path = [ ".php" ];
+                      try_files = [
+                        "{http.request.uri.path}"
+                        "{http.request.uri.path}/index.php"
+                        "index.php"
+                      ];
+                    };
+                  }
+                ];
+                handle = [
+                  {
+                    handler = "rewrite";
+                    uri = "{http.matchers.file.relative}";
+                  }
+                ];
+              }
+              # Send all PHP traffic to Nextcloud PHP service
+              {
+                match = [ { path = [ "*.php" ]; } ];
+                handle = [
+                  {
+                    handler = "reverse_proxy";
+                    transport = {
+                      protocol = "fastcgi";
+                      split_path = [ ".php" ];
+                    };
+                    upstreams = [ { dial = "unix//run/phpfpm/nextcloud.sock"; } ];
+                  }
+                ];
+              }
+              # Finally, send the rest to the file server
+              { handle = [ { handler = "file_server"; } ]; }
             ];
           }
-          # Reroute carddav and caldav traffic
-          {
-            match =
-              [{ path = [ "/.well-known/carddav" "/.well-known/caldav" ]; }];
-            handle = [{
-              handler = "static_response";
-              headers = { Location = [ "/remote.php/dav" ]; };
-              status_code = 301;
-            }];
-          }
-          # Block traffic to sensitive files
-          {
-            match = [{
-              path = [
-                "/.htaccess"
-                "/data/*"
-                "/config/*"
-                "/db_structure"
-                "/.xml"
-                "/README"
-                "/3rdparty/*"
-                "/lib/*"
-                "/templates/*"
-                "/occ"
-                "/console.php"
-              ];
-            }];
-            handle = [{
-              handler = "static_response";
-              status_code = 404;
-            }];
-          }
-          # Redirect index.php to the homepage
-          {
-            match = [{
-              file = { try_files = [ "{http.request.uri.path}/index.php" ]; };
-              not = [{ path = [ "*/" ]; }];
-            }];
-            handle = [{
-              handler = "static_response";
-              headers = { Location = [ "{http.request.orig_uri.path}/" ]; };
-              status_code = 308;
-            }];
-          }
-          # Rewrite paths to be relative
-          {
-            match = [{
-              file = {
-                split_path = [ ".php" ];
-                try_files = [
-                  "{http.request.uri.path}"
-                  "{http.request.uri.path}/index.php"
-                  "index.php"
-                ];
-              };
-            }];
-            handle = [{
-              handler = "rewrite";
-              uri = "{http.matchers.file.relative}";
-            }];
-          }
-          # Send all PHP traffic to Nextcloud PHP service
-          {
-            match = [{ path = [ "*.php" ]; }];
-            handle = [{
-              handler = "reverse_proxy";
-              transport = {
-                protocol = "fastcgi";
-                split_path = [ ".php" ];
-              };
-              upstreams = [{ dial = "unix//run/phpfpm/nextcloud.sock"; }];
-            }];
-          }
-          # Finally, send the rest to the file server
-          { handle = [{ handler = "file_server"; }]; }
         ];
-      }];
-      terminal = true;
-    }];
+        terminal = true;
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.content ];
@@ -168,8 +204,7 @@
     users.users.${config.user}.extraGroups = [ "nextcloud" ];
 
     # Open to groups, allowing for backups
-    systemd.services.phpfpm-nextcloud.serviceConfig.StateDirectoryMode =
-      lib.mkForce "0770";
+    systemd.services.phpfpm-nextcloud.serviceConfig.StateDirectoryMode = lib.mkForce "0770";
 
     # Log metrics to prometheus
     networking.hosts."127.0.0.1" = [ config.hostnames.content ];
@@ -180,15 +215,11 @@
       passwordFile = config.services.nextcloud.config.adminpassFile;
     };
     prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.nextcloud.port
-      }"
+      "127.0.0.1:${builtins.toString config.services.prometheus.exporters.nextcloud.port}"
     ];
     # Allows nextcloud-exporter to read passwordFile
     users.users.nextcloud-exporter.extraGroups =
       lib.mkIf config.services.prometheus.exporters.nextcloud.enable
-      [ "nextcloud" ];
-
+        [ "nextcloud" ];
   };
-
 }
diff --git a/modules/nixos/services/paperless.nix b/modules/nixos/services/paperless.nix
index 82bee53..3478b19 100644
--- a/modules/nixos/services/paperless.nix
+++ b/modules/nixos/services/paperless.nix
@@ -1,6 +1,7 @@
 # Paperless-ngx is a document scanning and management solution.
 
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   config = lib.mkIf config.services.paperless.enable {
 
@@ -8,8 +9,7 @@
       mediaDir = "/data/generic/paperless";
       passwordFile = config.secrets.paperless.dest;
       settings = {
-        PAPERLESS_OCR_USER_ARGS =
-          builtins.toJSON { invalidate_digital_signatures = true; };
+        PAPERLESS_OCR_USER_ARGS = builtins.toJSON { invalidate_digital_signatures = true; };
 
         # Enable if changing the path name in Caddy
         # PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";
@@ -18,23 +18,25 @@
     };
 
     # Allow Nextcloud and user to see files
-    users.users.nextcloud.extraGroups =
-      lib.mkIf config.services.nextcloud.enable [ "paperless" ];
+    users.users.nextcloud.extraGroups = lib.mkIf config.services.nextcloud.enable [ "paperless" ];
     users.users.${config.user}.extraGroups = [ "paperless" ];
 
-    caddy.routes = [{
-      match = [{
-        host = [ config.hostnames.paperless ];
-        # path = [ "/paperless*" ]; # Change path name in Caddy
-      }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial =
-            "localhost:${builtins.toString config.services.paperless.port}";
-        }];
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [
+          {
+            host = [ config.hostnames.paperless ];
+            # path = [ "/paperless*" ]; # Change path name in Caddy
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.paperless.port}"; } ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.paperless ];
@@ -53,11 +55,7 @@
 
     # Fix paperless shared permissions
     systemd.services.paperless-web.serviceConfig.UMask = lib.mkForce "0026";
-    systemd.services.paperless-scheduler.serviceConfig.UMask =
-      lib.mkForce "0026";
-    systemd.services.paperless-task-queue.serviceConfig.UMask =
-      lib.mkForce "0026";
-
+    systemd.services.paperless-scheduler.serviceConfig.UMask = lib.mkForce "0026";
+    systemd.services.paperless-task-queue.serviceConfig.UMask = lib.mkForce "0026";
   };
-
 }
diff --git a/modules/nixos/services/postgresql.nix b/modules/nixos/services/postgresql.nix
index 1784ea3..862cf2e 100644
--- a/modules/nixos/services/postgresql.nix
+++ b/modules/nixos/services/postgresql.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   services.postgresql = {
     package = pkgs.postgresql_15;
@@ -12,19 +18,19 @@
       root      root              postgres
       admin     ${config.user}    admin
     '';
-    ensureUsers = [{
-      name = "admin";
-      ensureClauses = {
-        createdb = true;
-        createrole = true;
-        login = true;
-      };
-    }];
+    ensureUsers = [
+      {
+        name = "admin";
+        ensureClauses = {
+          createdb = true;
+          createrole = true;
+          login = true;
+        };
+      }
+    ];
   };
 
-  home-manager.users.${config.user}.home.packages =
-    lib.mkIf config.services.postgresql.enable [
-      pkgs.pgcli # Postgres client with autocomplete
-    ];
-
+  home-manager.users.${config.user}.home.packages = lib.mkIf config.services.postgresql.enable [
+    pkgs.pgcli # Postgres client with autocomplete
+  ];
 }
diff --git a/modules/nixos/services/prometheus.nix b/modules/nixos/services/prometheus.nix
index fdb505d..fa5ac86 100644
--- a/modules/nixos/services/prometheus.nix
+++ b/modules/nixos/services/prometheus.nix
@@ -4,7 +4,13 @@
 # Instead of running traditional Prometheus, I generally run VictoriaMetrics as
 # a more efficient drop-in replacement.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.prometheus = {
     exporters.enable = lib.mkEnableOption "Enable Prometheus exporters";
@@ -15,105 +21,99 @@
     };
   };
 
-  config = let
+  config =
+    let
 
-    # If hosting Grafana, host local Prometheus and listen for inbound jobs. If
-    # not hosting Grafana, send remote Prometheus writes to primary host.
-    isServer = config.services.grafana.enable;
+      # If hosting Grafana, host local Prometheus and listen for inbound jobs. If
+      # not hosting Grafana, send remote Prometheus writes to primary host.
+      isServer = config.services.grafana.enable;
+    in
+    {
 
-  in {
-
-    # Turn on exporters if any Prometheus scraper is running
-    prometheus.exporters.enable = builtins.any (x: x) [
-      config.services.prometheus.enable
-      config.services.victoriametrics.enable
-      config.services.vmagent.enable
-    ];
-
-    prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.node.port
-      }"
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.systemd.port
-      }"
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.process.port
-      }"
-    ];
-
-    services.prometheus = {
-      exporters.node.enable = config.prometheus.exporters.enable;
-      exporters.node.enabledCollectors = [ ];
-      exporters.node.disabledCollectors = [ "cpufreq" ];
-      exporters.systemd.enable = config.prometheus.exporters.enable;
-      exporters.process.enable = config.prometheus.exporters.enable;
-      exporters.process.settings.process_names = [
-        # Remove nix store path from process name
-        {
-          name = "{{.Matches.Wrapped}} {{ .Matches.Args }}";
-          cmdline = [ "^/nix/store[^ ]*/(?P<Wrapped>[^ /]*) (?P<Args>.*)" ];
-        }
+      # Turn on exporters if any Prometheus scraper is running
+      prometheus.exporters.enable = builtins.any (x: x) [
+        config.services.prometheus.enable
+        config.services.victoriametrics.enable
+        config.services.vmagent.enable
       ];
-      extraFlags = lib.mkIf isServer [ "--web.enable-remote-write-receiver" ];
-      scrapeConfigs = [{
-        job_name = config.networking.hostName;
-        static_configs = [{ targets = config.scrapeTargets; }];
-      }];
-      webExternalUrl =
-        lib.mkIf isServer "https://${config.hostnames.prometheus}";
-      # Web config file: https://prometheus.io/docs/prometheus/latest/configuration/https/
-      webConfigFile = lib.mkIf isServer
-        ((pkgs.formats.yaml { }).generate "webconfig.yml" {
-          basic_auth_users = {
-            # Generate password: htpasswd -nBC 10 "" | tr -d ':\n'
-            # Encrypt and place in private/prometheus.age
-            "prometheus" =
-              "$2y$10$r7FWHLHTGPAY312PdhkPEuvb05aGn9Nk1IO7qtUUUjmaDl35l6sLa";
-          };
-        });
-      remoteWrite = lib.mkIf (!isServer) [{
-        name = config.networking.hostName;
-        url = "https://${config.hostnames.prometheus}/api/v1/write";
-        basic_auth = {
-          # Uses password hashed with bcrypt above
-          username = "prometheus";
-          password_file = config.secrets.prometheus.dest;
-        };
-      }];
-    };
 
-    # Create credentials file for remote Prometheus push
-    secrets.prometheus =
-      lib.mkIf (config.services.prometheus.enable && !isServer) {
+      prometheus.scrapeTargets = [
+        "127.0.0.1:${builtins.toString config.services.prometheus.exporters.node.port}"
+        "127.0.0.1:${builtins.toString config.services.prometheus.exporters.systemd.port}"
+        "127.0.0.1:${builtins.toString config.services.prometheus.exporters.process.port}"
+      ];
+
+      services.prometheus = {
+        exporters.node.enable = config.prometheus.exporters.enable;
+        exporters.node.enabledCollectors = [ ];
+        exporters.node.disabledCollectors = [ "cpufreq" ];
+        exporters.systemd.enable = config.prometheus.exporters.enable;
+        exporters.process.enable = config.prometheus.exporters.enable;
+        exporters.process.settings.process_names = [
+          # Remove nix store path from process name
+          {
+            name = "{{.Matches.Wrapped}} {{ .Matches.Args }}";
+            cmdline = [ "^/nix/store[^ ]*/(?P<Wrapped>[^ /]*) (?P<Args>.*)" ];
+          }
+        ];
+        extraFlags = lib.mkIf isServer [ "--web.enable-remote-write-receiver" ];
+        scrapeConfigs = [
+          {
+            job_name = config.networking.hostName;
+            static_configs = [ { targets = config.scrapeTargets; } ];
+          }
+        ];
+        webExternalUrl = lib.mkIf isServer "https://${config.hostnames.prometheus}";
+        # Web config file: https://prometheus.io/docs/prometheus/latest/configuration/https/
+        webConfigFile = lib.mkIf isServer (
+          (pkgs.formats.yaml { }).generate "webconfig.yml" {
+            basic_auth_users = {
+              # Generate password: htpasswd -nBC 10 "" | tr -d ':\n'
+              # Encrypt and place in private/prometheus.age
+              "prometheus" = "$2y$10$r7FWHLHTGPAY312PdhkPEuvb05aGn9Nk1IO7qtUUUjmaDl35l6sLa";
+            };
+          }
+        );
+        remoteWrite = lib.mkIf (!isServer) [
+          {
+            name = config.networking.hostName;
+            url = "https://${config.hostnames.prometheus}/api/v1/write";
+            basic_auth = {
+              # Uses password hashed with bcrypt above
+              username = "prometheus";
+              password_file = config.secrets.prometheus.dest;
+            };
+          }
+        ];
+      };
+
+      # Create credentials file for remote Prometheus push
+      secrets.prometheus = lib.mkIf (config.services.prometheus.enable && !isServer) {
         source = ../../../private/prometheus.age;
         dest = "${config.secretsDirectory}/prometheus";
         owner = "prometheus";
         group = "prometheus";
         permissions = "0440";
       };
-    systemd.services.prometheus-secret =
-      lib.mkIf (config.services.prometheus.enable && !isServer) {
+      systemd.services.prometheus-secret = lib.mkIf (config.services.prometheus.enable && !isServer) {
         requiredBy = [ "prometheus.service" ];
         before = [ "prometheus.service" ];
       };
 
-    caddy.routes = lib.mkIf (config.services.prometheus.enable && isServer) [{
-      match = [{ host = [ config.hostnames.prometheus ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams =
-          [{ dial = "localhost:${config.services.prometheus.port}"; }];
-      }];
-    }];
-
-    # Configure Cloudflare DNS to point to this machine
-    services.cloudflare-dyndns.domains =
-      if (config.services.prometheus.enable && isServer) then
-        [ config.hostnames.prometheus ]
-      else
-        [ ];
-
-  };
+      caddy.routes = lib.mkIf (config.services.prometheus.enable && isServer) [
+        {
+          match = [ { host = [ config.hostnames.prometheus ]; } ];
+          handle = [
+            {
+              handler = "reverse_proxy";
+              upstreams = [ { dial = "localhost:${config.services.prometheus.port}"; } ];
+            }
+          ];
+        }
+      ];
 
+      # Configure Cloudflare DNS to point to this machine
+      services.cloudflare-dyndns.domains =
+        if (config.services.prometheus.enable && isServer) then [ config.hostnames.prometheus ] else [ ];
+    };
 }
diff --git a/modules/nixos/services/samba.nix b/modules/nixos/services/samba.nix
index fba1faa..974fac6 100644
--- a/modules/nixos/services/samba.nix
+++ b/modules/nixos/services/samba.nix
@@ -1,6 +1,7 @@
 # Samba is a Windows-compatible file-sharing service.
 
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   config = {
 
@@ -21,15 +22,12 @@
     networking.firewall.allowedUDPPorts = [ 3702 ];
 
     # Allow client browsing Samba and virtual filesystem shares
-    services.gvfs =
-      lib.mkIf (config.gui.enable && config.nautilus.enable) { enable = true; };
+    services.gvfs = lib.mkIf (config.gui.enable && config.nautilus.enable) { enable = true; };
 
     # # Permissions required to mount Samba with GVFS, if not using desktop environment
     # environment.systemPackages = lib.mkIf (config.gui.enable
     #   && config.nautilus.enable
     #   && config.services.xserver.windowManager.i3.enable)
     #   [ pkgs.lxqt.lxqt-policykit ];
-
   };
-
 }
diff --git a/modules/nixos/services/secrets.nix b/modules/nixos/services/secrets.nix
index 851a633..a949992 100644
--- a/modules/nixos/services/secrets.nix
+++ b/modules/nixos/services/secrets.nix
@@ -3,7 +3,13 @@
 
 # In my case, I pre-encrypt my secrets and commit them to git.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
 
@@ -14,42 +20,43 @@
     };
 
     secrets = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule {
-        options = {
-          source = lib.mkOption {
-            type = lib.types.path;
-            description = "Path to encrypted secret.";
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options = {
+            source = lib.mkOption {
+              type = lib.types.path;
+              description = "Path to encrypted secret.";
+            };
+            dest = lib.mkOption {
+              type = lib.types.str;
+              description = "Resulting path for decrypted secret.";
+            };
+            owner = lib.mkOption {
+              default = "root";
+              type = lib.types.str;
+              description = "User to own the secret.";
+            };
+            group = lib.mkOption {
+              default = "root";
+              type = lib.types.str;
+              description = "Group to own the secret.";
+            };
+            permissions = lib.mkOption {
+              default = "0400";
+              type = lib.types.str;
+              description = "Permissions expressed as octal.";
+            };
+            prefix = lib.mkOption {
+              default = "";
+              type = lib.types.str;
+              description = "Prefix for secret value (for environment files).";
+            };
           };
-          dest = lib.mkOption {
-            type = lib.types.str;
-            description = "Resulting path for decrypted secret.";
-          };
-          owner = lib.mkOption {
-            default = "root";
-            type = lib.types.str;
-            description = "User to own the secret.";
-          };
-          group = lib.mkOption {
-            default = "root";
-            type = lib.types.str;
-            description = "Group to own the secret.";
-          };
-          permissions = lib.mkOption {
-            default = "0400";
-            type = lib.types.str;
-            description = "Permissions expressed as octal.";
-          };
-          prefix = lib.mkOption {
-            default = "";
-            type = lib.types.str;
-            description = "Prefix for secret value (for environment files).";
-          };
-        };
-      });
+        }
+      );
       description = "Set of secrets to decrypt to disk.";
       default = { };
     };
-
   };
 
   config = lib.mkIf pkgs.stdenv.isLinux {
@@ -80,7 +87,6 @@
           chown '${attrs.owner}':'${attrs.group}' '${attrs.dest}'
           chmod '${attrs.permissions}' '${attrs.dest}'
         '';
-
       };
     }) config.secrets;
 
@@ -92,7 +98,5 @@
     #   group = "my-app";
     #   permissions = "0440";
     # };
-
   };
-
 }
diff --git a/modules/nixos/services/sshd.nix b/modules/nixos/services/sshd.nix
index b3790f5..6dd0278 100644
--- a/modules/nixos/services/sshd.nix
+++ b/modules/nixos/services/sshd.nix
@@ -1,6 +1,12 @@
 # SSHD service for allowing SSH access to my machines.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     publicKeys = lib.mkOption {
@@ -27,8 +33,9 @@
       };
     };
 
-    users.users.${config.user}.openssh.authorizedKeys.keys =
-      lib.mkIf (config.publicKeys != null) config.publicKeys;
+    users.users.${config.user}.openssh.authorizedKeys.keys = lib.mkIf (
+      config.publicKeys != null
+    ) config.publicKeys;
 
     # Implement a simple fail2ban service for sshd
     services.sshguard.enable = true;
@@ -39,5 +46,4 @@
     # - Will disable until fixed
     environment.enableAllTerminfo = pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64;
   };
-
 }
diff --git a/modules/nixos/services/transmission.nix b/modules/nixos/services/transmission.nix
index d617c17..eeef101 100644
--- a/modules/nixos/services/transmission.nix
+++ b/modules/nixos/services/transmission.nix
@@ -1,85 +1,103 @@
 # Transmission is a bittorrent client, which can run in the background for
 # automated downloads with a web GUI.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  config = let
-    namespace = config.networking.wireguard.interfaces.wg0.interfaceNamespace;
-    vpnIp = lib.strings.removeSuffix "/32"
-      (builtins.head config.networking.wireguard.interfaces.wg0.ips);
-  in lib.mkIf config.services.transmission.enable {
+  config =
+    let
+      namespace = config.networking.wireguard.interfaces.wg0.interfaceNamespace;
+      vpnIp = lib.strings.removeSuffix "/32" (
+        builtins.head config.networking.wireguard.interfaces.wg0.ips
+      );
+    in
+    lib.mkIf config.services.transmission.enable {
 
-    # Setup transmission
-    services.transmission = {
-      settings = {
-        port-forwarding-enabled = false;
-        rpc-authentication-required = true;
-        rpc-port = 9091;
-        rpc-bind-address = "0.0.0.0";
-        rpc-username = config.user;
-        # This is a salted hash of the real password
-        # https://github.com/tomwijnroks/transmission-pwgen
-        rpc-password = "{c4c5145f6e18bcd3c7429214a832440a45285ce26jDOBGVW";
-        rpc-host-whitelist = config.hostnames.transmission;
-        rpc-host-whitelist-enabled = true;
-        rpc-whitelist = lib.mkDefault "127.0.0.1"; # Overwritten by Cloudflare
-        rpc-whitelist-enabled = true;
+      # Setup transmission
+      services.transmission = {
+        settings = {
+          port-forwarding-enabled = false;
+          rpc-authentication-required = true;
+          rpc-port = 9091;
+          rpc-bind-address = "0.0.0.0";
+          rpc-username = config.user;
+          # This is a salted hash of the real password
+          # https://github.com/tomwijnroks/transmission-pwgen
+          rpc-password = "{c4c5145f6e18bcd3c7429214a832440a45285ce26jDOBGVW";
+          rpc-host-whitelist = config.hostnames.transmission;
+          rpc-host-whitelist-enabled = true;
+          rpc-whitelist = lib.mkDefault "127.0.0.1"; # Overwritten by Cloudflare
+          rpc-whitelist-enabled = true;
+        };
+      };
+
+      # Configure Cloudflare DNS to point to this machine
+      services.cloudflare-dyndns.domains = [ config.hostnames.transmission ];
+
+      # Bind transmission to wireguard namespace
+      systemd.services.transmission = lib.mkIf config.wireguard.enable {
+        bindsTo = [ "netns@${namespace}.service" ];
+        requires = [
+          "network-online.target"
+          "transmission-secret.service"
+        ];
+        after = [
+          "wireguard-wg0.service"
+          "transmission-secret.service"
+        ];
+        unitConfig.JoinsNamespaceOf = "netns@${namespace}.service";
+        serviceConfig.NetworkNamespacePath = "/var/run/netns/${namespace}";
+      };
+
+      # Create reverse proxy for web UI
+      caddy.routes =
+        let
+          # Set if the download domain is the same as the Transmission domain
+          useDownloadDomain = config.hostnames.download == config.hostnames.transmission;
+        in
+        lib.mkAfter [
+          {
+            group = if useDownloadDomain then "download" else "transmission";
+            match = [
+              {
+                host = [ config.hostnames.transmission ];
+                path = if useDownloadDomain then [ "/transmission*" ] else null;
+              }
+            ];
+            handle = [
+              {
+                handler = "reverse_proxy";
+                upstreams = [
+                  { dial = "localhost:${builtins.toString config.services.transmission.settings.rpc-port}"; }
+                ];
+              }
+            ];
+          }
+        ];
+
+      # Caddy and Transmission both try to set rmem_max for larger UDP packets.
+      # We will choose Transmission's recommendation (4 MB).
+      boot.kernel.sysctl."net.core.rmem_max" = 4194304;
+
+      # Allow inbound connections to reach namespace
+      systemd.services.transmission-web-netns = lib.mkIf config.wireguard.enable {
+        description = "Forward to transmission in wireguard namespace";
+        requires = [ "transmission.service" ];
+        after = [ "transmission.service" ];
+        serviceConfig = {
+          Restart = "on-failure";
+          TimeoutStopSec = 300;
+        };
+        wantedBy = [ "multi-user.target" ];
+        script = ''
+          ${pkgs.iproute2}/bin/ip netns exec ${namespace} ${pkgs.iproute2}/bin/ip link set dev lo up
+          ${pkgs.socat}/bin/socat tcp-listen:9091,fork,reuseaddr exec:'${pkgs.iproute2}/bin/ip netns exec ${namespace} ${pkgs.socat}/bin/socat STDIO "tcp-connect:${vpnIp}:9091"',nofork
+        '';
       };
     };
-
-    # Configure Cloudflare DNS to point to this machine
-    services.cloudflare-dyndns.domains = [ config.hostnames.transmission ];
-
-    # Bind transmission to wireguard namespace
-    systemd.services.transmission = lib.mkIf config.wireguard.enable {
-      bindsTo = [ "netns@${namespace}.service" ];
-      requires = [ "network-online.target" "transmission-secret.service" ];
-      after = [ "wireguard-wg0.service" "transmission-secret.service" ];
-      unitConfig.JoinsNamespaceOf = "netns@${namespace}.service";
-      serviceConfig.NetworkNamespacePath = "/var/run/netns/${namespace}";
-    };
-
-    # Create reverse proxy for web UI
-    caddy.routes = let
-      # Set if the download domain is the same as the Transmission domain
-      useDownloadDomain = config.hostnames.download
-        == config.hostnames.transmission;
-    in lib.mkAfter [{
-      group = if useDownloadDomain then "download" else "transmission";
-      match = [{
-        host = [ config.hostnames.transmission ];
-        path = if useDownloadDomain then [ "/transmission*" ] else null;
-      }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial = "localhost:${
-              builtins.toString config.services.transmission.settings.rpc-port
-            }";
-        }];
-      }];
-    }];
-
-    # Caddy and Transmission both try to set rmem_max for larger UDP packets.
-    # We will choose Transmission's recommendation (4 MB).
-    boot.kernel.sysctl."net.core.rmem_max" = 4194304;
-
-    # Allow inbound connections to reach namespace
-    systemd.services.transmission-web-netns = lib.mkIf config.wireguard.enable {
-      description = "Forward to transmission in wireguard namespace";
-      requires = [ "transmission.service" ];
-      after = [ "transmission.service" ];
-      serviceConfig = {
-        Restart = "on-failure";
-        TimeoutStopSec = 300;
-      };
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${pkgs.iproute2}/bin/ip netns exec ${namespace} ${pkgs.iproute2}/bin/ip link set dev lo up
-        ${pkgs.socat}/bin/socat tcp-listen:9091,fork,reuseaddr exec:'${pkgs.iproute2}/bin/ip netns exec ${namespace} ${pkgs.socat}/bin/socat STDIO "tcp-connect:${vpnIp}:9091"',nofork
-      '';
-    };
-
-  };
-
 }
diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix
index 17d6088..bde0f6f 100644
--- a/modules/nixos/services/vaultwarden.nix
+++ b/modules/nixos/services/vaultwarden.nix
@@ -2,11 +2,17 @@
 # service, which allows for self-hosting the synchronization of a Bitwarden
 # password manager client.
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-let vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory
-
-in {
+let
+  vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory
+in
+{
 
   config = lib.mkIf config.services.vaultwarden.enable {
     services.vaultwarden = {
@@ -39,18 +45,20 @@ in {
 
     networking.firewall.allowedTCPPorts = [ 3012 ];
 
-    caddy.routes = [{
-      match = [{ host = [ config.hostnames.secrets ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial = "localhost:${
-              builtins.toString config.services.vaultwarden.config.ROCKET_PORT
-            }";
-        }];
-        headers.request.add."X-Real-IP" = [ "{http.request.remote.host}" ];
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.secrets ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              { dial = "localhost:${builtins.toString config.services.vaultwarden.config.ROCKET_PORT}"; }
+            ];
+            headers.request.add."X-Real-IP" = [ "{http.request.remote.host}" ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.secrets ];
@@ -58,8 +66,7 @@ in {
     ## Backup config
 
     # Open to groups, allowing for backups
-    systemd.services.vaultwarden.serviceConfig.StateDirectoryMode =
-      lib.mkForce "0770";
+    systemd.services.vaultwarden.serviceConfig.StateDirectoryMode = lib.mkForce "0770";
     systemd.tmpfiles.rules = [
       "f ${vaultwardenPath}/db.sqlite3 0660 vaultwarden vaultwarden"
       "f ${vaultwardenPath}/db.sqlite3-shm 0660 vaultwarden vaultwarden"
@@ -73,13 +80,14 @@ in {
     # Backup sqlite database with litestream
     services.litestream = {
       settings = {
-        dbs = [{
-          path = "${vaultwardenPath}/db.sqlite3";
-          replicas = [{
-            url =
-              "s3://${config.backup.s3.bucket}.${config.backup.s3.endpoint}/vaultwarden";
-          }];
-        }];
+        dbs = [
+          {
+            path = "${vaultwardenPath}/db.sqlite3";
+            replicas = [
+              { url = "s3://${config.backup.s3.bucket}.${config.backup.s3.endpoint}/vaultwarden"; }
+            ];
+          }
+        ];
       };
     };
 
@@ -117,7 +125,5 @@ in {
             --exclude ".db.sqlite3*"
       '';
     };
-
   };
-
 }
diff --git a/modules/nixos/services/victoriametrics.nix b/modules/nixos/services/victoriametrics.nix
index 70f9524..d24d506 100644
--- a/modules/nixos/services/victoriametrics.nix
+++ b/modules/nixos/services/victoriametrics.nix
@@ -1,37 +1,44 @@
 # VictoriaMetrics is a more efficient drop-in replacement for Prometheus and
 # InfluxDB (timeseries databases built for monitoring system metrics).
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
   username = "prometheus";
 
   prometheusConfig = (pkgs.formats.yaml { }).generate "prometheus.yml" {
-    scrape_configs = [{
-      job_name = config.networking.hostName;
-      stream_parse = true;
-      static_configs = [{ targets = config.prometheus.scrapeTargets; }];
-    }];
+    scrape_configs = [
+      {
+        job_name = config.networking.hostName;
+        stream_parse = true;
+        static_configs = [ { targets = config.prometheus.scrapeTargets; } ];
+      }
+    ];
   };
 
   authConfig = (pkgs.formats.yaml { }).generate "auth.yml" {
-    users = [{
-      username = username;
-      password = "%{PASSWORD}";
-      url_prefix =
-        "http://localhost${config.services.victoriametrics.listenAddress}";
-    }];
+    users = [
+      {
+        username = username;
+        password = "%{PASSWORD}";
+        url_prefix = "http://localhost${config.services.victoriametrics.listenAddress}";
+      }
+    ];
   };
 
   authPort = "8427";
-
-in {
+in
+{
 
   config = {
 
-    services.victoriametrics.extraOptions =
-      [ "-promscrape.config=${prometheusConfig}" ];
+    services.victoriametrics.extraOptions = [ "-promscrape.config=${prometheusConfig}" ];
 
     systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
       description = "VictoriaMetrics basic auth proxy";
@@ -55,39 +62,38 @@ in {
       dest = "${config.secretsDirectory}/vmauth";
       prefix = "PASSWORD=";
     };
-    systemd.services.vmauth-secret =
-      lib.mkIf config.services.victoriametrics.enable {
-        requiredBy = [ "vmauth.service" ];
-        before = [ "vmauth.service" ];
-      };
+    systemd.services.vmauth-secret = lib.mkIf config.services.victoriametrics.enable {
+      requiredBy = [ "vmauth.service" ];
+      before = [ "vmauth.service" ];
+    };
 
-    caddy.routes = lib.mkIf config.services.victoriametrics.enable [{
-      match = [{ host = [ config.hostnames.prometheus ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:${authPort}"; }];
-      }];
-    }];
+    caddy.routes = lib.mkIf config.services.victoriametrics.enable [
+      {
+        match = [ { host = [ config.hostnames.prometheus ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${authPort}"; } ];
+          }
+        ];
+      }
+    ];
 
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains =
-      if config.services.victoriametrics.enable then
-        [ config.hostnames.prometheus ]
-      else
-        [ ];
+      if config.services.victoriametrics.enable then [ config.hostnames.prometheus ] else [ ];
 
     # VMAgent
 
     services.vmagent.prometheusConfig = prometheusConfig; # Overwritten below
-    systemd.services.vmagent.serviceConfig =
-      lib.mkIf config.services.vmagent.enable {
-        ExecStart = lib.mkForce ''
-          ${pkgs.victoriametrics}/bin/vmagent \
-                  -promscrape.config=${prometheusConfig} \
-                  -remoteWrite.url="https://${config.hostnames.prometheus}/api/v1/write" \
-                  -remoteWrite.basicAuth.username=${username} \
-                  -remoteWrite.basicAuth.passwordFile=${config.secrets.vmagent.dest}'';
-      };
+    systemd.services.vmagent.serviceConfig = lib.mkIf config.services.vmagent.enable {
+      ExecStart = lib.mkForce ''
+        ${pkgs.victoriametrics}/bin/vmagent \
+                -promscrape.config=${prometheusConfig} \
+                -remoteWrite.url="https://${config.hostnames.prometheus}/api/v1/write" \
+                -remoteWrite.basicAuth.username=${username} \
+                -remoteWrite.basicAuth.passwordFile=${config.secrets.vmagent.dest}'';
+    };
 
     secrets.vmagent = lib.mkIf config.services.vmagent.enable {
       source = ../../../private/prometheus.age;
@@ -99,7 +105,5 @@ in {
       requiredBy = [ "vmagent.service" ];
       before = [ "vmagent.service" ];
     };
-
   };
-
 }
diff --git a/modules/nixos/services/wireguard.nix b/modules/nixos/services/wireguard.nix
index 440ff2f..7ddc497 100644
--- a/modules/nixos/services/wireguard.nix
+++ b/modules/nixos/services/wireguard.nix
@@ -1,7 +1,13 @@
 # Wireguard is a VPN protocol that can be setup to create a mesh network
 # between machines on different LANs. This is currently not in use in my setup.
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.wireguard.enable = lib.mkEnableOption "Wireguard VPN setup.";
 
@@ -21,7 +27,6 @@
 
           # Move to network namespace for isolating programs
           interfaceNamespace = "wg";
-
         };
       };
     };
@@ -45,7 +50,5 @@
       source = ../../../private/wireguard.age;
       dest = "${config.secretsDirectory}/wireguard";
     };
-
   };
-
 }
diff --git a/modules/nixos/system/auto-upgrade.nix b/modules/nixos/system/auto-upgrade.nix
index c75648f..fc51ec4 100644
--- a/modules/nixos/system/auto-upgrade.nix
+++ b/modules/nixos/system/auto-upgrade.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # This setting only applies to NixOS, different on Darwin
   nix.gc.dates = "09:03"; # Run every morning (but before upgrade)
@@ -19,8 +25,10 @@
 
   # Create an email notification service for failed jobs
   systemd.services."notify-email@" =
-    let address = "system@${config.mail.server}";
-    in {
+    let
+      address = "system@${config.mail.server}";
+    in
+    {
       enable = config.mail.enable;
       environment.SERVICE_ID = "%i";
       script = ''
@@ -40,8 +48,7 @@
     };
 
   # Send an email whenever auto upgrade fails
-  systemd.services.nixos-upgrade.onFailure =
-    lib.mkIf config.systemd.services."notify-email@".enable
-    [ "notify-email@%i.service" ];
-
+  systemd.services.nixos-upgrade.onFailure = lib.mkIf config.systemd.services."notify-email@".enable [
+    "notify-email@%i.service"
+  ];
 }
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index 64757f0..c35f4a9 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -1,14 +1,22 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  imports =
-    [ ./auto-upgrade.nix ./doas.nix ./journald.nix ./user.nix ./timezone.nix ];
+  imports = [
+    ./auto-upgrade.nix
+    ./doas.nix
+    ./journald.nix
+    ./user.nix
+    ./timezone.nix
+  ];
 
   config = lib.mkIf pkgs.stdenv.isLinux {
 
     # Pin a state version to prevent warnings
-    system.stateVersion =
-      config.home-manager.users.${config.user}.home.stateVersion;
-
+    system.stateVersion = config.home-manager.users.${config.user}.home.stateVersion;
   };
-
 }
diff --git a/modules/nixos/system/doas.nix b/modules/nixos/system/doas.nix
index e976cad..47a2200 100644
--- a/modules/nixos/system/doas.nix
+++ b/modules/nixos/system/doas.nix
@@ -1,6 +1,12 @@
 # Replace sudo with doas
 
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf pkgs.stdenv.isLinux {
 
@@ -18,24 +24,25 @@
 
         # Pass environment variables from user to root
         # Also requires specifying that we are removing password here
-        extraRules = [{
-          groups = [ "wheel" ];
-          noPass = true;
-          keepEnv = true;
-        }];
+        extraRules = [
+          {
+            groups = [ "wheel" ];
+            noPass = true;
+            keepEnv = true;
+          }
+        ];
       };
     };
 
     home-manager.users.${config.user}.programs = {
 
       # Alias sudo to doas for convenience
-      fish.shellAliases = { sudo = "doas"; };
+      fish.shellAliases = {
+        sudo = "doas";
+      };
 
       # Disable overriding our sudo alias with a TERMINFO alias
       kitty.settings.shell_integration = "no-sudo";
-
     };
-
   };
-
 }
diff --git a/modules/nixos/system/journald.nix b/modules/nixos/system/journald.nix
index 2b8582f..3855822 100644
--- a/modules/nixos/system/journald.nix
+++ b/modules/nixos/system/journald.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
 
   # How long to keep journalctl entries
   # This helps to make sure log disk usage doesn't grow too unwieldy
@@ -7,5 +8,4 @@
     MaxFileSec=1month
     MaxRetentionSec=2month
   '';
-
 }
diff --git a/modules/nixos/system/timezone.nix b/modules/nixos/system/timezone.nix
index d7feea6..f21c547 100644
--- a/modules/nixos/system/timezone.nix
+++ b/modules/nixos/system/timezone.nix
@@ -1,11 +1,19 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf pkgs.stdenv.isLinux {
 
     # Service to determine location for time zone
     services.geoclue2.enable = true;
     services.geoclue2.enableWifi = false; # Breaks when it can't connect
-    location = { provider = "geoclue2"; };
+    location = {
+      provider = "geoclue2";
+    };
 
     # Enable local time based on time zone
     services.localtimed.enable = true;
@@ -17,7 +25,5 @@
     # Fix "Failed to set timezone"
     # https://github.com/NixOS/nixpkgs/issues/68489#issuecomment-1484030107
     services.geoclue2.enableDemoAgent = lib.mkForce true;
-
   };
-
 }
diff --git a/modules/nixos/system/user.nix b/modules/nixos/system/user.nix
index 8ad8011..a05a870 100644
--- a/modules/nixos/system/user.nix
+++ b/modules/nixos/system/user.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
 
@@ -8,7 +14,6 @@
       default = null;
       # Test it by running: mkpasswd -m sha-512 --salt "PZYiMGmJIIHAepTM"
     };
-
   };
 
   config = {
@@ -28,7 +33,6 @@
       extraGroups = [
         "wheel" # Sudo privileges
       ];
-
     };
 
     # Allow writing custom scripts outside of Nix
@@ -59,10 +63,10 @@
         desktop = "$HOME/other/desktop";
         publicShare = "$HOME/other/public";
         templates = "$HOME/other/templates";
-        extraConfig = { XDG_DEV_DIR = "$HOME/dev"; };
+        extraConfig = {
+          XDG_DEV_DIR = "$HOME/dev";
+        };
       };
     };
-
   };
-
 }
diff --git a/modules/wsl/default.nix b/modules/wsl/default.nix
index a9b1240..1919133 100644
--- a/modules/wsl/default.nix
+++ b/modules/wsl/default.nix
@@ -1,10 +1,18 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.wsl.enable) {
 
     # Systemd doesn't work in WSL so these must be disabled
     services.geoclue2.enable = lib.mkForce false;
-    location = { provider = lib.mkForce "manual"; };
+    location = {
+      provider = lib.mkForce "manual";
+    };
     services.localtimed.enable = lib.mkForce false;
 
     # Used by NeoVim for clipboard sharing with Windows
@@ -17,7 +25,5 @@
       rm -rf /etc/nixos
       ln --symbolic --no-dereference --force ${config.dotfilesPath} /etc/nixos
     '';
-
   };
-
 }
diff --git a/templates/basic/flake.nix b/templates/basic/flake.nix
index 9a0aae3..9f18afe 100644
--- a/templates/basic/flake.nix
+++ b/templates/basic/flake.nix
@@ -1,7 +1,8 @@
 {
   description = "Basic project";
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  outputs = { nixpkgs }:
+  outputs =
+    { nixpkgs }:
     let
       forAllSystems = nixpkgs.lib.genAttrs [
         "x86_64-linux"
diff --git a/templates/haskell/flake.nix b/templates/haskell/flake.nix
index f9c6904..daa036b 100644
--- a/templates/haskell/flake.nix
+++ b/templates/haskell/flake.nix
@@ -8,8 +8,14 @@
   inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { nixpkgs, flake-utils, haskellNix }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      nixpkgs,
+      flake-utils,
+      haskellNix,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         overlay = self: _: {
           hsPkgs = self.haskell-nix.project' rec {
@@ -25,10 +31,12 @@
                 ormolu = {
                   version = "latest";
                   modules = [
-                    ({ lib, ... }: {
-                      options.nonReinstallablePkgs =
-                        lib.mkOption { apply = lib.remove "Cabal"; };
-                    })
+                    (
+                      { lib, ... }:
+                      {
+                        options.nonReinstallablePkgs = lib.mkOption { apply = lib.remove "Cabal"; };
+                      }
+                    )
                   ];
                 };
               };
@@ -47,8 +55,13 @@
         };
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ haskellNix.overlay overlay ];
+          overlays = [
+            haskellNix.overlay
+            overlay
+          ];
         };
         flake = pkgs.hsPkgs.flake { };
-      in flake // { defaultPackage = flake.packages."hello:exe:hello-exe"; });
+      in
+      flake // { defaultPackage = flake.packages."hello:exe:hello-exe"; }
+    );
 }
diff --git a/templates/poetry/flake.nix b/templates/poetry/flake.nix
index 10f1e5f..d41bb7d 100644
--- a/templates/poetry/flake.nix
+++ b/templates/poetry/flake.nix
@@ -5,23 +5,30 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
   inputs.poetry2nix.url = "github:nix-community/poetry2nix";
 
-  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      poetry2nix,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ poetry2nix.overlay ];
         };
         projectDir = ./.;
-
-      in {
-        defaultPackage =
-          pkgs.poetry2nix.mkPoetryApplication { inherit projectDir; };
+      in
+      {
+        defaultPackage = pkgs.poetry2nix.mkPoetryApplication { inherit projectDir; };
         devShells.default = pkgs.mkShell {
           buildInputs = [
             (pkgs.poetry2nix.mkPoetryEnv { inherit projectDir; })
             pkgs.poetry
           ];
         };
-      });
+      }
+    );
 }
diff --git a/templates/python/flake.nix b/templates/python/flake.nix
index 83d23b3..507ee48 100644
--- a/templates/python/flake.nix
+++ b/templates/python/flake.nix
@@ -11,18 +11,22 @@
     inputs.pypi-deps-db.follows = "pypi-deps-db";
   };
 
-  outputs = { nixpkgs, mach-nix, ... }:
+  outputs =
+    { nixpkgs, mach-nix, ... }:
     let
-      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      forAllSystems = f:
-        nixpkgs.lib.genAttrs supportedSystems
-        (system: f system (import nixpkgs { inherit system; }));
-    in rec {
-      defaultApp = forAllSystems (system: _pkgs:
-        mach-nix.lib."${system}".mkPython {
-          requirements = builtins.readFile ./requirements.txt;
-        });
-      devShell = forAllSystems (system: pkgs:
-        pkgs.mkShell { buildInputs = [ defaultApp."${system}" ]; });
+      supportedSystems = [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forAllSystems =
+        f: nixpkgs.lib.genAttrs supportedSystems (system: f system (import nixpkgs { inherit system; }));
+    in
+    rec {
+      defaultApp = forAllSystems (
+        system: _pkgs:
+        mach-nix.lib."${system}".mkPython { requirements = builtins.readFile ./requirements.txt; }
+      );
+      devShell = forAllSystems (system: pkgs: pkgs.mkShell { buildInputs = [ defaultApp."${system}" ]; });
     };
 }