add microcode service for amd

2025-07-28 21:50:15 +00:00 · 2024-11-11 18:18:20 -07:00
483 changed files with 9625 additions and 13943 deletions
--- a/.github/workflows/arrow-aws.yml
+++ b/.github/workflows/arrow-aws.yml
@ -3,7 +3,7 @@ name: Arrow (AWS)
 run-name: Arrow (AWS) - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}

 env:
-  TERRAFORM_DIRECTORY: deploy/aws
+  TERRAFORM_DIRECTORY: hosts/arrow/aws
  DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
  ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
  ZONE_NAME: masu.rs
--- a/.github/workflows/flame.yml
+++ b/.github/workflows/flame.yml
@ -1,200 +0,0 @@
-name: Flame
-
-run-name: Flame - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
-
-env:
-  TERRAFORM_DIRECTORY: deploy/oracle
-  DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
-  FLAME_IDENTITY_BASE64: ${{ secrets.FLAME_IDENTITY_BASE64 }}
-  ZONE_NAME: masu.rs
-  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-  CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-  OCI_CLI_USER: "ocid1.user.oc1..aaaaaaaa6lro2eoxdajjypjysepvzcavq5yn4qyozjyebxdiaoqziribuqba"
-  OCI_CLI_TENANCY: "ocid1.tenancy.oc1..aaaaaaaaudwr2ozedhjnrn76ofjgglgug6gexknjisd7gb7tkj3mjdp763da"
-  OCI_CLI_FINGERPRINT: "dd:d0:da:6d:83:46:8b:b3:d9:45:2b:c7:56:ae:30:94"
-  OCI_CLI_KEY_CONTENT: "${{ secrets.OCI_PRIVATE_KEY }}"
-  TF_VAR_oci_private_key: "${{ secrets.OCI_PRIVATE_KEY }}"
-  OCI_CLI_REGION: "us-ashburn-1"
-
-on:
-  workflow_dispatch:
-    inputs:
-      rebuild:
-        description: Rebuild Image
-        type: boolean
-        default: false
-      action:
-        description: Terraform Action
-        type: choice
-        required: true
-        default: create
-        options:
-          - create
-          - destroy
-          - nothing
-
-permissions:
-  id-token: write
-  contents: write
-
-jobs:
-  build-deploy:
-    name: Build and Deploy
-    # runs-on: ubuntu-latest
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - name: Checkout Repo Code
-        uses: actions/checkout@v4
-
-      # - name: Write OCI Key to File
-      #   run: |
-      #     echo "${{ env.OCI_PRIVATE_KEY_BASE64 }}" | base64 -d > OCI_PRIVATE_KEY
-
-      # # Enable access to KVM, required to build an image
-      # - name: Enable KVM group perms
-      #   if: inputs.rebuild && inputs.action != 'destroy'
-      #   run: |
-      #       echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-      #       sudo udevadm control --reload-rules
-      #       sudo udevadm trigger --name-match=kvm
-      #       sudo apt-get install -y qemu-user-static
-
-      # Install Nix
-      - name: Install Nix
-        # if: inputs.rebuild && inputs.action != 'destroy'
-        uses: cachix/install-nix-action@v31.4.1
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            system = aarch64-linux
-            system-features = aarch64-linux arm-linux kvm
-
-      # Build the image
-      - name: Build Image
-        if: inputs.rebuild && inputs.action != 'destroy'
-        run: nix build .#flame-qcow --system aarch64-linux
-
-      - name: List Images
-        if: inputs.rebuild && inputs.action != 'destroy'
-        run: |
-          ls -lh result/
-          echo "IMAGE_NAME=$(ls result/nixos.qcow2) >> $GITHUB_ENV
-
-      - name: Upload Image to S3
-        if: inputs.rebuild && inputs.action != 'destroy'
-        # env:
-        #   AWS_ACCESS_KEY_ID: "<YOUR_OCI_ACCESS_KEY>"
-        #   AWS_SECRET_ACCESS_KEY: "<YOUR_OCI_SECRET_KEY>"
-        #   AWS_DEFAULT_REGION: "us-ashburn-1" # e.g., us-ashburn-1, us-phoenix-1
-        #   AWS_ENDPOINT_URL: "https://masur.compat.objectstorage.us-ashburn-1.oraclecloud.com"
-        uses: oracle-actions/run-oci-cli-command@v1.3.2
-        with:
-          command: |
-            os object put \
-              --namespace "idptr5akf9pf" \
-              --bucket-name "noahmasur-images" \
-              --name "nixos.qcow2" \
-              --file "${IMAGE_NAME}" \
-              --part-size 128 \ # Optional: Specify part size in MiB for multipart uploads, default is 128 MiB
-              --parallel-upload-count 5 # Optional: Number of parallel uploads, default is 3
-
-      # Login to AWS
-      - name: AWS Assume Role
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::286370965832:role/github_actions_admin
-          aws-region: us-east-1
-
-      # Installs the Terraform binary and some other accessory functions.
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
-
-      # Checks whether Terraform is formatted properly. If this fails, you
-      # should install the pre-commit hook.
-      - name: Check Formatting
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform fmt -no-color -check -diff -recursive
-
-      # Connects to remote state backend and download providers.
-      - name: Terraform Init
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform init -input=false
-
-      # Deploys infrastructure or changes to infrastructure.
-      - name: Terraform Apply
-        if: inputs.action == 'create'
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform apply \
-            -auto-approve \
-            -input=false
-
-      # Removes infrastructure.
-      - name: Terraform Destroy
-        if: inputs.action == 'destroy'
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform destroy \
-            -auto-approve \
-            -input=false
-
-      - name: Get Host IP
-        if: inputs.action == 'create'
-        id: host
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform output -raw host_ip
-
-      - name: Wait on SSH
-        if: inputs.action == 'create'
-        run: |
-          for i in $(seq 1 15); do
-            if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
-              exit 0
-            fi
-            sleep 10
-          done
-
-      - name: Write Identity Keys to Files
-        if: inputs.action == 'create'
-        run: |
-          echo "${{ env.DEPLOY_IDENTITY_BASE64 }}" | base64 -d > deploy_ed25519
-          chmod 0600 deploy_ed25519
-          echo "${{ env.FLAME_IDENTITY_BASE64 }}" | base64 -d > flame_ed25519
-          chmod 0600 flame_ed25519
-          mkdir -pv "${HOME}/.ssh/"
-          cp deploy_ed25519 "${HOME}/.ssh/id_ed25519"
-
-      - name: Run nixos-anywhere
-        if: inputs.action == 'create'
-        run: |
-          nix run github:nix-community/nixos-anywhere -- --flake github:nmasur/dotfiles#flame --build-on remote --no-reboot --target-host ubuntu@${{ steps.host.outputs.stdout }}
-          reboot now
-
-      - name: Wait on SSH After Reboot
-        if: inputs.action == 'create'
-        run: |
-          for i in $(seq 1 15); do
-            if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
-              exit 0
-            fi
-            sleep 10
-          done
-
-      - name: Copy Identity File to Host
-        if: inputs.action == 'create'
-        run: |
-          ssh -i deploy_ed25519 -o StrictHostKeyChecking=accept-new noah@${{ steps.host.outputs.stdout }} 'mkdir -pv .ssh'
-          scp -i deploy_ed25519 flame_ed25519 noah@${{ steps.host.outputs.stdout }}:~/.ssh/id_ed25519
-
-      # - name: Wipe Records
-      #   if: ${{ inputs.action == 'destroy' }}
-      #   run: |
-      #     RECORD_ID=$(curl --request GET \
-      #        --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records \
-      #        --header 'Content-Type: application/json' \
-      #        --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "n8n2.${{ env.ZONE_NAME }}") | .id')
-      #     curl --request DELETE \
-      #        --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records/${RECORD_ID} \
-      #        --header 'Content-Type: application/json' \
-      #        --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}"
--- a/README.md
+++ b/README.md
@ -8,38 +8,38 @@ configuration may be difficult to translate to a non-Nix system.

 ## System Features

-| Feature        | Program                                             | Configuration                                                                     |
-|----------------|-----------------------------------------------------|-----------------------------------------------------------------------------------|
-| OS             | [NixOS](https://nixos.org)                          | [Link](./platforms/nixos)                                                         |
-| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./platforms/nixos/modules/nmasur/profiles/gui.nix)                         |
-| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./platforms/home-manager/modules/nmasur/presets/services/picom.nix)        |
-| Window Manager | [i3](https://i3wm.org/)                             | [Link](./platforms/home-manager/modules/nmasur/presets/services/i3.nix)           |
-| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./platforms/home-manager/modules/nmasur/presets/services/polybar.nix)      |
-| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./platforms/home-manager/modules/nmasur/presets/fonts.nix)                 |
-| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix) |
+| Feature        | Program                                             | Configuration                                 |
+|----------------|-----------------------------------------------------|-----------------------------------------------|
+| OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
+| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
+| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
+| Window Manager | [i3](https://i3wm.org/)                             | [Link](./modules/nixos/graphical/i3.nix)      |
+| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./modules/nixos/graphical/polybar.nix) |
+| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix)   |
+| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./modules/nixos/graphical/rofi.nix)    |

 ## User Features

-| Feature      | Program                                                                          | Configuration                                                                 |
-|--------------|----------------------------------------------------------------------------------|-------------------------------------------------------------------------------|
-| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./platforms/home-manager)                                              |
-| Terminal     | [Ghostty](https://sw.kovidgoyal.net/kitty/)                                      | [Link](./platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix)  |
-| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./platforms/home-manager/modules/nmasur/presets/programs/fish.nix)     |
-| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./platforms/home-manager/modules/nmasur/presets/programs/starship.nix) |
-| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)                                     |
-| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/x86_64-linux/tempest/default.nix)                              |
-| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./pkgs/applications/editors/neovim/nmasur/neovim/package.nix)          |
-| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./platforms/home-manager/modules/nmasur/presets/programs/firefox.nix)  |
-| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./platforms/home-manager/modules/nmasur/presets/programs/aerc.nix)     |
-| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./platforms/home-manager/modules/nmasur/presets/programs/nautilus.nix) |
-| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./platforms/home-manager/modules/nmasur/presets/programs/zathura.nix)  |
-| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./platforms/home-manager/modules/nmasur/presets/programs/mpv.nix)      |
+| Feature      | Program                                                                          | Configuration                                      |
+|--------------|----------------------------------------------------------------------------------|----------------------------------------------------|
+| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
+| Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
+| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
+| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starship.nix)        |
+| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)          |
+| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)                |
+| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
+| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
+| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |
+| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./modules/common/applications/nautilus.nix) |
+| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./modules/common/applications/media.nix)    |
+| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./modules/common/applications/media.nix)    |

 ## macOS Features

 | Feature  | Program                                     | Configuration                        |
 |----------|---------------------------------------------|--------------------------------------|
-| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./platforms/home-manager/modules/nmasur/presets/services/hammerspoon/) |
+| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |

 # Diagram

@ -51,16 +51,15 @@ configuration may be difficult to translate to a non-Nix system.

 This repo contains a few more elaborate elements of configuration.

- [Neovim config](./pkgs/applications/editors/neovim/nmasur/neovim/package.nix)
-generated with Nix2Vim and source-controlled plugins,
-differing based on installed LSPs, for example. - [Caddy
-JSON](./platforms/nixos/modules/nmasur/presets/services/caddy.nix) file (routes,
-etc.) based dynamically on enabled services rendered with Nix. - [Grafana
-config](./platforms/nixos/modules/nmasur/presets/services/grafana/grafana.nix)
-rendered with Nix. - Custom [secrets
-deployment](./platforms/nixos/modules/secrets.nix) similar to agenix. - Base16
-[colorschemes](./colorscheme/) applied to multiple applications, including
-Firefox userChrome.
+- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
+and source-controlled plugins, differing based on installed LSPs, for example.
+- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based
+dynamically on enabled services rendered with Nix.
+- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix.
+- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
+agenix.
+- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
+including Firefox userChrome.

 ---

--- a/apps/README.md
+++ b/apps/README.md
@ -0,0 +1,9 @@
+# Apps
+
+These are all my miscellaneous utilies and scripts to accompany this project.
+
+They can be run with:
+
+```
+nix run github:nmasur/dotfiles#appname
+```
--- a/apps/default.nix
+++ b/apps/default.nix
@ -0,0 +1,34 @@
+{ pkgs, ... }:
+rec {
+
+  # Show quick helper
+  default = import ./help.nix { inherit pkgs; };
+
+  # Format primary disk
+  format-root = import ./format-root.nix { inherit pkgs; };
+
+  # Format and install from nothing (deprecated)
+  installer = import ./installer.nix { inherit pkgs; };
+
+  # Display the readme for this repository
+  readme = import ./readme.nix { inherit pkgs; };
+
+  # Rebuild
+  rebuild = import ./rebuild.nix { inherit pkgs; };
+
+  # Load the SSH key for this machine
+  loadkey = import ./loadkey.nix { inherit pkgs; };
+
+  # Encrypt secret for all machines
+  encrypt-secret = import ./encrypt-secret.nix { inherit pkgs; };
+
+  # Re-encrypt secrets for all machines
+  reencrypt-secrets = import ./reencrypt-secrets.nix { inherit pkgs; };
+
+  # Connect machine metrics to Netdata Cloud
+  netdata = import ./netdata-cloud.nix { inherit pkgs; };
+
+  # Run neovim as an app
+  neovim = import ./neovim.nix { inherit pkgs; };
+  nvim = neovim;
+}
--- a/apps/encrypt-secret.nix
+++ b/apps/encrypt-secret.nix
@ -0,0 +1,19 @@
+{ 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
+    ''
+  );
+}
--- a/apps/format-root.nix
+++ b/apps/format-root.nix
@ -0,0 +1,41 @@
+{ pkgs, ... }:
+{
+
+  # This script will partition and format drives; use at your own risk!
+
+  type = "app";
+
+  program = builtins.toString (
+    pkgs.writeShellScript "format-root" ''
+      set -e
+
+      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
+
+      ${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.disko-packaged}/bin/disko \
+          --mode create \
+          --flake "path:$(pwd)#root" \
+          --arg disk "/dev/''${DISK}"
+
+    ''
+  );
+}
--- a/apps/help.nix
+++ b/apps/help.nix
@ -0,0 +1,25 @@
+{ 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 ""
+    ''
+  );
+}
--- a/apps/installer.nix
+++ b/apps/installer.nix
@ -0,0 +1,50 @@
+{ 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
+
+      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
+
+      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.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}
+    ''
+  );
+}
--- a/apps/loadkey.nix
+++ b/apps/loadkey.nix
@ -0,0 +1,15 @@
+{ 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"
+    ''
+  );
+}
--- a/apps/neovim.nix
+++ b/apps/neovim.nix
@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+
+  type = "app";
+
+  program = "${
+    (import ../modules/common/neovim/package {
+      inherit pkgs;
+      colors = (import ../colorscheme/nord).dark;
+    })
+  }/bin/nvim";
+}
--- a/apps/netdata-cloud.nix
+++ b/apps/netdata-cloud.nix
@ -0,0 +1,21 @@
+{ 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"
+    ''
+  );
+}
--- a/apps/readme.nix
+++ b/apps/readme.nix
@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+
+  type = "app";
+
+  program = builtins.toString (
+    pkgs.writeShellScript "readme" ''
+      ${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
+    ''
+  );
+}
--- a/apps/rebuild.nix
+++ b/apps/rebuild.nix
@ -0,0 +1,17 @@
+{ 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
+    ''
+  );
+}
--- a/apps/reencrypt-secrets.nix
+++ b/apps/reencrypt-secrets.nix
@ -0,0 +1,27 @@
+{ 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."
+    ''
+  );
+}
--- a/deploy/oracle/main.tf
+++ b/deploy/oracle/main.tf
@ -1,115 +0,0 @@
-terraform {
-  backend "s3" {
-    bucket       = "noahmasur-terraform"
-    key          = "flame.tfstate"
-    region       = "us-east-1"
-    use_lockfile = true
-  }
-  required_version = ">= 1.0.0"
-  required_providers {
-    oci = {
-      source  = "oracle/oci"
-      version = "7.7.0"
-    }
-  }
-}
-
-provider "oci" {
-  auth         = "APIKey"
-  tenancy_ocid = var.compartment_ocid
-  user_ocid    = "ocid1.user.oc1..aaaaaaaa6lro2eoxdajjypjysepvzcavq5yn4qyozjyebxdiaoqziribuqba"
-  private_key  = var.oci_private_key
-  fingerprint  = "dd:d0:da:6d:83:46:8b:b3:d9:45:2b:c7:56:ae:30:94"
-  region       = "us-ashburn-1"
-}
-
-# Get the latest Ubuntu image OCID
-# We'll filter for a recent Ubuntu LTS version (e.g., 22.04 or 24.04) and pick the latest.
-# Note: Image OCIDs are region-specific. This data source helps find the correct one.
-data "oci_core_images" "ubuntu_image" {
-  compartment_id   = var.compartment_ocid
-  operating_system = "Canonical Ubuntu"
-  # Adjust this version if you prefer a different Ubuntu LTS (e.g., "24.04")
-  operating_system_version = "24.04"
-  shape                    = var.instance_shape # Filter by the shape to ensure compatibility
-  sort_by                  = "TIMECREATED"
-  sort_order               = "DESC"
-}
-
-# resource "oci_core_image" "my_custom_image" {
-#   compartment_id = var.compartment_ocid
-#   display_name   = "noah-nixos"
-
-#   image_source_details {
-#     source_type = "objectStorageTuple" # Use this if specifying namespace, bucket, and object name
-#     # source_type  = "objectStorageUri"  # Use this if you have a pre-authenticated request URL (PAR)
-#     namespace_name = var.object_storage_namespace
-#     bucket_name    = var.object_storage_bucket_name
-#     object_name    = var.object_storage_object_name
-
-#     source_image_type = "QCOW2" # e.g., "QCOW2", "VMDK"
-
-#     # These properties help OCI understand how to launch instances from this image
-#     # Adjust based on your custom image's OS and boot mode
-#     operating_system         = "NixOS" # e.g., "CentOS", "Debian", "Windows"
-#     operating_system_version = "25.05" # e.g., "7", "11", "2019"
-#   }
-
-#   launch_mode = "PARAVIRTUALIZED" # Or "NATIVE", "EMULATED", "CUSTOM"
-#   # Optional: for specific launch options if your image requires them
-#   # launch_options {
-#   #   boot_volume_type = "PARAVIRTUALIZED"
-#   #   firmware         = "UEFI_64" # Or "BIOS"
-#   #   network_type     = "PARAVIRTUALIZED"
-#   # }
-
-#   # Time out for image import operation. Can take a while for large images.
-#   timeouts {
-#     create = "60m" # Default is 20m, often needs to be increased
-#   }
-# }
-
-data "oci_identity_availability_domains" "ads" {
-  compartment_id = var.compartment_ocid
-}
-
-resource "oci_core_instance" "my_compute_instance" {
-  compartment_id      = var.compartment_ocid
-  availability_domain = data.oci_identity_availability_domains.ads.availability_domains[0].name
-  shape               = var.instance_shape
-  display_name        = var.instance_display_name
-
-  source_details {
-    source_type = "image"
-    # Use the OCID of the latest Ubuntu image found by the data source
-    source_id = data.oci_core_images.ubuntu_image.images[0].id
-    # # Use the OCID of the newly imported custom image
-    # source_id = oci_core_image.my_custom_image.id
-    # Specify the boot volume size
-    boot_volume_size_in_gbs = var.boot_volume_size_in_gbs
-    boot_volume_vpus_per_gb = 20 # Highest free tier option
-  }
-
-  # launch_options {
-  #   is_consistent_volume_naming_enabled = true              # Sets boot device path to /dev/oracleoci/oraclevda
-  #   network_type                        = "PARAVIRTUALIZED" # I think this is the default?
-  # }
-
-  create_vnic_details {
-    subnet_id        = oci_core_subnet.my_public_subnet.id # Use the created subnet's ID
-    display_name     = "primary_vnic"
-    assign_public_ip = true
-    hostname_label   = "flame"
-  }
-
-  metadata = {
-    ssh_authorized_keys = var.ssh_public_key
-    user_data           = base64encode(var.cloud_init_script)
-  }
-
-  # Optional: For flexible shapes (e.g., VM.Standard.E4.Flex), you might need to specify OCPUs and memory
-  shape_config {
-    ocpus         = 4
-    memory_in_gbs = 24
-  }
-}
--- a/deploy/oracle/network.tf
+++ b/deploy/oracle/network.tf
@ -1,126 +0,0 @@
-resource "oci_core_vcn" "my_vpc" {
-  compartment_id = var.compartment_ocid
-  display_name   = "main"
-  cidr_block     = "10.0.0.0/16"
-  is_ipv6enabled = false
-  dns_label      = "mainvcn" # Must be unique within your tenancy
-}
-
-resource "oci_core_internet_gateway" "my_igw" {
-  compartment_id = var.compartment_ocid
-  vcn_id         = oci_core_vcn.my_vpc.id
-  display_name   = "main-igw"
-  enabled        = true
-}
-
-resource "oci_core_route_table" "my_public_route_table" {
-  compartment_id = var.compartment_ocid
-  vcn_id         = oci_core_vcn.my_vpc.id
-  display_name   = "main-public-rt"
-
-  # Default route to the Internet Gateway
-  route_rules {
-    destination       = "0.0.0.0/0"
-    destination_type  = "CIDR_BLOCK"
-    network_entity_id = oci_core_internet_gateway.my_igw.id
-  }
-}
-
-resource "oci_core_security_list" "my_public_security_list" {
-  compartment_id = var.compartment_ocid
-  vcn_id         = oci_core_vcn.my_vpc.id
-  display_name   = "main-public-sl"
-
-  # Egress Rules (Allow all outbound traffic)
-  egress_security_rules {
-    destination      = "0.0.0.0/0"
-    destination_type = "CIDR_BLOCK"
-    protocol         = "all"
-  }
-
-  # Ingress Rules
-  ingress_security_rules {
-    # SSH (TCP 22)
-    protocol    = "6" # TCP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    tcp_options {
-      min = 22
-      max = 22
-    }
-  }
-
-  ingress_security_rules {
-    # HTTP (TCP 80)
-    protocol    = "6" # TCP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    tcp_options {
-      min = 80
-      max = 80
-    }
-  }
-
-  ingress_security_rules {
-    # HTTPS (TCP 443)
-    protocol    = "6" # TCP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    tcp_options {
-      min = 443
-      max = 443
-    }
-  }
-
-  ingress_security_rules {
-    # Custom Minecraft
-    protocol    = "6" # TCP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    tcp_options {
-      min = 49732
-      max = 49732
-    }
-  }
-
-  ingress_security_rules {
-    # HTTPS (UDP 443) - For QUIC or specific UDP services
-    protocol    = "17" # UDP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    udp_options {
-      min = 443
-      max = 443
-    }
-  }
-
-  ingress_security_rules {
-    # ICMP (Ping)
-    protocol    = "1" # ICMP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    icmp_options {
-      type = 3 # Destination Unreachable (common for connectivity checks)
-      code = 4 # Fragmentation needed
-    }
-  }
-  ingress_security_rules {
-    protocol    = "1" # ICMP
-    source      = "0.0.0.0/0"
-    source_type = "CIDR_BLOCK"
-    icmp_options {
-      type = 8 # Echo Request (ping)
-    }
-  }
-}
-
-resource "oci_core_subnet" "my_public_subnet" {
-  compartment_id             = var.compartment_ocid
-  vcn_id                     = oci_core_vcn.my_vpc.id
-  display_name               = "main-public-subnet"
-  cidr_block                 = "10.0.0.0/24"
-  prohibit_public_ip_on_vnic = false # Allows instances in this subnet to get public IPs
-  route_table_id             = oci_core_route_table.my_public_route_table.id
-  security_list_ids          = [oci_core_security_list.my_public_security_list.id]
-  dns_label                  = "mainsub" # Must be unique within the VCN
-}
--- a/deploy/oracle/outputs.tf
+++ b/deploy/oracle/outputs.tf
@ -1,19 +0,0 @@
-output "host_ip" {
-  description = "The public IP address of the launched instance."
-  value       = oci_core_instance.my_compute_instance.public_ip
-}
-
-output "instance_id" {
-  description = "The OCID of the launched instance."
-  value       = oci_core_instance.my_compute_instance.id
-}
-
-output "vpc_ocid" {
-  description = "The OCID of the created VCN."
-  value       = oci_core_vcn.my_vpc.id
-}
-
-output "subnet_ocid" {
-  description = "The OCID of the created public subnet."
-  value       = oci_core_subnet.my_public_subnet.id
-}
--- a/deploy/oracle/variables.tf
+++ b/deploy/oracle/variables.tf
@ -1,63 +0,0 @@
-variable "boot_volume_size_in_gbs" {
-  description = "The size of the boot volume in GBs."
-  type        = number
-  default     = 150
-}
-
-variable "cloud_init_script" {
-  description = "A cloud-init script to run on instance launch."
-  type        = string
-  default     = <<-EOF
-              #!/bin/bash
-              echo "Hello from cloud-init!" > /home/ubuntu/cloud-init-output.txt
-              EOF
-}
-
-variable "compartment_ocid" {
-  description = "The OCID of the compartment where the instance will be created."
-  type        = string
-  default     = "ocid1.tenancy.oc1..aaaaaaaaudwr2ozedhjnrn76ofjgglgug6gexknjisd7gb7tkj3mjdp763da"
-}
-
-variable "instance_display_name" {
-  description = "A user-friendly name for the instance."
-  type        = string
-  default     = "noah-nixos"
-}
-
-variable "instance_shape" {
-  description = "The shape of the OCI compute instance."
-  type        = string
-  default     = "VM.Standard.A1.Flex" # Example shape. Choose one available in your region/AD.
-}
-
-variable "object_storage_namespace" {
-  description = "Your OCI Object Storage namespace (usually your tenancy name)."
-  type        = string
-  default     = "idptr5akf9pf"
-}
-
-variable "object_storage_bucket_name" {
-  description = "The name of the Object Storage bucket where your custom image is located."
-  type        = string
-  default     = "noahmasur-images"
-}
-
-variable "object_storage_object_name" {
-  description = "The object name (file name) of your custom image in Object Storage."
-  type        = string
-  default     = "nixos.qcow2"
-}
-
-variable "oci_private_key" {
-  type        = string
-  description = "API private key for Oracle Cloud management"
-  sensitive   = true
-}
-
-variable "ssh_public_key" {
-  description = "Your public SSH key content."
-  type        = string
-  # default     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
-  default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpPU2G9rSF8Q6waH62IJexDCQ6lY+8ZyVufGE3xMDGw actions-deploy"
-}
--- a/disks/README.md
+++ b/disks/README.md
@ -0,0 +1,5 @@
+# Disks
+
+These are my [disko](https://github.com/nix-community/disko) configurations,
+which allow me to save desired disk formatting layouts as a declarative file so
+I don't have to remember how to format my disks later on.
--- a/hosts/x86_64-linux/swan/root.nix
+++ b/hosts/x86_64-linux/swan/root.nix
--- a/disks/zfs.nix
+++ b/disks/zfs.nix
@ -0,0 +1,98 @@
+{ pool, disks, ... }:
+{
+  disk = lib.genAttrs disks (disk: {
+    "${disk}" = {
+      type = "disk";
+      device = "/dev/${disk}";
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [
+          {
+            type = "partition";
+            name = "zfs";
+            start = "128MiB";
+            end = "100%";
+            content = {
+              type = "zfs";
+              pool = pool;
+            };
+          }
+        ];
+      };
+    };
+  });
+  zpool = {
+    "${pool}" = {
+      type = "zpool";
+      mode = "raidz1";
+      rootFsOptions = {
+        compression = "on"; # lz4 by default
+        "com.sun:auto-snapshot" = "false";
+        ashift = "12";
+      };
+      # mountpoint = "/";
+
+      datasets = {
+        root = {
+          zfs_type = "filesystem";
+          mountpoint = null;
+          options."com.sun:auto-snapshot" = "false";
+        };
+        # "media/movies" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/movies";
+        #   options.recordsize = "1M";
+        # };
+        # "media/tv" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/tv";
+        #   options.recordsize = "1M";
+        # };
+        # "media/books" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/books";
+        # };
+        # archive = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/archive";
+        #   options.compression = "zstd";
+        #   options."com.sun:auto-snapshot" = "true";
+        # };
+        # zfs_unmounted_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "none";
+        # };
+        # zfs_legacy_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "legacy";
+        #   mountpoint = "/zfs_legacy_fs";
+        # };
+        # zfs_testvolume = {
+        #   zfs_type = "volume";
+        #   size = "10M";
+        #   content = {
+        #     type = "filesystem";
+        #     format = "ext4";
+        #     mountpoint = "/ext4onzfs";
+        #   };
+        # };
+        # encrypted = {
+        #   zfs_type = "filesystem";
+        #   size = "20M";
+        #   options = {
+        #     mountpoint = "none";
+        #     encryption = "aes-256-gcm";
+        #     keyformat = "passphrase";
+        #     keylocation = "file:///tmp/secret.key";
+        #   };
+        # };
+        # "encrypted/test" = {
+        #   zfs_type = "filesystem";
+        #   size = "2M";
+        #   mountpoint = "/zfs_crypted";
+        # };
+      };
+    };
+  };
+}
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@ -1,5 +1,5 @@
 {
-  description = "An opinionated flake containing the NixOS, nix-darwin, and home-manager configurations for multiple systems.";
+  description = "My system";

  # Other flakes that we want to pull from
  inputs = {
@ -10,6 +10,9 @@
    # Used for specific stable packages
    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";

+    # Used for caddy plugins
+    nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";
+
    # Used for MacOS system config
    darwin = {
      url = "github:lnl7/nix-darwin/master";
@ -28,9 +31,15 @@
      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
    };

+    # Used for AMD CPU microcode
+    ucodenix.url = "github:e-tho/ucodenix";
+
    # Community packages; used for Firefox extensions
-    nur = {
-      url = "github:nix-community/nur";
+    nur.url = "github:nix-community/nur";
+
+    # Use official Firefox binary for macOS
+    firefox-darwin = {
+      url = "github:bandithedoge/nixpkgs-firefox-darwin";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@ -46,6 +55,12 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    # Wallpapers
+    wallpapers = {
+      url = "gitlab:exorcist365/wallpapers";
+      flake = false;
+    };
+
    # Used to generate NixOS images for other platforms
    nixos-generators = {
      url = "github:nix-community/nixos-generators";
@ -58,201 +73,344 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    # Neovim plugins
+    base16-nvim-src = {
+      url = "github:RRethy/base16-nvim";
+      flake = false;
+    };
+    nvim-lspconfig-src = {
+      # https://github.com/neovim/nvim-lspconfig/tags
+      url = "github:neovim/nvim-lspconfig/v0.1.8";
+      flake = false;
+    };
+    cmp-nvim-lsp-src = {
+      url = "github:hrsh7th/cmp-nvim-lsp";
+      flake = false;
+    };
+    baleia-nvim-src = {
+      # https://github.com/m00qek/baleia.nvim/tags
+      url = "github:m00qek/baleia.nvim";
+      flake = false;
+    };
+    nvim-treesitter-src = {
+      # https://github.com/nvim-treesitter/nvim-treesitter/tags
+      url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
+      flake = false;
+    };
+    telescope-nvim-src = {
+      # https://github.com/nvim-telescope/telescope.nvim/releases
+      url = "github:nvim-telescope/telescope.nvim/0.1.8";
+      flake = false;
+    };
+    telescope-project-nvim-src = {
+      url = "github:nvim-telescope/telescope-project.nvim";
+      flake = false;
+    };
+    toggleterm-nvim-src = {
+      # https://github.com/akinsho/toggleterm.nvim/tags
+      url = "github:akinsho/toggleterm.nvim/v2.12.0";
+      flake = false;
+    };
+    bufferline-nvim-src = {
+      # https://github.com/akinsho/bufferline.nvim/releases
+      url = "github:akinsho/bufferline.nvim/v4.6.1";
+      flake = false;
+    };
+    nvim-tree-lua-src = {
+      url = "github:kyazdani42/nvim-tree.lua";
+      flake = false;
+    };
+    hmts-nvim-src = {
+      url = "github:calops/hmts.nvim";
+      flake = false;
+    };
+    fidget-nvim-src = {
+      # https://github.com/j-hui/fidget.nvim/tags
+      url = "github:j-hui/fidget.nvim/v1.4.5";
+      flake = false;
+    };
+    nvim-lint-src = {
+      url = "github:mfussenegger/nvim-lint";
+      flake = false;
+    };
+    tiny-inline-diagnostic-nvim-src = {
+      url = "github:rachartier/tiny-inline-diagnostic.nvim";
+      flake = false;
+    };
+    snipe-nvim-src = {
+      url = "github:leath-dub/snipe.nvim";
+      flake = false;
+    };
+
+    # Tree-Sitter Grammars
+    tree-sitter-bash = {
+      url = "github:tree-sitter/tree-sitter-bash/master";
+      flake = false;
+    };
+    tree-sitter-python = {
+      url = "github:tree-sitter/tree-sitter-python/master";
+      flake = false;
+    };
+    tree-sitter-lua = {
+      url = "github:MunifTanjim/tree-sitter-lua/main";
+      flake = false;
+    };
+    tree-sitter-ini = {
+      url = "github:justinmk/tree-sitter-ini";
+      flake = false;
+    };
+    tree-sitter-puppet = {
+      url = "github:amaanq/tree-sitter-puppet";
+      flake = false;
+    };
+    tree-sitter-rasi = {
+      url = "github:Fymyte/tree-sitter-rasi";
+      flake = false;
+    };
+    tree-sitter-vimdoc = {
+      url = "github:neovim/tree-sitter-vimdoc";
+      flake = false;
+    };
+
    # MPV Scripts
    zenyd-mpv-scripts = {
      url = "github:zenyd/mpv-scripts";
      flake = false;
    };

-    # Zellij Switcher
-    zellij-switch = {
-      url = "github:mostafaqanbaryan/zellij-switch";
-      inputs.nixpkgs.follows = "nixpkgs";
+    # Ren and rep - CLI find and replace
+    rep = {
+      url = "github:robenkleene/rep-grep";
+      flake = false;
+    };
+    ren = {
+      url = "github:robenkleene/ren-find";
+      flake = false;
    };

-    # Text editor
-    helix = {
-      url = "github:helix-editor/helix";
-      inputs.nixpkgs.follows = "nixpkgs";
+    gh-collaborators = {
+      url = "github:katiem0/gh-collaborators";
+      flake = false;
    };

-    # # Nextcloud Apps
-    # nextcloud-news = {
-    #   # https://github.com/nextcloud/news/releases
-    #   url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
-    #   flake = false;
-    # };
-    # nextcloud-external = {
-    #   # https://github.com/nextcloud-releases/external/releases
-    #   url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
-    #   flake = false;
-    # };
-    # nextcloud-cookbook = {
-    #   # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-    #   url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
-    #   flake = false;
-    # };
-    # nextcloud-snappymail = {
-    #   # https://github.com/the-djmaze/snappymail/releases
-    #   # https://snappymail.eu/repository/nextcloud
-    #   url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
-    #   # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
-    #   flake = false;
-    # };
+    # Nextcloud Apps
+    nextcloud-news = {
+      # https://github.com/nextcloud/news/releases
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
+      flake = false;
+    };
+    nextcloud-external = {
+      # https://github.com/nextcloud-releases/external/releases
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
+      flake = false;
+    };
+    nextcloud-cookbook = {
+      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
+      flake = false;
+    };
+    nextcloud-snappymail = {
+      # https://github.com/the-djmaze/snappymail/releases
+      # https://snappymail.eu/repository/nextcloud
+      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
+      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
+      flake = false;
+    };
  };

  outputs =
    { nixpkgs, ... }@inputs:

    let
-      hostnames =
+
+      # Global configuration for my systems
+      globals =
        let
          baseName = "masu.rs";
        in
-        {
-          audiobooks = "read.${baseName}";
-          bookmarks = "keep.${baseName}";
-          books = "books.${baseName}";
-          budget = "money.${baseName}";
-          content = "cloud.${baseName}";
-          download = "download.${baseName}";
-          files = "files.${baseName}";
-          git = "git.${baseName}";
-          imap = "imap.purelymail.com";
-          influxdb = "influxdb.${baseName}";
-          irc = "irc.${baseName}";
-          mail = "noahmasur.com";
-          mathesar = "mathesar.${baseName}";
-          metrics = "metrics.${baseName}";
-          minecraft = "minecraft.${baseName}";
-          n8n = "n8n.${baseName}";
-          navidrome = "music.${baseName}";
-          notifications = "ntfy.${baseName}";
-          paperless = "paper.${baseName}";
-          photos = "photos.${baseName}";
-          postgresql = "pg.${baseName}";
-          prometheus = "prom.${baseName}";
-          secrets = "vault.${baseName}";
-          smtp = "smtp.purelymail.com";
-          status = "status.${baseName}";
-          stream = "stream.${baseName}";
-          transmission = "transmission.${baseName}";
+        rec {
+          user = "noah";
+          fullName = "Noah Masur";
+          gitName = fullName;
+          gitEmail = "7386960+nmasur@users.noreply.github.com";
+          mail.server = "noahmasur.com";
+          mail.imapHost = "imap.purelymail.com";
+          mail.smtpHost = "smtp.purelymail.com";
+          dotfilesRepo = "https://github.com/nmasur/dotfiles";
+          hostnames = {
+            audiobooks = "read.${baseName}";
+            files = "files.${baseName}";
+            git = "git.${baseName}";
+            influxdb = "influxdb.${baseName}";
+            irc = "irc.${baseName}";
+            metrics = "metrics.${baseName}";
+            minecraft = "minecraft.${baseName}";
+            n8n = "n8n.${baseName}";
+            notifications = "ntfy.${baseName}";
+            prometheus = "prom.${baseName}";
+            paperless = "paper.${baseName}";
+            secrets = "vault.${baseName}";
+            stream = "stream.${baseName}";
+            content = "cloud.${baseName}";
+            books = "books.${baseName}";
+            download = "download.${baseName}";
+            status = "status.${baseName}";
+            transmission = "transmission.${baseName}";
+          };
        };

+      # Common overlays to always use
+      overlays = [
+        inputs.nur.overlay
+        inputs.nix2vim.overlay
+        (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/disko.nix inputs)
+        (import ./overlays/tree-sitter.nix inputs)
+        (import ./overlays/mpv-scripts.nix inputs)
+        (import ./overlays/nextcloud-apps.nix inputs)
+        (import ./overlays/betterlockscreen.nix)
+        (import ./overlays/gh-collaborators.nix inputs)
+        (import ./overlays/ren-rep.nix inputs)
+      ];
+
+      # System types to support.
+      supportedSystems = [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
+
+      # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
    in
    rec {

-      lib = import ./lib inputs;
-      flattenAttrset = attrs: builtins.foldl' lib.mergeAttrs { } (builtins.attrValues attrs);
+      # Contains my full system builds, including home-manager
+      # nixos-rebuild switch --flake .#tempest
+      nixosConfigurations = {
+        arrow = import ./hosts/arrow { inherit inputs globals overlays; };
+        tempest = import ./hosts/tempest { inherit inputs globals overlays; };
+        hydra = import ./hosts/hydra { inherit inputs globals overlays; };
+        flame = import ./hosts/flame { inherit inputs globals overlays; };
+        swan = import ./hosts/swan { inherit inputs globals overlays; };
+      };

-      nixosConfigurations = flattenAttrset (
-        builtins.mapAttrs (
-          system: hosts:
-          builtins.mapAttrs (
-            name: module:
-            lib.buildNixos {
-              inherit system module;
-              specialArgs = { inherit hostnames; };
-            }
-          ) hosts
-        ) lib.linuxHosts
-      );
+      # Contains my full Mac system builds, including home-manager
+      # darwin-rebuild switch --flake .#lookingglass
+      darwinConfigurations = {
+        lookingglass = import ./hosts/lookingglass { inherit inputs globals overlays; };
+      };

-      darwinConfigurations = flattenAttrset (
-        builtins.mapAttrs (
-          system: hosts:
-          builtins.mapAttrs (
-            name: module:
-            lib.buildDarwin {
-              inherit system module;
-              specialArgs = { inherit hostnames; };
-            }
-          ) hosts
-        ) lib.darwinHosts
-      );
-
-      homeModules = builtins.mapAttrs (
-        system: hosts:
-        builtins.mapAttrs (
-          name: module: (builtins.head (lib.attrsToList module.home-manager.users)).value
-        ) hosts
-      ) lib.hosts;
-
-      homeConfigurations = flattenAttrset (
-        builtins.mapAttrs (
-          system: hosts:
-          builtins.mapAttrs (
-            name: module:
-            lib.buildHome {
-              inherit system module;
-              specialArgs = { inherit hostnames; };
-            }
-          ) hosts
-        ) homeModules
-      );
+      # For quickly applying home-manager settings with:
+      # home-manager switch --flake .#tempest
+      homeConfigurations = {
+        tempest = nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
+        lookingglass = darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
+      };

      # Disk formatting, only used once
      diskoConfigurations = {
-        root = import ./hosts/x86_64-linux/swan/root.nix;
+        root = import ./disks/root.nix;
      };

-      generators = builtins.mapAttrs (
-        # x86_64-linux = { arrow = ...; swan = ...; }
-        system: hosts:
-        (lib.concatMapAttrs (name: module: {
-          "${name}-aws" = lib.generateImage {
-            inherit system module;
-            format = "amazon";
-            specialArgs = { inherit hostnames; };
-          };
-          "${name}-iso" = lib.generateImage {
-            inherit system module;
+      packages =
+        let
+          staff =
+            system:
+            import ./hosts/staff {
+              inherit
+                inputs
+                globals
+                overlays
+                system
+                ;
+            };
+          neovim =
+            system:
+            let
+              pkgs = import nixpkgs { inherit system overlays; };
+            in
+            import ./modules/common/neovim/package {
+              inherit pkgs;
+              colors = (import ./colorscheme/gruvbox-dark).dark;
+            };
+        in
+        {
+          x86_64-linux.staff = staff "x86_64-linux";
+          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
+            system = "x86_64-linux";
            format = "iso";
-            specialArgs = { inherit hostnames; };
+            specialArgs = {
+              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+              pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+            };
+            modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
          };
-          "${name}-qcow" = lib.generateImage {
-            inherit system module;
-            format = "qcow-efi";
-            specialArgs = { inherit hostnames; };
-            # extraModules = [ "${nixpkgs}/nixos/modules/virtualisation/oci-image.nix" ];
+          x86_64-linux.arrow-aws = inputs.nixos-generators.nixosGenerate rec {
+            system = "x86_64-linux";
+            format = "amazon";
+            specialArgs = {
+              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+              pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+            };
+            modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
+              (
+                { ... }:
+                {
+                  boot.kernelPackages = inputs.nixpkgs.legacyPackages.x86_64-linux.linuxKernel.packages.linux_6_6;
+                  amazonImage.sizeMB = 16 * 1024;
+                  permitRootLogin = "prohibit-password";
+                  boot.loader.systemd-boot.enable = inputs.nixpkgs.lib.mkForce false;
+                  boot.loader.efi.canTouchEfiVariables = inputs.nixpkgs.lib.mkForce false;
+                  services.amazon-ssm-agent.enable = true;
+                  users.users.ssm-user.extraGroups = [ "wheel" ];
+                }
+              )
+            ];
          };
-        }) hosts)
-      ) lib.linuxHosts # x86_64-linux = { arrow = ...; swan = ...; }
-      ;

-      # packages =
-      #   lib.forSystems lib.linuxSystems (
-      #     system: generateImagesForHosts system // lib.pkgsBySystem.${system}.nmasur
-      #   )
-      #   // lib.forSystems lib.darwinSystems (system: lib.pkgsBySystem.${system}.nmasur);
+          # Package Neovim config into standalone package
+          x86_64-linux.neovim = neovim "x86_64-linux";
+          x86_64-darwin.neovim = neovim "x86_64-darwin";
+          aarch64-linux.neovim = neovim "aarch64-linux";
+          aarch64-darwin.neovim = neovim "aarch64-darwin";
+        };

-      packages = lib.forAllSystems (
+      # Programs that can be run by calling this flake
+      apps = forAllSystems (
        system:
-        # Share the custom packages that I have placed under the nmasur namespace
-        lib.pkgsBySystem.${system}.nmasur
-        //
-          # Share generated images for each relevant host
-          (if (lib.hasInfix "linux" system) then generators.${system} else { })
-
-        # //
-        #   # Oracle
-        #   {
-        #     flame-oci = nixosConfigurations.flame.config.system.build.OCIImage;
-        #   }
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        import ./apps { inherit pkgs; }
      );

      # Development environments
-      devShells = lib.forAllSystems (system: {
-        default = lib.pkgsBySystem.${system}.nmasur.dotfiles-devshell;
-      });
-
-      checks = lib.forAllSystems (
+      devShells = forAllSystems (
        system:
        let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = lib.overlays;
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        {
+
+          # Used to run commands and edit files in this repo
+          default = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              git
+              stylua
+              nixfmt-rfc-style
+              shfmt
+              shellcheck
+            ];
          };
+        }
+      );
+
+      checks = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
        in
        {
          neovim =
@ -271,18 +429,37 @@
        }
      );

-      formatter = lib.forAllSystems (
+      formatter = forAllSystems (
        system:
        let
-          pkgs = import nixpkgs {
-            inherit system;
-            inherit (lib) overlays;
-          };
+          pkgs = import nixpkgs { inherit system overlays; };
        in
        pkgs.nixfmt-rfc-style
      );

      # Templates for starting other projects quickly
-      templates = (import ./templates { inherit lib; });
+      templates = rec {
+        default = basic;
+        basic = {
+          path = ./templates/basic;
+          description = "Basic program template";
+        };
+        poetry = {
+          path = ./templates/poetry;
+          description = "Poetry template";
+        };
+        python = {
+          path = ./templates/python;
+          description = "Legacy Python template";
+        };
+        haskell = {
+          path = ./templates/haskell;
+          description = "Haskell template";
+        };
+        rust = {
+          path = ./templates/rust;
+          description = "Rust template";
+        };
+      };
    };
 }
--- a/hosts/README.md
+++ b/hosts/README.md
@ -0,0 +1,26 @@
+# Hosts
+
+These are the individual machines managed by this flake.
+
+| Host                                       | Purpose             |
+| ---                                        | ---                 |
+| [aws](./aws/default.nix)                   | AWS AMI             |
+| [staff](./staff/default.nix)               | Live USB stick      |
+| [flame](./flame/default.nix)               | Oracle cloud server |
+| [hydra](./hydra/default.nix)               | WSL config          |
+| [lookingglass](./lookingglass/default.nix) | Work MacBook        |
+| [swan](./swan/default.nix)                 | Home server         |
+| [tempest](./tempest/default.nix)           | Linux desktop       |
+
+## NixOS Workflow
+
+Each hosts file is imported into [nixosConfigurations](../flake.nix) and passed
+the arguments from the flake (inputs, globals, overlays). The `nixosSystem`
+function in that hosts file will be called by the NixOS module system during a
+nixos-rebuild.
+
+Each module in the each host's `modules` list is either a function or an
+attrset. The attrsets will simply apply values to options that have been
+declared in the config by other modules. Meanwhile, the functions will be
+passed various arguments, several of which you will see listed at the top of
+each of their files.
--- a/hosts/aarch64-darwin/lookingglass/default.nix
+++ b/hosts/aarch64-darwin/lookingglass/default.nix
@ -1,41 +0,0 @@
-# The Looking Glass
-# System configuration for my work Macbook
-
-rec {
-  networking.hostName = "NYCM-NMASUR2";
-  networking.computerName = "NYCM-NMASUR2";
-
-  nmasur.settings = {
-    username = "Noah.Masur";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    work.enable = true;
-    extra.enable = true;
-    gaming.enable = true;
-  };
-
-  home-manager.users."Noah.Masur" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = "lookingglass";
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      darwin-base.enable = true;
-      power-user.enable = true;
-      work.enable = true;
-      experimental.enable = true;
-    };
-    nmasur.presets.programs.git-work.work = {
-      name = "Noah-Masur_1701";
-      email = "${nmasur.settings.username}@take2games.com";
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = 5;
-}
--- a/hosts/aarch64-linux/flame/default.nix
+++ b/hosts/aarch64-linux/flame/default.nix
@ -1,168 +0,0 @@
-# The Flame
-# System configuration for an Oracle free server
-
-# How to install:
-# https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
-# These days, probably use nixos-anywhere instead.
-
-rec {
-  networking.hostName = "flame";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    server.enable = true;
-    communications.enable = true;
-  };
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = networking.hostName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-      power-user.enable = true;
-    };
-    nmasur.presets.programs.helix.enable = true;
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-  # File systems must be declared in order to boot
-
-  # # This is the root filesystem containing NixOS
-  # # I forgot to set a clean label for it
-  # fileSystems."/" = {
-  #   device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
-  #   fsType = "ext4";
-  # };
-
-  # # This is the boot filesystem for systemd-boot
-  # fileSystems."/boot" = {
-  #   device = "/dev/disk/by-uuid/D5CA-237A";
-  #   fsType = "vfat";
-  # };
-
-  # Allows private remote access over the internet
-  nmasur.presets.services.cloudflared = {
-    tunnel = {
-      id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
-      credentialsFile = ./cloudflared-flame.age;
-      ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
-    };
-  };
-
-  # Taken from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/oci-common.nix
-
-  # fileSystems."/" = {
-  #   device = "/dev/disk/by-label/nixos";
-  #   fsType = "ext4";
-  #   autoResize = true;
-  # };
-
-  # fileSystems."/boot" = {
-  #   device = "/dev/disk/by-label/ESP";
-  #   fsType = "vfat";
-  # };
-
-  boot.loader.efi.canTouchEfiVariables = false;
-  boot.loader.grub = {
-    device = "nodev";
-    splashImage = null;
-    extraConfig = ''
-      serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
-      terminal_input --append serial
-      terminal_output --append serial
-    '';
-    efiInstallAsRemovable = true;
-    efiSupport = true;
-  };
-  boot.loader.systemd-boot.enable = false;
-
-  # https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/configuringntpservice.htm#Configuring_the_Oracle_Cloud_Infrastructure_NTP_Service_for_an_Instance
-  networking.timeServers = [ "169.254.169.254" ];
-
-  boot.growPartition = true;
-  boot.kernelParams = [
-    "net.ifnames=0"
-
-    "nvme.shutdown_timeout=10"
-    "nvme_core.shutdown_timeout=10"
-    "libiscsi.debug_libiscsi_eh=1"
-    "crash_kexec_post_notifiers"
-
-    # aarch64-linux
-    "console=ttyAMA0,115200n8"
-
-    # VNC console
-    "console=tty1"
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "virtio_net"
-    "virtio_pci"
-    "virtio_mmio"
-    "virtio_blk"
-    "virtio_scsi"
-    "9p"
-    "9pnet_virtio"
-  ];
-  boot.initrd.kernelModules = [
-    "virtio_balloon"
-    "virtio_console"
-    "virtio_rng"
-    "virtio_gpu"
-  ];
-
-  networking.useDHCP = true;
-  # networking = {
-  #   defaultGateway = "10.0.0.1";
-  #   interfaces.eth0 = {
-  #     ipAddress = throw "set your own";
-  #     prefixLength = 24;
-  #   };
-  # };
-
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        # device = "/dev/oracleoci/oraclevda"; # Consistent volume naming
-        device = "/dev/sda"; # Consistent volume naming
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-
-  # # Otherwise the instance may not have a working network-online.target,
-  # # making the fetch-ssh-keys.service fail
-  # networking.useNetworkd = true;
-}
--- a/hosts/arrow/aws/ec2.tf
+++ b/hosts/arrow/aws/ec2.tf
--- a/hosts/arrow/aws/image.tf
+++ b/hosts/arrow/aws/image.tf
--- a/hosts/arrow/aws/main.tf
+++ b/hosts/arrow/aws/main.tf
--- a/hosts/arrow/aws/outputs.tf
+++ b/hosts/arrow/aws/outputs.tf
--- a/hosts/arrow/aws/variables.tf
+++ b/hosts/arrow/aws/variables.tf
--- a/hosts/arrow/default.nix
+++ b/hosts/arrow/default.nix
@ -0,0 +1,41 @@
+# The Arrow
+# System configuration for temporary VM
+
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.nixpkgs.lib.nixosSystem rec {
+  system = "x86_64-linux";
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
+  modules = import ./modules.nix { inherit inputs globals overlays; } ++ [
+    {
+      # This is the root filesystem containing NixOS
+      fileSystems."/" = {
+        device = "/dev/disk/by-label/nixos";
+        fsType = "ext4";
+      };
+
+      # This is the boot filesystem for Grub
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-label/boot";
+        fsType = "vfat";
+      };
+
+      virtualisation.vmVariant = {
+        virtualisation.forwardPorts = [
+          {
+            from = "host";
+            host.port = 2222;
+            guest.port = 22;
+          }
+        ];
+      };
+    }
+  ];
+}
--- a/hosts/arrow/modules.nix
+++ b/hosts/arrow/modules.nix
@ -0,0 +1,32 @@
+{
+  inputs,
+  globals,
+  overlays,
+}:
+
+[
+  globals
+  inputs.home-manager.nixosModules.home-manager
+  {
+    nixpkgs.overlays = overlays;
+    networking.hostName = "arrow";
+    physical = false;
+    server = true;
+    gui.enable = false;
+    theme.colors = (import ../../colorscheme/gruvbox).dark;
+    publicKeys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpPU2G9rSF8Q6waH62IJexDCQ6lY+8ZyVufGE3xMDGw deploy"
+    ];
+    identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+    cloudflare.enable = true;
+    services.openssh.enable = true;
+    services.caddy.enable = true;
+    services.n8n.enable = true;
+
+    # nix-index seems to eat up too much memory for Vultr
+    home-manager.users.${globals.user}.programs.nix-index.enable = inputs.nixpkgs.lib.mkForce false;
+  }
+  ../../modules/common
+  ../../modules/nixos
+]
--- a/hosts/arrow/vultr/main.tf
+++ b/hosts/arrow/vultr/main.tf
--- a/hosts/default.nix
+++ b/hosts/default.nix
@ -1,47 +0,0 @@
-# Return a list of all hosts
-
-nixpkgs:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-{
-  # darwin-hosts = import ./darwin;
-  aarch64-darwin-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./aarch64-darwin) [
-    # Get only files ending in default.nix
-    (builtins.filter (name: lib.hasSuffix "default.nix" name))
-    # Import each host function
-    (map (file: {
-      name = builtins.baseNameOf (builtins.dirOf file);
-      value = import file;
-    }))
-    # Convert to an attrset of hostname -> host function
-    (builtins.listToAttrs)
-  ];
-  aarch64-linux-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./aarch64-linux) [
-    # Get only files ending in default.nix
-    (builtins.filter (name: lib.hasSuffix "default.nix" name))
-    # Remove the first file
-    (builtins.filter (name: name != ./aarch64-linux/default.nix))
-    # Import each host function
-    (map (file: {
-      name = builtins.baseNameOf (builtins.dirOf file);
-      value = import file;
-    }))
-    # Convert to an attrset of hostname -> host function
-    (builtins.listToAttrs)
-  ];
-  x86_64-linux-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./x86_64-linux) [
-    # Get only files ending in default.nix
-    (builtins.filter (name: lib.hasSuffix "default.nix" name))
-    # Import each host function
-    (map (file: {
-      # name = lib.removeSuffix ".nix" (builtins.baseNameOf file);
-      name = builtins.baseNameOf (builtins.dirOf file);
-      value = import file;
-    }))
-    # Convert to an attrset of hostname -> host function
-    (builtins.listToAttrs)
-  ];
-}
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -0,0 +1,138 @@
+# The Flame
+# System configuration for an Oracle free server
+
+# See [readme](../README.md) to explain how this file works.
+
+# How to install:
+# https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
+# These days, probably use nixos-anywhere instead.
+
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.nixpkgs.lib.nixosSystem rec {
+  system = "aarch64-linux";
+  specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
+  modules = [
+    globals
+    inputs.home-manager.nixosModules.home-manager
+    ../../modules/common
+    ../../modules/nixos
+    {
+      nixpkgs.overlays = overlays;
+
+      # Hardware
+      server = true;
+      networking.hostName = "flame";
+
+      # Not sure what's necessary but too afraid to remove anything
+      imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
+      boot.initrd.availableKernelModules = [
+        "xhci_pci"
+        "virtio_pci"
+        "usbhid"
+      ];
+
+      # File systems must be declared in order to boot
+
+      # This is the root filesystem containing NixOS
+      # I forgot to set a clean label for it
+      fileSystems."/" = {
+        device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
+        fsType = "ext4";
+      };
+
+      # This is the boot filesystem for systemd-boot
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-uuid/D5CA-237A";
+        fsType = "vfat";
+      };
+
+      # Theming
+
+      # Server doesn't require GUI
+      gui.enable = false;
+
+      # Still require colors for programs like Neovim, K9S
+      theme = {
+        colors = (import ../../colorscheme/gruvbox).dark;
+      };
+
+      # Programs and services
+      atuin.enable = true;
+      cloudflare.enable = true; # Proxy traffic with Cloudflare
+      dotfiles.enable = true; # Clone dotfiles
+      neovim.enable = true;
+      giteaRunner.enable = true;
+      services.caddy.enable = true;
+      services.grafana.enable = true;
+      services.thelounge.enable = true;
+      services.openssh.enable = true;
+      services.victoriametrics.enable = true;
+      services.influxdb2.enable = true;
+      services.gitea.enable = true;
+      services.vaultwarden.enable = true;
+      services.minecraft-server.enable = true; # Setup Minecraft server
+      services.n8n.enable = true;
+      services.ntfy-sh.enable = true;
+      services.uptime-kuma.enable = true;
+      system.autoUpgrade.enable = true;
+
+      # Allows private remote access over the internet
+      cloudflareTunnel = {
+        enable = true;
+        id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
+        credentialsFile = ../../private/cloudflared-flame.age;
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
+      };
+
+      # Nextcloud backup config
+      backup.s3 = {
+        endpoint = "s3.us-west-002.backblazeb2.com";
+        bucket = "noahmasur-backup";
+        accessKeyId = "0026b0e73b2e2c80000000005";
+      };
+
+      # Disable passwords, only use SSH key
+      publicKeys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+      ];
+
+      # # Wireguard config for Transmission
+      # wireguard.enable = true;
+      # networking.wireguard.interfaces.wg0 = {
+      #
+      #   # The local IPs for this machine within the Wireguard network
+      #   # Any inbound traffic bound for these IPs should be kept on localhost
+      #   ips = [ "10.66.13.200/32" "fc00:bbbb:bbbb:bb01::3:dc7/128" ];
+      #
+      #   peers = [{
+      #
+      #     # Identity of Wireguard target peer (VPN)
+      #     publicKey = "bOOP5lIjqCdDx5t+mP/kEcSbHS4cZqE0rMlBI178lyY=";
+      #
+      #     # The public internet address of the target peer
+      #     endpoint = "86.106.143.132:51820";
+      #
+      #     # Which outgoing IP ranges should be sent through Wireguard
+      #     allowedIPs = [ "0.0.0.0/0" "::0/0" ];
+      #
+      #     # Send heartbeat signal within the network
+      #     persistentKeepalive = 25;
+      #
+      #   }];
+      #
+      # };
+
+      # # VPN port forwarding
+      # services.transmission.settings.peer-port = 57599;
+    }
+  ];
+}
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@ -0,0 +1,51 @@
+# The Hydra
+# System configuration for WSL
+
+# See [readme](../README.md) to explain how this file works.
+
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  specialArgs = { };
+  modules = [
+    ../../modules/common
+    ../../modules/nixos
+    ../../modules/wsl
+    globals
+    inputs.wsl.nixosModules.wsl
+    inputs.home-manager.nixosModules.home-manager
+    {
+      networking.hostName = "hydra";
+      nixpkgs.overlays = overlays;
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+      gui.enable = false;
+      theme = {
+        colors = (import ../../colorscheme/gruvbox).dark;
+        dark = true;
+      };
+      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
+      wsl = {
+        enable = true;
+        wslConf.automount.root = "/mnt";
+        defaultUser = globals.user;
+        startMenuLaunchers = true;
+        nativeSystemd = true;
+        wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
+        interop.includePath = false; # Including Windows PATH will slow down Neovim command mode
+      };
+
+      neovim.enable = true;
+      mail.enable = true;
+      mail.aerc.enable = true;
+      mail.himalaya.enable = true;
+      dotfiles.enable = true;
+      lua.enable = true;
+    }
+  ];
+}
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -0,0 +1,59 @@
+# The Looking Glass
+# System configuration for my work Macbook
+
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.darwin.lib.darwinSystem {
+  system = "aarch64-darwin";
+  specialArgs = { };
+  modules = [
+    ../../modules/common
+    ../../modules/darwin
+    (
+      globals
+      // rec {
+        user = "Noah.Masur";
+        gitName = "Noah-Masur_1701";
+        gitEmail = "${user}@take2games.com";
+      }
+    )
+    inputs.home-manager.darwinModules.home-manager
+    inputs.mac-app-util.darwinModules.default
+    {
+      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
+      networking.hostName = "lookingglass";
+      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
+      gui.enable = true;
+      theme = {
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
+        dark = true;
+      };
+      mail.user = globals.user;
+      atuin.enable = true;
+      charm.enable = true;
+      neovim.enable = true;
+      mail.enable = true;
+      mail.aerc.enable = true;
+      mail.himalaya.enable = false;
+      kitty.enable = true;
+      discord.enable = true;
+      firefox.enable = true;
+      dotfiles.enable = true;
+      terraform.enable = true;
+      python.enable = true;
+      rust.enable = true;
+      lua.enable = true;
+      obsidian.enable = true;
+      kubernetes.enable = true;
+      _1password.enable = true;
+      slack.enable = true;
+      wezterm.enable = true;
+      yt-dlp.enable = true;
+    }
+  ];
+}
--- a/hosts/staff/default.nix
+++ b/hosts/staff/default.nix
@ -0,0 +1,53 @@
+# The Staff
+# ISO configuration for my USB drive
+
+{
+  inputs,
+  system,
+  overlays,
+  ...
+}:
+
+inputs.nixos-generators.nixosGenerate {
+  inherit system;
+  format = "install-iso";
+  modules = [
+    {
+      nixpkgs.overlays = overlays;
+      networking.hostName = "staff";
+      users.extraUsers.root.openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
+      ];
+      services.openssh = {
+        enable = true;
+        ports = [ 22 ];
+        allowSFTP = true;
+        settings = {
+          GatewayPorts = "no";
+          X11Forwarding = false;
+          PasswordAuthentication = false;
+          PermitRootLogin = "yes";
+        };
+      };
+      environment.systemPackages =
+        let
+          pkgs = import inputs.nixpkgs { inherit system overlays; };
+        in
+        with pkgs;
+        [
+          git
+          vim
+          wget
+          curl
+          (import ../../modules/common/neovim/package {
+            inherit pkgs;
+            colors = (import ../../colorscheme/gruvbox).dark;
+          })
+        ];
+      nix.extraOptions = ''
+        experimental-features = nix-command flakes
+        warn-dirty = false
+      '';
+    }
+  ];
+}
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -0,0 +1,144 @@
+# The Swan
+# System configuration for my home NAS server
+
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.nixpkgs.lib.nixosSystem rec {
+  system = "x86_64-linux";
+  specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
+  modules = [
+    globals
+    inputs.home-manager.nixosModules.home-manager
+    inputs.disko.nixosModules.disko
+    ../../modules/common
+    ../../modules/nixos
+    {
+      nixpkgs.overlays = overlays;
+
+      # Hardware
+      server = true;
+      physical = true;
+      networking.hostName = "swan";
+
+      # Not sure what's necessary but too afraid to remove anything
+      boot.initrd.availableKernelModules = [
+        "xhci_pci"
+        "ahci"
+        "nvme"
+        "usb_storage"
+        "sd_mod"
+      ];
+
+      # Required for transcoding
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      boot.kernelParams = [
+        "radeon.si_support=0"
+        "amdgpu.si_support=1"
+        "radeon.cik_support=0"
+        "amdgpu.cik_support=1"
+        "amdgpu.dc=1"
+      ];
+
+      # Required binary blobs to boot on this machine
+      hardware.enableRedistributableFirmware = true;
+
+      # Prioritize efficiency over performance
+      powerManagement.cpuFreqGovernor = "powersave";
+
+      # Allow firmware updates
+      hardware.cpu.intel.updateMicrocode = true;
+
+      # ZFS
+      zfs.enable = true;
+      # Generated with: head -c 8 /etc/machine-id
+      networking.hostId = "600279f4"; # Random ID required for ZFS
+
+      # Sets root ext4 filesystem instead of declaring it manually
+      disko = {
+        enableConfig = true;
+        devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
+      };
+
+      zramSwap.enable = true;
+      swapDevices = [
+        {
+          device = "/swapfile";
+          size = 4 * 1024; # 4 GB
+        }
+      ];
+
+      boot.zfs = {
+        # Automatically load the ZFS pool on boot
+        extraPools = [ "tank" ];
+        # Only try to decrypt datasets with keyfiles
+        requestEncryptionCredentials = [
+          "tank/archive"
+          "tank/generic"
+          "tank/nextcloud"
+          "tank/generic/git"
+        ];
+        # If password is requested and fails, continue to boot eventually
+        passwordTimeout = 300;
+      };
+
+      # Theming
+
+      # Server doesn't require GUI
+      gui.enable = false;
+
+      # Still require colors for programs like Neovim, K9S
+      theme = {
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
+      };
+
+      # Programs and services
+      atuin.enable = true;
+      neovim.enable = true;
+      cloudflare.enable = true;
+      dotfiles.enable = true;
+      arrs.enable = true;
+      filebrowser.enable = true;
+      services.audiobookshelf.enable = true;
+      services.bind.enable = true;
+      services.caddy.enable = true;
+      services.jellyfin.enable = true;
+      services.nextcloud.enable = true;
+      services.calibre-web.enable = true;
+      services.openssh.enable = true;
+      services.prometheus.enable = false;
+      services.vmagent.enable = true;
+      services.samba.enable = true;
+      services.paperless.enable = true;
+      services.postgresql.enable = true;
+      system.autoUpgrade.enable = false;
+
+      # Allows private remote access over the internet
+      cloudflareTunnel = {
+        enable = true;
+        id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
+        credentialsFile = ../../private/cloudflared-swan.age;
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
+      };
+
+      # Send regular backups and litestream for DBs to an S3-like bucket
+      backup.s3 = {
+        endpoint = "s3.us-west-002.backblazeb2.com";
+        bucket = "noahmasur-backup";
+        accessKeyId = "0026b0e73b2e2c80000000005";
+      };
+
+      # Disable passwords, only use SSH key
+      publicKeys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+      ];
+    }
+  ];
+}
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -0,0 +1,149 @@
+# The Tempest
+# System configuration for my desktop
+
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.nixpkgs.lib.nixosSystem rec {
+  system = "x86_64-linux";
+  specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
+  modules = [
+    globals
+    inputs.home-manager.nixosModules.home-manager
+    inputs.ucodenix.nixosModules.default
+    ../../modules/common
+    ../../modules/nixos
+    {
+      nixpkgs.overlays = overlays;
+
+      # Hardware
+      physical = true;
+      networking.hostName = "tempest";
+
+      # Not sure what's necessary but too afraid to remove anything
+      boot.initrd.availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usb_storage"
+        "usbhid"
+        "sd_mod"
+      ];
+
+      # Graphics and VMs
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      boot.kernelModules = [ "kvm-amd" ];
+      services.xserver.videoDrivers = [ "amdgpu" ];
+
+      # Required binary blobs to boot on this machine
+      hardware.enableRedistributableFirmware = true;
+
+      # Prioritize performance over efficiency
+      powerManagement.cpuFreqGovernor = "performance";
+
+      # Allow firmware updates
+      hardware.cpu.amd.updateMicrocode = true;
+      services.ucodenix.enable = true;
+
+      # Helps reduce GPU fan noise under idle loads
+      hardware.fancontrol.enable = true;
+      hardware.fancontrol.config = ''
+        # Configuration file generated by pwmconfig, changes will be lost
+        INTERVAL=10
+        DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
+        DEVNAME=hwmon0=amdgpu
+        FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
+        FCFANS= hwmon0/pwm1=hwmon0/fan1_input
+        MINTEMP=hwmon0/pwm1=50
+        MAXTEMP=hwmon0/pwm1=70
+        MINSTART=hwmon0/pwm1=100
+        MINSTOP=hwmon0/pwm1=10
+        MINPWM=hwmon0/pwm1=10
+        MAXPWM=hwmon0/pwm1=240
+      '';
+
+      # File systems must be declared in order to boot
+
+      # This is the root filesystem containing NixOS
+      fileSystems."/" = {
+        device = "/dev/disk/by-label/nixos";
+        fsType = "ext4";
+      };
+
+      # This is the boot filesystem for Grub
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-label/boot";
+        fsType = "vfat";
+      };
+
+      # Secrets must be prepared ahead before deploying
+      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
+
+      # Theming
+
+      # Turn on all features related to desktop and graphical applications
+      gui.enable = true;
+
+      # Set the system-wide theme, also used for non-graphical programs
+      theme = {
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
+        dark = true;
+      };
+      wallpaper = "${inputs.wallpapers}/gruvbox/road.jpg";
+      gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
+
+      # Programs and services
+      atuin.enable = true;
+      charm.enable = true;
+      neovim.enable = true;
+      media.enable = true;
+      dotfiles.enable = true;
+      firefox.enable = true;
+      kitty.enable = true;
+      _1password.enable = true;
+      discord.enable = true;
+      nautilus.enable = true;
+      obsidian.enable = true;
+      mail.enable = true;
+      mail.aerc.enable = true;
+      mail.himalaya.enable = true;
+      keybase.enable = true;
+      mullvad.enable = false;
+      rust.enable = true;
+      terraform.enable = true;
+      wezterm.enable = true;
+      yt-dlp.enable = true;
+      gaming = {
+        dwarf-fortress.enable = true;
+        enable = true;
+        steam.enable = true;
+        moonlight.enable = true;
+        legendary.enable = true;
+        lutris.enable = true;
+        ryujinx.enable = true;
+      };
+      services.vmagent.enable = true; # Enables Prometheus metrics
+      services.openssh.enable = true; # Required for Cloudflare tunnel and identity file
+
+      # Allows private remote access over the internet
+      cloudflareTunnel = {
+        enable = true;
+        id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
+        credentialsFile = ../../private/cloudflared-tempest.age;
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
+      };
+
+      # Allows requests to force machine to wake up
+      # This network interface might change, needs to be set specifically for each machine.
+      # Or set usePredictableInterfaceNames = false
+      networking.interfaces.enp5s0.wakeOnLan.enable = true;
+    }
+  ];
+}
--- a/hosts/x86_64-darwin/readme.md
+++ b/hosts/x86_64-darwin/readme.md
@ -1 +0,0 @@
-# No x86 Darwin Hosts Currently
--- a/hosts/x86_64-linux/arrow/default.nix
+++ b/hosts/x86_64-linux/arrow/default.nix
@ -1,47 +0,0 @@
-# The Arrow
-# System configuration for temporary VM
-
-rec {
-  # Hardware
-  networking.hostName = "arrow";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    server.enable = true;
-  };
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = networking.hostName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-
-  # These filesystems are ignored by nixos-generators
-
-  # This is the root filesystem containing NixOS
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  # This is the boot filesystem for Grub
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
-    fsType = "vfat";
-  };
-
-}
--- a/hosts/x86_64-linux/hydra/default.nix
+++ b/hosts/x86_64-linux/hydra/default.nix
@ -1,54 +0,0 @@
-# The Hydra
-# System configuration for WSL
-
-rec {
-  # Hardware
-  networking.hostName = "hydra";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    wsl.enable = true;
-  };
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = networking.hostName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-      power-user.enable = true;
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-
-  # This is the root filesystem containing NixOS
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  # This is the boot filesystem for Grub
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
-    fsType = "vfat";
-  };
-
-  # Not sure what's necessary but too afraid to remove anything
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-  ];
-}
--- a/hosts/x86_64-linux/staff/default.nix
+++ b/hosts/x86_64-linux/staff/default.nix
@ -1,68 +0,0 @@
-# The Staff
-# System configuration test
-
-rec {
-  # Hardware
-  networking.hostName = "staff";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    home.enable = true;
-    gui.enable = true;
-  };
-  nmasur.presets.services.cloudflared.enable = false;
-  nmasur.presets.services.kanata.enable = false;
-  nmasur.presets.services.openssh.enable = true;
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = networking.hostName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-      linux-gui.enable = true;
-      power-user.enable = true;
-    };
-    nmasur.presets.services.mbsync = {
-      user = nmasur.settings.username;
-      server = "noahmasur.com";
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-  # Not sure what's necessary but too afraid to remove anything
-  # File systems must be declared in order to boot
-
-  # Required to have a boot loader to work
-  boot.loader.systemd-boot.enable = true;
-
-  # This is the root filesystem containing NixOS
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  # This is the boot filesystem for Grub
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
-    fsType = "vfat";
-  };
-
-  # Allows private remote access over the internet
-  # nmasur.presets.services.cloudflared = {
-  #   tunnel = {
-  #     id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
-  #     credentialsFile = ../../private/cloudflared-tempest.age;
-  #     ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
-  #   };
-  # };
-}
--- a/hosts/x86_64-linux/swan/default.nix
+++ b/hosts/x86_64-linux/swan/default.nix
@ -1,85 +0,0 @@
-# The Swan
-# System configuration for my home NAS server
-
-rec {
-  networking.hostName = "swan";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    server.enable = true;
-    home.enable = true;
-    nas.enable = true;
-    shared-media.enable = true;
-  };
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = networking.hostName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-      power-user.enable = true;
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-
-  # Overrides
-  services.automatic-timezoned.enable = false;
-
-  # Not sure what's necessary but too afraid to remove anything
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-  ];
-
-  # Required for transcoding
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelParams = [
-    "radeon.si_support=0"
-    "amdgpu.si_support=1"
-    "radeon.cik_support=0"
-    "amdgpu.cik_support=1"
-    "amdgpu.dc=1"
-  ];
-
-  # Required binary blobs to boot on this machine
-  hardware.enableRedistributableFirmware = true;
-
-  # Prioritize efficiency over performance
-  powerManagement.cpuFreqGovernor = "powersave";
-
-  # Allow firmware updates
-  hardware.cpu.intel.updateMicrocode = true;
-
-  # ZFS
-  # Generated with: head -c 8 /etc/machine-id
-  networking.hostId = "600279f4"; # Random ID required for ZFS
-
-  # Sets root ext4 filesystem instead of declaring it manually
-  disko = {
-    enableConfig = true;
-    devices = (import ./root.nix { disk = "/dev/nvme0n1"; });
-  };
-
-  # Allows private remote access over the internet
-  nmasur.presets.services.cloudflared = {
-    tunnel = {
-      id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
-      credentialsFile = ./cloudflared-swan.age;
-      ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
-    };
-  };
-}
--- a/hosts/x86_64-linux/tempest/default.nix
+++ b/hosts/x86_64-linux/tempest/default.nix
@ -1,110 +0,0 @@
-# The Tempest
-# System configuration for my desktop
-
-rec {
-  # Hardware
-  networking.hostName = "tempest";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    home.enable = true;
-    gui.enable = true;
-    gaming.enable = true;
-  };
-
-  nmasur.presets.services.grub.enable = true;
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-      host = networking.hostName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-      linux-gui.enable = true;
-      linux-gaming.enable = true;
-      power-user.enable = true;
-      developer.enable = true;
-      experimental.enable = true;
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-
-  # Not sure what's necessary but too afraid to remove anything
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-
-  # Graphics and VMs
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  services.xserver.videoDrivers = [ "amdgpu" ];
-
-  # Required binary blobs to boot on this machine
-  hardware.enableRedistributableFirmware = true;
-
-  # Prioritize performance over efficiency
-  powerManagement.cpuFreqGovernor = "performance";
-
-  # Allow firmware updates
-  hardware.cpu.amd.updateMicrocode = true;
-
-  # Helps reduce GPU fan noise under idle loads
-  hardware.fancontrol.enable = true;
-  hardware.fancontrol.config = ''
-    # Configuration file generated by pwmconfig, changes will be lost
-    INTERVAL=10
-    DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
-    DEVNAME=hwmon0=amdgpu
-    FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
-    FCFANS= hwmon0/pwm1=hwmon0/fan1_input
-    MINTEMP=hwmon0/pwm1=50
-    MAXTEMP=hwmon0/pwm1=70
-    MINSTART=hwmon0/pwm1=100
-    MINSTOP=hwmon0/pwm1=10
-    MINPWM=hwmon0/pwm1=10
-    MAXPWM=hwmon0/pwm1=240
-  '';
-
-  # File systems must be declared in order to boot
-
-  # This is the root filesystem containing NixOS
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  # This is the boot filesystem for Grub
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
-    fsType = "vfat";
-  };
-
-  # Allows private remote access over the internet
-  nmasur.presets.services.cloudflared = {
-    tunnel = {
-      id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
-      credentialsFile = ./cloudflared-tempest.age;
-      ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
-    };
-  };
-
-  # Allows requests to force machine to wake up
-  # This network interface might change, needs to be set specifically for each machine.
-  # Or set usePredictableInterfaceNames = false
-  networking.interfaces.enp5s0.wakeOnLan.enable = true;
-}
--- a/lib/default.nix
+++ b/lib/default.nix
@ -1,233 +0,0 @@
-inputs:
-
-let
-  lib = inputs.nixpkgs.lib;
-in
-
-lib
-// rec {
-
-  # Returns all files in a directory matching a suffix
-  filesInDirectoryWithSuffix =
-    directory: suffix:
-    lib.pipe (lib.filesystem.listFilesRecursive directory) [
-      # Get only files ending in .nix
-      (builtins.filter (name: lib.hasSuffix suffix name))
-    ];
-
-  # Returns all files ending in .nix for a directory
-  nixFiles = directory: filesInDirectoryWithSuffix directory ".nix";
-
-  # Returns all files ending in default.nix for a directory
-  defaultFiles = directory: filesInDirectoryWithSuffix directory "default.nix";
-
-  # Imports all files in a directory and passes inputs
-  importOverlays =
-    directory:
-    lib.pipe (nixFiles directory) [
-      # Import each overlay file
-      (map (file: (import file) inputs))
-    ];
-
-  # Import default files as attrset with keys provided by parent directory
-  defaultFilesToAttrset =
-    directory:
-    lib.pipe (defaultFiles directory) [
-      # Import each file
-      (map (file: {
-        name = builtins.baseNameOf (builtins.dirOf file);
-        value = import file;
-      }))
-      # Convert to an attrset of parent dir name -> file
-      (builtins.listToAttrs)
-    ];
-
-  # [ package1/package.nix package2/package.nix package2/hello.sh ]
-  buildPkgsFromDirectoryAndPkgs =
-    directory: pkgs:
-    lib.pipe (filesInDirectoryWithSuffix directory "package.nix") [
-
-      # Apply callPackage to create a derivation
-      # Must use final.callPackage to avoid infinite recursion
-      # [ package1.drv package2.drv ]
-      (builtins.map (name: pkgs.callPackage name { }))
-
-      # Convert the list to an attrset with keys from pname or name attr
-      # { package1 = package1.drv, package2 = package2.drv }
-      (builtins.listToAttrs (
-        map (v: {
-          name = v."pname" or v."name";
-          value = v;
-        })
-      ))
-    ];
-
-  # Common overlays to always use
-  overlays = [
-    inputs.nur.overlays.default
-    inputs.nix2vim.overlay
-    inputs.zellij-switch.overlays.default
-    inputs.helix.overlays.default
-  ] ++ (importOverlays ../overlays);
-
-  # System types to support.
-  supportedSystems = [
-    "x86_64-linux"
-    "x86_64-darwin"
-    "aarch64-linux"
-    "aarch64-darwin"
-  ];
-
-  # Split system types by operating system
-  linuxSystems = builtins.filter (lib.hasSuffix "linux") supportedSystems;
-  darwinSystems = builtins.filter (lib.hasSuffix "darwin") supportedSystems;
-
-  # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
-  forSystems = systems: lib.genAttrs systems;
-  forAllSystems = lib.genAttrs supportedSystems;
-
-  # { x86_64-linux = { tempest = { settings = ...; }; }; };
-  hosts = forAllSystems (system: defaultFilesToAttrset ../hosts/${system});
-
-  linuxHosts = lib.filterAttrs (name: value: builtins.elem name linuxSystems) hosts;
-  darwinHosts = lib.filterAttrs (name: value: builtins.elem name darwinSystems) hosts;
-
-  # { system -> pkgs }
-  pkgsBySystem = forAllSystems (
-    system:
-    import inputs.nixpkgs {
-      inherit system overlays;
-      config.permittedInsecurePackages = [ "litestream-0.3.13" ];
-      config.allowUnfree = true;
-    }
-  );
-
-  colorscheme = defaultFilesToAttrset ../colorscheme;
-
-  homeModule = {
-    home-manager = {
-      # Include home-manager config in NixOS
-      sharedModules = nixFiles ../platforms/home-manager;
-      # Use the system-level nixpkgs instead of Home Manager's
-      useGlobalPkgs = lib.mkDefault true;
-      # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
-      # using multiple profiles for one user
-      useUserPackages = lib.mkDefault true;
-    };
-  };
-
-  buildHome =
-    {
-      system,
-      module,
-      specialArgs,
-    }:
-    inputs.home-manager.lib.homeManagerConfiguration {
-      pkgs = pkgsBySystem.${system};
-      modules = [
-        { imports = (nixFiles ../platforms/home-manager); }
-        module
-      ];
-      extraSpecialArgs = {
-        inherit colorscheme;
-      } // specialArgs;
-    };
-
-  buildNixos =
-    {
-      system,
-      module,
-      specialArgs,
-    }:
-    inputs.nixpkgs.lib.nixosSystem {
-      inherit specialArgs;
-      pkgs = pkgsBySystem.${system};
-      modules = [
-        inputs.home-manager.nixosModules.home-manager
-        inputs.disko.nixosModules.disko
-        inputs.wsl.nixosModules.wsl
-        { imports = (nixFiles ../platforms/nixos); }
-        module
-        {
-          home-manager = {
-            extraSpecialArgs = {
-              inherit colorscheme;
-            } // specialArgs;
-          } // homeModule.home-manager;
-        }
-      ];
-    };
-
-  buildDarwin =
-    {
-      system,
-      module,
-      specialArgs,
-    }:
-    inputs.darwin.lib.darwinSystem {
-      inherit system specialArgs;
-      modules = [
-        inputs.home-manager.darwinModules.home-manager
-        inputs.mac-app-util.darwinModules.default
-        {
-          imports = (nixFiles ../platforms/nix-darwin);
-          nixpkgs.pkgs = pkgsBySystem.${system};
-        }
-        module
-        {
-          home-manager = {
-            extraSpecialArgs = {
-              inherit colorscheme;
-            } // specialArgs;
-          } // homeModule.home-manager;
-        }
-      ];
-    };
-
-  generatorOptions = {
-    amazon = {
-      aws.enable = true;
-    };
-    iso = {
-      nmasur.profiles.wsl.enable = lib.mkForce false;
-      boot.loader.grub.enable = lib.mkForce false;
-    };
-    qcow-efi = {
-      nmasur.profiles.wsl.enable = lib.mkForce false;
-      boot.loader.grub.enable = lib.mkForce false;
-      fileSystems."/boot".device = lib.mkForce "/dev/disk/by-label/ESP";
-    };
-  };
-
-  generateImage =
-    {
-      system,
-      module,
-      format,
-      specialArgs,
-    }:
-    inputs.nixos-generators.nixosGenerate {
-      inherit system format;
-      pkgs = pkgsBySystem.${system};
-      modules = [
-        inputs.home-manager.nixosModules.home-manager
-        inputs.disko.nixosModules.disko
-        inputs.wsl.nixosModules.wsl
-        {
-          imports = (nixFiles ../platforms/nixos) ++ (nixFiles ../platforms/generators);
-        }
-        generatorOptions.${format}
-        module
-        {
-          home-manager = {
-            extraSpecialArgs = {
-              inherit colorscheme;
-            } // specialArgs;
-          } // homeModule.home-manager;
-        }
-      ];
-      specialArgs = {
-      } // specialArgs;
-    };
-
-}
--- a/modules/README.md
+++ b/modules/README.md
@ -0,0 +1,9 @@
+# Modules
+
+| Module                         | Purpose                                     |
+| ---                            | ---                                         |
+| [common](./common/default.nix) | User programs and OS-agnostic configuration |
+| [darwin](./darwin/default.nix) | macOS-specific configuration                |
+| [nixos](./nixos/default.nix)   | NixOS-specific configuration                |
+| [wsl](./wsl/default.nix)       | WSL-specific configuration                  |
+
--- a/modules/aws/default.nix
+++ b/modules/aws/default.nix
@ -0,0 +1,9 @@
+{ ... }:
+{
+  # AWS settings require this
+  permitRootLogin = "prohibit-password";
+
+  # Make sure disk size is large enough
+  # https://github.com/nix-community/nixos-generators/issues/150
+  amazonImage.sizeMB = 16 * 1024;
+}
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@ -0,0 +1,41 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    _1password = {
+      enable = lib.mkEnableOption {
+        description = "Enable 1Password.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config._1password.enable) {
+    unfreePackages = [
+      "1password"
+      "_1password-gui"
+      "1password-cli"
+    ];
+    home-manager.users.${config.user} = {
+      home.packages = [
+        pkgs._1password-cli
+      ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
+    };
+
+    # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
+    # On Mac, does not apply: https://1password.community/discussion/142794/app-and-browser-integration
+    # However, the button doesn't work either:
+    # https://1password.community/discussion/140735/extending-support-for-trusted-web-browsers
+    environment.etc."1password/custom_allowed_browsers".text = ''
+      ${
+        config.home-manager.users.${config.user}.programs.firefox.package
+      }/Applications/Firefox.app/Contents/MacOS/firefox
+      firefox
+    '';
+  };
+}
--- a/modules/common/applications/alacritty.nix
+++ b/modules/common/applications/alacritty.nix
@ -0,0 +1,107 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    alacritty = {
+      enable = lib.mkEnableOption {
+        description = "Enable Alacritty.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.alacritty.enable) {
+    home-manager.users.${config.user} = {
+      xsession.windowManager.i3.config.terminal = "alacritty";
+      programs.rofi.terminal = "${pkgs.alacritty}/bin/alacritty";
+      programs.alacritty = {
+        enable = true;
+        settings = {
+          window = {
+            dimensions = {
+              columns = 85;
+              lines = 30;
+            };
+            padding = {
+              x = 20;
+              y = 20;
+            };
+            opacity = 1.0;
+          };
+          scrolling.history = 10000;
+          font = {
+            size = 14.0;
+          };
+          key_bindings = [
+            # Used for word completion in fish_user_key_bindings
+            {
+              key = "Return";
+              mods = "Shift";
+              chars = "\\x1F";
+            }
+            # Used for searching nixpkgs in fish_user_key_bindings
+            {
+              key = "N";
+              mods = "Control|Shift";
+              chars = "\\x11F";
+            }
+            {
+              key = "H";
+              mods = "Control|Shift";
+              mode = "~Vi";
+              action = "ToggleViMode";
+            }
+            {
+              key = "Return";
+              mode = "Vi";
+              action = "ToggleViMode";
+            }
+            # Used to enable $ keybind in Vi mode
+            {
+              key = 5; # Scancode for key4
+              mods = "Shift";
+              mode = "Vi|~Search";
+              action = "Last";
+            }
+          ];
+          colors = {
+            primary = {
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
+            };
+            cursor = {
+              text = "#1d2021";
+              cursor = config.theme.colors.base05;
+            };
+            normal = {
+              black = "#1d2021";
+              red = config.theme.colors.base08;
+              green = config.theme.colors.base0B;
+              yellow = config.theme.colors.base0A;
+              blue = config.theme.colors.base0D;
+              magenta = config.theme.colors.base0E;
+              cyan = config.theme.colors.base0C;
+              white = config.theme.colors.base05;
+            };
+            bright = {
+              black = config.theme.colors.base03;
+              red = config.theme.colors.base09;
+              green = config.theme.colors.base01;
+              yellow = config.theme.colors.base02;
+              blue = config.theme.colors.base04;
+              magenta = config.theme.colors.base06;
+              cyan = config.theme.colors.base0F;
+              white = config.theme.colors.base07;
+            };
+          };
+          draw_bold_text_with_bright_colors = false;
+        };
+      };
+    };
+  };
+}
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@ -0,0 +1,17 @@
+{ ... }:
+{
+
+  imports = [
+    ./1password.nix
+    ./alacritty.nix
+    ./discord.nix
+    ./firefox.nix
+    ./kitty.nix
+    ./media.nix
+    ./obsidian.nix
+    ./qbittorrent.nix
+    ./slack.nix
+    ./wezterm.nix
+    ./yt-dlp.nix
+  ];
+}
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    discord = {
+      enable = lib.mkEnableOption {
+        description = "Enable Discord.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.discord.enable) {
+    unfreePackages = [ "discord" ];
+    environment.systemPackages = [ pkgs.discord ];
+    home-manager.users.${config.user} = {
+      xdg.configFile."discord/settings.json".text = ''
+        {
+          "BACKGROUND_COLOR": "#202225",
+          "IS_MAXIMIZED": false,
+          "IS_MINIMIZED": false,
+          "OPEN_ON_STARTUP": false,
+          "MINIMIZE_TO_TRAY": false,
+          "SKIP_HOST_UPDATE": true
+        }
+      '';
+    };
+  };
+}
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -0,0 +1,203 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+
+  options = {
+    firefox = {
+      enable = lib.mkEnableOption {
+        description = "Enable Firefox.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.firefox.enable) {
+
+    unfreePackages = [
+      (lib.mkIf config._1password.enable "onepassword-password-manager")
+      "okta-browser-plugin"
+    ];
+
+    home-manager.users.${config.user} = {
+
+      programs.firefox = {
+        enable = true;
+        package = if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
+        profiles.default = {
+          id = 0;
+          name = "default";
+          isDefault = true;
+          # https://nur.nix-community.org/repos/rycee/
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            (lib.mkIf config._1password.enable onepassword-password-manager)
+            darkreader
+            don-t-fuck-with-paste
+            facebook-container
+            markdownload
+            multi-account-containers
+            okta-browser-plugin
+            reddit-enhancement-suite
+            return-youtube-dislikes
+            sponsorblock
+            ublock-origin
+            ublacklist
+            vimium
+          ];
+          settings = {
+            "app.update.auto" = false;
+            "browser.aboutConfig.showWarning" = false;
+            "browser.warnOnQuit" = 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
+            "dom.forms.autocomplete.formautofill" = false; # Disable autofill
+            "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
+            "extensions.pocket.enabled" = false;
+            "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
+            "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
+            "devtools.command-button-screenshot.enabled" = true; # Scrolling screenshot of entire page
+            "svg.context-properties.content.enabled" = true; # Sidebery styling
+            "browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
+            "browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
+          };
+          userChrome = ''
+            :root {
+              --focus-outline-color: ${config.theme.colors.base04} !important;
+              --toolbar-color: ${config.theme.colors.base07} !important;
+              --tab-min-height: 30px !important;
+            }
+            /* Background of tab bar */
+            .toolbar-items {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            /* Extra tab bar sides on macOS */
+            .titlebar-spacer {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            .titlebar-buttonbox-container {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            #tabbrowser-tabs {
+              border-inline-start: 0 !important;
+            }
+            /* Private Browsing indicator on macOS */
+            #private-browsing-indicator-with-label {
+              background-color: ${config.theme.colors.base00} !important;
+              margin-inline: 0 !important;
+              padding-inline: 7px;
+            }
+            /* Tabs themselves */
+            .tabbrowser-tab .tab-stack {
+              border-radius: 5px 5px 0 0;
+              overflow: hidden;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
+            }
+            .tab-content {
+              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent);
+              border-radius: 5px 5px 0 0;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
+            }
+            .tab-content[selected] {
+              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
+              background-color: ${config.theme.colors.base01} !important;
+              color: ${config.theme.colors.base07} !important;
+            }
+            /* Below tab bar */
+            #nav-bar {
+              background: ${config.theme.colors.base01} !important;
+            }
+            /* URL bar in nav bar */
+            #urlbar[focused=true] {
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+              caret-color: ${config.theme.colors.base05} !important;
+            }
+            #urlbar:not([focused=true]) {
+              color: ${config.theme.colors.base04} !important;
+              background: ${config.theme.colors.base02} !important;
+            }
+            #urlbar ::-moz-selection {
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+            }
+            #urlbar-input-container {
+              border: 1px solid ${config.theme.colors.base01} !important;
+            }
+            #urlbar-background {
+              background: ${config.theme.colors.base01} !important;
+            }
+            /* Text in URL bar */
+            #urlbar-input, #urlbar-scheme, .searchbar-textbox {
+              color: ${config.theme.colors.base07} !important;
+            }
+          '';
+          userContent = ''
+            @-moz-document url-prefix(about:blank) {
+              * {
+                background-color:${config.theme.colors.base01} !important;
+              }
+            }
+          '';
+
+          extraConfig = "";
+        };
+      };
+
+      # Mimic nixpkgs package environment for read-only profiles.ini management
+      # From: https://github.com/booxter/home-manager/commit/dd1602e306fec366280f5953c5e1b553e3d9672a
+      home.sessionVariables = {
+        MOZ_LEGACY_PROFILES = 1;
+        MOZ_ALLOW_DOWNGRADE = 1;
+      };
+
+      # launchd.user.envVariables = config.home-manager.users.${config.user}.home.sessionVariables;
+
+      xdg.mimeApps = {
+        associations.added = {
+          "text/html" = [ "firefox.desktop" ];
+        };
+        defaultApplications = {
+          "text/html" = [ "firefox.desktop" ];
+        };
+        associations.removed = {
+          "text/html" = [ "wine-extension-htm.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"
+            ''
+          )
+        }";
+      };
+    };
+  };
+}
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -0,0 +1,118 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    kitty = {
+      enable = lib.mkEnableOption {
+        description = "Enable Kitty.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.kitty.enable) {
+
+    # Set the Rofi-Systemd terminal for viewing logs
+    # Using optionalAttrs because only available in NixOS
+    environment =
+      { }
+      // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
+      };
+
+    home-manager.users.${config.user} = {
+
+      # Set the i3 terminal
+      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 (lib.mkDefault "${pkgs.kitty}/bin/kitty");
+
+      # Display images in the terminal
+      programs.fish.interactiveShellInit = # fish
+        ''
+          if test "$TERM" = "xterm-kitty"
+              alias icat="kitty +kitten icat"
+              alias ssh="kitty +kitten ssh"
+          end
+        '';
+
+      programs.kitty = {
+        enable = true;
+        environment = { };
+        extraConfig = "";
+        font.size = 14;
+        keybindings = {
+          # Use shift+enter to complete text suggestions in fish
+          "shift+enter" = "send_text all \\x1F";
+
+          # Easy fullscreen toggle (for macOS)
+          "super+f" = "toggle_fullscreen";
+        };
+        settings = {
+
+          # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
+          background = config.theme.colors.base00;
+          foreground = config.theme.colors.base05;
+          selection_background = config.theme.colors.base05;
+          selection_foreground = config.theme.colors.base00;
+          url_color = config.theme.colors.base04;
+          cursor = config.theme.colors.base05;
+          active_border_color = config.theme.colors.base03;
+          inactive_border_color = config.theme.colors.base01;
+          active_tab_background = config.theme.colors.base00;
+          active_tab_foreground = config.theme.colors.base05;
+          inactive_tab_background = config.theme.colors.base01;
+          inactive_tab_foreground = config.theme.colors.base04;
+          tab_bar_background = config.theme.colors.base01;
+
+          # normal
+          color0 = config.theme.colors.base00;
+          color1 = config.theme.colors.base08;
+          color2 = config.theme.colors.base0B;
+          color3 = config.theme.colors.base0A;
+          color4 = config.theme.colors.base0D;
+          color5 = config.theme.colors.base0E;
+          color6 = config.theme.colors.base0C;
+          color7 = config.theme.colors.base05;
+
+          # bright
+          color8 = config.theme.colors.base03;
+          color9 = config.theme.colors.base08;
+          color10 = config.theme.colors.base0B;
+          color11 = config.theme.colors.base0A;
+          color12 = config.theme.colors.base0D;
+          color13 = config.theme.colors.base0E;
+          color14 = config.theme.colors.base0C;
+          color15 = config.theme.colors.base07;
+
+          # extended base16 colors
+          color16 = config.theme.colors.base09;
+          color17 = config.theme.colors.base0F;
+          color18 = config.theme.colors.base01;
+          color19 = config.theme.colors.base02;
+          color20 = config.theme.colors.base04;
+          color21 = config.theme.colors.base06;
+
+          # Scrollback
+          scrollback_lines = 10000;
+          scrollback_pager_history_size = 300; # MB
+
+          # Window
+          window_padding_width = 6;
+
+          tab_bar_edge = "top";
+          tab_bar_style = "slant";
+
+          # Disable audio
+          enable_audio_bell = false;
+        };
+      };
+    };
+  };
+}
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@ -0,0 +1,67 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    media = {
+      enable = lib.mkEnableOption {
+        description = "Enable media programs.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.media.enable) {
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [
+        nsxiv # Image viewer
+        mupdf # PDF viewer
+        zathura # PDF viewer
+      ];
+
+      # Video player
+      programs.mpv = {
+        enable = true;
+        bindings = { };
+        config = {
+          image-display-duration = 2; # For cycling through images
+          hwdec = "auto-safe"; # Attempt to use GPU decoding for video
+        };
+        scripts = [
+
+          # Automatically load playlist entries before and after current file
+          pkgs.mpvScripts.autoload
+
+          # Delete current file after quitting
+          pkgs.mpvScripts.mpv-delete-file
+        ];
+      };
+
+      # Set default programs for opening PDFs and other media
+      xdg.mimeApps = {
+        associations.added = {
+          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+        associations.removed = {
+          "application/pdf" = [
+            "mupdf.desktop"
+            "wine-extension-pdf.desktop"
+          ];
+        };
+        defaultApplications = {
+          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+      };
+    };
+  };
+}
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    obsidian = {
+      enable = lib.mkEnableOption {
+        description = "Enable Obsidian.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
+    unfreePackages = [ "obsidian" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ obsidian ];
+    };
+
+    # 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" ];
+  };
+}
--- a/modules/common/applications/qbittorrent.nix
+++ b/modules/common/applications/qbittorrent.nix
@ -0,0 +1,25 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    qbittorrent = {
+      enable = lib.mkEnableOption {
+        description = "Enable qBittorrent.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.qbittorrent.enable) {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [ qbittorrent ];
+    };
+  };
+}
--- a/modules/common/applications/slack.nix
+++ b/modules/common/applications/slack.nix
@ -0,0 +1,24 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    slack = {
+      enable = lib.mkEnableOption {
+        description = "Enable Slack.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.slack.enable) {
+    unfreePackages = [ "slack" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ slack ];
+    };
+  };
+}
--- a/modules/common/applications/wezterm.nix
+++ b/modules/common/applications/wezterm.nix
@ -0,0 +1,238 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    wezterm = {
+      enable = lib.mkEnableOption {
+        description = "Enable WezTerm terminal.";
+        default = false;
+      };
+    };
+  };
+
+  config =
+    let
+      font = config.home-manager.users.${config.user}.programs.kitty.font.name;
+    in
+    lib.mkIf (config.gui.enable && config.wezterm.enable) {
+
+      # Set the Rofi-Systemd terminal for viewing logs
+      # Using optionalAttrs because only available in NixOS
+      environment =
+        { }
+        // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+          sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.wezterm}/bin/wezterm";
+        };
+
+      home-manager.users.${config.user} = {
+
+        # Set the i3 terminal
+        xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "wezterm";
+
+        # Set the Rofi terminal for running programs
+        programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.wezterm}/bin/wezterm";
+
+        # Display images in the terminal
+        programs.fish.shellAliases = {
+          icat = lib.mkForce "wezterm imgcat";
+        };
+
+        programs.wezterm = {
+          enable = true;
+          colorSchemes = {
+            myTheme = {
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
+              cursor_bg = config.theme.colors.base05;
+              cursor_fg = config.theme.colors.base00;
+              cursor_border = config.theme.colors.base05;
+              selection_bg = config.theme.colors.base05;
+              selection_fg = config.theme.colors.base00;
+              scrollbar_thumb = config.theme.colors.base03;
+              ansi = [
+                config.theme.colors.base01 # black
+                config.theme.colors.base0F # maroon
+                config.theme.colors.base0B # green
+                config.theme.colors.base0A # olive
+                config.theme.colors.base0D # navy
+                config.theme.colors.base0E # purple
+                config.theme.colors.base0C # teal
+                config.theme.colors.base06 # silver
+              ];
+              brights = [
+                config.theme.colors.base03 # grey
+                config.theme.colors.base08 # red
+                config.theme.colors.base0B # lime
+                config.theme.colors.base0A # yellow
+                config.theme.colors.base0D # blue
+                config.theme.colors.base0E # fuchsia
+                config.theme.colors.base0C # aqua
+                config.theme.colors.base07 # white
+              ];
+              compose_cursor = config.theme.colors.base09; # orange
+              copy_mode_active_highlight_bg = {
+                Color = config.theme.colors.base03;
+              };
+              copy_mode_active_highlight_fg = {
+                Color = config.theme.colors.base07;
+              };
+              copy_mode_inactive_highlight_bg = {
+                Color = config.theme.colors.base02;
+              };
+              copy_mode_inactive_highlight_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_label_bg = {
+                Color = config.theme.colors.base02;
+              };
+              quick_select_label_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_match_bg = {
+                Color = config.theme.colors.base03;
+              };
+              quick_select_match_fg = {
+                Color = config.theme.colors.base07;
+              };
+            };
+          };
+          extraConfig = ''
+            return {
+                color_scheme = "myTheme",
+
+                -- Scrollback
+                scrollback_lines = 10000,
+
+                -- Window
+                window_padding = {
+                  left = 10,
+                  right = 10,
+                  top = 10,
+                  bottom = 10,
+                },
+
+                font = wezterm.font('${font}', { weight = 'Bold'}),
+                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
+
+                -- Fix color blocks instead of text
+                front_end = "WebGpu",
+
+                -- Tab Bar
+                hide_tab_bar_if_only_one_tab = true,
+                window_frame = {
+                  font = wezterm.font('${font}', { weight = 'Bold'}),
+                  font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
+                },
+
+                colors = {
+                  tab_bar = {
+                    active_tab = {
+                      bg_color = '${config.theme.colors.base00}',
+                      fg_color = '${config.theme.colors.base04}',
+                    },
+                  },
+                },
+
+                -- Disable audio
+                audible_bell = "Disabled",
+
+                initial_rows = 80,
+                initial_cols = 200,
+
+                keys = {
+                  -- sends completion string for fish autosuggestions
+                  {
+                    key = 'Enter',
+                    mods = 'SHIFT',
+                    action = wezterm.action.SendString '\x1F'
+                  },
+                  -- ctrl-shift-h was "hide"
+                  {
+                    key = 'H',
+                    mods = 'SHIFT|CTRL',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- alt-enter was "fullscreen"
+                  {
+                    key = 'Enter',
+                    mods = 'ALT',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- make super-f "fullscreen"
+                  {
+                    key = 'f',
+                    mods = 'SUPER',
+                    action = wezterm.action.ToggleFullScreen
+                  },
+                  -- super-t open new tab in new dir
+                  {
+                    key = 't',
+                    mods = ${if pkgs.stdenv.isDarwin then "'SUPER'" else "'ALT'"},
+                    action = wezterm.action.SpawnCommandInNewTab {
+                      cwd = wezterm.home_dir,
+                    },
+                  },
+                  -- shift-super-t open new tab in same dir
+                  {
+                    key = 't',
+                    mods = 'SUPER|SHIFT',
+                    action = wezterm.action.SpawnTab 'CurrentPaneDomain'
+                  },
+                  -- project switcher
+                  {
+                     key = 'P',
+                     mods = 'SUPER',
+                     action = wezterm.action_callback(function(window, pane)
+                       local choices = {}
+
+                       wezterm.log_info "working?"
+
+                       function scandir(directory)
+                           local i, t, popen = 0, {}, io.popen
+                           local pfile = popen('${pkgs.fd}/bin/fd --search-path "'..directory..'" --type directory --exact-depth 2 | ${pkgs.proximity-sort}/bin/proximity-sort "'..os.getenv("HOME").."/dev/work"..'"')
+                           for filename in pfile:lines() do
+                               i = i + 1
+                               t[i] = filename
+                           end
+                           pfile:close()
+                           return t
+                       end
+
+                       for _, v in pairs(scandir(os.getenv("HOME").."/dev")) do
+                         table.insert(choices, { label = v })
+                       end
+
+                       window:perform_action(
+                         wezterm.action.InputSelector {
+                           action = wezterm.action_callback(function(window, pane, id, label)
+                             if not id and not label then
+                               wezterm.log_info "cancelled"
+                             else
+                               window:perform_action(
+                                 wezterm.action.SpawnCommandInNewTab {
+                                   cwd = label,
+                                 },
+                                 pane
+                               )
+                             end
+                           end),
+                           fuzzy = true,
+                           title = "Select Project",
+                           choices = choices,
+                         },
+                         pane
+                       )
+                     end),
+                  },
+                },
+            }
+          '';
+        };
+      };
+    };
+}
--- a/modules/common/applications/yt-dlp.nix
+++ b/modules/common/applications/yt-dlp.nix
@ -0,0 +1,38 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    yt-dlp = {
+      enable = lib.mkEnableOption {
+        description = "Enable YouTube downloader.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.yt-dlp.enable) {
+    home-manager.users.${config.user} = {
+      programs.yt-dlp = {
+        enable = true;
+        extraConfig = "";
+        settings = {
+          no-continue = true; # Always re-download each fragment
+          no-overwrites = true; # Don't overwrite existing files
+          download-archive = "archive.log"; # Log of archives
+          embed-metadata = true;
+          embed-thumbnail = true;
+          embed-subs = true;
+          sub-langs = "en.*";
+          concurrent-fragments = 4; # Parallel download chunks
+        };
+      };
+
+      programs.fish.shellAbbrs.yt = "yt-dlp";
+    };
+  };
+}
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -0,0 +1,184 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+
+  imports = [
+    ./applications
+    ./mail
+    ./neovim
+    ./programming
+    ./repositories
+    ./shell
+  ];
+
+  options = {
+    user = lib.mkOption {
+      type = lib.types.str;
+      description = "Primary user of the system";
+    };
+    fullName = lib.mkOption {
+      type = lib.types.str;
+      description = "Human readable name of the user";
+    };
+    userDirs = {
+      # Required to prevent infinite recursion when referenced by himalaya
+      download = lib.mkOption {
+        type = lib.types.str;
+        description = "XDG directory for downloads";
+        default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
+      };
+    };
+    identityFile = lib.mkOption {
+      type = lib.types.str;
+      description = "Path to existing private key file.";
+      default = "/etc/ssh/ssh_host_ed25519_key";
+    };
+    gui = {
+      enable = lib.mkEnableOption {
+        description = "Enable graphics.";
+        default = false;
+      };
+    };
+    theme = {
+      colors = lib.mkOption {
+        type = lib.types.attrs;
+        description = "Base16 color scheme.";
+        default = (import ../colorscheme/gruvbox).dark;
+      };
+      dark = lib.mkOption {
+        type = lib.types.bool;
+        description = "Enable dark mode.";
+        default = true;
+      };
+    };
+    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}"
+      );
+    };
+    dotfilesPath = lib.mkOption {
+      type = lib.types.path;
+      description = "Path of dotfiles repository.";
+      default = config.homePath + "/dev/personal/dotfiles";
+    };
+    dotfilesRepo = lib.mkOption {
+      type = lib.types.str;
+      description = "Link to dotfiles repository HTTPS URL.";
+    };
+    unfreePackages = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "List of unfree packages to allow.";
+      default = [ ];
+    };
+    hostnames = {
+      audiobooks = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for audiobook server (Audiobookshelf).";
+      };
+      files = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for files server (Filebrowser).";
+      };
+      git = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for git server (Gitea).";
+      };
+      metrics = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for metrics server.";
+      };
+      minecraft = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Minecraft server.";
+      };
+      paperless = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for document server (paperless-ngx).";
+      };
+      prometheus = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Prometheus server.";
+      };
+      influxdb = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for InfluxDB2 server.";
+      };
+      secrets = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for passwords and secrets (Vaultwarden).";
+      };
+      stream = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for video/media library (Jellyfin).";
+      };
+      content = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for personal content system (Nextcloud).";
+      };
+      books = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for books library (Calibre-Web).";
+      };
+      download = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for download services.";
+      };
+      irc = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for IRC services.";
+      };
+      n8n = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for n8n automation.";
+      };
+      notifications = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for push notification services (ntfy).";
+      };
+      status = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for status page (Uptime-Kuma).";
+      };
+      transmission = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for peer2peer downloads (Transmission).";
+      };
+    };
+  };
+
+  config =
+    let
+      stateVersion = "23.05";
+    in
+    {
+
+      # 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;
+
+      # 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;
+    };
+}
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -0,0 +1,220 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
+
+  config = lib.mkIf config.mail.aerc.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        w3m # Render HTML
+        dante # Socksify for rendering HTML
+      ];
+
+      programs.aerc = {
+        enable = true;
+        extraBinds = {
+          # Binds are of the form <key sequence> = <command to run>
+          # To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
+          # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
+          global = {
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab <Enter>";
+            "<C-t>" = ":term<Enter>";
+            "?" = ":help keys<Enter>";
+          };
+
+          messages = {
+            q = ":quit<Enter>";
+
+            j = ":next <Enter>";
+            "<Down>" = ":next<Enter>";
+            "<C-d>" = ":next 50%<Enter>";
+            "<C-f>" = ":next 100%<Enter>";
+            "<PgDn>" = ":next 100%<Enter>";
+
+            k = ":prev <Enter>";
+            "<Up>" = ":prev<Enter>";
+            "<C-u>" = ":prev 50%<Enter>";
+            "<C-b>" = ":prev 100%<Enter>";
+            "<PgUp>" = ":prev 100%<Enter>";
+            g = ":select 0 <Enter>";
+            G = ":select -1<Enter>";
+
+            J = ":next-folder <Enter>";
+            K = ":prev-folder<Enter>";
+            H = ":collapse-folder<Enter>";
+            L = ":expand-folder<Enter>";
+
+            v = ":mark -t<Enter>";
+            V = ":mark -v<Enter>";
+
+            T = ":toggle-threads<Enter>";
+
+            "<Enter>" = ":view<Enter>";
+            d = ":prompt 'Really delete this message?' 'delete-message'<Enter>";
+            D = ":move Trash<Enter>";
+            A = ":archive flat<Enter>";
+
+            C = ":compose<Enter>";
+
+            rr = ":reply -a<Enter>";
+            rq = ":reply -aq<Enter>";
+            Rr = ":reply<Enter>";
+            Rq = ":reply -q<Enter>";
+
+            c = ":cf<space>";
+            "$" = ":term<space>";
+            "!" = ":term<space>";
+            "|" = ":pipe<space>";
+
+            "/" = ":search<space>-a<space>";
+            "\\" = ":filter <space>";
+            n = ":next-result<Enter>";
+            N = ":prev-result<Enter>";
+            "<Esc>" = ":clear<Enter>";
+          };
+
+          "messages:folder=Drafts" = {
+            "<Enter>" = ":recall<Enter>";
+          };
+
+          view = {
+            "/" = ":toggle-key-passthrough <Enter> /";
+            q = ":close<Enter>";
+            O = ":open<Enter>";
+            S = ":save<space>";
+            "|" = ":pipe<space>";
+            D = ":move Trash<Enter>";
+            A = ":archive flat<Enter>";
+
+            "<C-l>" = ":open-link <space>";
+
+            f = ":forward <Enter>";
+            rr = ":reply -a<Enter>";
+            rq = ":reply -aq<Enter>";
+            Rr = ":reply<Enter>";
+            Rq = ":reply -q<Enter>";
+
+            H = ":toggle-headers<Enter>";
+            "<C-k>" = ":prev-part<Enter>";
+            "<C-j>" = ":next-part<Enter>";
+            J = ":next <Enter>";
+            K = ":prev<Enter>";
+          };
+
+          "view::passthrough" = {
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<Esc>" = ":toggle-key-passthrough<Enter>";
+          };
+
+          compose = {
+            # Keybindings used when the embedded terminal is not selected in the compose
+            # view
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-k>" = ":prev-field<Enter>";
+            "<C-j>" = ":next-field<Enter>";
+            "<A-p>" = ":switch-account -p<Enter>";
+            "<A-n>" = ":switch-account -n<Enter>";
+            "<tab>" = ":next-field<Enter>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+          "compose::editor" = {
+            # Keybindings used when the embedded terminal is selected in the compose view
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-k>" = ":prev-field<Enter>";
+            "<C-j>" = ":next-field<Enter>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+          "compose::review" = {
+            # Keybindings used when reviewing a message to be sent
+            y = ":send <Enter>";
+            n = ":abort<Enter>";
+            p = ":postpone<Enter>";
+            q = ":choose -o d discard abort -o p postpone postpone<Enter>";
+            e = ":edit<Enter>";
+            a = ":attach<space>";
+            d = ":detach<space>";
+          };
+
+          terminal = {
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+        };
+        extraConfig = {
+          general = {
+            unsafe-accounts-conf = true;
+            # log-file = "~/.cache/aerc.log";
+            # log-level = "debug";
+          };
+          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/*" =
+            #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
+            "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 -";
+            "audio/*" = "${pkgs.mpv}/bin/mpv -";
+            "image/*" = "${pkgs.feh}/bin/feh -";
+          };
+        };
+      };
+      accounts.email.accounts.home.aerc = {
+        enable = true;
+        extraAccounts = {
+          check-mail = "5m";
+          check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
+          check-mail-timeout = "15s";
+        };
+      };
+
+      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
+        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";
+      };
+    };
+  };
+}
--- a/modules/common/mail/default.nix
+++ b/modules/common/mail/default.nix
@ -0,0 +1,139 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  imports = [
+    ./himalaya.nix
+    ./aerc.nix
+    ./system.nix
+  ];
+
+  options = {
+    mail.enable = lib.mkEnableOption "Mail service.";
+    mail.user = lib.mkOption {
+      type = lib.types.str;
+      description = "User name for the email address.";
+      default = config.user;
+    };
+    mail.server = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server name for the email address.";
+    };
+    mail.imapHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for IMAP (reading mail).";
+    };
+    mail.smtpHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for SMTP (sending mail).";
+    };
+  };
+
+  config = lib.mkIf config.mail.enable {
+
+    home-manager.users.${config.user} = {
+      programs.mbsync = {
+        enable = true;
+      };
+
+      # Automatically check for mail and keep files synced locally
+      services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
+        enable = true;
+        frequency = "*:0/5";
+        postExec = "${pkgs.notmuch}/bin/notmuch new";
+      };
+
+      # Used to watch for new mail and trigger sync
+      services.imapnotify.enable = pkgs.stdenv.isLinux;
+
+      # Allows sending email from CLI/sendmail
+      programs.msmtp.enable = true;
+
+      # Better local mail search
+      programs.notmuch = {
+        enable = true;
+        new.ignore = [
+          ".mbsyncstate.lock"
+          ".mbsyncstate.journal"
+          ".mbsyncstate.new"
+        ];
+      };
+
+      accounts.email = {
+
+        # Where email files are stored
+        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"
+              ];
+
+              # Options for contact completion
+              alot = { };
+
+              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'";
+              };
+
+              # 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
+                };
+              };
+
+              # 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;
+              };
+            };
+        };
+      };
+    };
+  };
+}
--- a/modules/common/mail/himalaya.nix
+++ b/modules/common/mail/himalaya.nix
@ -0,0 +1,26 @@
+{ config, lib, ... }:
+{
+
+  options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
+
+  config = lib.mkIf config.mail.himalaya.enable {
+
+    home-manager.users.${config.user} = {
+
+      programs.himalaya = {
+        enable = true;
+      };
+      accounts.email.accounts.home.himalaya = {
+        enable = true;
+        settings = {
+          downloads-dir = config.userDirs.download;
+          smtp-insecure = true;
+        };
+      };
+
+      programs.fish.shellAbbrs = {
+        hi = "himalaya";
+      };
+    };
+  };
+}
--- a/modules/common/mail/system.nix
+++ b/modules/common/mail/system.nix
@ -0,0 +1,35 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  config = lib.mkIf (config.mail.enable || config.server) {
+
+    home-manager.users.${config.user} = {
+
+      programs.msmtp.enable = true;
+
+      # The system user for sending automatic notifications
+      accounts.email.accounts.system =
+        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)}";
+          msmtp.enable = true;
+          smtp = {
+            host = config.mail.smtpHost;
+            port = 465;
+            tls.enable = true;
+          };
+        };
+    };
+  };
+}
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/align.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/align.nix
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/bufferline.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/bufferline.nix
--- a/modules/common/neovim/config/colors.nix
+++ b/modules/common/neovim/config/colors.nix
@ -0,0 +1,27 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+
+  # Sets Neovim colors based on Nix colorscheme
+
+  options.colors = lib.mkOption {
+    type = lib.types.attrsOf lib.types.str;
+    description = "Attrset of base16 colorscheme key value pairs.";
+  };
+
+  config = {
+    plugins = [ pkgs.vimPlugins.base16-nvim ];
+    setup.base16-colorscheme = config.colors;
+
+    # Telescope isn't working, shut off for now
+    lua = ''
+      require('base16-colorscheme').with_config {
+          telescope = false,
+      }
+    '';
+  };
+}
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/completion.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/completion.nix
@ -2,7 +2,6 @@
 {

  plugins = [
-    pkgs.vimPlugins.nvim-cmp
    pkgs.vimPlugins.cmp-nvim-lsp
    pkgs.vimPlugins.cmp-buffer
    pkgs.vimPlugins.cmp-path
@ -27,21 +26,15 @@

    # Basic completion keybinds
    mapping = {
-      "['<C-n>']" =
-        dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-      "['<C-p>']" =
-        dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-      "['<Down>']" =
-        dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
-      "['<Up>']" =
-        dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
+      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
+      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
+      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
+      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
      "['<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()";
-      "['<C-y>']" =
-        dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
-      "['<C-r>']" =
-        dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
+      "['<C-y>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
+      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
      "['<Esc>']" = dsl.rawLua ''
        function(_)
            cmp.mapping({
@ -135,7 +128,7 @@
    };
  };

-  lua' = ''
+  lua = ''
    -- Use buffer source for `/`
    require('cmp').setup.cmdline("/", {
        mapping = {
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/github.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/github.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/gitsigns.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/gitsigns.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/gitsigns.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/gitsigns.nix
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/kubernetes.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/kubernetes.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix
@ -8,9 +8,9 @@
 {

  # Terraform optional because non-free
-  options.enableTerraform = lib.mkEnableOption "Whether to enable Terraform LSP";
-  options.enableGithub = lib.mkEnableOption "Whether to enable GitHub features";
-  options.enableKubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
+  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
+  options.github = lib.mkEnableOption "Whether to enable GitHub features";
+  options.kubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";

  config = {
    plugins = [
@ -54,7 +54,7 @@

    use.lspconfig.terraformls.setup = dsl.callWith {
      cmd =
-        if config.enableTerraform then
+        if config.terraform then
          [
            "${pkgs.terraform-ls}/bin/terraform-ls"
            "serve"
@ -93,7 +93,7 @@
        nix = [ "nixfmt" ];
        rust = [ "rustfmt" ];
        sh = [ "shfmt" ];
-        terraform = if config.enableTerraform then [ "terraform_fmt" ] else [ ];
+        terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
        hcl = [ "hcl" ];
      };
      formatters = {
@ -110,7 +110,7 @@
            "-ci"
          ];
        };
-        terraform_fmt.command = if config.enableTerraform then "${pkgs.terraform}/bin/terraform" else "";
+        terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
        hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
      };
    };
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/misc.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/misc.nix
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/statusline.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/statusline.nix
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/syntax.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/syntax.nix
@ -2,24 +2,26 @@
 {

  plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins: [
-      pkgs.nmasur.ini-grammar
-      pkgs.nmasur.puppet-grammar
-      pkgs.nmasur.rasi-grammar
-      pkgs.nmasur.vimdoc-grammar
-      pkgs.tree-sitter-grammars.tree-sitter-bash
-      pkgs.tree-sitter-grammars.tree-sitter-c
-      pkgs.tree-sitter-grammars.tree-sitter-fish
-      pkgs.tree-sitter-grammars.tree-sitter-hcl
-      pkgs.tree-sitter-grammars.tree-sitter-json
-      pkgs.tree-sitter-grammars.tree-sitter-lua
-      pkgs.tree-sitter-grammars.tree-sitter-markdown
-      pkgs.tree-sitter-grammars.tree-sitter-markdown-inline
-      pkgs.tree-sitter-grammars.tree-sitter-nix
-      pkgs.tree-sitter-grammars.tree-sitter-python
-      pkgs.tree-sitter-grammars.tree-sitter-toml
-      pkgs.tree-sitter-grammars.tree-sitter-yaml
-    ]))
+    (pkgs.vimPlugins.nvim-treesitter.withPlugins (
+      _plugins: with pkgs.tree-sitter-grammars; [
+        tree-sitter-bash
+        tree-sitter-c
+        tree-sitter-fish
+        tree-sitter-hcl
+        tree-sitter-ini
+        tree-sitter-json
+        tree-sitter-lua
+        tree-sitter-markdown
+        tree-sitter-markdown-inline
+        tree-sitter-nix
+        tree-sitter-puppet
+        tree-sitter-python
+        tree-sitter-rasi
+        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
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/telescope.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/telescope.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/telescope.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/telescope.nix
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/toggleterm.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/toggleterm.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/toggleterm.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/toggleterm.nix
@ -18,7 +18,7 @@

  lua = ''
    ${builtins.readFile ./toggleterm.lua}
-    ${if config.enableGithub then (builtins.readFile ./github.lua) else ""}
-    ${if config.enableKubernetes then (builtins.readFile ./kubernetes.lua) else ""}
+    ${if config.github then (builtins.readFile ./github.lua) else ""}
+    ${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
  '';
 }
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/tree.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/tree.nix
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -0,0 +1,67 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+
+  neovim = import ./package {
+    inherit pkgs;
+    colors = config.theme.colors;
+    terraform = config.terraform.enable;
+    github = true;
+    kubernetes = config.kubernetes.enable;
+  };
+in
+{
+
+  options.neovim.enable = lib.mkEnableOption "Neovim.";
+
+  config = lib.mkIf config.neovim.enable {
+    home-manager.users.${config.user} =
+
+      {
+
+        home.packages = [ neovim ];
+
+        # Use Neovim as the editor for git commit messages
+        programs.git.extraConfig.core.editor = "nvim";
+        programs.jujutsu.settings.ui.editor = "nvim";
+
+        # Set Neovim as the default app for text editing and manual pages
+        home.sessionVariables = {
+          EDITOR = "nvim";
+          MANPAGER = "nvim +Man!";
+        };
+
+        # Create quick aliases for launching Neovim
+        programs.fish = {
+          shellAliases = {
+            vim = "nvim";
+          };
+          shellAbbrs = {
+            v = lib.mkForce "nvim";
+            vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
+            vll = "nvim -c 'Telescope oldfiles'";
+          };
+        };
+
+        # 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 && config.gui.enable) {
+          name = "Neovim wrapper";
+          exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} nvim %F";
+          mimeType = [
+            "text/plain"
+            "text/markdown"
+          ];
+        };
+        xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
+          "text/plain" = [ "nvim.desktop" ];
+          "text/markdown" = [ "nvim.desktop" ];
+        };
+      };
+  };
+}
--- a/pkgs/applications/editors/neovim/nmasur/neovim/lua/keybinds.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/lua/keybinds.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/lua/settings.lua
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/lua/settings.lua
--- a/pkgs/applications/editors/neovim/nmasur/neovim/package.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/package.nix
@ -28,10 +28,10 @@

 {
  pkgs,
-  colors ? null,
-  enableTerraform ? false,
-  enableGithub ? false,
-  enableKubernetes ? false,
+  colors,
+  terraform ? false,
+  github ? false,
+  kubernetes ? false,
  ...
 }:

@ -41,22 +41,22 @@ pkgs.neovimBuilder {
  package = pkgs.neovim-unwrapped;
  inherit
    colors
-    enableTerraform
-    enableGithub
-    enableKubernetes
+    terraform
+    github
+    kubernetes
    ;
  imports = [
-    ./config/align.nix
-    ./config/bufferline.nix
-    ./config/colors.nix
-    ./config/completion.nix
-    ./config/gitsigns.nix
-    ./config/lsp.nix
-    ./config/misc.nix
-    ./config/statusline.nix
-    ./config/syntax.nix
-    ./config/telescope.nix
-    ./config/toggleterm.nix
-    ./config/tree.nix
+    ../config/align.nix
+    ../config/bufferline.nix
+    ../config/colors.nix
+    ../config/completion.nix
+    ../config/gitsigns.nix
+    ../config/lsp.nix
+    ../config/misc.nix
+    ../config/statusline.nix
+    ../config/syntax.nix
+    ../config/telescope.nix
+    ../config/toggleterm.nix
+    ../config/tree.nix
  ];
 }
--- a/pkgs/applications/editors/neovim/nmasur/neovim/plugin/after/queries/nix/injections.scm
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/plugin/after/queries/nix/injections.scm
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@ -0,0 +1,12 @@
+{ ... }:
+{
+
+  imports = [
+    ./haskell.nix
+    ./kubernetes.nix
+    ./lua.nix
+    ./python.nix
+    ./rust.nix
+    ./terraform.nix
+  ];
+}
--- a/platforms/home-manager/modules/nmasur/presets/programs/haskell.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/haskell.nix
@ -1,13 +1,9 @@
 { config, lib, ... }:
-let
-  cfg = config.nmasur.presets.programs.haskell;
-in
 {

-  options.nmasur.presets.programs.haskell.enable =
-    lib.mkEnableOption "Haskell programming language config.";
+  options.haskell.enable = lib.mkEnableOption "Haskell programming language.";

-  config = lib.mkIf cfg.enable {
+  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=" ];
--- a/modules/common/programming/kubernetes.nix
+++ b/modules/common/programming/kubernetes.nix
@ -0,0 +1,164 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
+
+  config = lib.mkIf config.kubernetes.enable {
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        kubectl # Basic Kubernetes queries
+        kubernetes-helm # Helm CLI
+        fluxcd # Bootstrap clusters with Flux
+        kustomize # Kustomize CLI (for Flux)
+      ];
+
+      programs.fish.shellAbbrs = {
+        k = "kubectl";
+        pods = "kubectl get pods -A";
+        nodes = "kubectl get nodes";
+        deploys = "kubectl get deployments -A";
+        dash = "kube-dashboard";
+        ks = "k9s";
+      };
+
+      # Terminal Kubernetes UI
+      programs.k9s = {
+        enable = true;
+        settings = {
+          k9s = {
+            ui = {
+              enableMouse = true;
+              headless = true;
+              logoless = true;
+              crumbsless = false;
+              skin = "main";
+            };
+          };
+        };
+        skins = {
+          main = {
+            k9s = {
+              body = {
+                fgColor = config.theme.colors.base06;
+                bgColor = "default";
+                logoColor = config.theme.colors.base02; # *blue ?
+              };
+              # Search bar
+              prompt = {
+                fgColor = config.theme.colors.base06;
+                bgColor = "default";
+                suggestColor = config.theme.colors.base03;
+              };
+              # Header left side
+              info = {
+                fgColor = config.theme.colors.base04;
+                sectionColor = config.theme.colors.base05;
+              };
+              dialog = {
+                fgColor = config.theme.colors.base06;
+                bgColor = "default";
+                buttonFgColor = config.theme.colors.base06;
+                buttonBgColor = config.theme.colors.base0E;
+                buttonFocusFgColor = config.theme.colors.base07;
+                buttonFocusBgColor = config.theme.colors.base02; # *cyan
+                labelFgColor = config.theme.colors.base09;
+                fieldFgColor = config.theme.colors.base06;
+              };
+              frame = {
+                border = {
+                  fgColor = config.theme.colors.base01;
+                  focusColor = config.theme.colors.base06;
+                };
+                menu = {
+                  fgColor = config.theme.colors.base06;
+                  keyColor = config.theme.colors.base0E; # *magenta
+                  numKeyColor = config.theme.colors.base0E; # *magenta
+                };
+                crumbs = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = config.theme.colors.base01;
+                  activeColor = config.theme.colors.base03;
+                };
+                status = {
+                  newColor = config.theme.colors.base04; # *cyan
+                  modifyColor = config.theme.colors.base0D; # *blue
+                  addColor = config.theme.colors.base0B; # *green
+                  errorColor = config.theme.colors.base08; # *red
+                  highlightColor = config.theme.colors.base09; # *orange
+                  killColor = config.theme.colors.base03; # *comment
+                  completedColor = config.theme.colors.base03; # *comment
+                };
+                title = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+                  highlightColor = config.theme.colors.base09; # *orange
+                  counterColor = config.theme.colors.base0D; # *blue
+                  filterColor = config.theme.colors.base0E; # *magenta
+                };
+              };
+              views = {
+                charts = {
+                  bgColor = "default";
+                  defaultDialColors = [
+                    config.theme.colors.base0D
+                    config.theme.colors.base08
+                  ];
+                  # - *blue
+                  # - *red
+                  defaultChartColors = [
+                    config.theme.colors.base0D
+                    config.theme.colors.base08
+                  ];
+                  # - *blue
+                  # - *red
+                };
+                table = {
+                  # List of resources
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+
+                  # Row selection
+                  cursorFgColor = config.theme.colors.base07;
+                  cursorBgColor = config.theme.colors.base01;
+
+                  # Header row
+                  header = {
+                    fgColor = config.theme.colors.base0D;
+                    bgColor = "default";
+                    sorterColor = config.theme.colors.base0A; # *selection
+                  };
+                };
+                xray = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+                  cursorColor = config.theme.colors.base06;
+                  graphicColor = config.theme.colors.base0D;
+                  showIcons = false;
+                };
+                yaml = {
+                  keyColor = config.theme.colors.base0D;
+                  colonColor = config.theme.colors.base04;
+                  fgColor = config.theme.colors.base03;
+                };
+                logs = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+                  indicator = {
+                    fgColor = config.theme.colors.base06;
+                    bgColor = "default";
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/common/programming/lua.nix
+++ b/modules/common/programming/lua.nix
@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.lua.enable = lib.mkEnableOption "Lua programming language.";
+
+  config = lib.mkIf config.lua.enable {
+    home-manager.users.${config.user}.home.packages = with pkgs; [
+      stylua # Lua formatter
+      sumneko-lua-language-server # Lua LSP
+    ];
+  };
+}
--- a/modules/common/programming/python.nix
+++ b/modules/common/programming/python.nix
@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.python.enable = lib.mkEnableOption "Python programming language.";
+
+  config = lib.mkIf config.python.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        # python310 # Standard Python interpreter
+        pyright # Python language server
+        black # Python formatter
+        python310Packages.flake8 # Python linter
+      ];
+
+      programs.fish.shellAbbrs = {
+        py = "python3";
+      };
+    };
+  };
+}
--- a/modules/common/programming/rust.nix
+++ b/modules/common/programming/rust.nix
@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.rust.enable = lib.mkEnableOption "Rust programming language.";
+
+  config = lib.mkIf config.rust.enable {
+
+    home-manager.users.${config.user} = {
+
+      programs.fish.shellAbbrs = {
+        ca = "cargo";
+      };
+
+      home.packages = with pkgs; [
+        cargo
+        rustc
+        clippy
+        gcc
+      ];
+    };
+  };
+}
--- a/modules/common/programming/terraform.nix
+++ b/modules/common/programming/terraform.nix
@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.terraform.enable = lib.mkEnableOption "Terraform tools.";
+
+  config = lib.mkIf config.terraform.enable {
+    unfreePackages = [ "terraform" ];
+
+    home-manager.users.${config.user} = {
+      programs.fish.shellAbbrs = {
+        # Terraform
+        te = "terraform";
+      };
+      home.packages = with pkgs; [
+        terraform # Terraform executable
+        terraform-ls # Language server
+        tflint # Linter
+      ];
+    };
+  };
+}
--- a/modules/common/repositories/default.nix
+++ b/modules/common/repositories/default.nix
@ -0,0 +1,8 @@
+{ ... }:
+{
+
+  imports = [
+    ./dotfiles.nix
+    ./notes.nix
+  ];
+}
--- a/modules/common/repositories/dotfiles.nix
+++ b/modules/common/repositories/dotfiles.nix
@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  # Allows me to make sure I can work on my dotfiles locally
+
+  options.dotfiles.enable = lib.mkEnableOption "Clone dotfiles.";
+
+  config = lib.mkIf config.dotfiles.enable {
+
+    home-manager.users.${config.user} = {
+
+      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
+        '';
+      };
+
+      # Set a variable for dotfiles repo, not necessary but convenient
+      home.sessionVariables.DOTS = config.dotfilesPath;
+    };
+  };
+}
--- a/Show More
+++ b/Show More