add trash from homebrew to path

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/87131f51f8256952d1a306b5521cedc2dc61aa08' (2025-01-18)
  → 'github:lnl7/nix-darwin/65cc1fa8e36ceff067daf6cfb142331f02f524d3' (2025-01-22)
• Updated input 'firefox-darwin':
    'github:bandithedoge/nixpkgs-firefox-darwin/3224752c71a5245e90cfae360e0dc5de98e2b53c' (2025-01-18)
  → 'github:bandithedoge/nixpkgs-firefox-darwin/ef9a452ffc26aed9265e2a5ff04952e960f8f21b' (2025-01-25)
• Updated input 'home-manager':
    'github:nix-community/home-manager/a0046af169ce7b1da503974e1b22c48ef4d71887' (2025-01-17)
  → 'github:nix-community/home-manager/daf04c5950b676f47a794300657f1d3d14c1a120' (2025-01-24)
• Updated input 'jujutsu':
    'github:martinvonz/jj/83d40d2c425fa2e050bdac8837b19e5beb3bef25' (2025-01-18)
  → 'github:martinvonz/jj/e58713c1355d0536e197a3f99ce5a5c713fe69c3' (2025-01-25)
• Updated input 'jujutsu/rust-overlay':
    'github:oxalica/rust-overlay/04d5f1836721461b256ec452883362c5edc5288e' (2025-01-02)
  → 'github:oxalica/rust-overlay/eb64cbcc8eee0fa87ebded92805280d2ec97415a' (2025-01-24)
• Updated input 'nextcloud-snappymail':
    'https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz?narHash=sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E%3D' (2025-01-18)
  → 'https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz?narHash=sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E%3D' (2025-01-25)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c' (2025-01-16)
  → 'github:nixos/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9' (2025-01-23)
• Updated input 'nur':
    'github:nix-community/nur/62cdd681201843553ec740a85ccf2f0a6fca75c6' (2025-01-18)
  → 'github:nix-community/nur/e3bdfbe8b01b6469fd2351ab0cf867d9cfa73da8' (2025-01-25)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c' (2025-01-16)
  → 'github:nixos/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9' (2025-01-23)
• Updated input 'nvim-lint-src':
    'github:mfussenegger/nvim-lint/dfa45de973c3ce7bd1b9a6d346f896a68ad07e44' (2025-01-06)
  → 'github:mfussenegger/nvim-lint/789b7ada1b4f00e08d026dffde410dcfa6a0ba87' (2025-01-21)
• Updated input 'nvim-tree-lua-src':
    'github:kyazdani42/nvim-tree.lua/fca0b67c0b5a31727fb33addc4d9c100736a2894' (2025-01-17)
  → 'github:kyazdani42/nvim-tree.lua/fee1da88972f5972a8296813f6c00d7598325ebd' (2025-01-25)
• Updated input 'tiny-inline-diagnostic-nvim-src':
    'github:rachartier/tiny-inline-diagnostic.nvim/aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8' (2025-01-15)
  → 'github:rachartier/tiny-inline-diagnostic.nvim/5c00aec99f558b8f0a2c4445038f74e5f5435c00' (2025-01-23)
• Updated input 'tree-sitter-bash':
    'github:tree-sitter/tree-sitter-bash/49c31006d8307dcb12bc5770f35b6d5b9e2be68e' (2024-11-11)
  → 'github:tree-sitter/tree-sitter-bash/03f4927065b3c0d71a962be87130aa7e79b35448' (2025-01-24)
• Updated input 'tree-sitter-python':
    'github:tree-sitter/tree-sitter-python/409b5d671eb0ea4972eeacaaca24bbec1acf79b1' (2025-01-07)
  → 'github:tree-sitter/tree-sitter-python/ab2ba8be034368fa009f62f371c068b8728f9db7' (2025-01-23)

.github/workflows/arrow-aws.yml

@@ -0,0 +1,166 @@
+name: Arrow (AWS)
+
+run-name: Arrow (AWS) - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
+
+env:
+  TERRAFORM_DIRECTORY: hosts/arrow/aws
+  DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
+  ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
+  ZONE_NAME: masu.rs
+  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+  CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      rebuild:
+        type: boolean
+        default: false
+      action:
+        type: choice
+        required: true
+        default: create
+        options:
+          - create
+          - destroy
+          - nothing
+      size:
+        type: choice
+        required: false
+        options:
+          - t3a.small # 2 GB RAM / $10
+
+permissions:
+  id-token: write
+  contents: write
+
+jobs:
+  build-deploy:
+    name: Build and Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo Code
+        uses: actions/checkout@v4
+
+      - name: Free Disk Space (Ubuntu)
+        if: inputs.rebuild && inputs.action != 'destroy'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
+      # 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
+
+      # 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
+
+      # Install Nix
+      - name: Install Nix
+        if: inputs.rebuild && inputs.action != 'destroy'
+        uses: cachix/install-nix-action@v20
+
+      # Build the image
+      - name: Build Image
+        if: inputs.rebuild && inputs.action != 'destroy'
+        run: nix build .#arrow-aws
+
+      - name: Upload Image to S3
+        if: inputs.rebuild && inputs.action != 'destroy'
+        run: |
+          aws s3 cp \
+            result/nixos-amazon-image-*.vhd \
+            s3://${{ secrets.IMAGES_BUCKET }}/arrow.vhd \
+
+      # 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 \
+            -backend-config="bucket=${{ secrets.TERRAFORM_STATE_BUCKET }}" \
+            -backend-config="key=arrow.tfstate"
+
+      # Deploys infrastructure or changes to infrastructure.
+      - name: Terraform Apply
+        if: inputs.action == 'create'
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_ec2_size: ${{ inputs.size }}
+          TF_VAR_images_bucket: ${{ secrets.IMAGES_BUCKET }}
+        run: |
+          terraform apply \
+            -auto-approve \
+            -input=false
+
+      # Removes infrastructure.
+      - name: Terraform Destroy
+        if: inputs.action == 'destroy'
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_ec2_size: ${{ inputs.size }}
+          TF_VAR_images_bucket: ${{ secrets.IMAGES_BUCKET }}
+        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.ARROW_IDENTITY_BASE64 }}" | base64 -d > arrow_ed25519
+          chmod 0600 arrow_ed25519
+
+      - 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 arrow_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 }}"

.github/workflows/arrow.yml

@@ -75,16 +75,6 @@ jobs:
             s3://noahmasur-arrow-images/arrow.iso \
             --endpoint-url "https://${{ env.CLOUDFLARE_R2_ENDPOINT }}"
 
-      # # Copy the image to S3
-      # - name: Upload Image to Cache
-      #   env:
-      #     NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
-      #   run: |
-      #     echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
-      #     nix store sign --key-file cache.key $(readlink result)
-      #     nix copy --to s3://t2-aws-nixos-test $(readlink result)
-      #     rm cache.key
-
       # Installs the Terraform binary and some other accessory functions.
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
@@ -157,7 +147,7 @@ jobs:
           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 == "transmission.${{ env.ZONE_NAME }}") | .id')
+             --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' \

.github/workflows/check.yml

@@ -11,10 +11,10 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
+        uses: DeterminateSystems/nix-installer-action@v11
       - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
+        uses: DeterminateSystems/flake-checker-action@v7
       - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
+        uses: DeterminateSystems/magic-nix-cache-action@v6
       - name: Check the Flake
         run: nix flake check

.github/workflows/update.yml

@@ -3,7 +3,7 @@ name: Update Flake
 on:
   workflow_dispatch: # allows manual triggering
   schedule:
-    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
+    - cron: '33 3 * * 6' # runs weekly on Saturday at 03:33
 
 permissions:
   contents: write
@@ -18,13 +18,15 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
+        uses: DeterminateSystems/nix-installer-action@v11
+        with:
+          nix-package-url: https://releases.nixos.org/nix/nix-2.18.4/nix-2.18.4-x86_64-linux.tar.xz
       - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
+        uses: DeterminateSystems/flake-checker-action@v7
       - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
+        uses: DeterminateSystems/magic-nix-cache-action@v6
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v19
+        uses: DeterminateSystems/update-flake-lock@v23
         id: update
         with:
           pr-title: "Update flake.lock" # Title of PR to be created

README.md

@@ -9,7 +9,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## System Features
 
 | 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)   |
@@ -21,11 +21,11 @@ configuration may be difficult to translate to a non-Nix system.
 ## User Features
 
 | 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)         |
+| 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)             |
@@ -38,7 +38,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## macOS Features
 
 | Feature  | Program                                     | Configuration                        |
-| ---      | ---                                         | ---                                  |
+|----------|---------------------------------------------|--------------------------------------|
 | Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
 
 # Diagram

apps/format-root.nix

@@ -21,7 +21,7 @@
           exit 1
       fi
 
-      ${pkgs.disko-packaged}/bin/disko \
+      ${pkgs.disko}/bin/disko \
           --mode create \
           --dry-run \
           --flake "path:$(pwd)#root" \
@@ -31,7 +31,7 @@
           "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
           --default=false
 
-      ${pkgs.disko-packaged}/bin/disko \
+      ${pkgs.disko}/bin/disko \
           --mode create \
           --flake "path:$(pwd)#root" \
           --arg disk "/dev/''${DISK}"

flake.nix

@@ -7,6 +7,12 @@
     # Used for system packages
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    # 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";
@@ -34,6 +40,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Better App install management in macOS
+    mac-app-util = {
+      url = "github:hraban/mac-app-util";
+      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
+    };
+
     # Manage disk format and partitioning
     disko = {
       url = "github:nix-community/disko";
@@ -65,7 +77,7 @@
     };
     nvim-lspconfig-src = {
       # https://github.com/neovim/nvim-lspconfig/tags
-      url = "github:neovim/nvim-lspconfig/v0.1.7";
+      url = "github:neovim/nvim-lspconfig/v0.1.8";
       flake = false;
     };
     cmp-nvim-lsp-src = {
@@ -77,19 +89,14 @@
       url = "github:m00qek/baleia.nvim";
       flake = false;
     };
-    comment-nvim-src = {
-      # https://github.com/numToStr/Comment.nvim/releases
-      url = "github:numToStr/Comment.nvim/v0.8.0";
-      flake = false;
-    };
     nvim-treesitter-src = {
       # https://github.com/nvim-treesitter/nvim-treesitter/tags
-      url = "github:nvim-treesitter/nvim-treesitter/master";
+      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.5";
+      url = "github:nvim-telescope/telescope.nvim/0.1.8";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -98,12 +105,12 @@
     };
     toggleterm-nvim-src = {
       # https://github.com/akinsho/toggleterm.nvim/tags
-      url = "github:akinsho/toggleterm.nvim/v2.9.0";
+      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.5.0";
+      url = "github:akinsho/bufferline.nvim/v4.6.1";
       flake = false;
     };
     nvim-tree-lua-src = {
@@ -116,17 +123,21 @@
     };
     fidget-nvim-src = {
       # https://github.com/j-hui/fidget.nvim/tags
-      url = "github:j-hui/fidget.nvim/v1.2.0";
-      flake = false;
-    };
-    kitty-scrollback-nvim-src = {
-      url = "github:mikesmithgh/kitty-scrollback.nvim";
+      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 = {
@@ -164,6 +175,13 @@
       flake = false;
     };
 
+    # Git alternative
+    # Fixes: https://github.com/martinvonz/jj/issues/4784
+    jujutsu = {
+      url = "github:martinvonz/jj";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Ren and rep - CLI find and replace
     rep = {
       url = "github:robenkleene/rep-grep";
@@ -174,40 +192,38 @@
       flake = false;
     };
 
-    # GE version of Proton for game compatibility
-    # Alternatively, could consider using https://github.com/fufexan/nix-gaming
-    proton-ge = {
-      # https://github.com/GloriousEggroll/proton-ge-custom/releases
-      url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz";
+    gh-collaborators = {
+      url = "github:katiem0/gh-collaborators";
       flake = false;
     };
 
-    # Firefox addon from outside the extension store
-    bypass-paywalls-clean = {
-      # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
-      url = "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-latest.xpi";
+    # Clipboard over SSH
+    osc = {
+      url = "github:theimpostor/osc/v0.4.6";
       flake = false;
     };
 
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
+      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.3.1/external-v5.3.1.tar.gz";
+      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.0/cookbook-0.11.0.tar.gz";
+      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
-      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz";
+      # 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;
     };
   };
@@ -232,38 +248,43 @@
           mail.smtpHost = "smtp.purelymail.com";
           dotfilesRepo = "https://github.com/nmasur/dotfiles";
           hostnames = {
+            audiobooks = "read.${baseName}";
+            budget = "money.${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}";
+            photos = "photos.${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.nur.overlays.default
         inputs.nix2vim.overlay
+        inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784
         (import ./overlays/neovim-plugins.nix inputs)
-        (import ./overlays/calibre-web.nix)
-        (import ./overlays/disko.nix inputs)
         (import ./overlays/tree-sitter.nix inputs)
-        (import ./overlays/caddy.nix inputs)
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/proton-ge.nix inputs)
-        (import ./overlays/gh-collaborators.nix)
-        (import ./overlays/bypass-paywalls-clean.nix inputs)
+        (import ./overlays/gh-collaborators.nix inputs)
+        (import ./overlays/osc.nix inputs)
         (import ./overlays/ren-rep.nix inputs)
+        (import ./overlays/volnoti.nix)
       ];
 
       # System types to support.
@@ -309,16 +330,6 @@
 
       packages =
         let
-          arrow =
-            system:
-            import ./hosts/arrow {
-              inherit
-                inputs
-                globals
-                overlays
-                system
-                ;
-            };
           staff =
             system:
             import ./hosts/staff {
@@ -341,11 +352,37 @@
         in
         {
           x86_64-linux.staff = staff "x86_64-linux";
-          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate {
+          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
             system = "x86_64-linux";
             format = "iso";
+            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; };
           };
+          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" ];
+                }
+              )
+            ];
+          };
 
           # Package Neovim config into standalone package
           x86_64-linux.neovim = neovim "x86_64-linux";

hosts/arrow/aws/ec2.tf

@@ -0,0 +1,98 @@
+resource "aws_instance" "instance" {
+  ami                    = aws_ami.image.id
+  iam_instance_profile   = aws_iam_instance_profile.instance.name
+  instance_type          = var.ec2_size
+  vpc_security_group_ids = [aws_security_group.instance.id]
+
+  tags = {
+    Name = "aws-nixos"
+  }
+
+  lifecycle {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_ec2_instance_state" "instance" {
+  instance_id = aws_instance.instance.id
+  state       = "running"
+}
+
+data "aws_vpc" "vpc" {
+  default = true
+}
+
+resource "aws_security_group" "instance" {
+  name        = "aws-nixos"
+  description = "Allow SSH and HTTPS"
+  vpc_id      = data.aws_vpc.vpc.id
+
+  ingress {
+    description = "Ping"
+    from_port   = -1
+    to_port     = -1
+    protocol    = "icmp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    description = "SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    description = "HTTPS"
+    from_port   = 443
+    to_port     = 443
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port        = 0
+    to_port          = 0
+    protocol         = "-1"
+    cidr_blocks      = ["0.0.0.0/0"]
+    ipv6_cidr_blocks = ["::/0"]
+  }
+}
+
+# Setup IAM for the instance to use SSM
+data "aws_iam_policy_document" "ec2_assume_role" {
+  statement {
+    actions = ["sts:AssumeRole"]
+    principals {
+      type        = "Service"
+      identifiers = ["ec2.amazonaws.com"]
+    }
+  }
+}
+
+data "aws_iam_policy_document" "instance_profile" {
+  statement {
+    actions = [
+      "s3:ListAllMyBuckets",
+    ]
+    resources = ["*"]
+  }
+}
+
+resource "aws_iam_role" "instance_profile" {
+  name               = "nixos"
+  assume_role_policy = data.aws_iam_policy_document.ec2_assume_role.json
+  inline_policy {
+    name   = "instance-profile"
+    policy = data.aws_iam_policy_document.instance_profile.json
+  }
+}
+resource "aws_iam_role_policy_attachment" "instance_ssm" {
+  role       = aws_iam_role.instance_profile.name
+  policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
+}
+resource "aws_iam_instance_profile" "instance" {
+  name = "nixos"
+  role = aws_iam_role.instance_profile.name
+}

hosts/arrow/aws/image.tf

@@ -0,0 +1,95 @@
+# locals {
+#   image_file = one(fileset(path.root, "../../../result/nixos-amazon-image-*.vhd"))
+# }
+#
+# # Upload image to S3
+# resource "aws_s3_object" "image" {
+#   bucket = var.images_bucket
+#   key    = basename(local.image_file)
+#   source = local.image_file
+#   etag   = filemd5(local.image_file)
+# }
+
+# Use existing image in S3
+data "aws_s3_object" "image" {
+  bucket = var.images_bucket
+  key    = "arrow.vhd"
+}
+
+resource "terraform_data" "image_replacement" {
+  input = data.aws_s3_object.image.etag
+}
+
+# Setup IAM access for the VM Importer
+data "aws_iam_policy_document" "vmimport_trust_policy" {
+  statement {
+    actions = ["sts:AssumeRole"]
+    principals {
+      type        = "Service"
+      identifiers = ["vmie.amazonaws.com"]
+    }
+  }
+}
+
+data "aws_iam_policy_document" "vmimport" {
+  statement {
+    actions = [
+      "s3:GetBucketLocation",
+      "s3:GetObject",
+      "s3:ListBucket",
+    ]
+    resources = [
+      "arn:aws:s3:::${data.aws_s3_object.image.bucket}",
+      "arn:aws:s3:::${data.aws_s3_object.image.bucket}/*",
+    ]
+  }
+  statement {
+    actions = [
+      "ec2:ModifySnapshotAttribute",
+      "ec2:CopySnapshot",
+      "ec2:RegisterImage",
+      "ec2:Describe*",
+    ]
+    resources = ["*"]
+  }
+}
+
+resource "aws_iam_role" "vmimport" {
+  name               = "vmimport"
+  assume_role_policy = data.aws_iam_policy_document.vmimport_trust_policy.json
+  inline_policy {
+    name   = "vmimport"
+    policy = data.aws_iam_policy_document.vmimport.json
+  }
+}
+
+# Import to EBS
+resource "aws_ebs_snapshot_import" "image" {
+  disk_container {
+    format = "VHD"
+    user_bucket {
+      s3_bucket = data.aws_s3_object.image.bucket
+      s3_key    = data.aws_s3_object.image.key
+    }
+  }
+
+  role_name = aws_iam_role.vmimport.name
+  lifecycle {
+    replace_triggered_by = [terraform_data.image_replacement]
+  }
+}
+
+# Convert to AMI
+resource "aws_ami" "image" {
+  description         = "Created with NixOS."
+  name                = replace(basename(data.aws_s3_object.image.key), "/\\.vhd$/", "")
+  virtualization_type = "hvm"
+  root_device_name    = "/dev/xvda"
+  ena_support         = true
+
+  ebs_block_device {
+    device_name = "/dev/xvda"
+    snapshot_id = aws_ebs_snapshot_import.image.id
+    volume_size = 17
+  }
+}

hosts/arrow/aws/main.tf

@@ -1,80 +1,13 @@
-locals {
-  image_file = one(fileset(path.root, "result/nixos-amazon-image-*.vhd"))
-}
-
-# Upload to S3
-resource "aws_s3_object" "image" {
-  bucket = "your_bucket_name"
-  key    = basename(local.image_file)
-  source = local.image_file
-  etag   = filemd5(local.image_file)
-}
-
-# Setup IAM access for the VM Importer
-data "aws_iam_policy_document" "vmimport_trust_policy" {
-  statement {
-    actions = ["sts:AssumeRole"]
-    principals {
-      type        = "Service"
-      identifiers = ["vmie.amazonaws.com"]
+terraform {
+  backend "s3" {
+    region         = "us-east-1"
+    dynamodb_table = "terraform-state-lock"
+  }
+  required_version = ">= 1.0.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "5.42.0"
     }
   }
 }
-
-data "aws_iam_policy_document" "vmimport" {
-  statement {
-    actions = [
-      "s3:GetBucketLocation",
-      "s3:GetObject",
-      "s3:ListBucket",
-    ]
-    resources = [
-      "arn:aws:s3:::${aws_s3_object.image.bucket}",
-      "arn:aws:s3:::${aws_s3_object.image.bucket}/*",
-    ]
-  }
-  statement {
-    actions = [
-      "ec2:ModifySnapshotAttribute",
-      "ec2:CopySnapshot",
-      "ec2:RegisterImage",
-      "ec2:Describe*",
-    ]
-    resources = ["*"]
-  }
-}
-
-resource "aws_iam_role" "vmimport" {
-  name               = "vmimport"
-  assume_role_policy = data.aws_iam_policy_document.vmimport_trust_policy.json
-  inline_policy {
-    name   = "vmimport"
-    policy = data.aws_iam_policy_document.vmimport.json
-  }
-}
-
-# Import to EBS
-resource "aws_ebs_snapshot_import" "image" {
-  disk_container {
-    format = "VHD"
-    user_bucket {
-      s3_bucket = aws_s3_object.image.bucket
-      s3_key    = aws_s3_object.image.key
-    }
-  }
-
-  role_name = aws_iam_role.vmimport.name
-}
-
-# Convert to AMI
-resource "aws_ami" "image" {
-  description         = "Created with NixOS."
-  name                = replace(basename(local.image_file), "/\\.vhd$/", "")
-  virtualization_type = "hvm"
-
-  ebs_block_device {
-    device_name = "/dev/xvda"
-    snapshot_id = aws_ebs_snapshot_import.image.id
-    volume_size = 8
-  }
-}

hosts/arrow/aws/outputs.tf

@@ -0,0 +1,3 @@
+output "host_ip" {
+  value = aws_instance.instance.public_ip
+}

hosts/arrow/aws/variables.tf

@@ -0,0 +1,10 @@
+variable "ec2_size" {
+  type        = string
+  description = "Size of instance to launch"
+  default     = "t3a.small" # 2 GB RAM ($14/mo)
+}
+
+variable "images_bucket" {
+  description = "Name of the bucket in which to store the NixOS VM images."
+  type        = string
+}

hosts/arrow/default.nix

@@ -8,9 +8,11 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
-  specialArgs = { };
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
   modules = import ./modules.nix { inherit inputs globals overlays; } ++ [
     {
       # This is the root filesystem containing NixOS
@@ -24,6 +26,16 @@ inputs.nixpkgs.lib.nixosSystem {
         device = "/dev/disk/by-label/boot";
         fsType = "vfat";
       };
+
+      virtualisation.vmVariant = {
+        virtualisation.forwardPorts = [
+          {
+            from = "host";
+            host.port = 2222;
+            guest.port = 22;
+          }
+        ];
+      };
     }
   ];
 }

hosts/arrow/modules.nix

@@ -22,20 +22,10 @@
     cloudflare.enable = true;
     services.openssh.enable = true;
     services.caddy.enable = true;
-    services.transmission.enable = true;
+    services.n8n.enable = true;
 
-    # nix-index seems to each up too much memory for Vultr
+    # 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;
-
-    virtualisation.vmVariant = {
-      virtualisation.forwardPorts = [
-        {
-          from = "host";
-          host.port = 2222;
-          guest.port = 22;
-        }
-      ];
-    };
   }
   ../../modules/common
   ../../modules/nixos

hosts/arrow/vultr/main.tf

@@ -30,15 +30,6 @@ terraform {
   }
 }
 
-# locals {
-#   image_file = one(fileset(path.root, "result/iso/nixos.iso"))
-# }
-
-# variable "cloudflare_r2_endpoint" {
-#   type        = string
-#   description = "Domain for the Cloudflare R2 endpoint"
-# }
-
 variable "vultr_api_key" {
   type        = string
   description = "API key for Vultr management"
@@ -64,18 +55,6 @@ provider "vultr" {
   api_key = var.vultr_api_key
 }
 
-# data "aws_s3_bucket" "images" {
-#   bucket = "noahmasur-arrow-images"
-# }
-#
-# resource "aws_s3_object" "image" {
-#   bucket = data.aws_s3_bucket.images.id
-#   key    = "arrow.iso"
-#   source = local.image_file
-#   etag   = filemd5(local.image_file)
-#   acl    = "public-read"
-# }
-
 resource "vultr_iso_private" "image" {
   # url = "https://${var.cloudflare_account_id}.r2.cloudflarestorage.com/${data.aws_s3_bucket.images.id}/${aws_s3_object.image.key}"
   url = "https://arrow-images.masu.rs/arrow.iso"

hosts/flame/default.nix

@@ -14,9 +14,12 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "aarch64-linux";
-  specialArgs = { };
+  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
@@ -59,7 +62,7 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # Still require colors for programs like Neovim, K9S
       theme = {
-        colors = (import ../../colorscheme/gruvbox).dark;
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
       };
 
       # Programs and services
@@ -68,6 +71,7 @@ inputs.nixpkgs.lib.nixosSystem {
       dotfiles.enable = true; # Clone dotfiles
       neovim.enable = true;
       giteaRunner.enable = true;
+      services.actualbudget.enable = true;
       services.caddy.enable = true;
       services.grafana.enable = true;
       services.thelounge.enable = true;
@@ -77,6 +81,11 @@ inputs.nixpkgs.lib.nixosSystem {
       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.postgresql.enable = true;
+      services.uptime-kuma.enable = true;
+      system.autoUpgrade.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
@@ -91,6 +100,7 @@ inputs.nixpkgs.lib.nixosSystem {
         endpoint = "s3.us-west-002.backblazeb2.com";
         bucket = "noahmasur-backup";
         accessKeyId = "0026b0e73b2e2c80000000005";
+        resticBucket = "noahmasur-restic";
       };
 
       # Disable passwords, only use SSH key

hosts/hydra/default.nix

@@ -45,7 +45,6 @@ inputs.nixpkgs.lib.nixosSystem {
       mail.aerc.enable = true;
       mail.himalaya.enable = true;
       dotfiles.enable = true;
-      nixlang.enable = true;
       lua.enable = true;
     }
   ];

hosts/lookingglass/default.nix

@@ -23,9 +23,11 @@ inputs.darwin.lib.darwinSystem {
       }
     )
     inputs.home-manager.darwinModules.home-manager
+    inputs.mac-app-util.darwinModules.default
     {
       nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
-      networking.hostName = "lookingglass";
+      networking.hostName = "NYCM-NMASUR2";
+      networking.computerName = "NYCM-NMASUR2";
       identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
       gui.enable = true;
       theme = {
@@ -43,7 +45,6 @@ inputs.darwin.lib.darwinSystem {
       discord.enable = true;
       firefox.enable = true;
       dotfiles.enable = true;
-      nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
       rust.enable = true;
@@ -52,6 +53,8 @@ inputs.darwin.lib.darwinSystem {
       kubernetes.enable = true;
       _1password.enable = true;
       slack.enable = true;
+      wezterm.enable = true;
+      yt-dlp.enable = true;
     }
   ];
 }

hosts/swan/default.nix

@@ -8,9 +8,12 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
-  specialArgs = { };
+  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
@@ -64,6 +67,14 @@ inputs.nixpkgs.lib.nixosSystem {
         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" ];
@@ -94,8 +105,11 @@ inputs.nixpkgs.lib.nixosSystem {
       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.immich.enable = true;
       services.jellyfin.enable = true;
       services.nextcloud.enable = true;
       services.calibre-web.enable = true;
@@ -105,6 +119,7 @@ inputs.nixpkgs.lib.nixosSystem {
       services.samba.enable = true;
       services.paperless.enable = true;
       services.postgresql.enable = true;
+      system.autoUpgrade.enable = false;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
@@ -119,6 +134,7 @@ inputs.nixpkgs.lib.nixosSystem {
         endpoint = "s3.us-west-002.backblazeb2.com";
         bucket = "noahmasur-backup";
         accessKeyId = "0026b0e73b2e2c80000000005";
+        resticBucket = "noahmasur-restic";
       };
 
       # Disable passwords, only use SSH key

hosts/tempest/default.nix

@@ -8,8 +8,12 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+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
@@ -37,6 +41,12 @@ inputs.nixpkgs.lib.nixosSystem {
       boot.kernelModules = [ "kvm-amd" ];
       services.xserver.videoDrivers = [ "amdgpu" ];
 
+      # I don't think I need this?
+      # boot.kernelParams = [
+      #   "video=DP-0:2560x1440@165"
+      #   "video=DP-1:1920x1080@60"
+      # ];
+
       # Required binary blobs to boot on this machine
       hardware.enableRedistributableFirmware = true;
 
@@ -110,14 +120,15 @@ inputs.nixpkgs.lib.nixosSystem {
       mail.himalaya.enable = true;
       keybase.enable = true;
       mullvad.enable = false;
-      nixlang.enable = true;
       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;

modules/aws/default.nix

@@ -1,15 +1,9 @@
 { ... }:
 {
-  config = {
-    # AWS settings require this
-    permitRootLogin = "prohibit-password";
+  # AWS settings require this
+  permitRootLogin = "prohibit-password";
 
-    # Make sure disk size is large enough
-    # https://github.com/nix-community/nixos-generators/issues/150
-    formatConfigs.amazon =
-      { config, ... }:
-      {
-        amazonImage.sizeMB = 16 * 1024;
-      };
-  };
+  # Make sure disk size is large enough
+  # https://github.com/nix-community/nixos-generators/issues/150
+  amazonImage.sizeMB = 16 * 1024;
 }

modules/common/applications/1password.nix

@@ -22,10 +22,9 @@
       "1password-cli"
     ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [
-        _1password-gui
-        _1password
-      ];
+      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

modules/common/applications/default.nix

@@ -11,6 +11,7 @@
     ./obsidian.nix
     ./qbittorrent.nix
     ./slack.nix
+    ./wezterm.nix
     ./yt-dlp.nix
   ];
 }

modules/common/applications/firefox.nix

@@ -35,7 +35,6 @@
           # https://nur.nix-community.org/repos/rycee/
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
             (lib.mkIf config._1password.enable onepassword-password-manager)
-            pkgs.bypass-paywalls-clean
             darkreader
             don-t-fuck-with-paste
             facebook-container
@@ -72,6 +71,8 @@
             "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 {
@@ -158,13 +159,26 @@
         };
       };
 
+      # 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" ];
+          "text/html" = [ "firefox.desktop" ];
         };
         defaultApplications = {
-          "text.html" = [ "firefox.desktop" ];
+          "text/html" = [ "firefox.desktop" ];
         };
+        associations.removed = {
+          "text/html" = [ "wine-extension-htm.desktop" ];
+        };
+
       };
 
       xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {

modules/common/applications/kitty.nix

@@ -22,7 +22,7 @@
     environment =
       { }
       // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
+        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
       };
 
     home-manager.users.${config.user} = {
@@ -31,13 +31,16 @@
       xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
 
       # Set the Rofi terminal for running programs
-      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
 
       # Display images in the terminal
-      programs.fish.shellAliases = {
-        icat = "kitty +kitten icat";
-        ssh = "kitty +kitten ssh";
-      };
+      programs.fish.interactiveShellInit = # fish
+        ''
+          if test "$TERM" = "xterm-kitty"
+              alias icat="kitty +kitten icat"
+              alias ssh="kitty +kitten ssh"
+          end
+        '';
 
       programs.kitty = {
         enable = true;
@@ -50,18 +53,9 @@
 
           # Easy fullscreen toggle (for macOS)
           "super+f" = "toggle_fullscreen";
-
-          # Kitty scrollback nvim
-          "kitty_mod+h" = "kitty_scrollback_nvim";
-          "kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
         };
         settings = {
 
-          # Required for kitty-scrollback.nvim
-          allow_remote_control = "socket-only";
-          listen_on = "unix:/tmp/kitty";
-          action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
-
           # 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;

modules/common/applications/obsidian.nix

@@ -23,6 +23,6 @@
 
     # 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" ];
+    insecurePackages = [ "electron-25.9.0" ];
   };
 }

modules/common/applications/slack.nix

@@ -21,4 +21,6 @@
       home.packages = with pkgs; [ slack ];
     };
   };
+
+  # Theme string: #1D2122,#665C54,#8EC07C,#BDAE93
 }

modules/common/applications/wezterm.nix

@@ -0,0 +1,286 @@
+{
+  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";
+        };
+
+      terminal = "${pkgs.wezterm}/bin/wezterm";
+      terminalLaunchCommand = "${config.terminal} start --";
+
+      home-manager.users.${config.user} = {
+
+        # Set the i3 terminal
+        xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "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 = ''
+            local wezterm = require("wezterm")
+            local config = wezterm.config_builder()
+            config.check_for_updates = false
+            config.color_scheme = "myTheme"
+
+            -- Scrollback
+            config.scrollback_lines = 10000
+
+            -- Window
+            config.window_padding = {
+              left = 10,
+              right = 10,
+              top = 10,
+              bottom = 12,
+            }
+
+            config.font = wezterm.font('${font}', { weight = 'Bold'})
+            config.font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"}
+
+            -- Fix color blocks instead of text
+            config.front_end = "WebGpu"
+
+            -- Tab Bar
+            config.hide_tab_bar_if_only_one_tab = true
+            config.window_frame = {
+              font = wezterm.font('${font}', { weight = 'Bold'}),
+              font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
+            }
+
+            config.colors = {
+              tab_bar = {
+                active_tab = {
+                  bg_color = '${config.theme.colors.base00}',
+                  fg_color = '${config.theme.colors.base04}',
+                },
+              },
+            }
+
+            -- Disable audio
+            config.audible_bell = "Disabled"
+
+            config.initial_rows = 80
+            config.initial_cols = 200
+
+            config.unix_domains = {
+              {
+                name = 'unix',
+              },
+            }
+
+            -- This causes `wezterm` to act as though it was started as
+            -- `wezterm connect unix` by default, connecting to the unix
+            -- domain on startup.
+            -- If you prefer to connect manually, leave out this line.
+            config.default_gui_startup_args = { 'connect', 'unix' }
+
+            config.leader = {
+              key = 'a',
+              mods = 'CTRL',
+              timeout_milliseconds = 2000,
+            }
+
+            config.keys = {
+              -- Attach to muxer
+              {
+                key = 'a',
+                mods = 'LEADER',
+                action = wezterm.action.AttachDomain 'unix',
+              },
+
+              -- Detach from muxer
+              {
+                key = 'd',
+                mods = 'LEADER',
+                action = wezterm.action.DetachDomain { DomainName = 'unix' },
+              },
+              -- 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),
+              },
+            }
+
+            -- print the workspace name at the upper right
+            wezterm.on("update-right-status", function(window, pane)
+              window:set_right_status(window:active_workspace())
+            end)
+            -- load plugin
+            local workspace_switcher = wezterm.plugin.require("https://github.com/MLFlexer/smart_workspace_switcher.wezterm")
+            -- set path to zoxide
+            workspace_switcher.zoxide_path = "${pkgs.zoxide}/bin/zoxide"
+            -- keymaps
+            table.insert(config.keys, { key = "s", mods = "CTRL|SHIFT", action = workspace_switcher.switch_workspace() })
+            -- table.insert(config.keys, { key = "t", mods = "CTRL|SHIFT", action = wezterm.action.ShowLauncherArgs({ flags = "FUZZY|WORKSPACES" }) })
+            table.insert(config.keys, { key = "[", mods = "CTRL|SHIFT", action = wezterm.action.SwitchWorkspaceRelative(1) })
+            table.insert(config.keys, { key = "]", mods = "CTRL|SHIFT", action = wezterm.action.SwitchWorkspaceRelative(-1) })
+
+            return config
+          '';
+        };
+      };
+    };
+}

modules/common/default.nix

@@ -76,7 +76,24 @@
       description = "List of unfree packages to allow.";
       default = [ ];
     };
+    insecurePackages = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "List of insecure packages to allow.";
+      default = [ ];
+    };
     hostnames = {
+      audiobooks = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for audiobook server (Audiobookshelf).";
+      };
+      budget = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for budgeting server (ActualBudget).";
+      };
+      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).";
@@ -93,6 +110,10 @@
         type = lib.types.str;
         description = "Hostname for document server (paperless-ngx).";
       };
+      photos = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for photo management (Immich).";
+      };
       prometheus = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for Prometheus server.";
@@ -125,6 +146,18 @@
         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).";
@@ -157,6 +190,9 @@
       # Retrieves package object based on string name
       nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;
 
+      # Allow specified insecure packages (identified elsewhere)
+      nixpkgs.config.permittedInsecurePackages = config.insecurePackages;
+
       # Pin a state version to prevent warnings
       home-manager.users.${config.user}.home.stateVersion = stateVersion;
       home-manager.users.root.home.stateVersion = stateVersion;

modules/common/mail/aerc.nix

@@ -158,14 +158,19 @@
           };
         };
         extraConfig = {
-          general.unsafe-accounts-conf = true;
+          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/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";
@@ -186,26 +191,25 @@
         };
       };
 
-      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
+      xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
         name = "aerc";
-        exec = "kitty aerc %u";
+        exec = "${config.terminalLaunchCommand} 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"
-            ''
-          )
-        }";
+        "${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 ${config.terminal} start --class aerc -- aerc"
+                    sleep 0.25
+                fi
+                i3-msg "[class=aerc] focus"
+              ''
+            )
+          }";
       };
 
       programs.fish.shellAbbrs = {

modules/common/neovim/config/bufferline.nix

@@ -6,6 +6,7 @@
   plugins = [
     pkgs.vimPlugins.bufferline-nvim
     pkgs.vimPlugins.vim-bbye # Better closing of buffers
+    pkgs.vimPlugins.snipe-nvim # Jump between open buffers
   ];
   setup.bufferline = {
     options = {
@@ -15,6 +16,7 @@
       offsets = [ { filetype = "NvimTree"; } ];
     };
   };
+  setup.snipe = { };
   lua = ''
     -- Move buffers
     vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
@@ -22,5 +24,7 @@
 
     -- Kill buffer
     vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
-  '';
+
+    -- Jump to buffer
+    vim.keymap.set("n", "gb", require("snipe").open_buffer_menu, { silent = true }) '';
 }

modules/common/neovim/config/completion.nix

@@ -2,6 +2,7 @@
 {
 
   plugins = [
+    pkgs.vimPlugins.nvim-cmp
     pkgs.vimPlugins.cmp-nvim-lsp
     pkgs.vimPlugins.cmp-buffer
     pkgs.vimPlugins.cmp-path
@@ -26,15 +27,21 @@
 
     # Basic completion keybinds
     mapping = {
-      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
-      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
-      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
-      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<C-n>']" =
+        dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { '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()";
-      "['<CR>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
-      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<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({
@@ -44,7 +51,7 @@
             vim.cmd("stopinsert") --- Abort and leave insert mode
         end
       '';
-      "['<C-l>']" = dsl.rawLua ''
+      "['<C-k>']" = dsl.rawLua ''
         cmp.mapping(function(_)
             if require("luasnip").expand_or_jumpable() then
                 require("luasnip").expand_or_jump()
@@ -128,16 +135,44 @@
     };
   };
 
-  lua = ''
+  lua' = ''
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
-        sources = {
-            { name = "buffer", keyword_length = 5 },
+        mapping = {
+            ['<C-n>'] = {
+                c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-p>'] = {
+                c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-y>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
+            },
+            ['<C-r>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
+            },
         },
+        sources = require('cmp').config.sources({
+            { name = "buffer", keyword_length = 5 },
+        }),
     })
 
     -- Use cmdline & path source for ':'
     require('cmp').setup.cmdline(":", {
+        mapping = {
+            ['<C-n>'] = {
+                c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-p>'] = {
+                c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-y>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
+            },
+            ['<C-r>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
+            },
+        },
         sources = require('cmp').config.sources({
             { name = "path" },
         }, {

modules/common/neovim/config/github.lua

@@ -2,8 +2,11 @@
 vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
 
 -- Pop a terminal to watch the current run
-local gitwatch =
-    require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+local gitwatch = require("toggleterm.terminal").Terminal:new({
+    cmd = "fish --interactive --init-command 'gh run watch'",
+    hidden = true,
+    direction = "float",
+})
 
 -- Set a toggle for this terminal
 function GITWATCH_TOGGLE()
@@ -11,4 +14,4 @@ function GITWATCH_TOGGLE()
 end
 
 -- Keymap to toggle the run
-vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
+vim.keymap.set("n", "<Leader>W", GITWATCH_TOGGLE)

modules/common/neovim/config/lsp.nix

@@ -18,9 +18,12 @@
       pkgs.vimPlugins.conform-nvim
       pkgs.vimPlugins.fidget-nvim
       pkgs.vimPlugins.nvim-lint
+      pkgs.vimPlugins.vim-table-mode
+      pkgs.vimPlugins.tiny-inline-diagnostic-nvim
     ];
 
     setup.fidget = { };
+    setup.tiny-inline-diagnostic = { };
 
     use.lspconfig.lua_ls.setup = dsl.callWith {
       settings = {
@@ -37,8 +40,8 @@
       cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
     };
 
-    use.lspconfig.nil_ls.setup = dsl.callWith {
-      cmd = [ "${pkgs.nil}/bin/nil" ];
+    use.lspconfig.nixd.setup = dsl.callWith {
+      cmd = [ "${pkgs.nixd}/bin/nixd" ];
       capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
     };
 
@@ -70,6 +73,9 @@
           files = {
             excludeDirs = [ ".direnv" ];
           };
+          cargo = {
+            features = "all";
+          };
         };
       };
     };
@@ -88,7 +94,7 @@
         rust = [ "rustfmt" ];
         sh = [ "shfmt" ];
         terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
-        hcl = if config.terraform then [ "terraform_fmt" ] else [ ];
+        hcl = [ "hcl" ];
       };
       formatters = {
         lua.command = "${pkgs.stylua}/bin/stylua";
@@ -105,6 +111,7 @@
           ];
         };
         terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+        hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
       };
     };
 
@@ -131,6 +138,9 @@
 
       -- Prevent infinite log size (change this when debugging)
       vim.lsp.set_log_level("off")
+
+      -- Hide buffer diagnostics (use tiny-inline-diagnostic.nvim instead)
+      vim.diagnostic.config({ virtual_text = false })
     '';
   };
 }

modules/common/neovim/config/misc.nix

@@ -10,23 +10,20 @@
     pkgs.vimPlugins.vim-eunuch # File manipulation commands
     pkgs.vimPlugins.vim-fugitive # Git commands
     pkgs.vimPlugins.vim-repeat # Better repeat using .
-    pkgs.vimPlugins.comment-nvim # Smart comment commands
-    pkgs.vimPlugins.glow-nvim # Markdown preview popup
+    pkgs.vimPlugins.vim-abolish # Keep capitalization in substitute (Subvert)
+    pkgs.vimPlugins.markview-nvim # Markdown preview
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper
-    pkgs.vimPlugins.kitty-scrollback-nvim # Scrollback pager for kitty
   ];
 
   # Initialize some plugins
-  setup.Comment = { };
   setup.colorizer = {
     user_default_options = {
       names = false;
     };
   };
-  setup.glow = { };
+  setup.markview = { };
   setup.which-key = { };
-  setup.kitty-scrollback = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -44,7 +41,6 @@
     scrolloff = 3; # Margin of lines to see while scrolling
     splitright = true; # Vertical splits on the right side
     splitbelow = true; # Horizontal splits on the bottom side
-    pastetoggle = "<F3>"; # Use F3 to enter raw paste mode
     clipboard = "unnamedplus"; # Uses system clipboard for yanking
     updatetime = 300; # Faster diagnostics
     mouse = "nv"; # Mouse interaction / scrolling
@@ -62,8 +58,8 @@
 
   # Better backup, swap and undo storage
   vim.o.backup = true; # Easier to recover and more secure
-  vim.bo.swapfile = false; # Instead of swaps, create backups
-  vim.bo.undofile = true; # Keeps undos after quit
+  vim.opt.undofile = true; # Keeps undos after quit
+  vim.opt.swapfile = false; # Instead of swaps, create backups
   vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
   vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
 

modules/common/neovim/config/syntax.nix

@@ -26,7 +26,6 @@
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
     pkgs.vimPlugins.vim-helm
-    pkgs.vimPlugins.baleia-nvim # Clean ANSI from kitty scrollback
     # pkgs.vimPlugins.hmts-nvim # Tree-sitter injections for home-manager
     (pkgs.vimUtils.buildVimPlugin {
       pname = "nmasur";

modules/common/neovim/config/toggleterm.lua

@@ -21,7 +21,7 @@ function TERM_TOGGLE()
     basicterminal:toggle()
 end
 
-local nixpkgs = terminal:new({ cmd = "nix repl '<nixpkgs>'" })
+local nixpkgs = terminal:new({ cmd = "nix repl --expr 'import <nixpkgs>{}'" })
 function NIXPKGS_TOGGLE()
     nixpkgs:toggle()
 end

modules/common/neovim/default.nix

@@ -48,17 +48,11 @@ in
           };
         };
 
-        # Set Neovim as the kitty terminal "scrollback" (vi mode) option.
-        # Requires removing some of the ANSI escape codes that are sent to the
-        # scrollback using sed and baleia, as well as removing several
-        # unnecessary features.
-        programs.kitty.settings.scrollback_pager = "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
-
         # 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 {
+        xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
           name = "Neovim wrapper";
-          exec = "kitty nvim %F";
+          exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} nvim %F";
           mimeType = [
             "text/plain"
             "text/markdown"

modules/common/neovim/lua/keybinds.lua

@@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
 key("n", "cq", ":cclose<CR>")
 
 -- Other
-key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
-key("n", "Y", "y$")                                         --- Copy to end of line
+key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
+key("n", "Y", "y$") --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
-key("v", "D", "y'>gp")                                      --- Duplicate selected
-key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
+key("v", "D", "y'>gp") --- Duplicate selected
+key("x", "<Leader>p", '"_dP') --- Paste but keep register

modules/common/neovim/lua/settings.lua

@@ -11,8 +11,20 @@ vim.filetype.add({
 })
 
 vim.api.nvim_create_autocmd("FileType", {
-    pattern = "*.eml",
+    pattern = "mail",
     callback = function()
         vim.o.wrapmargin = 79 -- Wrap text automatically
     end,
 })
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "markdown",
+    command = "TableModeEnable",
+})
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "terraform",
+    callback = function()
+        vim.bo.commentstring = "# %s"
+    end,
+})

modules/common/programming/default.nix

@@ -5,7 +5,6 @@
     ./haskell.nix
     ./kubernetes.nix
     ./lua.nix
-    ./nix.nix
     ./python.nix
     ./rust.nix
     ./terraform.nix

modules/common/programming/nix.nix

@@ -1,21 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.nixlang.enable = lib.mkEnableOption "Nix programming language.";
-
-  config = lib.mkIf config.nixlang.enable {
-
-    home-manager.users.${config.user} = {
-
-      home.packages = with pkgs; [
-        nixfmt-rfc-style # Nix file formatter
-        nil # Nix language server
-      ];
-    };
-  };
-}

modules/common/programming/python.nix

@@ -14,7 +14,7 @@
 
       home.packages = with pkgs; [
         # python310 # Standard Python interpreter
-        nodePackages.pyright # Python language server
+        pyright # Python language server
         black # Python formatter
         python310Packages.flake8 # Python linter
       ];

modules/common/shell/bash/scripts/aws-ec2.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Retrieve list of AWS instances
+# Use enter to jump into their sessions with SSM
+
+# Specify AWS_PROFILE and AWS_REGION before running this script
+
+aws ec2 describe-instances \
+    --filters "Name=instance-state-name,Values=running" |
+    jq -r \
+        '.Reservations[]
+        | .Instances[]
+        | .InstanceId + " - " +
+        (.PrivateIpAddress // "n/a") + " - " +
+        (.PublicIpAddress // "n/a") + " - " +
+        (.Tags // [] | from_entries | .Name // "n/a")' |
+    fzf \
+        --height 100% \
+        --layout reverse \
+        --header $'Press Enter to start SSM session\nInstance ID - Private IP - Public IP - Name' \
+        --preview "aws ec2 describe-instances --instance-ids \"\$(echo {} | cut -d' ' -f1)\" | jq -r '.Reservations[].Instances[0]'" \
+        --bind "enter:become(aws ssm start-session --target \$(echo {} | cut -d' ' -f1))"

modules/common/shell/bash/scripts/jqr.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Adapted from: https://gist.github.com/reegnz/b9e40993d410b75c2d866441add2cb55
+
+if [[ -z $1 ]] || [[ $1 == "-" ]]; then
+    input=$(mktemp)
+    trap 'rm -f $input' EXIT
+    cat /dev/stdin >"$input"
+else
+    input=$1
+fi
+
+echo '' |
+    fzf --phony \
+        --height 100% \
+        --preview-window='up:80%' \
+        --query '.' \
+        --print-query \
+        --header $'CTRL-O: jq output\nCTRL-Y: copy output\nALT-Y: copy query' \
+        --preview "jq --color-output -r {q} $input" \
+        --bind "ctrl-o:execute(jq -r {q} $input)+clear-query+accept" \
+        --bind "alt-y:execute(echo {q} | pbcopy)" \
+        --bind "ctrl-y:execute(jq -r {q} $input | pbcopy)"

modules/common/shell/bash/scripts/terraform-init.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+export AWS_PROFILE="gs"
+
+BUCKET_NAME_PART_1="t2"
+BUCKET_NAME_PART_2="global"
+BUCKET_NAME_PART_3="terraformstate"
+
+PROJECT_ROOT=$(git rev-parse --show-toplevel)
+WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/terraform.yml"
+
+if [ ! -f "$WORKFLOW_FILE" ]; then
+    WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/apply.yml"
+fi
+
+AWS_ACCOUNT_NUMBER=$(
+    awk '/aws_account_number: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
+        echo "$(
+            read -r s
+            s=${s//\'/}
+            echo "$s"
+        )" # Remove single quote if it exists
+)
+
+if [ -z "${AWS_ACCOUNT_NUMBER}" ]; then
+    AWS_ACCOUNT_NUMBER=$(
+        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
+            echo "$(
+                read -r s
+                s=${s//\'/}
+                echo "$s"
+            )" # Remove single quote if it exists
+    )
+fi
+
+REPOSITORY=$(
+    git remote get-url origin |
+        awk -F'/' -v OFS='/' '{print $(NF-1),$NF }' |
+        echo "$(
+            read -r s
+            s=${s%.git}
+            echo "$s"
+        )" # Remove .git suffix if it exists
+)
+BRANCH=$(git branch --show-current)
+
+terraform init \
+    -backend-config="region=us-east-1" \
+    -backend-config="bucket=${BUCKET_NAME_PART_1}${BUCKET_NAME_PART_2}${BUCKET_NAME_PART_3}" \
+    -backend-config="workspace_key_prefix=accounts/${AWS_ACCOUNT_NUMBER}/${REPOSITORY}" \
+    -backend-config="key=state.tfstate" \
+    -backend-config="dynamodb_table=global-tf-state-lock" \
+    -upgrade
+
+terraform workspace select "$BRANCH"

modules/common/shell/fish/default.nix

@@ -76,6 +76,10 @@
           description = "Full git commit on notes";
           body = builtins.readFile ./functions/syncnotes.fish;
         };
+        _which = {
+          description = "Identify the path to a program in the shell";
+          body = "command --search (string sub --start=2 $argv)";
+        };
       };
       interactiveShellInit = ''
         fish_vi_key_bindings
@@ -101,10 +105,18 @@
         "-" = "cd -";
         mkd = "mkdir -pv";
 
+        # Convert a program into its full path
+        "=" = {
+          position = "anywhere";
+          regex = "=\\w+";
+          function = "_which";
+        };
+
         # System
         s = "sudo";
         sc = "systemctl";
         scs = "systemctl status";
+        sca = "systemctl cat";
         m = "make";
         t = "trash";
 

modules/common/shell/fish/functions/edit.fish

@@ -1,4 +1,4 @@
 set vimfile (fzf)
 and set vimfile (echo $vimfile | tr -d '\r')
-and commandline -r "vim $vimfile"
+and commandline -r "vim \"$vimfile\""
 and commandline -f execute

modules/common/shell/fzf.nix

@@ -41,5 +41,16 @@
         FZF_CTRL_T_COMMAND = fzfCommand;
         FZF_DEFAULT_OPTS = "-m --height 50% --border";
       };
+
+    home.packages = [
+      (pkgs.writeShellApplication {
+        name = "jqr";
+        runtimeInputs = [
+          pkgs.jq
+          pkgs.fzf
+        ];
+        text = builtins.readFile ./bash/scripts/jqr.sh;
+      })
+    ];
   };
 }

modules/common/shell/git.nix

@@ -113,6 +113,11 @@ in
         gpd = "git push origin -d";
         gbd = "git branch -d";
         gbD = "git branch -D";
+        gdd = {
+          position = "anywhere";
+          setCursor = true;
+          expansion = "BRANCH=% git push origin -d $BRANCH and git branch -d $BRANCH";
+        };
         gr = "git reset";
         grh = "git reset --hard";
         gm = "git merge";
@@ -158,6 +163,13 @@ in
                 and git branch -D $branch
               '';
             };
+            git-delete-both = {
+              argumentNames = "branch";
+              body = ''
+                git push origin -d $branch
+                git branch -d $branch
+              '';
+            };
             git-merge-fuzzy = {
               body = ''
                 set branch (git-fuzzy-branch "merge from...")

modules/common/shell/github.nix

@@ -6,13 +6,19 @@
 }:
 {
 
+  unfreePackages = [ "gh-copilot" ];
+
   home-manager.users.${config.user} = {
 
     programs.gh = lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
       enable = true;
       gitCredentialHelper.enable = true;
       settings.git_protocol = "https";
-      extensions = [ pkgs.gh-collaborators ];
+      extensions = [
+        pkgs.gh-collaborators
+        pkgs.gh-dash
+        pkgs.gh-copilot
+      ];
     };
 
     programs.fish = lib.mkIf config.home-manager.users.${config.user}.programs.gh.enable {
@@ -51,7 +57,7 @@
         esac
 
         selected=$(gh repo list "$organization" \
-            --limit 100 \
+            --limit 1000 \
             --no-archived \
             --json=name,description,isPrivate,updatedAt,primaryLanguage \
             | jq -r '.[] | .name + "," + if .description == "" then "-" else .description |= gsub(","; " ") | .description end + "," + .updatedAt + "," + .primaryLanguage.name' \

modules/common/shell/nixpkgs.nix

@@ -13,12 +13,18 @@
         ns = "nix-shell -p";
         nsf = "nix-shell --run fish -p";
         nsr = "nix-shell-run";
-        nps = "nix repl '<nixpkgs>'";
+        nps = "nix repl --expr 'import <nixpkgs>{}'";
         nixo = "man configuration.nix";
         nixh = "man home-configuration.nix";
-        nr = "rebuild-nixos";
-        nro = "rebuild-nixos offline";
-        hm = "rebuild-home";
+        nr = {
+          function = "rebuild-nixos";
+        };
+        nro = {
+          function = "rebuild-nixos-offline";
+        };
+        hm = {
+          function = "rebuild-home";
+        };
       };
       functions = {
         nix-shell-run = {
@@ -42,19 +48,20 @@
         };
         rebuild-nixos = {
           body = ''
-            if test "$argv[1]" = "offline"
-                set option "--option substitute false"
-            end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "doas nixos-rebuild switch $option --flake ${config.dotfilesPath}#${config.networking.hostName}"
-            commandline --function execute
+            echo "doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName}"
+          '';
+        };
+        rebuild-nixos-offline = {
+          body = ''
+            git -C ${config.dotfilesPath} add --intent-to-add --all
+            echo "doas nixos-rebuild switch --option substitute false --flake ${config.dotfilesPath}#${config.networking.hostName}"
           '';
         };
         rebuild-home = {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
-            commandline --function execute
+            echo "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
           '';
         };
       };
@@ -91,12 +98,6 @@
     # Set channel to flake packages, used for nix-shell commands
     nixPath = [ "nixpkgs=${pkgs.path}" ];
 
-    # Set registry to this flake's packages, used for nix X commands
-    registry.nixpkgs.to = {
-      type = "path";
-      path = builtins.toString pkgs.path;
-    };
-
     # For security, only allow specific users
     settings.allowed-users = [
       "@wheel"

modules/common/shell/utilities.nix

@@ -31,12 +31,14 @@ in
         jo # JSON output
         jq # JSON manipulation
         lf # File viewer
+        osc # Clipboard over SSH
         qrencode # Generate qr codes
         rsync # Copy folders
-        ren # Rename files
+        # ren # Rename files
         # rep # Replace text in files
         ripgrep # grep
         sd # sed
+        spacer # Output lines in terminal
         tealdeer # Cheatsheets
         tree # View directory hierarchy
         vimv-rs # Batch rename files

modules/common/shell/work.nix

@@ -12,41 +12,56 @@
     home.packages =
       let
         ldap_scheme = "ldaps";
-        magic_number = "2";
-        magic_end_seq = "corp";
         magic_prefix = "take";
-        ldap_host = "${magic_prefix}${magic_number}.t${magic_number}.${magic_end_seq}";
-        ldap_port = 636;
-        ldap_dc_1 = "${magic_prefix}${magic_number}";
-        ldap_dc_2 = "t${magic_number}";
-        ldap_dc_3 = magic_end_seq;
+        ldap_port = 3269;
+        jq_parse = pkgs.writeShellScriptBin "ljq" ''
+          jq --slurp \
+            --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
+        '';
         ldap_script = pkgs.writeShellScriptBin "ldap" ''
-          # if ! [ "$LDAP_HOST" ]; then
-          #     echo "No LDAP_HOST specified!"
-          #     exit 1
-          # fi
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
           SEARCH_FILTER="$@"
           ldapsearch -LLL \
               -B -o ldif-wrap=no \
-              -H "${ldap_scheme}://${ldap_host}:${builtins.toString ldap_port}" \
-              -D "${pkgs.lib.toUpper magic_prefix}${magic_number}\\${pkgs.lib.toLower config.user}" \
-              -w "$(${pkgs._1password}/bin/op item get T${magic_number} --fields label=password)" \
-              -b "DC=${ldap_dc_1},DC=${ldap_dc_2},DC=${ldap_dc_3}" \
-              -s "sub" -x "(cn=$SEARCH_FILTER)" \
-              | jq --slurp \
-                  --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
+              -E pr=5000/prompt \
+              -H "${ldap_scheme}://''${LDAP_HOST}:${builtins.toString ldap_port}" \
+              -D "${pkgs.lib.toUpper magic_prefix}2\\${pkgs.lib.toLower config.user}" \
+              -w "$(${pkgs._1password-cli}/bin/op item get T2 --fields label=password --reveal)" \
+              -b "dc=''${LDAP_HOST//./,dc=}" \
+              -s "sub" -x "(cn=''${SEARCH_FILTER})" \
+              | ${jq_parse}/bin/ljq
         '';
         ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
           ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
         '';
         ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
           ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
         '';
+        ldapl_script = pkgs.writeShellScriptBin "ldapl" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
+          ${ldap_script}/bin/ldap "*$@*" | jq -r '.[].name'
+        '';
       in
       [
         ldap_script
         ldapm_script
         ldapg_script
+        ldapl_script
+        jq_parse
       ];
   };
 }

modules/darwin/fonts.nix

@@ -8,14 +8,14 @@
 
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
-    home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ];
+    home.packages = with pkgs; [ nerd-fonts.victor-mono ];
 
     programs.alacritty.settings = {
       font.normal.family = "VictorMono";
     };
 
     programs.kitty.font = {
-      package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; });
+      package = pkgs.nerd-fonts.victor-mono;
       name = "VictorMono Nerd Font Mono";
     };
   };

modules/darwin/hammerspoon.nix

@@ -18,7 +18,7 @@
         src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
         firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
         discord = "${pkgs.discord}/Applications/Discord.app";
-        kitty = "${pkgs.kitty}/Applications/kitty.app";
+        wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
         obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
         slack = "${pkgs.slack}/Applications/Slack.app";
       };
@@ -36,7 +36,7 @@
     homebrew.casks = [ "hammerspoon" ];
 
     system.activationScripts.postUserActivation.text = ''
-      defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
+      defaults write org.hammerspoon.Hammerspoon MJConfigFile "${config.homePath}/.config/hammerspoon/init.lua"
       sudo killall Dock
     '';
   };

modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -56,7 +56,7 @@ function obj:init()
     -- Launcher shortcuts
     self.launcher:bind("ctrl", "space", function() end)
     self.launcher:bind("", "return", function()
-        self:switch("@kitty@")
+        self:switch("@wezterm@")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")

modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua

@@ -41,15 +41,15 @@ local function worklayout()
         local u = hs.geometry.unitrect
         -- set the layout
         local left = {
-            { "kitty", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
+            { "WezTerm", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
         }
         local right = {
-            { "Slack",   nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1),         nil, nil, visible = true },
-            { "Mail",    nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1),         nil, nil, visible = true },
+            { "Slack", nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1), nil, nil, visible = true },
+            { "Mail", nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1), nil, nil, visible = true },
             { "zoom.us", nil, WORK_ONLY_MONITOR, u(5 / 8, 1 / 4, 1 / 4, 1 / 2), nil, nil, visible = true },
         }
         local laptop = {
-            { "Firefox",  nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
+            { "Firefox", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
             { "Obsidian", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
             { "Calendar", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
         }

modules/darwin/homebrew.nix

@@ -20,7 +20,10 @@
     '';
 
     # Add homebrew paths to CLI path
-    home-manager.users.${config.user}.home.sessionPath = [ "/opt/homebrew/bin/" ];
+    home-manager.users.${config.user}.home.sessionPath = [
+      "/opt/homebrew/bin/"
+      "/opt/homebrew/opt/trash/bin/"
+    ];
 
     homebrew = {
       enable = true;
@@ -44,8 +47,9 @@
         "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
-        # "steam" # Not packaged for Nix
-        # "epic-games" # Not packaged for Nix
+        "notunes" # Don't launch Apple Music with the play button
+        "steam" # Not packaged for Nixon macOS
+        "epic-games" # Not packaged for Nix
       ];
     };
   };

modules/darwin/networking.nix

@@ -6,11 +6,12 @@
 }:
 {
 
-  config = lib.mkIf pkgs.stdenv.isDarwin {
-    networking = {
-      computerName = config.networking.hostName;
-      # Adjust if necessary
-      # hostName = "";
-    };
-  };
+  #   config = lib.mkIf pkgs.stdenv.isDarwin {
+  #     networking = {
+  #       computerName = config.networking.hostName;
+  #       # Adjust if necessary
+  #       # hostName = "";
+  #     };
+  #   };
+  # }
 }

modules/darwin/nixpkgs.nix

@@ -10,25 +10,30 @@
 
     programs.fish = {
       shellAbbrs = {
-        nr = lib.mkForce "rebuild-darwin";
-        nro = lib.mkForce "rebuild-darwin offline";
+        nr = {
+          function = lib.mkForce "rebuild-darwin";
+        };
+        nro = {
+          function = lib.mkForce "rebuild-darwin-offline";
+        };
       };
       functions = {
         rebuild-darwin = {
           body = ''
-            if test "$argv[1]" = "offline"
-                set option "--option substitute false"
-            end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#lookingglass"
-            commandline --function execute
+            echo "darwin-rebuild switch --flake ${config.dotfilesPath}#lookingglass"
+          '';
+        };
+        rebuild-darwin-offline = {
+          body = ''
+            git -C ${config.dotfilesPath} add --intent-to-add --all
+            echo "darwin-rebuild switch --option substitute false --flake ${config.dotfilesPath}#lookingglass"
           '';
         };
         rebuild-home = lib.mkForce {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
-            commandline --function execute
+            echo "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
           '';
         };
       };

modules/darwin/system.nix

@@ -6,6 +6,19 @@
 }:
 {
 
+  options = {
+    terminal = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Path to executable for terminal emulator program.";
+      default = null;
+    };
+    terminalLaunchCommand = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Command for using the terminal to launch a new window with a program.";
+      default = null;
+    };
+  };
+
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
     services.nix-daemon.enable = true;
@@ -23,6 +36,8 @@
 
     system = {
 
+      stateVersion = 5;
+
       keyboard = {
         remapCapsLockToControl = true;
         enableKeyMapping = true; # Allows for skhd
@@ -105,8 +120,7 @@
             "/Applications/zoom.us.app"
             "${pkgs.discord}/Applications/Discord.app"
             "${pkgs.obsidian}/Applications/Obsidian.app"
-            "${pkgs.kitty}/Applications/kitty.app"
-            "/System/Applications/System Settings.app"
+            "${pkgs.wezterm}/Applications/WezTerm.app"
           ];
         };
 
@@ -134,6 +148,9 @@
         # Where to save screenshots
         screencapture.location = "~/Downloads";
 
+        # Show seconds on the clock
+        menuExtraClock.ShowSeconds = true;
+
         CustomUserPreferences = {
           # Disable disk image verification
           "com.apple.frameworks.diskimages" = {
@@ -171,6 +188,7 @@
             eventTitleIconFormat = ''"iconCalendar"'';
             slackBrowser = ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
             zoomBrowser = ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
+            teamsBrowser = ''{"deletable":true,"arguments":"","name":"Teams","path":""}'';
             KeyboardShortcuts_joinEventShortcut = ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
             timeFormat = ''"12-hour"'';
           };

modules/darwin/user.nix

@@ -11,9 +11,13 @@
     users.users."${config.user}" = {
       # macOS user
       home = config.homePath;
-      shell = pkgs.fish; # Default shell
+      uid = 502;
+      # shell = pkgs.fish; # Default shell
     };
 
+    # This might fix the shell issues
+    users.knownUsers = [ config.user ];
+
     home-manager.users.${config.user} = {
 
       # Default shell setting doesn't work

modules/darwin/utilities.nix

@@ -10,32 +10,54 @@
   unfreePackages = [
     "consul"
     "vault-bin"
+    # "teams"
   ];
 
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
-    home.packages = with pkgs; [
-      visidata # CSV inspector
-      dos2unix # Convert Windows text files
-      inetutils # Includes telnet
-      youtube-dl # Convert web videos
-      pandoc # Convert text documents
-      mpd # TUI slideshows
-      mpv # Video player
-      gnupg # Encryption
-      awscli2
-      ssm-session-manager-plugin
-      awslogs
-      google-cloud-sdk
-      vault-bin
-      consul
-      noti # Create notifications programmatically
-      ipcalc # Make IP network calculations
-      (writeShellApplication {
+    home.packages = [
+      pkgs.visidata # CSV inspector
+      pkgs.dos2unix # Convert Windows text files
+      pkgs.inetutils # Includes telnet
+      pkgs.pandoc # Convert text documents
+      pkgs.mpd # TUI slideshows
+      pkgs.mpv # Video player
+      pkgs.gnupg # Encryption
+      pkgs.awscli2
+      pkgs.ssm-session-manager-plugin
+      pkgs.awslogs
+      pkgs.stu # TUI for AWS S3
+      pkgs.google-cloud-sdk
+      pkgs.vault-bin
+      pkgs.consul
+      pkgs.noti # Create notifications programmatically
+      pkgs.ipcalc # Make IP network calculations
+      # pkgs.teams
+      pkgs.cloudflared # Allow connecting to Cloudflare tunnels
+      pkgs.monitorcontrol # Allows adjusting external displays
+      (pkgs.writeShellApplication {
         name = "ocr";
-        runtimeInputs = [ tesseract ];
+        runtimeInputs = [ pkgs.tesseract ];
         text = builtins.readFile ../../modules/common/shell/bash/scripts/ocr.sh;
       })
+      (pkgs.writeShellApplication {
+        name = "ec2";
+        runtimeInputs = [
+          pkgs.awscli2
+          pkgs.jq
+          pkgs.fzf
+        ];
+        text = builtins.readFile ../../modules/common/shell/bash/scripts/aws-ec2.sh;
+      })
+      (pkgs.writeShellApplication {
+        name = "tfinit";
+        runtimeInputs = [
+          pkgs.terraform
+          pkgs.gawk
+          pkgs.git
+        ];
+        text = builtins.readFile ../../modules/common/shell/bash/scripts/terraform-init.sh;
+      })
     ];
 
     programs.fish.shellAbbrs = {

modules/nixos/applications/calendar.nix

@@ -0,0 +1,37 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    calendar = {
+      enable = lib.mkEnableOption {
+        description = "Enable calendar.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.calendar.enable) {
+    home-manager.users.${config.user} = {
+
+      accounts.calendar.accounts.default = {
+        basePath = "other/calendars"; # Where to save calendars in ~ directory
+        name = "personal";
+        local.type = "filesystem";
+        primary = true;
+        remote = {
+          passwordCommand = [ "" ];
+          type = "caldav";
+          url = "https://${config.hostnames.content}/remote.php/dav/principals/users/${config.user}";
+          userName = config.user;
+        };
+      };
+
+      home.packages = with pkgs; [ gnome-calendar ];
+    };
+  };
+}

modules/nixos/applications/default.nix

@@ -2,6 +2,7 @@
 {
 
   imports = [
+    ./calendar.nix
     ./calibre.nix
     ./nautilus.nix
   ];

modules/nixos/applications/nautilus.nix

@@ -20,7 +20,7 @@
 
     # Quick preview with spacebar
     services.gnome.sushi.enable = true;
-    environment.systemPackages = [ pkgs.gnome.nautilus ];
+    environment.systemPackages = [ pkgs.nautilus ];
 
     home-manager.users.${config.user} = {
 
@@ -28,13 +28,13 @@
       xsession.windowManager.i3.config.keybindings = {
         "${
           config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-        }+n" = "exec --no-startup-id ${pkgs.gnome.nautilus}/bin/nautilus";
+        }+n" = "exec --no-startup-id ${pkgs.nautilus}/bin/nautilus";
       };
 
       # Generates a QR code and previews it with sushi
       programs.fish.functions = {
         qr = {
-          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.sushi}/bin/sushi /tmp/qr.png";
         };
       };
 

modules/nixos/gaming/default.nix

@@ -12,6 +12,7 @@
     ./legendary.nix
     ./lutris.nix
     ./minecraft-server.nix
+    ./moonlight.nix
     ./ryujinx.nix
     ./steam.nix
   ];
@@ -19,10 +20,9 @@
   options.gaming.enable = lib.mkEnableOption "Enable gaming features.";
 
   config = lib.mkIf (config.gaming.enable && pkgs.stdenv.isLinux) {
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
     };
     programs.gamemode.enable = true;
   };

modules/nixos/gaming/dwarf-fortress.nix

@@ -9,7 +9,10 @@
   options.gaming.dwarf-fortress.enable = lib.mkEnableOption "Dwarf Fortress free edition.";
 
   config = lib.mkIf config.gaming.dwarf-fortress.enable {
-    unfreePackages = [ "dwarf-fortress" ];
+    unfreePackages = [
+      "dwarf-fortress"
+      "phoebus-theme"
+    ];
     environment.systemPackages =
       let
         dfDesktopItem = pkgs.makeDesktopItem {

modules/nixos/gaming/moonlight.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.gaming.moonlight.enable = lib.mkEnableOption "Enable Moonlight game streaming client.";
+
+  config = lib.mkIf config.gaming.moonlight.enable {
+    environment.systemPackages = with pkgs; [ moonlight-qt ];
+  };
+}

modules/nixos/gaming/steam.nix

@@ -15,28 +15,24 @@
       "steam-original"
       "steamcmd"
       "steam-run"
+      "steam-unwrapped"
     ];
 
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true;
-      package = pkgs.steam.override {
-        # Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix
-        # Based on: https://github.com/NixOS/nixpkgs/issues/73323
-        extraEnv = {
-          STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeBinPath [ pkgs.proton-ge-custom ];
-        };
-      };
+      extraCompatPackages = [ pkgs.proton-ge-bin ];
+      gamescopeSession.enable = true;
     };
 
     environment.systemPackages = with pkgs; [
 
       # Enable terminal interaction
-      steamPackages.steamcmd
+      steamcmd
       steam-tui
 
-      # Allow downloading of GE-Proton and other versions
-      protonup-qt
+      # Overlay with performance monitoring
+      mangohud
     ];
 
     # Seems like NetworkManager can help speed up Steam launch

modules/nixos/graphical/default.nix

@@ -46,6 +46,16 @@
       type = lib.types.str;
       description = "Command to use for power options menu";
     };
+    terminal = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Path to executable for terminal emulator program.";
+      default = null;
+    };
+    terminalLaunchCommand = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Command for using the terminal to launch a new window with a program.";
+      default = null;
+    };
     wallpaper = lib.mkOption {
       type = lib.types.path;
       description = "Wallpaper background image file";

modules/nixos/graphical/fonts.nix

@@ -14,7 +14,7 @@ in
 
     fonts.packages = with pkgs; [
       victor-mono # Used for Vim and Terminal
-      (nerdfonts.override { fonts = [ "Hack" ]; }) # For Polybar, Rofi
+      nerd-fonts.hack # For Polybar, Rofi
     ];
     fonts.fontconfig.defaultFonts.monospace = [ fontName ];
 

modules/nixos/graphical/i3.nix

@@ -9,6 +9,7 @@ let
 
   lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
   lockUpdate = "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
+  terminal = "wezterm";
 in
 {
 
@@ -47,9 +48,10 @@ in
             assigns = {
               "${ws1}" = [ { class = "Firefox"; } ];
               "${ws2}" = [
-                { class = "kitty"; }
                 { class = "aerc"; }
+                { class = "kitty"; }
                 { class = "obsidian"; }
+                { class = "wezterm"; }
               ];
               "${ws3}" = [ { class = "discord"; } ];
               "${ws4}" = [
@@ -126,7 +128,9 @@ in
               "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
 
               # Launchers
-              "${modifier}+Return" = "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
+              "${modifier}+Return" = "exec --no-startup-id ${
+                config.home-manager.users.${config.user}.programs.rofi.terminal
+              }; workspace ${ws2}; layout tabbed";
               "${modifier}+space" = "exec --no-startup-id ${config.launcherCommand}";
               "${modifier}+Shift+s" = "exec --no-startup-id ${config.systemdSearch}";
               "${modifier}+Shift+a" = "exec --no-startup-id ${config.audioSwitchCommand}";
@@ -138,8 +142,12 @@ in
               "${modifier}+Shift+r" = "restart";
               "${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
               "${modifier}+Shift+x" = "exec ${lockCmd}";
-              "${modifier}+Mod1+h" = "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-              "${modifier}+Mod1+r" = "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+              "${modifier}+Mod1+h" = "exec --no-startup-id ${
+                config.home-manager.users.${config.user}.programs.rofi.terminal
+              } -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+              "${modifier}+Mod1+r" = "exec --no-startup-id ${
+                config.home-manager.users.${config.user}.programs.rofi.terminal
+              } -e sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
 
               # Window options
               "${modifier}+q" = "kill";

modules/nixos/graphical/polybar.nix

@@ -42,7 +42,7 @@
             module-margin = 1;
             modules-left = "i3";
             modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date keyboard power";
+            modules-right = "mailcount network pulseaudio date power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -209,12 +209,6 @@
             label-foreground = config.theme.colors.base06;
             # format-background = colors.background;
           };
-          "module/keyboard" = {
-            type = "custom/text";
-            content = "󰌌";
-            click-left = "doas systemctl restart keyd";
-            content-foreground = config.theme.colors.base04;
-          };
           "module/power" = {
             type = "custom/text";
             content = "  ";

modules/nixos/graphical/rofi.nix

@@ -18,9 +18,6 @@ in
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
 
-    # Set the Rofi-Systemd terminal for viewing logs
-    environment.sessionVariables.ROFI_SYSTEMD_TERM = lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
-
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [
@@ -32,6 +29,7 @@ in
         cycle = true;
         location = "center";
         pass = { };
+        terminal = lib.mkIf pkgs.stdenv.isLinux config.terminal;
         plugins = [
           pkgs.rofi-calc
           pkgs.rofi-emoji

modules/nixos/graphical/xorg.nix

@@ -8,13 +8,13 @@
 
   config = lib.mkIf config.gui.enable {
 
+    # Enable touchpad support
+    services.libinput.enable = true;
+
     # Enable the X11 windowing system.
     services.xserver = {
       enable = config.gui.enable;
 
-      # Enable touchpad support
-      libinput.enable = true;
-
       # Login screen
       displayManager = {
         lightdm = {

modules/nixos/hardware/audio.nix

@@ -36,8 +36,6 @@ in
 {
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
-    sound.enable = true;
-
     # Enable PipeWire
     services.pipewire = {
       enable = true;

modules/nixos/hardware/disk.nix

@@ -1,12 +1,7 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ config, lib, ... }:
 {
 
   # Enable fstrim, which tracks free space on SSDs for garbage collection
   # More info: https://www.reddit.com/r/NixOS/comments/rbzhb1/if_you_have_a_ssd_dont_forget_to_enable_fstrim/
-  services.fstrim.enable = true;
+  services.fstrim.enable = lib.mkIf config.physical true;
 }

modules/nixos/hardware/keyboard.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ config, lib, ... }:
 {
 
   config = lib.mkIf config.physical {
@@ -17,24 +12,30 @@
       autoRepeatInterval = 40;
     };
 
-    # Use capslock as escape and/or control
-    services.keyd = {
+    # Swap Caps-Lock with Escape when pressed or LCtrl when held/combined with others
+    # Inspired by: https://www.youtube.com/watch?v=XuQVbZ0wENE
+    services.kanata = {
       enable = true;
-      keyboards = {
-        default = {
-          ids = [ "*" ];
-          settings = {
-            main = {
-              capslock = "overload(control, esc)";
-            };
-          };
-        };
+      keyboards.default = {
+        devices = [
+          "/dev/input/by-id/usb-Logitech_Logitech_G710_Keyboard-event-kbd"
+          "/dev/input/by-id/usb-Logitech_Logitech_G710_Keyboard-if01-event-kbd"
+        ];
+        extraDefCfg = "process-unmapped-keys yes";
+        config = ''
+          (defsrc
+              caps
+          )
+          (defalias
+              escctrl (tap-hold-press 1000 1000 esc lctrl)
+          )
+          (deflayer base
+              @escctrl
+          )
+        '';
       };
     };
 
-    # For some reason, keyd doesn't restart properly when updating
-    system.activationScripts.keyd.text = "${pkgs.systemd}/bin/systemctl restart keyd.service";
-
     # Enable num lock on login
     home-manager.users.${config.user}.xsession.numlock.enable = true;
   };

modules/nixos/hardware/monitors.nix

@@ -37,16 +37,16 @@
       # Set up screen position and rotation
       setupCommands = ''
         ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-1 \
-                                            --mode 1920x1200 \
-                                            --pos 1920x0 \
-                                            --rotate left \
-                                        --output HDMI-A-0 \
                                             --primary \
-                                            --mode 1920x1080 \
-                                            --pos 0x560 \
                                             --rotate normal \
+                                            --mode 2560x1440 \
+                                            --rate 165 \
+                                        --output DisplayPort-2 \
+                                            --right-of DisplayPort-1 \
+                                            --rotate left \
                                         --output DVI-0 --off \
                                         --output DVI-1 --off \
+                                        || echo "xrandr failed"
       '';
     };
   };

modules/nixos/hardware/mouse.nix

@@ -16,10 +16,20 @@
       piper # Mouse adjustments GUI
     ];
 
-    services.xserver.libinput.mouse = {
+    services.libinput.mouse = {
       # Disable mouse acceleration
       accelProfile = "flat";
       accelSpeed = "1.15";
     };
+
+    # Cursor
+    home-manager.users.${config.user}.home.pointerCursor = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+      size = 24;
+      gtk.enable = true;
+      x11.enable = true;
+    };
+
   };
 }

modules/nixos/hardware/sleep.nix

@@ -8,6 +8,10 @@
 
   config = lib.mkIf (config.physical && !config.server) {
 
+    # Use power button to sleep instead of poweroff
+    services.logind.powerKey = "suspend";
+    services.logind.powerKeyLongPress = "poweroff";
+
     # Prevent wake from keyboard
     powerManagement.powerDownCommands = ''
       set +e

modules/nixos/hardware/zfs.nix

@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
 
   options = {
@@ -8,7 +13,7 @@
   config = lib.mkIf (config.server && config.zfs.enable) {
 
     # Only use compatible Linux kernel, since ZFS can be behind
-    boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    boot.kernelPackages = pkgs.linuxPackages; # Defaults to latest LTS
     boot.kernelParams = [ "nohibernate" ];
     boot.supportedFilesystems = [ "zfs" ];
     services.prometheus.exporters.zfs.enable = config.prometheus.exporters.enable;

modules/nixos/services/actualbudget.nix

@@ -0,0 +1,74 @@
+{ config, lib, ... }:
+{
+
+  options = {
+    services.actualbudget = {
+      enable = lib.mkEnableOption "ActualBudget budgeting service";
+      port = lib.mkOption {
+        type = lib.types.port;
+        description = "Port to use for the localhost";
+        default = 5006;
+      };
+    };
+  };
+
+  config = lib.mkIf config.services.actualbudget.enable {
+
+    virtualisation.podman.enable = lib.mkDefault true;
+
+    users.users.actualbudget = {
+      isSystemUser = true;
+      group = "shared";
+      uid = 980;
+    };
+
+    # Create budget directory, allowing others to manage it
+    systemd.tmpfiles.rules = [
+      "d /var/lib/actualbudget 0770 actualbudget shared"
+    ];
+
+    virtualisation.oci-containers.containers.actualbudget = {
+      workdir = null;
+      volumes = [ "/var/lib/actualbudget:/data" ];
+      user = "${toString (builtins.toString config.users.users.actualbudget.uid)}";
+      pull = "missing";
+      privileged = false;
+      ports = [ "127.0.0.1:${builtins.toString config.services.actualbudget.port}:5006" ];
+      networks = [ ];
+      log-driver = "journald";
+      labels = {
+        app = "actualbudget";
+      };
+      image = "ghcr.io/actualbudget/actual-server:25.1.0";
+      hostname = null;
+      environmentFiles = [ ];
+      environment = {
+        DEBUG = "actual:config"; # Enable debug logging
+        ACTUAL_TRUSTED_PROXIES = builtins.concatStringsSep "," [ "127.0.0.1" ];
+      };
+      dependsOn = [ ];
+      autoStart = true;
+    };
+
+    # Allow web traffic to Caddy
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.budget ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.actualbudget.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.budget ];
+
+    # Backups
+    services.restic.backups.default.paths = [ "/var/lib/actualbudget" ];
+
+  };
+
+}

modules/nixos/services/arr.nix

@@ -14,6 +14,11 @@ let
       url = "localhost:7878";
       apiKey = config.secrets.radarrApiKey.dest;
     };
+    readarr = {
+      exportarrPort = "9711";
+      url = "localhost:8787";
+      apiKey = config.secrets.readarrApiKey.dest;
+    };
     sonarr = {
       exportarrPort = "9708";
       url = "localhost:8989";
@@ -39,37 +44,44 @@ in
 
   config = lib.mkIf config.arrs.enable {
 
+    # Broken on 2024-12-07
+    # https://discourse.nixos.org/t/solved-sonarr-is-broken-in-24-11-unstable-aka-how-the-hell-do-i-use-nixpkgs-config-permittedinsecurepackages/
+    insecurePackages = [
+      "aspnetcore-runtime-wrapped-6.0.36"
+      "aspnetcore-runtime-6.0.36"
+      "dotnet-sdk-wrapped-6.0.428"
+      "dotnet-sdk-6.0.428"
+    ];
+
     services = {
       bazarr = {
         enable = true;
-        group = "media";
+        group = "shared";
       };
       jellyseerr.enable = true;
       prowlarr.enable = true;
       sabnzbd = {
         enable = true;
-        group = "media";
+        group = "shared";
         # The config file must be editable within the application
         # It contains server configs and credentials
         configFile = "/data/downloads/sabnzbd/sabnzbd.ini";
       };
       sonarr = {
         enable = true;
-        group = "media";
+        group = "shared";
       };
       radarr = {
         enable = true;
-        group = "media";
+        group = "shared";
+      };
+      readarr = {
+        enable = true;
+        group = "shared";
       };
     };
 
-    # Create a media group to be shared between services
-    users.groups.media = { };
-
-    # Give the human user access to the media group
-    users.users.${config.user}.extraGroups = [ "media" ];
-
-    # Allows media group to read/write the sabnzbd directory
+    # Allows shared group to read/write the sabnzbd directory
     users.users.sabnzbd.homeMode = "0770";
 
     unfreePackages = [ "unrar" ]; # Required as a dependency for sabnzbd
@@ -90,7 +102,7 @@ in
         handle = [
           {
             handler = "reverse_proxy";
-            # We're able to reference the url and port of the service dynamically 
+            # We're able to reference the url and port of the service dynamically
             upstreams = [ { dial = arrConfig.sonarr.url; } ];
           }
         ];
@@ -110,6 +122,21 @@ in
           }
         ];
       }
+      {
+        group = "download";
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/readarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = arrConfig.readarr.url; } ];
+          }
+        ];
+      }
       {
         group = "download";
         match = [
@@ -223,6 +250,11 @@ in
       dest = "/var/private/radarr-api";
       prefix = "API_KEY=";
     };
+    secrets.readarrApiKey = {
+      source = ../../../private/radarr-api-key.age;
+      dest = "/var/private/readarr-api";
+      prefix = "API_KEY=";
+    };
     secrets.sonarrApiKey = {
       source = ../../../private/sonarr-api-key.age;
       dest = "/var/private/sonarr-api";

modules/nixos/services/audiobookshelf.nix

@@ -0,0 +1,29 @@
+{ config, lib, ... }:
+{
+
+  config = lib.mkIf config.services.audiobookshelf.enable {
+
+    services.audiobookshelf = {
+      group = "shared";
+      dataDir = "audiobookshelf";
+    };
+
+    # Allow web traffic to Caddy
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.audiobooks ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.audiobookshelf.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.audiobooks ];
+
+  };
+
+}

modules/nixos/services/backups.nix

@@ -22,6 +22,11 @@
         description = "S3 access key ID for backups";
         default = null;
       };
+      resticBucket = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        description = "S3 bucket for restic backups";
+        default = null;
+      };
     };
   };
 
@@ -44,6 +49,10 @@
       settings = { };
     };
 
+    # Broken on 2024-08-23
+    # https://github.com/NixOS/nixpkgs/commit/0875d0ce1c778f344cd2377a5337a45385d6ffa0
+    insecurePackages = [ "litestream-0.3.13" ];
+
     # Wait for secret to exist
     systemd.services.litestream = {
       after = [ "backup-secret.service" ];
@@ -65,5 +74,30 @@
     #   timerConfig = { OnCalendar = "00:05:00"; };
     #   environmentFile = backup.s3File;
     # };
+
+    secrets.s3-glacier = {
+      source = ../../../private/s3-glacier.age;
+      dest = "${config.secretsDirectory}/s3-glacier";
+    };
+    secrets.restic = {
+      source = ../../../private/restic.age;
+      dest = "${config.secretsDirectory}/restic";
+    };
+
+    services.restic.backups = lib.mkIf (config.backup.s3.resticBucket != null) {
+      default = {
+        repository = "s3:s3.us-east-1.amazonaws.com/${config.backup.s3.resticBucket}/restic";
+        paths = [ ];
+        environmentFile = config.secrets.s3-glacier.dest;
+        passwordFile = config.secrets.restic.dest;
+        pruneOpts = [
+          "--keep-daily 14"
+          "--keep-weekly 6"
+          "--keep-monthly 12"
+          "--keep-yearly 100"
+        ];
+      };
+    };
+
   };
 }

modules/nixos/services/bind.nix

@@ -20,6 +20,7 @@ let
     config.hostnames.content
     config.hostnames.books
     config.hostnames.download
+    config.hostnames.photos
   ];
   mkRecord = service: "${service}       A       ${localIp}";
   localRecords = lib.concatLines (map mkRecord localServices);

modules/nixos/services/caddy.nix

@@ -46,7 +46,7 @@
 
     # Force Caddy to 403 if not coming from allowlisted source
     caddy.cidrAllowlist = [ "127.0.0.1/32" ];
-    caddy.routes = [
+    caddy.routes = lib.mkBefore [
       {
         match = [ { not = [ { remote_ip.ranges = config.caddy.cidrAllowlist; } ]; } ];
         handle = [
@@ -58,42 +58,155 @@
       }
     ];
 
-    services.caddy = {
-      adapter = "''"; # Required to enable JSON
-      configFile = pkgs.writeText "Caddyfile" (
-        builtins.toJSON {
-          apps.http.servers.main = {
-            listen = [ ":443" ];
+    services.caddy =
+      let
+        default_logger_name = "other";
+        roll_size_mb = 25;
+        # Extract list of hostnames (fqdns) from current caddy routes
+        getHostnameFromMatch = match: if (lib.hasAttr "host" match) then match.host else [ ];
+        getHostnameFromRoute =
+          route:
+          if (lib.hasAttr "match" route) then (lib.concatMap getHostnameFromMatch route.match) else [ ];
+        hostnames_non_unique = lib.concatMap getHostnameFromRoute config.caddy.routes;
+        hostnames = lib.unique hostnames_non_unique;
+        # Create attrset of subdomains to their fqdns
+        hostname_map = builtins.listToAttrs (
+          map (hostname: {
+            name = builtins.head (lib.splitString "." hostname);
+            value = hostname;
+          }) hostnames
+        );
+      in
+      {
+        adapter = "''"; # Required to enable JSON
+        configFile = pkgs.writeText "Caddyfile" (
+          builtins.toJSON {
+            apps.http.servers.main = {
+              listen = [ ":443" ];
 
-            # These routes are pulled from the rest of this repo
-            routes = config.caddy.routes;
-            errors.routes = config.caddy.blocks;
+              # These routes are pulled from the rest of this repo
+              routes = config.caddy.routes;
+              errors.routes = config.caddy.blocks;
 
-            logs = { }; # Uncommenting collects access logs
-          };
-          apps.http.servers.metrics = { }; # Enables Prometheus metrics
-          apps.tls.automation.policies = config.caddy.tlsPolicies;
-
-          # Setup logging to file
-          logging.logs.main = {
-            encoder = {
-              format = "console";
+              # Uncommenting collects access logs
+              logs = {
+                inherit default_logger_name;
+                # Invert hostnames keys and values
+                logger_names = lib.mapAttrs' (name: value: {
+                  name = value;
+                  value = name;
+                }) hostname_map;
+              };
             };
-            writer = {
-              output = "file";
-              filename = "${config.services.caddy.logDir}/caddy.log";
-              roll = true;
-              roll_size_mb = 1;
-            };
-            level = "INFO";
-          };
-        }
-      );
+            apps.http.servers.metrics = { }; # Enables Prometheus metrics
+            apps.tls.automation.policies = config.caddy.tlsPolicies;
+
+            # Setup logging to journal and files
+            logging.logs =
+              {
+                # System logs and catch-all
+                # Must be called `default` to override Caddy's built-in default logger
+                default = {
+                  level = "INFO";
+                  encoder.format = "console";
+                  writer = {
+                    output = "stderr";
+                  };
+                  exclude = (map (hostname: "http.log.access.${hostname}") (builtins.attrNames hostname_map)) ++ [
+                    "http.log.access.${default_logger_name}"
+                  ];
+                };
+                # This is for the default access logs (anything not captured by hostname)
+                other = {
+                  level = "INFO";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/other.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "http.log.access.${default_logger_name}" ];
+                };
+                # This is for using the Caddy API, which will probably never happen
+                admin = {
+                  level = "INFO";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/admin.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "admin" ];
+                };
+                # This is for TLS cert management tracking
+                tls = {
+                  level = "INFO";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/tls.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "tls" ];
+                };
+                # This is for debugging
+                debug = {
+                  level = "DEBUG";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/debug.log";
+                    roll = true;
+                    roll_keep = 1;
+                    inherit roll_size_mb;
+                  };
+                };
+              }
+              # These are the access logs for individual hostnames
+              // (lib.mapAttrs (name: value: {
+                level = "INFO";
+                encoder.format = "json";
+                writer = {
+                  output = "file";
+                  filename = "${config.services.caddy.logDir}/${name}-access.log";
+                  roll = true;
+                  inherit roll_size_mb;
+                };
+                include = [ "http.log.access.${name}" ];
+              }) hostname_map)
+              # We also capture just the errors separately for easy debugging
+              // (lib.mapAttrs' (name: value: {
+                name = "${name}-error";
+                value = {
+                  level = "ERROR";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/${name}-error.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "http.log.access.${name}" ];
+                };
+              }) hostname_map);
+          }
+        );
+      };
+
+    systemd.services.caddy.serviceConfig = {
+
+      # Allows Caddy to serve lower ports (443, 80)
+      AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+
+      # Prevent flooding of logs by rate-limiting
+      LogRateLimitIntervalSec = "5s"; # Limit period
+      LogRateLimitBurst = 100; # Limit threshold
+
     };
 
-    # Allows Caddy to serve lower ports (443, 80)
-    systemd.services.caddy.serviceConfig.AmbientCapabilities = "CAP_NET_BIND_SERVICE";
-
     # Required for web traffic to reach this machine
     networking.firewall.allowedTCPPorts = [
       80

modules/nixos/services/calibre.nix

@@ -28,6 +28,7 @@ in
   config = lib.mkIf config.services.calibre-web.enable {
 
     services.calibre-web = {
+      group = "shared";
       openFirewall = true;
       options = {
         reverseProxyAuth.enable = false;

modules/nixos/services/cloudflare.nix

@@ -11,6 +11,7 @@
 {
   config,
   pkgs,
+  pkgs-caddy,
   lib,
   ...
 }:
@@ -62,12 +63,23 @@ in
     caddy.cidrAllowlist = cloudflareIpRanges;
 
     # Tell Caddy to use Cloudflare DNS for ACME challenge validation
-    services.caddy.package = pkgs.caddy-cloudflare; # Patched overlay
+    services.caddy.package = pkgs-caddy.caddy.override {
+      externalPlugins = [
+        {
+          name = "cloudflare";
+          repo = "github.com/caddy-dns/cloudflare";
+          version = "master";
+        }
+      ];
+      vendorHash = "sha256-C7JOGd4sXsRZL561oP84V2/pTg7szEgF4OFOw35yS1s=";
+    };
     caddy.tlsPolicies = [
       {
         issuers = [
           {
             module = "acme";
+            email = "acme@${config.mail.server}";
+            account_key = "{env.ACME_ACCOUNT_KEY}";
             challenges = {
               dns = {
                 provider = {
@@ -82,7 +94,18 @@ in
       }
     ];
     # Allow Caddy to read Cloudflare API key for DNS validation
-    systemd.services.caddy.serviceConfig.EnvironmentFile = config.secrets.cloudflare-api.dest;
+    systemd.services.caddy.serviceConfig.EnvironmentFile = [
+      config.secrets.cloudflare-api.dest
+      config.secrets.letsencrypt-key.dest
+    ];
+
+    # Private key is used for LetsEncrypt
+    secrets.letsencrypt-key = {
+      source = ../../../private/letsencrypt-key.age;
+      dest = "${config.secretsDirectory}/letsencrypt-key";
+      owner = "caddy";
+      group = "caddy";
+    };
 
     # API key must have access to modify Cloudflare DNS records
     secrets.cloudflare-api = {
@@ -94,8 +117,14 @@ in
 
     # Wait for secret to exist
     systemd.services.caddy = {
-      after = [ "cloudflare-api-secret.service" ];
-      requires = [ "cloudflare-api-secret.service" ];
+      after = [
+        "cloudflare-api-secret.service"
+        "letsencrypt-key-secret.service"
+      ];
+      requires = [
+        "cloudflare-api-secret.service"
+        "letsencrypt-key-secret.service"
+      ];
     };
 
     # Allows Nextcloud to trust Cloudflare IPs
@@ -106,6 +135,9 @@ in
       [ "127.0.0.1" ] ++ cloudflareIpRanges
     );
 
+    # Using dyn-dns instead of ddclient because I can't find a way to choose
+    # between proxied and non-proxied records for Cloudflare using just
+    # ddclient.
     services.cloudflare-dyndns =
       lib.mkIf ((builtins.length config.services.cloudflare-dyndns.domains) > 0)
         {

modules/nixos/services/default.nix

@@ -5,6 +5,8 @@
 {
 
   imports = [
+    ./actualbudget.nix
+    ./audiobookshelf.nix
     ./arr.nix
     ./backups.nix
     ./bind.nix
@@ -12,7 +14,9 @@
     ./calibre.nix
     ./cloudflare-tunnel.nix
     ./cloudflare.nix
+    ./filebrowser.nix
     ./identity.nix
+    ./immich.nix
     ./irc.nix
     ./gitea-runner.nix
     ./gitea.nix
@@ -26,6 +30,7 @@
     ./n8n.nix
     ./netdata.nix
     ./nextcloud.nix
+    ./ntfy.nix
     ./paperless.nix
     ./postgresql.nix
     ./prometheus.nix
@@ -33,6 +38,7 @@
     ./secrets.nix
     ./sshd.nix
     ./transmission.nix
+    ./uptime-kuma.nix
     ./vaultwarden.nix
     ./victoriametrics.nix
     ./wireguard.nix

modules/nixos/services/filebrowser.nix

@@ -0,0 +1,68 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  dataDir = "/var/lib/filebrowser";
+
+  settings = {
+    port = 8020;
+    baseURL = "";
+    address = "";
+    log = "stdout";
+    database = "${dataDir}/filebrowser.db";
+    root = "";
+    "auth.method" = "json";
+    username = config.user;
+    # Generate password: htpasswd -nBC 10 "" | tr -d ':\n'
+    password = "$2y$10$ze1cMob0k6pnXRjLowYfZOVZWg4G.dsPtH3TohbUeEbI0sdkG9.za";
+  };
+
+in
+{
+
+  options.filebrowser.enable = lib.mkEnableOption "Use Filebrowser.";
+
+  config = lib.mkIf config.filebrowser.enable {
+
+    environment.etc."filebrowser/.filebrowser.json".text = builtins.toJSON settings;
+
+    systemd.services.filebrowser = lib.mkIf config.filebrowser.enable {
+      description = "Filebrowser cloud file services";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      startLimitIntervalSec = 14400;
+      startLimitBurst = 10;
+      serviceConfig = {
+        ExecStart = "${pkgs.filebrowser}/bin/filebrowser";
+        DynamicUser = true;
+        Group = "shared";
+        ReadWritePaths = [ dataDir ];
+        StateDirectory = [ "filebrowser" ];
+        Restart = "on-failure";
+        RestartPreventExitStatus = 1;
+        RestartSec = "5s";
+      };
+      path = [ pkgs.getent ]; # Fix: getent not found in $PATH
+    };
+
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.files ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString settings.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.files ];
+
+  };
+
+}

modules/nixos/services/grafana.nix

@@ -53,6 +53,7 @@ in
             uid = promUid;
           }
         ];
+        # TODO: Add option to pull services from a list like Caddy does
         dashboards.settings.providers = [
           {
             name = "test";
@@ -368,6 +369,18 @@ in
                           range = true;
                           refId = "C";
                         }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "readarr_system_status";
+                          hide = false;
+                          legendFormat = "Readarr";
+                          range = true;
+                          refId = "F";
+                        }
                         {
                           datasource = {
                             type = "prometheus";
@@ -669,7 +682,7 @@ in
                           };
                           editorMode = "code";
                           exemplar = false;
-                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[1d])'';
+                          "expr" = ''delta(zfs_dataset_used_bytes{name="tank"}[1d])'';
                           hide = false;
                           instant = false;
                           interval = "";
@@ -683,7 +696,7 @@ in
                             uid = promUid;
                           };
                           editorMode = "code";
-                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[7d])'';
+                          "expr" = ''delta(zfs_dataset_used_bytes{name="tank"}[7d])'';
                           hide = false;
                           legendFormat = "Past Week";
                           range = true;
@@ -695,7 +708,7 @@ in
                             uid = promUid;
                           };
                           editorMode = "code";
-                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[30d])'';
+                          "expr" = ''delta(zfs_dataset_used_bytes{name="tank"}[30d])'';
                           hide = false;
                           legendFormat = "Past Month";
                           range = true;
@@ -819,6 +832,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8787";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Readarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/readarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -885,6 +920,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8086";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "InfluxDB";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.influxdb}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -929,6 +986,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:9000";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "The Lounge";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.irc}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -1039,6 +1118,50 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.paperless.port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Paperless";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.paperless}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.audiobookshelf.port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Audiobookshelf";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.audiobooks}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                         ];
                       };
                       gridPos = {
@@ -2321,7 +2444,7 @@ in
                       datasourceUid = promUid;
                       model = {
                         editorMode = "code";
-                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
+                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
                         hide = false;
                         instant = true;
                         intervalMs = 1000;
@@ -2418,7 +2541,7 @@ in
                   execErrState = "Error";
                   for = "5m";
                   annotations = {
-                    description = "Cloudflare Tunnel for {{ $job }}.";
+                    description = "Cloudflare Tunnel for {{ index $labels \"job\" }}.";
                     summary = "Cloudflare Tunnel is down.";
                   };
                   isPaused = false;

modules/nixos/services/immich.nix

@@ -0,0 +1,48 @@
+{ config, lib, ... }:
+
+{
+
+  config = lib.mkIf config.services.immich.enable {
+
+    services.immich = {
+      port = 2283;
+      group = "shared";
+      database.enable = true;
+      redis.enable = true;
+      machine-learning.enable = true;
+      machine-learning.environment = { };
+      mediaLocation = "/data/images";
+      secretsFile = null;
+      settings.server.externalDomain = "https://${config.hostnames.photos}";
+      environment = {
+        IMMICH_ENV = "production";
+        IMMICH_LOG_LEVEL = "log";
+        NO_COLOR = "false";
+        IMMICH_TRUSTED_PROXIES = "127.0.0.1";
+      };
+    };
+
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.photos ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.immich.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.photos ];
+
+    # Point localhost to the local domain
+    networking.hosts."127.0.0.1" = [ config.hostnames.photos ];
+
+    # Backups
+    services.restic.backups.default.paths = [ "/data/images" ];
+
+  };
+
+}

modules/nixos/services/jellyfin.nix

@@ -11,7 +11,7 @@
 
   config = lib.mkIf config.services.jellyfin.enable {
 
-    services.jellyfin.group = "media";
+    services.jellyfin.group = "shared";
     users.users.jellyfin = {
       isSystemUser = true;
     };
@@ -49,14 +49,13 @@
 
     # Create videos directory, allow anyone in Jellyfin group to manage it
     systemd.tmpfiles.rules = [
-      "d /var/lib/jellyfin 0775 jellyfin media"
-      "d /var/lib/jellyfin/library 0775 jellyfin media"
+      "d /var/lib/jellyfin 0775 jellyfin shared"
+      "d /var/lib/jellyfin/library 0775 jellyfin shared"
     ];
 
     # Enable VA-API for hardware transcoding
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
       extraPackages = [ pkgs.libva ];
     };
     environment.systemPackages = [ pkgs.libva-utils ];

modules/nixos/services/n8n.nix

@@ -4,33 +4,34 @@
 { config, lib, ... }:
 {
 
-  options = {
-    n8nServer = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Hostname for n8n automation";
-      default = null;
-    };
-  };
+  config = lib.mkIf config.services.n8n.enable {
 
-  config = lib.mkIf (config.n8nServer != null) {
+    unfreePackages = [ "n8n" ];
 
     services.n8n = {
-      enable = true;
+      webhookUrl = "https://${config.hostnames.n8n}";
       settings = {
-        n8n = {
-          listenAddress = "127.0.0.1";
-          port = 5678;
-        };
+        listen_address = "127.0.0.1";
+        port = 5678;
+
       };
     };
 
+    systemd.services.n8n.environment = {
+      N8N_EDITOR_BASE_URL = config.services.n8n.webhookUrl;
+    };
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.n8n ];
+
+    # Allow web traffic to Caddy
     caddy.routes = [
       {
-        match = [ { host = [ config.n8nServer ]; } ];
+        match = [ { host = [ config.hostnames.n8n ]; } ];
         handle = [
           {
             handler = "reverse_proxy";
-            upstreams = [ { dial = "localhost:5678"; } ];
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.n8n.settings.port}"; } ];
           }
         ];
       }

modules/nixos/services/nextcloud.nix

@@ -9,7 +9,7 @@
   config = lib.mkIf config.services.nextcloud.enable {
 
     services.nextcloud = {
-      package = pkgs.nextcloud28; # Required to specify
+      package = pkgs.nextcloud30; # Required to specify
       configureRedis = true;
       datadir = "/data/nextcloud";
       database.createLocally = true;
@@ -26,10 +26,13 @@
         trusted_domains = [ config.hostnames.content ];
         trusted_proxies = [ "127.0.0.1" ];
         maintenance_window_start = 4; # Run jobs at 4am UTC
+        log_type = "file";
+        loglevel = 1; # Include all actions in the log
       };
       extraAppsEnable = true;
-      extraApps = with config.services.nextcloud.package.packages.apps; {
-        inherit calendar contacts;
+      extraApps = {
+        calendar = config.services.nextcloud.package.packages.apps.calendar;
+        contacts = config.services.nextcloud.package.packages.apps.contacts;
         # These apps are defined and pinned by overlay in flake.
         news = pkgs.nextcloudApps.news;
         external = pkgs.nextcloudApps.external;