nixd neovim setup

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/8c8388ade72e58efdeae71b4cbb79e872c23a56b' (2024-10-03)
  → 'github:lnl7/nix-darwin/48b50b3b137be5cfb9f4d006835ce7c3fe558ccc' (2024-10-08)
• Updated input 'disko':
    'github:nix-community/disko/48ebb577855fb2398653f033b3b2208a9249203d' (2024-10-05)
  → 'github:nix-community/disko/bdbdb725d632863bdedb80baabf21327614dd237' (2024-10-11)
• Updated input 'firefox-darwin':
    'github:bandithedoge/nixpkgs-firefox-darwin/1cab93c0c087555cb21dd9ceb383b0d15deade32' (2024-10-06)
  → 'github:bandithedoge/nixpkgs-firefox-darwin/8a3143c1ce147481db4463e71bc3b7002e6ebc56' (2024-10-12)
• Updated input 'home-manager':
    'github:nix-community/home-manager/509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e' (2024-10-04)
  → 'github:nix-community/home-manager/2b13611eaed8326789f76f70d21d06fbb14e3e47' (2024-10-11)
• Updated input 'nextcloud-snappymail':
    'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-06)
  → 'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-12)
• Updated input 'nixos-generators':
    'github:nix-community/nixos-generators/9ae128172f823956e54947fe471bc6dfa670ecb4' (2024-10-03)
  → 'github:nix-community/nixos-generators/40c8d30c490414910fc63626ad1b67af7db40cd3' (2024-10-10)
• Updated input 'nixos-generators/nixlib':
    'github:nix-community/nixpkgs.lib/bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1' (2024-09-29)
  → 'github:nix-community/nixpkgs.lib/b61309c3c1b6013d36299bc8285612865b3b9e4c' (2024-10-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04)
  → 'github:nixos/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04)
  → 'github:nixos/nixpkgs/c505ebf777526041d792a49d5f6dd4095ea391a7' (2024-10-11)
• Updated input 'nur':
    'github:nix-community/nur/1841d27c08fb58b1bb3e7944711938e719dd532e' (2024-10-06)
  → 'github:nix-community/nur/1d143f52b0a046924ee7fe74bce0bd2e10e07c3d' (2024-10-12)
• Updated input 'nvim-lint-src':
    'github:mfussenegger/nvim-lint/27f44d1cc3d733a38a736acb902f94879d99c76c' (2024-10-03)
  → 'github:mfussenegger/nvim-lint/f707b3ae50417067fa63fdfe179b0bff6b380da1' (2024-10-10)
• Updated input 'nvim-tree-lua-src':
    'github:kyazdani42/nvim-tree.lua/c9104a5d079db5a158c9562c54689df27d52dccc' (2024-09-30)
  → 'github:kyazdani42/nvim-tree.lua/5ad87620ec9d1190d15c88171a3f0122bc16b0fe' (2024-10-11)
• Updated input 'wsl':
    'github:nix-community/NixOS-WSL/31a18ceaeac81e75d10b05ab0dfb4fcc79d4ed1a' (2024-10-05)
  → 'github:nix-community/NixOS-WSL/0fc8d9bb51cc46b31d950513df6d088905c8fe55' (2024-10-10)

.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

@@ -1,7 +1,9 @@
 name: Arrow
 
+run-name: Arrow - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
+
 env:
-  TERRAFORM_DIRECTORY: hosts/arrow
+  TERRAFORM_DIRECTORY: hosts/arrow/vultr
   DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
   ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
   CLOUDFLARE_R2_ENDPOINT: "${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
@@ -10,6 +12,9 @@ env:
   AWS_DEFAULT_REGION: auto
   AWS_ENDPOINT_URL_S3: "https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
   TF_VAR_vultr_api_key: ${{ secrets.VULTR_API_KEY }}
+  ZONE_NAME: masu.rs
+  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+  CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
 
 on:
   workflow_dispatch:
@@ -24,6 +29,17 @@ on:
         options:
           - create
           - destroy
+          - nothing
+      plan:
+        type: choice
+        required: false
+        options:
+          - vc2-1c-1gb # 25 GB / $5
+          - vc2-1c-2gb # 55 GB / $10 (default)
+          - vc2-2c-2gb # 65 GB / $15
+          - vc2-2c-4gb # 80 GB / $20
+          - vc2-4c-8gb # 160 GB / $40
+          - vc2-6c-16gb # 320 GB / $80
 
 jobs:
   build-deploy:
@@ -49,7 +65,7 @@ jobs:
       # Build the image
       - name: Build Image
         if: inputs.rebuild && inputs.action != 'destroy'
-        run: nix build .#image.arrow
+        run: nix build .#arrow
 
       - name: Upload Image to S3
         if: inputs.rebuild && inputs.action != 'destroy'
@@ -59,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
@@ -89,6 +95,8 @@ jobs:
       - name: Terraform Apply
         if: inputs.action == 'create'
         working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_vultr_plan: ${{ inputs.plan }}
         run: |
           terraform apply \
             -auto-approve \
@@ -132,3 +140,15 @@ jobs:
         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/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,16 +38,12 @@ 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
 
-![Diagram](https://github.com/nmasur/dotfiles/assets/7386960/ed3e7202-09c4-4a9c-9b14-0272c01647f6)
+![Diagram](https://github.com/nmasur/dotfiles/assets/7386960/4cc22285-cea1-4831-b387-a82241184381)
-
-- [flake.nix](./flake.nix)
-- [hosts](./hosts/)
-- [modules](./modules/)
 
 ---
 

apps/default.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: rec {
+{ pkgs, ... }:
+rec {
 
   # Show quick helper
   default = import ./help.nix { inherit pkgs; };
@@ -30,5 +31,4 @@
   # Run neovim as an app
   neovim = import ./neovim.nix { inherit pkgs; };
   nvim = neovim;
-
 }

apps/encrypt-secret.nix

@@ -1,19 +1,19 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # nix run github:nmasur/dotfiles#encrypt-secret > private/mysecret.age
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "encrypt-secret" ''
+  program = builtins.toString (
-    printf "\nEnter the secret data to encrypt for all hosts...\n\n" 1>&2
+    pkgs.writeShellScript "encrypt-secret" ''
-    read -p "Secret: " secret
+      printf "\nEnter the secret data to encrypt for all hosts...\n\n" 1>&2
-    printf "\nEncrypting...\n\n" 1>&2
+      read -p "Secret: " secret
-    tmpfile=$(mktemp)
+      printf "\nEncrypting...\n\n" 1>&2
-    echo "''${secret}" > ''${tmpfile}
+      tmpfile=$(mktemp)
-    ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
+      echo "''${secret}" > ''${tmpfile}
-      builtins.toString ../misc/public-keys
+      ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile
-    } $tmpfile
+      rm $tmpfile
-    rm $tmpfile
+    ''
-  '');
+  );
-
 }

apps/format-root.nix

@@ -1,39 +1,41 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # This script will partition and format drives; use at your own risk!
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "format-root" ''
+  program = builtins.toString (
-    set -e
+    pkgs.writeShellScript "format-root" ''
+      set -e
 
-    DISK=$1
+      DISK=$1
 
-    if [ -z "''${DISK}" ]; then
+      if [ -z "''${DISK}" ]; then
-        ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
+          ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
-            --foreground "#fb4934" \
+              --foreground "#fb4934" \
-            "Missing required parameter." \
+              "Missing required parameter." \
-            "Usage: format-root -- <disk>" \
+              "Usage: format-root -- <disk>" \
-            "Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
+              "Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
-        echo "(exiting)"
+          echo "(exiting)"
-        exit 1
+          exit 1
-    fi
+      fi
 
-    ${pkgs.disko-packaged}/bin/disko \
+      ${pkgs.disko-packaged}/bin/disko \
-        --mode create \
+          --mode create \
-        --dry-run \
+          --dry-run \
-        --flake "path:$(pwd)#root" \
+          --flake "path:$(pwd)#root" \
-        --arg disk \""/dev/''${DISK}"\"
+          --arg disk \""/dev/''${DISK}"\"
 
-    ${pkgs.gum}/bin/gum confirm \
+      ${pkgs.gum}/bin/gum confirm \
-        "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
+          "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
-        --default=false
+          --default=false
 
-    ${pkgs.disko-packaged}/bin/disko \
+      ${pkgs.disko-packaged}/bin/disko \
-        --mode create \
+          --mode create \
-        --flake "path:$(pwd)#root" \
+          --flake "path:$(pwd)#root" \
-        --arg disk "/dev/''${DISK}"
+          --arg disk "/dev/''${DISK}"
-
-  '');
 
+    ''
+  );
 }

apps/help.nix

@@ -1,23 +1,25 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "default" ''
+  program = builtins.toString (
-    ${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
+    pkgs.writeShellScript "default" ''
-    ${pkgs.gum}/bin/gum format --type=template -- '  {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
+      ${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
-    echo ""
+      ${pkgs.gum}/bin/gum format --type=template -- '  {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
-    echo ""
+      echo ""
-    ${pkgs.gum}/bin/gum format --type=template -- \
+      echo ""
-        '  • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
+      ${pkgs.gum}/bin/gum format --type=template -- \
-        '  • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
+          '  • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
-        '  • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
+          '  • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
-        '  • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
+          '  • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
-        '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
+          '  • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
-        '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
+          '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
-        '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
+          '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
-        '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
+          '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
-    echo ""
+          '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
-    echo ""
+      echo ""
-  '');
+      echo ""
-
+    ''
+  );
 }

apps/installer.nix

@@ -1,48 +1,50 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # Inspired by https://github.com/cleverca22/nix-tests/blob/master/kexec/justdoit.nix
   # This script will partition and format drives; use at your own risk!
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "installer" ''
+  program = builtins.toString (
-    set -e
+    pkgs.writeShellScript "installer" ''
+      set -e
 
-    DISK=$1
+      DISK=$1
-    FLAKE=$2
+      FLAKE=$2
-    PARTITION_PREFIX=""
+      PARTITION_PREFIX=""
 
-    if [ -z "$DISK" ] || [ -z "$FLAKE" ]; then
+      if [ -z "$DISK" ] || [ -z "$FLAKE" ]; then
-        ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
+          ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
-            --foreground "#fb4934" \
+              --foreground "#fb4934" \
-            "Missing required parameter." \
+              "Missing required parameter." \
-            "Usage: installer -- <disk> <host>" \
+              "Usage: installer -- <disk> <host>" \
-            "Example: installer -- nvme0n1 tempest" \
+              "Example: installer -- nvme0n1 tempest" \
-            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
+              "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
-        echo "(exiting)"
+          echo "(exiting)"
-        exit 1
+          exit 1
-    fi
+      fi
 
-    case "$DISK" in nvme*)
+      case "$DISK" in nvme*)
-        PARTITION_PREFIX="p"
+          PARTITION_PREFIX="p"
-    esac
+      esac
 
-    ${pkgs.gum}/bin/gum confirm \
+      ${pkgs.gum}/bin/gum confirm \
-        "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
+          "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
-        --default=false
+          --default=false
 
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
-    ${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
+      ${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
-    mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
+      mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
-    mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}2
+      mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}2
 
-    mount /dev/disk/by-label/nixos /mnt
+      mount /dev/disk/by-label/nixos /mnt
-    mkdir --parents /mnt/boot
+      mkdir --parents /mnt/boot
-    mount /dev/disk/by-label/boot /mnt/boot
+      mount /dev/disk/by-label/boot /mnt/boot
-
-    ${pkgs.nixos-install-tools}/bin/nixos-install --flake github:nmasur/dotfiles#''${FLAKE}
-  '');
 
+      ${pkgs.nixos-install-tools}/bin/nixos-install --flake github:nmasur/dotfiles#''${FLAKE}
+    ''
+  );
 }

apps/loadkey.nix

@@ -1,13 +1,15 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "loadkey" ''
+  program = builtins.toString (
-    printf "\nEnter the seed phrase for your SSH key...\n"
+    pkgs.writeShellScript "loadkey" ''
-    printf "\nThen press ^D when complete.\n\n"
+      printf "\nEnter the seed phrase for your SSH key...\n"
-    mkdir -p ~/.ssh/
+      printf "\nThen press ^D when complete.\n\n"
-    ${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
+      mkdir -p ~/.ssh/
-    printf "\n\nContinuing activation.\n\n"
+      ${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
-  '');
+      printf "\n\nContinuing activation.\n\n"
-
+    ''
+  );
 }

apps/neovim.nix

@@ -1,12 +1,12 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
   program = "${
-      (import ../modules/common/neovim/package {
+    (import ../modules/common/neovim/package {
-        inherit pkgs;
+      inherit pkgs;
-        colors = (import ../colorscheme/nord).dark;
+      colors = (import ../colorscheme/nord).dark;
-      })
+    })
-    }/bin/nvim";
+  }/bin/nvim";
-
 }

apps/netdata-cloud.nix

@@ -1,19 +1,21 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "netdata-cloud" ''
+  program = builtins.toString (
-    if [ "$EUID" -ne 0 ]; then
+    pkgs.writeShellScript "netdata-cloud" ''
-      echo "Please run as root"
+      if [ "$EUID" -ne 0 ]; then
-      exit 1
+        echo "Please run as root"
-    fi
+        exit 1
-    mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
+      fi
-    printf "\nEnter the claim token for netdata cloud...\n\n"
+      mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
-    read -p "Token: " token
+      printf "\nEnter the claim token for netdata cloud...\n\n"
-    echo "''${token}" > /var/lib/netdata/cloud.d/token
+      read -p "Token: " token
-    chown -R netdata:netdata /var/lib/netdata
+      echo "''${token}" > /var/lib/netdata/cloud.d/token
-    ${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
+      chown -R netdata:netdata /var/lib/netdata
-    printf "\n\nNow restart netdata service.\n\n"
+      ${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
-  '');
+      printf "\n\nNow restart netdata service.\n\n"
-
+    ''
+  );
 }

apps/readme.nix

@@ -1,9 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "readme" ''
+  program = builtins.toString (
-    ${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
+    pkgs.writeShellScript "readme" ''
-  '');
+      ${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
-
+    ''
+  );
 }

apps/rebuild.nix

@@ -1,15 +1,17 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "rebuild" ''
+  program = builtins.toString (
-    echo ${pkgs.system}
+    pkgs.writeShellScript "rebuild" ''
-    SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
+      echo ${pkgs.system}
-    if [ "$SYSTEM" == "darwin" ]; then
+      SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
-        sudo darwin-rebuild switch --flake ${builtins.toString ../.}
+      if [ "$SYSTEM" == "darwin" ]; then
-    else
+          sudo darwin-rebuild switch --flake ${builtins.toString ../.}
-        doas nixos-rebuild switch --flake ${builtins.toString ../.}
+      else
-    fi
+          doas nixos-rebuild switch --flake ${builtins.toString ../.}
-  '');
+      fi
-
+    ''
+  );
 }

apps/reencrypt-secrets.nix

@@ -1,27 +1,27 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # nix run github:nmasur/dotfiles#reencrypt-secrets ./private
 
   type = "app";
 
-  program = builtins.toString (pkgs.writeShellScript "reencrypt-secrets" ''
+  program = builtins.toString (
-    if [ $# -eq 0 ]; then
+    pkgs.writeShellScript "reencrypt-secrets" ''
-      echo "Must provide directory to reencrypt."
+      if [ $# -eq 0 ]; then
-      exit 1
+        echo "Must provide directory to reencrypt."
-    fi
+        exit 1
-    encrypted=$1
+      fi
-    for encryptedfile in ''${1}/*; do
+      encrypted=$1
-      tmpfile=$(mktemp)
+      for encryptedfile in ''${1}/*; do
-      echo "Decrypting ''${encryptedfile}..."
+        tmpfile=$(mktemp)
-      ${pkgs.age}/bin/age --decrypt \
+        echo "Decrypting ''${encryptedfile}..."
-        --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
+        ${pkgs.age}/bin/age --decrypt \
-      echo "Encrypting ''${encryptedfile}..."
+          --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
-      ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
+        echo "Encrypting ''${encryptedfile}..."
-        builtins.toString ../misc/public-keys
+        ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile > $encryptedfile
-      } $tmpfile > $encryptedfile
+        rm $tmpfile
-      rm $tmpfile
+      done
-    done
+      echo "Finished."
-    echo "Finished."
+    ''
-  '');
+  );
-
 }

colorscheme/everforest/default.nix

@@ -16,9 +16,7 @@
     base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
     base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
     base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-    base0E =
+    base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
-    base0F =
-      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
   };
 }

colorscheme/gruvbox-dark/default.nix

@@ -2,8 +2,7 @@
 
 {
   name = "gruvbox-dark"; # Dark, Medium
-  author =
+  author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
-    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
   dark = {
     base00 = "#1D2122"; # ---- This is the change from normal gruvbox
     base01 = "#3c3836"; # ---

colorscheme/gruvbox/default.nix

@@ -1,7 +1,6 @@
 {
   name = "gruvbox"; # Dark, Medium
-  author =
+  author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
-    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
   dark = {
     base00 = "#282828"; # ----
     base01 = "#3c3836"; # ---

disks/root.nix

@@ -1,4 +1,5 @@
-{ disk, ... }: {
+{ disk, ... }:
+{
   disk = {
     boot = {
       type = "disk";

disks/zfs.nix

@@ -1,4 +1,5 @@
-{ pool, disks, ... }: {
+{ pool, disks, ... }:
+{
   disk = lib.genAttrs disks (disk: {
     "${disk}" = {
       type = "disk";
@@ -6,16 +7,18 @@
       content = {
         type = "table";
         format = "gpt";
-        partitions = [{
+        partitions = [
-          type = "partition";
+          {
-          name = "zfs";
+            type = "partition";
-          start = "128MiB";
+            name = "zfs";
-          end = "100%";
+            start = "128MiB";
-          content = {
+            end = "100%";
-            type = "zfs";
+            content = {
-            pool = pool;
+              type = "zfs";
-          };
+              pool = pool;
-        }];
+            };
+          }
+        ];
       };
     };
   });

docs/installation.md

@@ -57,6 +57,7 @@ Launch a new shell. Then use Nix to switch to the macOS configuration:
 ```bash
 sudo rm /etc/bashrc
 sudo rm /etc/nix/nix.conf
+export NIX_SSL_CERT_FILE="$HOME/Documents/t2-ca-bundle.pem"
 nix \
     --extra-experimental-features flakes \
     --extra-experimental-features nix-command \

flake.lock

@@ -3,11 +3,11 @@
     "baleia-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1704551058,
+        "lastModified": 1721805312,
-        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
+        "narHash": "sha256-qA1x5kplP2I8bURO0I4R0gt/zeznu9hQQ+XHptLGuwc=",
         "owner": "m00qek",
         "repo": "baleia.nvim",
-        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
+        "rev": "1b25eac3ac03659c3d3af75c7455e179e5f197f7",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     "base16-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1708139024,
+        "lastModified": 1716483968,
-        "narHash": "sha256-l0BO2boIy6mwK8ISWS3D68f8egqHYwsGSAnzjbB5aOE=",
+        "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
         "owner": "RRethy",
         "repo": "base16-nvim",
-        "rev": "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a",
+        "rev": "6ac181b5733518040a33017dde654059cd771b7c",
         "type": "github"
       },
       "original": {
@@ -35,44 +35,43 @@
     "bufferline-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706180994,
+        "lastModified": 1716555412,
-        "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=",
+        "narHash": "sha256-8PCkY1zrlMrPGnQOb7MjqDXNlkeX46jrT4ScIL+MOwM=",
         "owner": "akinsho",
         "repo": "bufferline.nvim",
-        "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748",
+        "rev": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v4.5.0",
+        "ref": "v4.6.1",
         "repo": "bufferline.nvim",
         "type": "github"
       }
     },
-    "bypass-paywalls-clean": {
+    "cl-nix-lite": {
-      "flake": false,
       "locked": {
-        "lastModified": 1709556839,
+        "lastModified": 1717972076,
-        "narHash": "sha256-LbsaYISpsjCI8DXPu2toBI3uMK+Xau1sWuzA2xsQ6Pg=",
+        "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
-        "owner": "magnolia1234",
+        "owner": "hraban",
-        "repo": "bpc-uploads",
+        "repo": "cl-nix-lite",
-        "rev": "0ca7c6a857e4e6c3e508228168e8de70e21cee3a",
+        "rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
-        "type": "gitlab"
+        "type": "github"
       },
       "original": {
-        "owner": "magnolia1234",
+        "owner": "hraban",
-        "repo": "bpc-uploads",
+        "repo": "cl-nix-lite",
-        "type": "gitlab"
+        "type": "github"
       }
     },
     "cmp-nvim-lsp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702205473,
+        "lastModified": 1715931395,
-        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
+        "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
+        "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d",
         "type": "github"
       },
       "original": {
@@ -81,23 +80,6 @@
         "type": "github"
       }
     },
-    "comment-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1681214440,
-        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numToStr",
-        "ref": "v0.8.0",
-        "repo": "Comment.nvim",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -105,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709771483,
+        "lastModified": 1728385805,
-        "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
+        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
+        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
         "type": "github"
       },
       "original": {
@@ -126,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709967935,
+        "lastModified": 1728687662,
-        "narHash": "sha256-ZLLdGWs9njivxZsfSzfQN05g6WIyIe24bPb61y7FVqo=",
+        "narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "72818e54ec29427f8d9f9cfa6fc859d01ca6dc66",
+        "rev": "bdbdb725d632863bdedb80baabf21327614dd237",
         "type": "github"
       },
       "original": {
@@ -142,16 +124,16 @@
     "fidget-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1704696337,
+        "lastModified": 1716093309,
-        "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=",
+        "narHash": "sha256-Gpk/G0ByOAIE8uX4Xr94CvAjJBSJMEOwBuvrhmYYGsg=",
         "owner": "j-hui",
         "repo": "fidget.nvim",
-        "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db",
+        "rev": "ef99df04a1c53a453602421bc0f756997edc8289",
         "type": "github"
       },
       "original": {
         "owner": "j-hui",
-        "ref": "v1.2.0",
+        "ref": "v1.4.5",
         "repo": "fidget.nvim",
         "type": "github"
       }
@@ -163,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710031437,
+        "lastModified": 1728694479,
-        "narHash": "sha256-XauWQSnMUwJOHgW/ByZP1kOrJyNSJxV4aNoBlo8lnoc=",
+        "narHash": "sha256-NFFW6RrOTBuIk29LKtAO3MU5Y0ll7zAp9Skd9HvCGfs=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "e9883b75736b2d33787c9326d27d719a644b1c35",
+        "rev": "8a3143c1ce147481db4463e71bc3b7002e6ebc56",
         "type": "github"
       },
       "original": {
@@ -177,6 +159,23 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1697816753,
+        "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
+        "owner": "hraban",
+        "repo": "flake-compat",
+        "rev": "6025bade1336a36014639bc3f67eacc853dab78f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hraban",
+        "ref": "fixed-output",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -197,17 +196,16 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1710146030,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "id": "flake-utils",
-        "repo": "flake-utils",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "flake-utils_2": {
@@ -228,14 +226,48 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gh-collaborators": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717117275,
+        "narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
+        "owner": "katiem0",
+        "repo": "gh-collaborators",
+        "rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "katiem0",
+        "repo": "gh-collaborators",
+        "type": "github"
+      }
+    },
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706900289,
+        "lastModified": 1727357627,
-        "narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
+        "narHash": "sha256-8FJlLw5LApQs7S8xEh2UE9wdYCAweZTbvgozCGPfQJc=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
+        "rev": "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa",
         "type": "github"
       },
       "original": {
@@ -251,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709988192,
+        "lastModified": 1728685293,
-        "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=",
+        "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030",
+        "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
         "type": "github"
       },
       "original": {
@@ -265,87 +297,94 @@
         "type": "github"
       }
     },
-    "kitty-scrollback-nvim-src": {
+    "mac-app-util": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710038457,
-        "narHash": "sha256-/6uDN3wE6uO4yxj7tNtLXjaMse2DCQsehpTnoEyBA/U=",
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "rev": "c3014974e4cd498a534ff814761ef794ebb85d01",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "type": "github"
-      }
-    },
-    "nextcloud-cookbook": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1702545935,
-        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
-        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
-      }
-    },
-    "nextcloud-external": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1699624334,
-        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
-      }
-    },
-    "nextcloud-news": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1703426420,
-        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
-      }
-    },
-    "nextcloud-snappymail": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710042081,
-        "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
-      }
-    },
-    "nix2vim": {
       "inputs": {
+        "cl-nix-lite": "cl-nix-lite",
+        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1707832982,
+        "lastModified": 1727470707,
-        "narHash": "sha256-Jsrj8HJyo+PmjrHIDhq4gjZCE0eYCVmmTrx24cG8eOQ=",
+        "narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
+        "owner": "hraban",
+        "repo": "mac-app-util",
+        "rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hraban",
+        "repo": "mac-app-util",
+        "type": "github"
+      }
+    },
+    "nextcloud-cookbook": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719431638,
+        "narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
+        "type": "tarball",
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
+      }
+    },
+    "nextcloud-external": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1710338675,
+        "narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
+        "type": "tarball",
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
+      }
+    },
+    "nextcloud-news": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718102703,
+        "narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
+        "type": "tarball",
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
+      }
+    },
+    "nextcloud-snappymail": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1728704544,
+        "narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
+      }
+    },
+    "nix2vim": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727867024,
+        "narHash": "sha256-yimXLupF3hG57imRMpqWho/Wstcj7P8Yh8t0SBiX+dQ=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "2fb1328cf058fc967b02f9a5330a99253b4c247e",
+        "rev": "da26caae6c7776eedbc6514a0f57f1ccd6a759ed",
         "type": "github"
       },
       "original": {
@@ -356,11 +395,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1709426687,
+        "lastModified": 1728176478,
-        "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
+        "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
+        "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
         "type": "github"
       },
       "original": {
@@ -377,11 +416,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709887845,
+        "lastModified": 1728522165,
-        "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=",
+        "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "bef32a05496d9480b02be586fa7827748b9e597b",
+        "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
         "type": "github"
       },
       "original": {
@@ -392,11 +431,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709703039,
+        "lastModified": 1728492678,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {
@@ -406,13 +445,45 @@
         "type": "github"
       }
     },
+    "nixpkgs-caddy": {
+      "locked": {
+        "lastModified": 1699107987,
+        "narHash": "sha256-nWXETr4Oqy/vOfzgWyMY04qzEN2iREFJc5ycQ3XNu0A=",
+        "owner": "jpds",
+        "repo": "nixpkgs",
+        "rev": "a33b02fa9d664f31dadc8a874eb1a5dbaa9f4ecf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jpds",
+        "ref": "caddy-external-plugins",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1728627514,
+        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
-        "lastModified": 1710037658,
+        "lastModified": 1728704557,
-        "narHash": "sha256-6i7th4IX+2E1KX7FEJ4XgYtvQAooLa6YRsUIVRDu0PU=",
+        "narHash": "sha256-HnYBB+oE+03rNDzTTVazBcysPOu5udRpTOGpP7/A5Ow=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "ff870a7e359c3f34fc1144c6c35f76003d6c17e7",
+        "rev": "1d143f52b0a046924ee7fe74bce0bd2e10e07c3d",
         "type": "github"
       },
       "original": {
@@ -424,11 +495,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1709238483,
+        "lastModified": 1728582620,
-        "narHash": "sha256-fYaiUFNaaSPejKBecKB7ifp/soREWYIh3avemU5qJJE=",
+        "narHash": "sha256-wfui4kE3oxveCJPjJfkJSbE69zVTeAsasDdfJkElmn8=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "e824adb9bc01647f71e55457353a68f0f37f9931",
+        "rev": "f707b3ae50417067fa63fdfe179b0bff6b380da1",
         "type": "github"
       },
       "original": {
@@ -440,16 +511,16 @@
     "nvim-lspconfig-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701687137,
+        "lastModified": 1716281382,
-        "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=",
+        "narHash": "sha256-foJ7a59N0a3QaBW24PtwbyYDQVlIsFxiatADLO/hQvc=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "cf3dd4a290084a868fac0e2e876039321d57111c",
+        "rev": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98",
         "type": "github"
       },
       "original": {
         "owner": "neovim",
-        "ref": "v0.1.7",
+        "ref": "v0.1.8",
         "repo": "nvim-lspconfig",
         "type": "github"
       }
@@ -457,11 +528,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1709951243,
+        "lastModified": 1728614821,
-        "narHash": "sha256-1lWdTSZt/J4geoQKLkZLQ5Yh992XpZ4cFHw4AGEJFPY=",
+        "narHash": "sha256-WYtu+jtsQSFqruTxdzkHE9UQJBE2TGoNoFar36AAoqo=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "041dbd18f440207ad161503a384e7c82d575db66",
+        "rev": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe",
         "type": "github"
       },
       "original": {
@@ -473,33 +544,20 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1709968077,
+        "lastModified": 1705679158,
-        "narHash": "sha256-5cHJMqbiBAbkis9exMAH5Y2ALynaSVmQT8NQTR4VztM=",
+        "narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "7ff51f53b0efb6228df2e8539b51bb2e737b77f3",
+        "rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
-        "ref": "master",
+        "ref": "v0.9.2",
         "repo": "nvim-treesitter",
         "type": "github"
       }
     },
-    "proton-ge": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710987994,
-        "narHash": "sha256-NqBzKonCYH+hNpVZzDhrVf+r2i6EwLG/IFBXjE2mC7s=",
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"
-      }
-    },
     "ren": {
       "flake": false,
       "locked": {
@@ -537,16 +595,15 @@
         "baleia-nvim-src": "baleia-nvim-src",
         "base16-nvim-src": "base16-nvim-src",
         "bufferline-nvim-src": "bufferline-nvim-src",
-        "bypass-paywalls-clean": "bypass-paywalls-clean",
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
-        "comment-nvim-src": "comment-nvim-src",
         "darwin": "darwin",
         "disko": "disko",
         "fidget-nvim-src": "fidget-nvim-src",
         "firefox-darwin": "firefox-darwin",
+        "gh-collaborators": "gh-collaborators",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
-        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
+        "mac-app-util": "mac-app-util",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
@@ -554,16 +611,19 @@
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-caddy": "nixpkgs-caddy",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "nvim-lint-src": "nvim-lint-src",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
-        "proton-ge": "proton-ge",
         "ren": "ren",
         "rep": "rep",
+        "snipe-nvim-src": "snipe-nvim-src",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
+        "tiny-inline-diagnostic-nvim-src": "tiny-inline-diagnostic-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
         "tree-sitter-bash": "tree-sitter-bash",
         "tree-sitter-ini": "tree-sitter-ini",
@@ -577,6 +637,22 @@
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
+    "snipe-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1724418876,
+        "narHash": "sha256-G4g/OzyXhDhX84HkxlhFSy6E+EAGxH+HL1Bw5s5FWHE=",
+        "owner": "leath-dub",
+        "repo": "snipe.nvim",
+        "rev": "f1abd4aaaef6398b45dcddc9f1a40dd982f732b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "leath-dub",
+        "repo": "snipe.nvim",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -607,19 +683,34 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701167040,
+        "lastModified": 1716532947,
-        "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=",
+        "narHash": "sha256-e1ulhc4IIvUgpjKQrSqPY4WpXuez6wlxL6Min9U0o5Q=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "d90956833d7c27e73c621a61f20b29fdb7122709",
+        "rev": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
-        "ref": "0.1.5",
+        "ref": "0.1.8",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -627,11 +718,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701464478,
+        "lastModified": 1725880250,
-        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
+        "narHash": "sha256-wO/cm5PT1L0hFr/CX466w0UimoFg/tWrDK8T0QeKZMU=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
+        "rev": "796200876bb0fe8157b8eb1ce03d927d3827a052",
         "type": "github"
       },
       "original": {
@@ -640,19 +731,35 @@
         "type": "github"
       }
     },
+    "tiny-inline-diagnostic-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726582328,
+        "narHash": "sha256-NBcUVUSnk2TlbSr/vFTbp3Rh35ms8lAcfDqpmE1KTq4=",
+        "owner": "rachartier",
+        "repo": "tiny-inline-diagnostic.nvim",
+        "rev": "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rachartier",
+        "repo": "tiny-inline-diagnostic.nvim",
+        "type": "github"
+      }
+    },
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701858874,
+        "lastModified": 1721232722,
-        "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=",
+        "narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008",
+        "rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.9.0",
+        "ref": "v2.12.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
@@ -660,11 +767,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1707951703,
+        "lastModified": 1725407033,
-        "narHash": "sha256-SU5wBy81aANd7oUZvYR14Vd53Ml/cBSwDtO6uG34CaE=",
+        "narHash": "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "975bc70ad95dbbf2733872bc2e0a059c055db983",
+        "rev": "c8713e50f0bd77d080832fc61ad128bc8f2934e9",
         "type": "github"
       },
       "original": {
@@ -677,11 +784,11 @@
     "tree-sitter-ini": {
       "flake": false,
       "locked": {
-        "lastModified": 1699877527,
+        "lastModified": 1725233451,
-        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
+        "narHash": "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU=",
         "owner": "justinmk",
         "repo": "tree-sitter-ini",
-        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
+        "rev": "962568c9efa71d25720ab42c5d36e222626ef3a6",
         "type": "github"
       },
       "original": {
@@ -693,11 +800,11 @@
     "tree-sitter-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1708499929,
+        "lastModified": 1725894603,
-        "narHash": "sha256-kzyn6XF4/PN8civ/0UV+ancCMkh7DF2B7WUYxix6aaM=",
+        "narHash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
         "owner": "MunifTanjim",
         "repo": "tree-sitter-lua",
-        "rev": "04c9579dcb917255b2e5f8199df4ae7f587d472f",
+        "rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
         "type": "github"
       },
       "original": {
@@ -710,11 +817,11 @@
     "tree-sitter-puppet": {
       "flake": false,
       "locked": {
-        "lastModified": 1709480423,
+        "lastModified": 1713617121,
-        "narHash": "sha256-Lwfiby7amjTIOz8QRoC4RdZyFPfFikmQ2sqta4akyH8=",
+        "narHash": "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI=",
         "owner": "amaanq",
         "repo": "tree-sitter-puppet",
-        "rev": "5849f9694197a6e822872945b415429c285fdd54",
+        "rev": "584522f32495d648b18a53ccb52d988e60de127d",
         "type": "github"
       },
       "original": {
@@ -726,11 +833,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1709753184,
+        "lastModified": 1725324041,
-        "narHash": "sha256-SqPd9O1OqBEOA+WPLfP3J2vuHWt53G5gI/9FWKQx2/Y=",
+        "narHash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "03e88c170cb23142559a406b6e7621c4af3128f5",
+        "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
         "type": "github"
       },
       "original": {
@@ -743,11 +850,11 @@
     "tree-sitter-rasi": {
       "flake": false,
       "locked": {
-        "lastModified": 1707776004,
+        "lastModified": 1716296585,
-        "narHash": "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c=",
+        "narHash": "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=",
         "owner": "Fymyte",
         "repo": "tree-sitter-rasi",
-        "rev": "43196d934a9a6ab3c7093a8683efd0111bb03db1",
+        "rev": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa",
         "type": "github"
       },
       "original": {
@@ -759,11 +866,11 @@
     "tree-sitter-vimdoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1709370081,
+        "lastModified": 1717834376,
-        "narHash": "sha256-v+hSI/6ocC2KxH8ogCexNcxxhcZsl7OvV9197zBCKr4=",
+        "narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
         "owner": "neovim",
         "repo": "tree-sitter-vimdoc",
-        "rev": "016ad75faa854e4e13bc40c517015183b795eed9",
+        "rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
         "type": "github"
       },
       "original": {
@@ -790,18 +897,18 @@
     },
     "wsl": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1709980437,
+        "lastModified": 1728588346,
-        "narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
+        "narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
+        "rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
         "type": "github"
       },
       "original": {

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";
@@ -22,8 +28,7 @@
     # Used for user packages and dotfiles
     home-manager = {
       url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows =
+      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
-        "nixpkgs"; # Use system packages list for their inputs
     };
 
     # Community packages; used for Firefox extensions
@@ -35,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";
@@ -66,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 = {
@@ -78,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 = {
@@ -99,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 = {
@@ -117,17 +123,21 @@
     };
     fidget-nvim-src = {
       # https://github.com/j-hui/fidget.nvim/tags
-      url = "github:j-hui/fidget.nvim/v1.2.0";
+      url = "github:j-hui/fidget.nvim/v1.4.5";
-      flake = false;
-    };
-    kitty-scrollback-nvim-src = {
-      url = "github:mikesmithgh/kitty-scrollback.nvim";
       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 = {
@@ -175,107 +185,103 @@
       flake = false;
     };
 
-    # GE version of Proton for game compatibility
+    gh-collaborators = {
-    # Alternatively, could consider using https://github.com/fufexan/nix-gaming
+      url = "github:katiem0/gh-collaborators";
-    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";
-      flake = false;
-    };
-
-    # Firefox addon from outside the extension store
-    bypass-paywalls-clean = {
-      # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
-      url = "gitlab:magnolia1234/bpc-uploads";
       flake = false;
     };
 
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
-      url =
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
-        "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
       flake = false;
     };
     nextcloud-external = {
       # https://github.com/nextcloud-releases/external/releases
-      url =
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
-        "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
       flake = false;
     };
     nextcloud-cookbook = {
       # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url =
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
-        "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
       flake = false;
     };
     nextcloud-snappymail = {
       # https://github.com/the-djmaze/snappymail/releases
-      url =
+      # https://snappymail.eu/repository/nextcloud
-        "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz";
+      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
+      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
       flake = false;
     };
-
   };
 
-  outputs = { nixpkgs, ... }@inputs:
+  outputs =
+    { nixpkgs, ... }@inputs:
 
     let
 
       # Global configuration for my systems
-      globals = let baseName = "masu.rs";
+      globals =
-      in rec {
+        let
-        user = "noah";
+          baseName = "masu.rs";
-        fullName = "Noah Masur";
+        in
-        gitName = fullName;
+        rec {
-        gitEmail = "7386960+nmasur@users.noreply.github.com";
+          user = "noah";
-        mail.server = "noahmasur.com";
+          fullName = "Noah Masur";
-        mail.imapHost = "imap.purelymail.com";
+          gitName = fullName;
-        mail.smtpHost = "smtp.purelymail.com";
+          gitEmail = "7386960+nmasur@users.noreply.github.com";
-        dotfilesRepo = "https://github.com/nmasur/dotfiles";
+          mail.server = "noahmasur.com";
-        hostnames = {
+          mail.imapHost = "imap.purelymail.com";
-          git = "git.${baseName}";
+          mail.smtpHost = "smtp.purelymail.com";
-          influxdb = "influxdb.${baseName}";
+          dotfilesRepo = "https://github.com/nmasur/dotfiles";
-          irc = "irc.${baseName}";
+          hostnames = {
-          metrics = "metrics.${baseName}";
+            audiobooks = "read.${baseName}";
-          prometheus = "prom.${baseName}";
+            files = "files.${baseName}";
-          paperless = "paper.${baseName}";
+            git = "git.${baseName}";
-          secrets = "vault.${baseName}";
+            influxdb = "influxdb.${baseName}";
-          stream = "stream.${baseName}";
+            irc = "irc.${baseName}";
-          content = "cloud.${baseName}";
+            metrics = "metrics.${baseName}";
-          books = "books.${baseName}";
+            minecraft = "minecraft.${baseName}";
-          download = "download.${baseName}";
+            n8n = "n8n.${baseName}";
-          transmission = "transmission.${baseName}";
+            notifications = "ntfy.${baseName}";
+            prometheus = "prom.${baseName}";
+            paperless = "paper.${baseName}";
+            secrets = "vault.${baseName}";
+            stream = "stream.${baseName}";
+            content = "cloud.${baseName}";
+            books = "books.${baseName}";
+            download = "download.${baseName}";
+            status = "status.${baseName}";
+            transmission = "transmission.${baseName}";
+          };
         };
-      };
 
       # Common overlays to always use
       overlays = [
         inputs.nur.overlay
         inputs.nix2vim.overlay
         (import ./overlays/neovim-plugins.nix inputs)
-        (import ./overlays/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 inputs)
-        (import ./overlays/gh-collaborators.nix)
-        (import ./overlays/bypass-paywalls-clean.nix inputs)
         (import ./overlays/ren-rep.nix inputs)
       ];
 
       # System types to support.
-      supportedSystems =
+      supportedSystems = [
-        [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
 
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
+    in
-    in rec {
+    rec {
 
       # Contains my full system builds, including home-manager
       # nixos-rebuild switch --flake .#tempest
@@ -290,90 +296,143 @@
       # Contains my full Mac system builds, including home-manager
       # darwin-rebuild switch --flake .#lookingglass
       darwinConfigurations = {
-        lookingglass =
+        lookingglass = import ./hosts/lookingglass { inherit inputs globals overlays; };
-          import ./hosts/lookingglass { inherit inputs globals overlays; };
       };
 
       # For quickly applying home-manager settings with:
       # home-manager switch --flake .#tempest
       homeConfigurations = {
-        tempest =
+        tempest = nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
-          nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
+        lookingglass = darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
-        lookingglass =
-          darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
       };
 
       # Disk formatting, only used once
-      diskoConfigurations = { root = import ./disks/root.nix; };
+      diskoConfigurations = {
-
+        root = import ./disks/root.nix;
-      packages = let
-        arrow = system:
-          import ./hosts/arrow { inherit inputs globals overlays system; };
-        aws = system:
-          import ./hosts/aws { inherit inputs globals overlays system; };
-        staff = system:
-          import ./hosts/staff { inherit inputs globals overlays system; };
-        neovim = system:
-          let pkgs = import nixpkgs { inherit system overlays; };
-          in import ./modules/common/neovim/package {
-            inherit pkgs;
-            colors = (import ./colorscheme/gruvbox-dark).dark;
-          };
-      in {
-        x86_64-linux.arrow = arrow "x86_64-linux";
-        x86_64-linux.aws = aws "x86_64-linux";
-        x86_64-linux.staff = staff "x86_64-linux";
-        x86_64-linux.image = {
-          arrow = inputs.nixos-generators.nixosGenerate {
-            system = "x86_64-linux";
-            format = "iso";
-            modules = import ./hosts/arrow/modules.nix {
-              inherit inputs globals overlays;
-            };
-          };
-        };
-
-        # Package Neovim config into standalone package
-        x86_64-linux.neovim = neovim "x86_64-linux";
-        x86_64-darwin.neovim = neovim "x86_64-darwin";
-        aarch64-linux.neovim = neovim "aarch64-linux";
-        aarch64-darwin.neovim = neovim "aarch64-darwin";
       };
 
+      packages =
+        let
+          staff =
+            system:
+            import ./hosts/staff {
+              inherit
+                inputs
+                globals
+                overlays
+                system
+                ;
+            };
+          neovim =
+            system:
+            let
+              pkgs = import nixpkgs { inherit system overlays; };
+            in
+            import ./modules/common/neovim/package {
+              inherit pkgs;
+              colors = (import ./colorscheme/gruvbox-dark).dark;
+            };
+        in
+        {
+          x86_64-linux.staff = staff "x86_64-linux";
+          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
+            system = "x86_64-linux";
+            format = "iso";
+            specialArgs = {
+              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";
+          x86_64-darwin.neovim = neovim "x86_64-darwin";
+          aarch64-linux.neovim = neovim "aarch64-linux";
+          aarch64-darwin.neovim = neovim "aarch64-darwin";
+        };
+
       # Programs that can be run by calling this flake
-      apps = forAllSystems (system:
+      apps = forAllSystems (
-        let pkgs = import nixpkgs { inherit system overlays; };
+        system:
-        in import ./apps { inherit pkgs; });
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        import ./apps { inherit pkgs; }
+      );
 
       # Development environments
-      devShells = forAllSystems (system:
+      devShells = forAllSystems (
-        let pkgs = import nixpkgs { inherit system overlays; };
+        system:
-        in {
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        {
 
           # Used to run commands and edit files in this repo
           default = pkgs.mkShell {
-            buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
+            buildInputs = with pkgs; [
+              git
+              stylua
+              nixfmt-rfc-style
+              shfmt
+              shellcheck
+            ];
           };
+        }
+      );
 
-        });
+      checks = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        {
+          neovim =
+            pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
+              ''
+                mkdir -p $out
+                export HOME=$TMPDIR
+                nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
 
-      checks = forAllSystems (system:
+                # Check for errors inside the health log
-        let pkgs = import nixpkgs { inherit system overlays; };
+                if $(grep "ERROR" $out/health.log); then
-        in {
+                  cat $out/health.log
-          neovim = pkgs.runCommand "neovim-check-health" {
+                  exit 1
-            buildInputs = [ inputs.self.packages.${system}.neovim ];
+                fi
-          } ''
+              '';
-            mkdir -p $out
+        }
-            export HOME=$TMPDIR
+      );
-            nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
 
-            # Check for errors inside the health log
+      formatter = forAllSystems (
-            if $(grep "ERROR" $out/health.log); then
+        system:
-              cat $out/health.log
+        let
-              exit 1
+          pkgs = import nixpkgs { inherit system overlays; };
-            fi
+        in
-          '';
+        pkgs.nixfmt-rfc-style
-        });
+      );
 
       # Templates for starting other projects quickly
       templates = rec {
@@ -399,6 +458,5 @@
           description = "Rust template";
         };
       };
-
     };
 }

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

@@ -1,13 +1,23 @@
-locals {
+# locals {
-  image_file = one(fileset(path.root, "result/nixos-amazon-image-*.vhd"))
+#   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"
 }
 
-# Upload to S3
+resource "terraform_data" "image_replacement" {
-resource "aws_s3_object" "image" {
+  input = data.aws_s3_object.image.etag
-  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
@@ -26,11 +36,11 @@ data "aws_iam_policy_document" "vmimport" {
     actions = [
       "s3:GetBucketLocation",
       "s3:GetObject",
-        "s3:ListBucket",
+      "s3:ListBucket",
     ]
     resources = [
-      "arn:aws:s3:::${aws_s3_object.image.bucket}",
+      "arn:aws:s3:::${data.aws_s3_object.image.bucket}",
-      "arn:aws:s3:::${aws_s3_object.image.bucket}/*",
+      "arn:aws:s3:::${data.aws_s3_object.image.bucket}/*",
     ]
   }
   statement {
@@ -58,23 +68,28 @@ resource "aws_ebs_snapshot_import" "image" {
   disk_container {
     format = "VHD"
     user_bucket {
-      s3_bucket = aws_s3_object.image.bucket
+      s3_bucket = data.aws_s3_object.image.bucket
-      s3_key    = aws_s3_object.image.key
+      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(local.image_file), "/\\.vhd$/", "")
+  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 = 8
+    volume_size = 17
   }
 }

hosts/arrow/aws/main.tf

@@ -0,0 +1,13 @@
+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"
+    }
+  }
+}

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

@@ -1,8 +1,41 @@
-{ inputs, globals, overlays, ... }:
+# The Arrow
+# System configuration for temporary VM
 
-inputs.nixpkgs.lib.nixosSystem {
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
+
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
-  specialArgs = { };
+  specialArgs = {
-  modules = import ./modules.nix { inherit inputs globals overlays; };
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
-}
+  };
+  modules = import ./modules.nix { inherit inputs globals overlays; } ++ [
+    {
+      # This is the root filesystem containing NixOS
+      fileSystems."/" = {
+        device = "/dev/disk/by-label/nixos";
+        fsType = "ext4";
+      };
 
+      # This is the boot filesystem for Grub
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-label/boot";
+        fsType = "vfat";
+      };
+
+      virtualisation.vmVariant = {
+        virtualisation.forwardPorts = [
+          {
+            from = "host";
+            host.port = 2222;
+            guest.port = 22;
+          }
+        ];
+      };
+    }
+  ];
+}

hosts/arrow/modules.nix

@@ -1,4 +1,8 @@
-{ inputs, globals, overlays }:
+{
+  inputs,
+  globals,
+  overlays,
+}:
 
 [
   globals
@@ -18,21 +22,11 @@
     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 =
+    home-manager.users.${globals.user}.programs.nix-index.enable = inputs.nixpkgs.lib.mkForce false;
-      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,21 +30,19 @@ 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"
   sensitive   = true
 }
 
+# https://api.vultr.com/v2/plans
+variable "vultr_plan" {
+  type        = string
+  description = "Size of instance to launch"
+  default     = "vc2-1c-2gb" # 55 GB SSD ($10/mo)
+}
+
 provider "aws" {
   region                      = "auto"
   skip_credentials_validation = true
@@ -57,25 +55,13 @@ 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"
+  url = "https://arrow-images.masu.rs/arrow.iso"
 }
 
 resource "vultr_instance" "arrow" {
-  plan                = "vc2-1c-2gb"
+  plan                = var.vultr_plan
   region              = "ewr"
   iso_id              = vultr_iso_private.image.id
   label               = "arrow"

hosts/aws/default.nix

@@ -1,28 +0,0 @@
-{ inputs, system, globals, overlays, ... }:
-
-inputs.nixos-generators.nixosGenerate {
-  inherit system;
-  format = "amazon";
-  modules = [
-    globals
-    inputs.home-manager.nixosModules.home-manager
-    {
-      nixpkgs.overlays = overlays;
-      networking.hostName = "sheep";
-      gui.enable = false;
-      theme.colors = (import ../../colorscheme/gruvbox).dark;
-      passwordHash = null;
-      publicKeys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
-      ];
-      # AWS settings require this
-      permitRootLogin = "prohibit-password";
-    }
-    ../../modules/common
-    ../../modules/nixos
-    ../../modules/nixos/services/sshd.nix
-  ] ++ [
-    # Required to fix diskSize errors during build
-    ({ ... }: { amazonImage.sizeMB = 16 * 1024; })
-  ];
-}

hosts/aws/workflow.yml

@@ -1,280 +0,0 @@
-name: 'Terraform'
-env:
-
-  AWS_ACCOUNT_NUMBER: ''
-  AWS_PLAN_ROLE_NAME: github_actions_plan
-  AWS_APPLY_ROLE_NAME: github_actions_admin
-
-  # Always required. Used for authenticating to AWS, but can also act as your
-  # default region if you don't want to specify in the provider configuration.
-  AWS_REGION: us-east-1
-
-  # You must change these to fit your project.
-  TF_VAR_project: change-me
-  TF_VAR_label: change-me
-  TF_VAR_owner: Your Name Here
-
-  # If storing Terraform in a subdirectory, specify it here.
-  TERRAFORM_DIRECTORY: .
-
-  # Pinned versions of tools to use.
-  # Check for new releases:
-  # - https://github.com/hashicorp/terraform/releases
-  # - https://github.com/fugue/regula/releases
-  # - https://github.com/terraform-linters/tflint/releases
-  TERRAFORM_VERSION: 1.2.6
-  REGULA_VERSION: 2.9.0
-  TFLINT_VERSION: 0.39.1
-
-  # Terraform configuration options
-  TERRAFORM_PARALLELISM: 10
-
-  # These variables are passed to Terraform based on GitHub information.
-  TF_VAR_repo: ${{ github.repository }}
-
-# This workflow is triggered in the following ways.
-on:
-
-  # Any push or merge to these branches.
-  push:
-    branches:
-      - dev
-      - prod
-
-  # Any pull request targeting these branches (plan only).
-  pull_request:
-    branches:
-      - dev
-      - prod
-
-
-  # Any manual trigger on these branches.
-  workflow_dispatch:
-    branches:
-      - dev
-      - prod
-
-# -------------------------------------------------------------------
-# The rest of this workflow can operate without adjustments. Edit the
-# below content at your own risk!
-# -------------------------------------------------------------------
-
-# Used to connect to AWS IAM
-permissions:
-  id-token: write
-  contents: read
-  pull-requests: write
-
-# Only run one workflow at a time for each Terraform state. This prevents
-# lockfile conflicts, especially during PR vs push.
-concurrency: terraform-${{ github.base_ref || github.ref }}
-
-jobs:
-  terraform:
-
-    name: 'Terraform'
-
-    # Change this if you need to run your deployment on-prem.
-    runs-on: ubuntu-latest
-
-    steps:
-
-      # Downloads the current repo code to the runner.
-      - name: Checkout Repo Code
-        uses: actions/checkout@v3
-
-      # Enable access to KVM, required to build an image
-      - name: Enable KVM group perms
-        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@v1.6.1
-        with:
-          role-to-assume: ${{ env.AWS_ROLE_ARN }}
-          aws-region: ${{ env.AWS_REGION }}
-
-      # Install Nix
-      - name: Install Nix
-        uses: cachix/install-nix-action@v17
-        with:
-          extra_nix_config: |
-            substituters = s3://insert-cache-bucket https://cache.nixos.org/
-            trusted-public-keys = insert-cache-bucket:M6PsZjHXcLvbQyPUBLICKEYGVoNwI84g1FBQzouRU= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-
-      # Build the image
-      - name: Build Image
-        run: nix build .#aws
-
-      # 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
-
-      # Exports all GitHub Secrets as environment variables prefixed by
-      # "TF_VAR_", which exposes them to Terraform. The name of each GitHub
-      # Secret must match its Terraform variable name exactly.
-      - name: Export Secrets to Terraform Variables
-        env:
-          ALL_SECRETS: ${{ toJson(secrets) }}
-        run: |
-          echo "$ALL_SECRETS" \
-            | jq "to_entries | .[] | \"TF_VAR_\" + ( .key | ascii_downcase ) + \"=\" + .value" \
-            | tr -d \" >> $GITHUB_ENV
-
-      # Installs the Terraform binary and some other accessory functions.
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_version: ${{ env.TERRAFORM_VERSION }}
-
-      # Checks whether Terraform is formatted properly. If this fails, you
-      # should install the pre-commit hook.
-      - name: Check Formatting
-        run: |
-          terraform fmt -no-color -check -diff -recursive
-
-      # Downloads a Terraform code lint test.
-      - uses: terraform-linters/setup-tflint@v1
-        name: Setup TFLint
-        with:
-          tflint_version: v${{ env.TFLINT_VERSION }}
-
-      # Sets up linting with this codebase.
-      - name: Init TFLint
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: tflint --init
-
-      # Lints the current code.
-      - name: Run TFLint
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          tflint -f compact
-          find ./modules/* -type d -maxdepth 0 | xargs -I __ tflint -f compact --disable-rule=terraform_required_providers --disable-rule=terraform_required_version __
-
-      # Connects to remote state backend and download providers.
-      - name: Terraform Init
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform init \
-            -backend-config="role_arn=${{ env.AWS_STATE_ROLE_ARN }}" \
-            -backend-config="region=us-east-1" \
-            -backend-config="workspace_key_prefix=accounts/${{ env.AWS_ACCOUNT_NUMBER }}/${{ github.repository }}" \
-            -backend-config="key=state.tfstate" \
-            -backend-config="dynamodb_table=global-tf-state-lock"
-
-      # Set the Terraform Workspace to the current branch name.
-      - name: Set Terraform Workspace
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        shell: bash
-        run: |
-          export WORKSPACE=${{ github.base_ref || github.ref_name }}
-          terraform workspace select ${WORKSPACE} || terraform workspace new $WORKSPACE
-          echo "TF_WORKSPACE=$(echo ${WORKSPACE} | sed 's/\//_/g')" >> $GITHUB_ENV
-
-      # Checks differences between current code and infrastructure state.
-      - name: Terraform Plan
-        id: plan
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform plan \
-            -input=false \
-            -no-color \
-            -out=tfplan \
-            -parallelism=${TERRAFORM_PARALLELISM} \
-            -var-file=variables-${TF_WORKSPACE}.tfvars
-
-      # Gets the results of the plan for pull requests.
-      - name: Terraform Show Plan
-        id: show
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform show -no-color tfplan
-
-      # Adds the results of the plan to the pull request.
-      - name: Comment Plan
-        uses: actions/github-script@v6
-        if: github.event_name == 'pull_request'
-        env:
-          STDOUT: "```terraform\n${{ steps.show.outputs.stdout }}```"
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            // 1. Retrieve existing bot comments for the PR
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            })
-            const botComment = comments.find(comment => {
-              return comment.user.type === 'Bot' && comment.body.includes('Terraform Format and Style')
-            })
-
-            // 2. Prepare format of the comment
-            const output = `#### Terraform Format and Style 🖌\`${{ steps.fmt.outcome }}\`
-            #### Terraform Initialization ⚙️\`${{ steps.init.outcome }}\`
-            #### Terraform Validation 🤖\`${{ steps.validate.outcome }}\`
-            <details><summary>Validation Output</summary>
-
-            \`\`\`\n
-            ${{ steps.validate.outputs.stdout }}
-            \`\`\`
-
-            </details>
-
-            #### Terraform Plan 📖\`${{ steps.plan.outcome }}\`
-
-            <details><summary>Show Plan</summary>
-
-            \`\`\`\n
-            ${process.env.PLAN}
-            \`\`\`
-
-            </details>
-
-            *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Working Directory: \`${{ env.tf_actions_working_dir }}\`, Workflow: \`${{ github.workflow }}\`*`;
-
-            // 3. If we have a comment, update it, otherwise create a new one
-            if (botComment) {
-              github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: botComment.id,
-                body: output
-              })
-            } else {
-              github.rest.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: output
-              })
-            }
-
-      # Downloads Regula and checks whether the plan meets compliance requirements.
-      - name: Regula Compliance Check
-        shell: bash
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          REGULA_URL="https://github.com/fugue/regula/releases/download/v${REGULA_VERSION}/regula_${REGULA_VERSION}_Linux_x86_64.tar.gz"
-          curl -sL "$REGULA_URL" -o regula.tar.gz
-          tar xzf regula.tar.gz
-          terraform show -json tfplan | ./regula run
-
-      # Deploys infrastructure or changes to infrastructure.
-      - name: Terraform Apply
-        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform apply \
-            -auto-approve \
-            -input=false \
-            -parallelism=${TERRAFORM_PARALLELISM} \
-            tfplan

hosts/flame/default.nix

@@ -7,11 +7,19 @@
 # https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
 # These days, probably use nixos-anywhere instead.
 
-{ inputs, globals, overlays, ... }:
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
 
-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
@@ -26,7 +34,11 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # Not sure what's necessary but too afraid to remove anything
       imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
-      boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
+      boot.initrd.availableKernelModules = [
+        "xhci_pci"
+        "virtio_pci"
+        "usbhid"
+      ];
 
       # File systems must be declared in order to boot
 
@@ -49,7 +61,9 @@ inputs.nixpkgs.lib.nixosSystem {
       gui.enable = false;
 
       # Still require colors for programs like Neovim, K9S
-      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+      theme = {
+        colors = (import ../../colorscheme/gruvbox).dark;
+      };
 
       # Programs and services
       atuin.enable = true;
@@ -66,14 +80,17 @@ 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.uptime-kuma.enable = true;
+      system.autoUpgrade.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
         enable = true;
         id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
         credentialsFile = ../../private/cloudflared-flame.age;
-        ca =
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
       };
 
       # Nextcloud backup config
@@ -116,7 +133,6 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # # VPN port forwarding
       # services.transmission.settings.peer-port = 57599;
-
     }
   ];
 }

hosts/hydra/default.nix

@@ -3,7 +3,12 @@
 
 # See [readme](../README.md) to explain how this file works.
 
-{ inputs, globals, overlays, ... }:
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
 
 inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
@@ -32,8 +37,7 @@ inputs.nixpkgs.lib.nixosSystem {
         startMenuLaunchers = true;
         nativeSystemd = true;
         wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
-        interop.includePath =
+        interop.includePath = false; # Including Windows PATH will slow down Neovim command mode
-          false; # Including Windows PATH will slow down Neovim command mode
       };
 
       neovim.enable = true;
@@ -41,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

@@ -1,7 +1,12 @@
 # The Looking Glass
 # System configuration for my work Macbook
 
-{ inputs, globals, overlays, ... }:
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
 
 inputs.darwin.lib.darwinSystem {
   system = "aarch64-darwin";
@@ -9,12 +14,16 @@ inputs.darwin.lib.darwinSystem {
   modules = [
     ../../modules/common
     ../../modules/darwin
-    (globals // rec {
+    (
-      user = "Noah.Masur";
+      globals
-      gitName = "Noah-Masur_1701";
+      // rec {
-      gitEmail = "${user}@take2games.com";
+        user = "Noah.Masur";
-    })
+        gitName = "Noah-Masur_1701";
+        gitEmail = "${user}@take2games.com";
+      }
+    )
     inputs.home-manager.darwinModules.home-manager
+    inputs.mac-app-util.darwinModules.default
     {
       nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
       networking.hostName = "lookingglass";
@@ -35,7 +44,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;
@@ -44,6 +52,8 @@ inputs.darwin.lib.darwinSystem {
       kubernetes.enable = true;
       _1password.enable = true;
       slack.enable = true;
+      wezterm.enable = true;
+      yt-dlp.enable = true;
     }
   ];
 }

hosts/staff/default.nix

@@ -1,43 +1,53 @@
 # The Staff
 # ISO configuration for my USB drive
 
-{ inputs, system, overlays, ... }:
+{
+  inputs,
+  system,
+  overlays,
+  ...
+}:
 
 inputs.nixos-generators.nixosGenerate {
   inherit system;
   format = "install-iso";
-  modules = [{
+  modules = [
-    nixpkgs.overlays = overlays;
+    {
-    networking.hostName = "staff";
+      nixpkgs.overlays = overlays;
-    users.extraUsers.root.openssh.authorizedKeys.keys = [
+      networking.hostName = "staff";
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
+      users.extraUsers.root.openssh.authorizedKeys.keys = [
-    ];
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
-    services.openssh = {
-      enable = true;
-      ports = [ 22 ];
-      allowSFTP = true;
-      settings = {
-        GatewayPorts = "no";
-        X11Forwarding = false;
-        PasswordAuthentication = false;
-        PermitRootLogin = "yes";
-      };
-    };
-    environment.systemPackages =
-      let pkgs = import inputs.nixpkgs { inherit system overlays; };
-      in with pkgs; [
-        git
-        vim
-        wget
-        curl
-        (import ../../modules/common/neovim/package {
-          inherit pkgs;
-          colors = (import ../../colorscheme/gruvbox).dark;
-        })
       ];
-    nix.extraOptions = ''
+      services.openssh = {
-      experimental-features = nix-command flakes
+        enable = true;
-      warn-dirty = false
+        ports = [ 22 ];
-    '';
+        allowSFTP = true;
-  }];
+        settings = {
+          GatewayPorts = "no";
+          X11Forwarding = false;
+          PasswordAuthentication = false;
+          PermitRootLogin = "yes";
+        };
+      };
+      environment.systemPackages =
+        let
+          pkgs = import inputs.nixpkgs { inherit system overlays; };
+        in
+        with pkgs;
+        [
+          git
+          vim
+          wget
+          curl
+          (import ../../modules/common/neovim/package {
+            inherit pkgs;
+            colors = (import ../../colorscheme/gruvbox).dark;
+          })
+        ];
+      nix.extraOptions = ''
+        experimental-features = nix-command flakes
+        warn-dirty = false
+      '';
+    }
+  ];
 }

hosts/swan/default.nix

@@ -1,13 +1,19 @@
 # The Swan
 # System configuration for my home NAS server
 
-# See [readme](../README.md) to explain how this file works.
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
 
-{ inputs, globals, overlays, ... }:
+inputs.nixpkgs.lib.nixosSystem rec {
-
-inputs.nixpkgs.lib.nixosSystem {
   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
@@ -23,8 +29,13 @@ inputs.nixpkgs.lib.nixosSystem {
       networking.hostName = "swan";
 
       # Not sure what's necessary but too afraid to remove anything
-      boot.initrd.availableKernelModules =
+      boot.initrd.availableKernelModules = [
-        [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+        "xhci_pci"
+        "ahci"
+        "nvme"
+        "usb_storage"
+        "sd_mod"
+      ];
 
       # Required for transcoding
       boot.initrd.kernelModules = [ "amdgpu" ];
@@ -56,12 +67,24 @@ 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" ];
         # Only try to decrypt datasets with keyfiles
-        requestEncryptionCredentials =
+        requestEncryptionCredentials = [
-          [ "tank/archive" "tank/generic" "tank/nextcloud" ];
+          "tank/archive"
+          "tank/generic"
+          "tank/nextcloud"
+          "tank/generic/git"
+        ];
         # If password is requested and fails, continue to boot eventually
         passwordTimeout = 300;
       };
@@ -72,7 +95,9 @@ inputs.nixpkgs.lib.nixosSystem {
       gui.enable = false;
 
       # Still require colors for programs like Neovim, K9S
-      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+      theme = {
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
+      };
 
       # Programs and services
       atuin.enable = true;
@@ -80,6 +105,8 @@ 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.jellyfin.enable = true;
@@ -91,14 +118,14 @@ 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 = {
         enable = true;
         id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
         credentialsFile = ../../private/cloudflared-swan.age;
-        ca =
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
       };
 
       # Send regular backups and litestream for DBs to an S3-like bucket

hosts/tempest/default.nix

@@ -1,12 +1,19 @@
 # The Tempest
 # System configuration for my desktop
 
-# See [readme](../README.md) to explain how this file works.
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:
 
-{ inputs, globals, overlays, ... }:
+inputs.nixpkgs.lib.nixosSystem rec {
-
-inputs.nixpkgs.lib.nixosSystem {
   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
@@ -20,8 +27,14 @@ inputs.nixpkgs.lib.nixosSystem {
       networking.hostName = "tempest";
 
       # Not sure what's necessary but too afraid to remove anything
-      boot.initrd.availableKernelModules =
+      boot.initrd.availableKernelModules = [
-        [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usb_storage"
+        "usbhid"
+        "sd_mod"
+      ];
 
       # Graphics and VMs
       boot.initrd.kernelModules = [ "amdgpu" ];
@@ -101,37 +114,34 @@ 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;
-        leagueoflegends.enable = true;
         ryujinx.enable = true;
       };
       services.vmagent.enable = true; # Enables Prometheus metrics
-      services.openssh.enable =
+      services.openssh.enable = true; # Required for Cloudflare tunnel and identity file
-        true; # Required for Cloudflare tunnel and identity file
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
         enable = true;
         id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
         credentialsFile = ../../private/cloudflared-tempest.age;
-        ca =
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
       };
 
       # Allows requests to force machine to wake up
       # This network interface might change, needs to be set specifically for each machine.
       # Or set usePredictableInterfaceNames = false
       networking.interfaces.enp5s0.wakeOnLan.enable = true;
-
     }
   ];
 }

modules/aws/default.nix

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

modules/common/applications/1password.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     _1password = {
@@ -10,9 +16,15 @@
   };
 
   config = lib.mkIf (config.gui.enable && config._1password.enable) {
-    unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
+    unfreePackages = [
+      "1password"
+      "_1password-gui"
+      "1password-cli"
+    ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ _1password-gui _1password ];
+      home.packages = [
+        pkgs._1password
+      ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
     };
 
     # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
@@ -26,5 +38,4 @@
       firefox
     '';
   };
-
 }

modules/common/applications/alacritty.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     alacritty = {
@@ -28,7 +34,9 @@
             opacity = 1.0;
           };
           scrolling.history = 10000;
-          font = { size = 14.0; };
+          font = {
+            size = 14.0;
+          };
           key_bindings = [
             # Used for word completion in fish_user_key_bindings
             {

modules/common/applications/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
 
   imports = [
     ./1password.nix
@@ -10,7 +11,7 @@
     ./obsidian.nix
     ./qbittorrent.nix
     ./slack.nix
+    ./wezterm.nix
     ./yt-dlp.nix
   ];
-
 }

modules/common/applications/discord.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     discord = {

modules/common/applications/firefox.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
 
@@ -22,8 +27,7 @@
 
       programs.firefox = {
         enable = true;
-        package =
+        package = if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
-          if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
         profiles.default = {
           id = 0;
           name = "default";
@@ -31,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
@@ -49,33 +52,27 @@
             "app.update.auto" = false;
             "browser.aboutConfig.showWarning" = false;
             "browser.warnOnQuit" = false;
-            "browser.quitShortcut.disabled" =
+            "browser.quitShortcut.disabled" = if pkgs.stdenv.isLinux then true else false;
-              if pkgs.stdenv.isLinux then true else false;
             "browser.theme.dark-private-windows" = true;
             "browser.toolbars.bookmarks.visibility" = false;
             "browser.startup.page" = 3; # Restore previous session
             "browser.newtabpage.enabled" = false; # Make new tabs blank
-            "trailhead.firstrun.didSeeAboutWelcome" =
+            "trailhead.firstrun.didSeeAboutWelcome" = true; # Disable welcome splash
-              true; # Disable welcome splash
             "dom.forms.autocomplete.formautofill" = false; # Disable autofill
-            "extensions.formautofill.creditCards.enabled" =
+            "extensions.formautofill.creditCards.enabled" = false; # Disable credit cards
-              false; # Disable credit cards
             "dom.payments.defaults.saveAddress" = false; # Disable address save
             "general.autoScroll" = true; # Drag middle-mouse to scroll
-            "services.sync.prefs.sync.general.autoScroll" =
+            "services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll
-              false; # Prevent disabling autoscroll
             "extensions.pocket.enabled" = false;
-            "toolkit.legacyUserProfileCustomizations.stylesheets" =
+            "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Allow userChrome.css
-              true; # Allow userChrome.css
             "layout.css.color-mix.enabled" = true;
-            "ui.systemUsesDarkTheme" =
+            "ui.systemUsesDarkTheme" = if config.theme.dark == true then 1 else 0;
-              if config.theme.dark == true then 1 else 0;
+            "media.ffmpeg.vaapi.enabled" = true; # Enable hardware video acceleration
-            "media.ffmpeg.vaapi.enabled" =
-              true; # Enable hardware video acceleration
             "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "devtools.command-button-screenshot.enabled" =
+            "devtools.command-button-screenshot.enabled" = true; # Scrolling screenshot of entire page
-              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 {
@@ -160,33 +157,47 @@
 
           extraConfig = "";
         };
-
       };
 
+      # Mimic nixpkgs package environment for read-only profiles.ini management
+      # From: https://github.com/booxter/home-manager/commit/dd1602e306fec366280f5953c5e1b553e3d9672a
+      home.sessionVariables = {
+        MOZ_LEGACY_PROFILES = 1;
+        MOZ_ALLOW_DOWNGRADE = 1;
+      };
+
+      # launchd.user.envVariables = config.home-manager.users.${config.user}.home.sessionVariables;
+
       xdg.mimeApps = {
-        associations.added = { "text.html" = [ "firefox.desktop" ]; };
+        associations.added = {
-        defaultApplications = { "text.html" = [ "firefox.desktop" ]; };
+          "text/html" = [ "firefox.desktop" ];
-      };
+        };
-
+        defaultApplications = {
-      xsession.windowManager.i3.config.keybindings =
+          "text/html" = [ "firefox.desktop" ];
-        lib.mkIf pkgs.stdenv.isLinux {
+        };
-          "${
+        associations.removed = {
-            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+          "text/html" = [ "wine-extension-htm.desktop" ];
-          }+Shift+b" = "exec ${
-            # Don't name the script `firefox` or it will affect grep
-              builtins.toString (pkgs.writeShellScript "focus-ff.sh" ''
-                count=$(ps aux | grep -c firefox)
-                if [ "$count" -eq 1 ]; then
-                    i3-msg "exec --no-startup-id firefox"
-                    sleep 0.5
-                fi
-                i3-msg "[class=firefox] focus"
-              '')
-            }";
         };
 
+      };
+
+      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
+        "${
+          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+        }+Shift+b" = "exec ${
+          # Don't name the script `firefox` or it will affect grep
+          builtins.toString (
+            pkgs.writeShellScript "focus-ff.sh" ''
+              count=$(ps aux | grep -c firefox)
+              if [ "$count" -eq 1 ]; then
+                  i3-msg "exec --no-startup-id firefox"
+                  sleep 0.5
+              fi
+              i3-msg "[class=firefox] focus"
+            ''
+          )
+        }";
+      };
     };
-
   };
-
 }

modules/common/applications/kitty.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     kitty = {
@@ -13,26 +19,28 @@
 
     # Set the Rofi-Systemd terminal for viewing logs
     # Using optionalAttrs because only available in NixOS
-    environment = { } // lib.attrsets.optionalAttrs
+    environment =
-      (builtins.hasAttr "sessionVariables" config.environment) {
+      { }
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
+      // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
       };
 
     home-manager.users.${config.user} = {
 
       # Set the i3 terminal
-      xsession.windowManager.i3.config.terminal =
+      xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
-        lib.mkIf pkgs.stdenv.isLinux "kitty";
 
       # Set the Rofi terminal for running programs
-      programs.rofi.terminal =
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
-        lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
 
       # Display images in the terminal
-      programs.fish.shellAliases = {
+      programs.fish.interactiveShellInit = # fish
-        icat = "kitty +kitten icat";
+        ''
-        ssh = "kitty +kitten ssh";
+          if test "$TERM" = "xterm-kitty"
-      };
+              alias icat="kitty +kitten icat"
+              alias ssh="kitty +kitten ssh"
+          end
+        '';
 
       programs.kitty = {
         enable = true;
@@ -45,20 +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/media.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     media = {
@@ -44,7 +50,10 @@
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
-          "application/pdf" = [ "mupdf.desktop" "wine-extension-pdf.desktop" ];
+          "application/pdf" = [
+            "mupdf.desktop"
+            "wine-extension-pdf.desktop"
+          ];
         };
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
@@ -53,9 +62,6 @@
           "image/*" = [ "nsxiv.desktop" ];
         };
       };
-
     };
-
   };
-
 }

modules/common/applications/obsidian.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     obsidian = {
@@ -18,7 +24,5 @@
     # Broken on 2023-12-11
     # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
     nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
-
   };
-
 }

modules/common/applications/qbittorrent.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     qbittorrent = {
@@ -14,8 +20,6 @@
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [ qbittorrent ];
-
     };
   };
-
 }

modules/common/applications/slack.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     slack = {
@@ -15,5 +21,4 @@
       home.packages = with pkgs; [ slack ];
     };
   };
-
 }

modules/common/applications/wezterm.nix

@@ -0,0 +1,238 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    wezterm = {
+      enable = lib.mkEnableOption {
+        description = "Enable WezTerm terminal.";
+        default = false;
+      };
+    };
+  };
+
+  config =
+    let
+      font = config.home-manager.users.${config.user}.programs.kitty.font.name;
+    in
+    lib.mkIf (config.gui.enable && config.wezterm.enable) {
+
+      # Set the Rofi-Systemd terminal for viewing logs
+      # Using optionalAttrs because only available in NixOS
+      environment =
+        { }
+        // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+          sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.wezterm}/bin/wezterm";
+        };
+
+      home-manager.users.${config.user} = {
+
+        # Set the i3 terminal
+        xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "wezterm";
+
+        # Set the Rofi terminal for running programs
+        programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.wezterm}/bin/wezterm";
+
+        # Display images in the terminal
+        programs.fish.shellAliases = {
+          icat = lib.mkForce "wezterm imgcat";
+        };
+
+        programs.wezterm = {
+          enable = true;
+          colorSchemes = {
+            myTheme = {
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
+              cursor_bg = config.theme.colors.base05;
+              cursor_fg = config.theme.colors.base00;
+              cursor_border = config.theme.colors.base05;
+              selection_bg = config.theme.colors.base05;
+              selection_fg = config.theme.colors.base00;
+              scrollbar_thumb = config.theme.colors.base03;
+              ansi = [
+                config.theme.colors.base01 # black
+                config.theme.colors.base0F # maroon
+                config.theme.colors.base0B # green
+                config.theme.colors.base0A # olive
+                config.theme.colors.base0D # navy
+                config.theme.colors.base0E # purple
+                config.theme.colors.base0C # teal
+                config.theme.colors.base06 # silver
+              ];
+              brights = [
+                config.theme.colors.base03 # grey
+                config.theme.colors.base08 # red
+                config.theme.colors.base0B # lime
+                config.theme.colors.base0A # yellow
+                config.theme.colors.base0D # blue
+                config.theme.colors.base0E # fuchsia
+                config.theme.colors.base0C # aqua
+                config.theme.colors.base07 # white
+              ];
+              compose_cursor = config.theme.colors.base09; # orange
+              copy_mode_active_highlight_bg = {
+                Color = config.theme.colors.base03;
+              };
+              copy_mode_active_highlight_fg = {
+                Color = config.theme.colors.base07;
+              };
+              copy_mode_inactive_highlight_bg = {
+                Color = config.theme.colors.base02;
+              };
+              copy_mode_inactive_highlight_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_label_bg = {
+                Color = config.theme.colors.base02;
+              };
+              quick_select_label_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_match_bg = {
+                Color = config.theme.colors.base03;
+              };
+              quick_select_match_fg = {
+                Color = config.theme.colors.base07;
+              };
+            };
+          };
+          extraConfig = ''
+            return {
+                color_scheme = "myTheme",
+
+                -- Scrollback
+                scrollback_lines = 10000,
+
+                -- Window
+                window_padding = {
+                  left = 10,
+                  right = 10,
+                  top = 10,
+                  bottom = 10,
+                },
+
+                font = wezterm.font('${font}', { weight = 'Bold'}),
+                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
+
+                -- Fix color blocks instead of text
+                front_end = "WebGpu",
+
+                -- Tab Bar
+                hide_tab_bar_if_only_one_tab = true,
+                window_frame = {
+                  font = wezterm.font('${font}', { weight = 'Bold'}),
+                  font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
+                },
+
+                colors = {
+                  tab_bar = {
+                    active_tab = {
+                      bg_color = '${config.theme.colors.base00}',
+                      fg_color = '${config.theme.colors.base04}',
+                    },
+                  },
+                },
+
+                -- Disable audio
+                audible_bell = "Disabled",
+
+                initial_rows = 80,
+                initial_cols = 200,
+
+                keys = {
+                  -- sends completion string for fish autosuggestions
+                  {
+                    key = 'Enter',
+                    mods = 'SHIFT',
+                    action = wezterm.action.SendString '\x1F'
+                  },
+                  -- ctrl-shift-h was "hide"
+                  {
+                    key = 'H',
+                    mods = 'SHIFT|CTRL',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- alt-enter was "fullscreen"
+                  {
+                    key = 'Enter',
+                    mods = 'ALT',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- make super-f "fullscreen"
+                  {
+                    key = 'f',
+                    mods = 'SUPER',
+                    action = wezterm.action.ToggleFullScreen
+                  },
+                  -- super-t open new tab in new dir
+                  {
+                    key = 't',
+                    mods = ${if pkgs.stdenv.isDarwin then "'SUPER'" else "'ALT'"},
+                    action = wezterm.action.SpawnCommandInNewTab {
+                      cwd = wezterm.home_dir,
+                    },
+                  },
+                  -- shift-super-t open new tab in same dir
+                  {
+                    key = 't',
+                    mods = 'SUPER|SHIFT',
+                    action = wezterm.action.SpawnTab 'CurrentPaneDomain'
+                  },
+                  -- project switcher
+                  {
+                     key = 'P',
+                     mods = 'SUPER',
+                     action = wezterm.action_callback(function(window, pane)
+                       local choices = {}
+
+                       wezterm.log_info "working?"
+
+                       function scandir(directory)
+                           local i, t, popen = 0, {}, io.popen
+                           local pfile = popen('${pkgs.fd}/bin/fd --search-path "'..directory..'" --type directory --exact-depth 2 | ${pkgs.proximity-sort}/bin/proximity-sort "'..os.getenv("HOME").."/dev/work"..'"')
+                           for filename in pfile:lines() do
+                               i = i + 1
+                               t[i] = filename
+                           end
+                           pfile:close()
+                           return t
+                       end
+
+                       for _, v in pairs(scandir(os.getenv("HOME").."/dev")) do
+                         table.insert(choices, { label = v })
+                       end
+
+                       window:perform_action(
+                         wezterm.action.InputSelector {
+                           action = wezterm.action_callback(function(window, pane, id, label)
+                             if not id and not label then
+                               wezterm.log_info "cancelled"
+                             else
+                               window:perform_action(
+                                 wezterm.action.SpawnCommandInNewTab {
+                                   cwd = label,
+                                 },
+                                 pane
+                               )
+                             end
+                           end),
+                           fuzzy = true,
+                           title = "Select Project",
+                           choices = choices,
+                         },
+                         pane
+                       )
+                     end),
+                  },
+                },
+            }
+          '';
+        };
+      };
+    };
+}

modules/common/applications/yt-dlp.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options = {
     yt-dlp = {
@@ -27,9 +33,6 @@
       };
 
       programs.fish.shellAbbrs.yt = "yt-dlp";
-
     };
-
   };
-
 }

modules/common/default.nix

@@ -1,7 +1,19 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
 
-  imports =
+  imports = [
-    [ ./applications ./mail ./neovim ./programming ./repositories ./shell ];
+    ./applications
+    ./mail
+    ./neovim
+    ./programming
+    ./repositories
+    ./shell
+  ];
 
   options = {
     user = lib.mkOption {
@@ -17,8 +29,7 @@
       download = lib.mkOption {
         type = lib.types.str;
         description = "XDG directory for downloads";
-        default =
+        default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
-          if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
       };
     };
     identityFile = lib.mkOption {
@@ -47,10 +58,9 @@
     homePath = lib.mkOption {
       type = lib.types.path;
       description = "Path of user's home directory.";
-      default = builtins.toPath (if pkgs.stdenv.isDarwin then
+      default = builtins.toPath (
-        "/Users/${config.user}"
+        if pkgs.stdenv.isDarwin then "/Users/${config.user}" else "/home/${config.user}"
-      else
+      );
-        "/home/${config.user}");
     };
     dotfilesPath = lib.mkOption {
       type = lib.types.path;
@@ -67,6 +77,10 @@
       default = [ ];
     };
     hostnames = {
+      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).";
@@ -75,6 +89,10 @@
         type = lib.types.str;
         description = "Hostname for metrics server.";
       };
+      minecraft = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Minecraft server.";
+      };
       paperless = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for document server (paperless-ngx).";
@@ -111,6 +129,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).";
@@ -118,28 +148,33 @@
     };
   };
 
-  config = let stateVersion = "23.05";
+  config =
-  in {
+    let
+      stateVersion = "23.05";
+    in
+    {
 
-    # Basic common system packages for all devices
+      # Basic common system packages for all devices
-    environment.systemPackages = with pkgs; [ git vim wget curl ];
+      environment.systemPackages = with pkgs; [
+        git
+        vim
+        wget
+        curl
+      ];
 
-    # Use the system-level nixpkgs instead of Home Manager's
+      # Use the system-level nixpkgs instead of Home Manager's
-    home-manager.useGlobalPkgs = true;
+      home-manager.useGlobalPkgs = true;
 
-    # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
+      # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
-    # using multiple profiles for one user
+      # using multiple profiles for one user
-    home-manager.useUserPackages = true;
+      home-manager.useUserPackages = true;
 
-    # Allow specified unfree packages (identified elsewhere)
+      # Allow specified unfree packages (identified elsewhere)
-    # Retrieves package object based on string name
+      # Retrieves package object based on string name
-    nixpkgs.config.allowUnfreePredicate = pkg:
+      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;
-      builtins.elem (lib.getName pkg) config.unfreePackages;
-
-    # Pin a state version to prevent warnings
-    home-manager.users.${config.user}.home.stateVersion = stateVersion;
-    home-manager.users.root.home.stateVersion = stateVersion;
-
-  };
 
+      # 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

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
 
@@ -75,7 +81,9 @@
             "<Esc>" = ":clear<Enter>";
           };
 
-          "messages:folder=Drafts" = { "<Enter>" = ":recall<Enter>"; };
+          "messages:folder=Drafts" = {
+            "<Enter>" = ":recall<Enter>";
+          };
 
           view = {
             "/" = ":toggle-key-passthrough <Enter> /";
@@ -148,21 +156,23 @@
             "<C-p>" = ":prev-tab<Enter>";
             "<C-n>" = ":next-tab<Enter>";
           };
-
         };
         extraConfig = {
-          general.unsafe-accounts-conf = true;
+          general = {
-          viewer = { pager = "${pkgs.less}/bin/less -R"; };
+            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" =
+            "text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/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" =
+            "message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
-              "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
             "application/pdf" = "${pkgs.zathura}/bin/zathura -";
@@ -176,6 +186,7 @@
         extraAccounts = {
           check-mail = "5m";
           check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
+          check-mail-timeout = "15s";
         };
       };
 
@@ -183,26 +194,27 @@
         name = "aerc";
         exec = "kitty aerc %u";
       };
-      xsession.windowManager.i3.config.keybindings =
+      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
-        lib.mkIf pkgs.stdenv.isLinux {
+        "${
-          "${
+          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+        }+Shift+e" = "exec ${
-          }+Shift+e" = "exec ${
+          # Don't name the script `aerc` or it will affect grep
-            # Don't name the script `aerc` or it will affect grep
+          builtins.toString (
-              builtins.toString (pkgs.writeShellScript "focus-mail.sh" ''
+            pkgs.writeShellScript "focus-mail.sh" ''
-                count=$(ps aux | grep -c aerc)
+              count=$(ps aux | grep -c aerc)
-                if [ "$count" -eq 1 ]; then
+              if [ "$count" -eq 1 ]; then
-                    i3-msg "exec --no-startup-id kitty --class aerc aerc"
+                  i3-msg "exec --no-startup-id kitty --class aerc aerc"
-                    sleep 0.25
+                  sleep 0.25
-                fi
+              fi
-                i3-msg "[class=aerc] focus"
+              i3-msg "[class=aerc] focus"
-              '')
+            ''
-            }";
+          )
-        };
+        }";
-
+      };
-      programs.fish.shellAbbrs = { ae = "aerc"; };
 
+      programs.fish.shellAbbrs = {
+        ae = "aerc";
+      };
     };
-
   };
 }

modules/common/mail/default.nix

@@ -1,6 +1,16 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
-  imports = [ ./himalaya.nix ./aerc.nix ./system.nix ];
+  imports = [
+    ./himalaya.nix
+    ./aerc.nix
+    ./system.nix
+  ];
 
   options = {
     mail.enable = lib.mkEnableOption "Mail service.";
@@ -26,7 +36,9 @@
   config = lib.mkIf config.mail.enable {
 
     home-manager.users.${config.user} = {
-      programs.mbsync = { enable = true; };
+      programs.mbsync = {
+        enable = true;
+      };
 
       # Automatically check for mail and keep files synced locally
       services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
@@ -44,8 +56,11 @@
       # Better local mail search
       programs.notmuch = {
         enable = true;
-        new.ignore =
+        new.ignore = [
-          [ ".mbsyncstate.lock" ".mbsyncstate.journal" ".mbsyncstate.new" ];
+          ".mbsyncstate.lock"
+          ".mbsyncstate.journal"
+          ".mbsyncstate.new"
+        ];
       };
 
       accounts.email = {
@@ -54,72 +69,71 @@
         maildirBasePath = "${config.homePath}/mail";
 
         accounts = {
-          home = let address = "${config.mail.user}@${config.mail.server}";
+          home =
-          in {
+            let
-            userName = address;
+              address = "${config.mail.user}@${config.mail.server}";
-            realName = config.fullName;
+            in
-            primary = true;
+            {
-            inherit address;
+              userName = address;
-            aliases = map (user: "${user}@${config.mail.server}") [
+              realName = config.fullName;
-              "me"
+              primary = true;
-              "hey"
+              inherit address;
-              "admin"
+              aliases = map (user: "${user}@${config.mail.server}") [
-            ];
+                "me"
+                "hey"
+                "admin"
+              ];
 
-            # Options for contact completion
+              # Options for contact completion
-            alot = { };
+              alot = { };
 
-            imap = {
+              imap = {
-              host = config.mail.imapHost;
+                host = config.mail.imapHost;
-              port = 993;
+                port = 993;
-              tls.enable = true;
+                tls.enable = true;
-            };
+              };
 
-            # Watch for mail and run notifications or sync
+              # Watch for mail and run notifications or sync
-            imapnotify = {
+              imapnotify = {
-              enable = true;
+                enable = true;
-              boxes = [ "Inbox" ];
+                boxes = [ "Inbox" ];
-              onNotify = "${pkgs.isync}/bin/mbsync -a";
+                onNotify = "${pkgs.isync}/bin/mbsync -a";
-              onNotifyPost = lib.mkIf
+                onNotifyPost =
-                config.home-manager.users.${config.user}.services.dunst.enable
+                  lib.mkIf config.home-manager.users.${config.user}.services.dunst.enable
-                "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
+                    "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
-            };
+              };
 
-            # Name of the directory in maildir for this account
+              # Name of the directory in maildir for this account
-            maildir = { path = "main"; };
+              maildir = {
+                path = "main";
+              };
 
-            # Bi-directional syncing options for local files
+              # Bi-directional syncing options for local files
-            mbsync = {
+              mbsync = {
-              enable = true;
+                enable = true;
-              create = "both";
+                create = "both";
-              expunge = "both";
+                expunge = "both";
-              remove = "both";
+                remove = "both";
-              patterns = [ "*" ];
+                patterns = [ "*" ];
-              extraConfig.channel = {
+                extraConfig.channel = {
-                CopyArrivalDate = "yes"; # Sync time of original message
+                  CopyArrivalDate = "yes"; # Sync time of original message
+                };
+              };
+
+              # Enable indexing
+              notmuch.enable = true;
+
+              # Used to login and send and receive emails
+              passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
+
+              smtp = {
+                host = config.mail.smtpHost;
+                port = 465;
+                tls.enable = true;
               };
             };
-
-            # Enable indexing
-            notmuch.enable = true;
-
-            # Used to login and send and receive emails
-            passwordCommand =
-              "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${
-                pkgs.writeText "mailpass.age"
-                (builtins.readFile ../../../private/mailpass.age)
-              }";
-
-            smtp = {
-              host = config.mail.smtpHost;
-              port = 465;
-              tls.enable = true;
-            };
-          };
         };
       };
-
     };
-
   };
 }

modules/common/mail/himalaya.nix

@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
 
@@ -6,7 +7,9 @@
 
     home-manager.users.${config.user} = {
 
-      programs.himalaya = { enable = true; };
+      programs.himalaya = {
+        enable = true;
+      };
       accounts.email.accounts.home.himalaya = {
         enable = true;
         settings = {
@@ -15,9 +18,9 @@
         };
       };
 
-      programs.fish.shellAbbrs = { hi = "himalaya"; };
+      programs.fish.shellAbbrs = {
-
+        hi = "himalaya";
+      };
     };
-
   };
 }

modules/common/mail/system.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = lib.mkIf (config.mail.enable || config.server) {
 
@@ -8,17 +14,15 @@
 
       # The system user for sending automatic notifications
       accounts.email.accounts.system =
-        let address = "system@${config.mail.server}";
+        let
-        in {
+          address = "system@${config.mail.server}";
+        in
+        {
           userName = address;
           realName = "NixOS System";
           primary = !config.mail.enable; # Only primary if mail not enabled
           inherit address;
-          passwordCommand =
+          passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${pkgs.writeText "mailpass-system.age" (builtins.readFile ../../../private/mailpass-system.age)}";
-            "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
-              pkgs.writeText "mailpass-system.age"
-              (builtins.readFile ../../../private/mailpass-system.age)
-            }";
           msmtp.enable = true;
           smtp = {
             host = config.mail.smtpHost;
@@ -26,9 +30,6 @@
             tls.enable = true;
           };
         };
-
     };
-
   };
-
 }

modules/common/neovim/config/align.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # Plugin for aligning text programmatically
 

modules/common/neovim/config/bufferline.nix

@@ -1,19 +1,22 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
 
   # Shows buffers in a VSCode-style tab layout
 
   plugins = [
     pkgs.vimPlugins.bufferline-nvim
     pkgs.vimPlugins.vim-bbye # Better closing of buffers
+    pkgs.vimPlugins.snipe-nvim # Jump between open buffers
   ];
   setup.bufferline = {
     options = {
       diagnostics = "nvim_lsp";
       always_show_bufferline = false;
       separator_style = "slant";
-      offsets = [{ filetype = "NvimTree"; }];
+      offsets = [ { filetype = "NvimTree"; } ];
     };
   };
+  setup.snipe = { };
   lua = ''
     -- Move buffers
     vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
@@ -21,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/colors.nix

@@ -1,4 +1,10 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
 
   # Sets Neovim colors based on Nix colorscheme
 
@@ -18,5 +24,4 @@
       }
     '';
   };
-
 }

modules/common/neovim/config/completion.nix

@@ -1,4 +1,5 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, ... }:
+{
 
   plugins = [
     pkgs.vimPlugins.cmp-nvim-lsp
@@ -25,21 +26,15 @@
 
     # Basic completion keybinds
     mapping = {
-      "['<C-n>']" = dsl.rawLua
+      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-        "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 }, { 'i', 'c' })";
-      "['<C-p>']" = dsl.rawLua
+      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
-        "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
-      "['<Down>']" = dsl.rawLua
-        "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
-      "['<Up>']" = dsl.rawLua
-        "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
       "['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
       "['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
       "['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
-      "['<CR>']" = dsl.rawLua
+      "['<C-y>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
-        "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, }, { 'i', 'c' })";
-      "['<C-r>']" = dsl.rawLua
-        "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
       "['<Esc>']" = dsl.rawLua ''
         function(_)
             cmp.mapping({
@@ -49,7 +44,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()
@@ -72,13 +67,19 @@
         name = "rg"; # Grep for text from the current directory
         keyword_length = 6;
         max_item_count = 10;
-        option = { additional_arguments = "--ignore-case"; };
+        option = {
+          additional_arguments = "--ignore-case";
+        };
       }
     ];
 
     # Styling of the completion menu
     formatting = {
-      fields = [ "kind" "abbr" "menu" ];
+      fields = [
+        "kind"
+        "abbr"
+        "menu"
+      ];
       format = dsl.rawLua ''
         function(entry, vim_item)
             local kind_icons = {
@@ -125,19 +126,46 @@
       native_menu = false; # Use cmp menu instead of Vim menu
       ghost_text = true; # Show preview auto-completion
     };
-
   };
 
   lua = ''
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
-        sources = {
+        mapping = {
-            { name = "buffer", keyword_length = 5 },
+            ['<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" },
         }, {
@@ -145,5 +173,4 @@
         }),
     })
   '';
-
 }

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 =
+local gitwatch = require("toggleterm.terminal").Terminal:new({
-    require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+    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/gitsigns.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   plugins = [ pkgs.vimPlugins.gitsigns-nvim ];
   setup.gitsigns = { };
   lua = builtins.readFile ./gitsigns.lua;

modules/common/neovim/config/lsp.nix

@@ -1,10 +1,21 @@
-{ pkgs, lib, config, dsl, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  dsl,
+  ...
+}:
+{
 
   # Terraform optional because non-free
   options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
   options.github = lib.mkEnableOption "Whether to enable GitHub features";
-  options.kubernetes =
+  options.kubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
-    lib.mkEnableOption "Whether to enable Kubernetes features";
+  options.nixosConfiguration = lib.mkOption {
+    type = lib.types.str;
+    description = "Configuration to use for nixd options checking";
+    default = "default";
+  };
 
   config = {
     plugins = [
@@ -12,41 +23,79 @@
       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 = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+      settings = {
-      capabilities =
+        Lua = {
-        dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+          diagnostics = {
+            globals = [
+              "vim"
+              "hs"
+            ];
+          };
+        };
+      };
+      capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
       cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
     };
 
-    use.lspconfig.nil_ls.setup = dsl.callWith {
+    use.lspconfig.nixd.setup = dsl.callWith {
-      cmd = [ "${pkgs.nil}/bin/nil" ];
+      cmd = [ "${pkgs.nixd}/bin/nixd" ];
-      capabilities =
+      capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-        dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      # settings = {
+      #   nixd = {
+      #     options = {
+      #       nixos = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #       home-manager = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).homeConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #       darwin = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #     };
+      #   };
+      # };
     };
 
     use.lspconfig.pyright.setup = dsl.callWith {
-      cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+      cmd = [
+        "${pkgs.pyright}/bin/pyright-langserver"
+        "--stdio"
+      ];
     };
 
     use.lspconfig.terraformls.setup = dsl.callWith {
-      cmd = if config.terraform then [
+      cmd =
-        "${pkgs.terraform-ls}/bin/terraform-ls"
+        if config.terraform then
-        "serve"
+          [
-      ] else
+            "${pkgs.terraform-ls}/bin/terraform-ls"
-        [ "echo" ];
+            "serve"
+          ]
+        else
+          [ "echo" ];
     };
 
     use.lspconfig.rust_analyzer.setup = dsl.callWith {
       cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
       settings = {
         "['rust-analyzer']" = {
-          check = { command = "clippy"; };
+          check = {
-          files = { excludeDirs = [ ".direnv" ]; };
+            command = "clippy";
+          };
+          files = {
+            excludeDirs = [ ".direnv" ];
+          };
+          cargo = {
+            features = "all";
+          };
         };
       };
     };
@@ -65,23 +114,24 @@
         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";
         black.command = "${pkgs.black}/bin/black";
         fish_indent.command = "${pkgs.fish}/bin/fish_indent";
-        nixfmt.command = "${pkgs.nixfmt}/bin/nixfmt";
+        nixfmt.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
-        rustfmt = {
+        rustfmt.command = "${pkgs.rustfmt}/bin/rustfmt";
-          command = "${pkgs.rustfmt}/bin/rustfmt";
-          prepend_args = [ "--edition" "2021" ];
-        };
         shfmt = {
           command = "${pkgs.shfmt}/bin/shfmt";
-          prepend_args = [ "-i" "4" "-ci" ];
+          prepend_args = [
+            "-i"
+            "4"
+            "-ci"
+          ];
         };
-        terraform_fmt.command =
+        terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
-          if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+        hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
       };
     };
 
@@ -93,7 +143,10 @@
     };
 
     vim.api.nvim_create_autocmd = dsl.callWith [
-      (dsl.toTable [ "BufEnter" "BufWritePost" ])
+      (dsl.toTable [
+        "BufEnter"
+        "BufWritePost"
+      ])
       (dsl.rawLua "{ callback = function() require('lint').try_lint() end }")
     ];
 
@@ -105,8 +158,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

@@ -1,22 +1,29 @@
-{ pkgs, dsl, lib, ... }: {
+{
+  pkgs,
+  dsl,
+  lib,
+  ...
+}:
+{
   plugins = [
     pkgs.vimPlugins.vim-surround # Keybinds for surround characters
     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.vim-abolish # Keep capitalization in substitute (Subvert)
-    pkgs.vimPlugins.glow-nvim # Markdown preview popup
+    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 = {
-  setup.colorizer = { user_default_options = { names = false; }; };
+    user_default_options = {
-  setup.glow = { };
+      names = false;
+    };
+  };
+  setup.markview = { };
   setup.which-key = { };
-  setup.kitty-scrollback = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -34,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
@@ -52,14 +58,17 @@
 
   # 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.opt.undofile = true; # Keeps undos after quit
-  vim.bo.undofile = true; # Keeps undos after quit
+  vim.opt.swapfile = false; # Instead of swaps, create backups
-  vim.o.backupdir =
+  vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
-    dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
   vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
 
   # Required for nvim-cmp completion
-  vim.opt.completeopt = [ "menu" "menuone" "noselect" ];
+  vim.opt.completeopt = [
+    "menu"
+    "menuone"
+    "noselect"
+  ];
 
   lua = lib.mkBefore ''
     vim.loader.enable()

modules/common/neovim/config/statusline.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   plugins = [ pkgs.vimPlugins.lualine-nvim ];
   setup.lualine = {
     options = {

modules/common/neovim/config/syntax.nix

@@ -1,8 +1,9 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
 
   plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
+    (pkgs.vimPlugins.nvim-treesitter.withPlugins (
-      with pkgs.tree-sitter-grammars; [
+      _plugins: with pkgs.tree-sitter-grammars; [
         tree-sitter-bash
         tree-sitter-c
         tree-sitter-fish
@@ -19,12 +20,12 @@
         tree-sitter-toml
         tree-sitter-vimdoc
         tree-sitter-yaml
-      ]))
+      ]
+    ))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
     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";
@@ -34,9 +35,15 @@
   ];
 
   setup."nvim-treesitter.configs" = {
-    highlight = { enable = true; };
+    highlight = {
-    indent = { enable = true; };
+      enable = true;
-    matchup = { enable = true; }; # Uses vim-matchup
+    };
+    indent = {
+      enable = true;
+    };
+    matchup = {
+      enable = true;
+    }; # Uses vim-matchup
 
     textobjects = {
       select = {
@@ -70,5 +77,4 @@
     -- Use HCL parser with .tf files
     vim.treesitter.language.register('hcl', 'terraform')
   '';
-
 }

modules/common/neovim/config/telescope.nix

@@ -1,4 +1,5 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, ... }:
+{
 
   # Telescope is a fuzzy finder that can work with different sub-plugins
 
@@ -20,9 +21,15 @@
       };
     };
     pickers = {
-      find_files = { theme = "ivy"; };
+      find_files = {
-      oldfiles = { theme = "ivy"; };
+        theme = "ivy";
-      buffers = { theme = "dropdown"; };
+      };
+      oldfiles = {
+        theme = "ivy";
+      };
+      buffers = {
+        theme = "dropdown";
+      };
     };
     extensions = {
       fzy_native = { };
@@ -33,5 +40,4 @@
   setup.project_nvim = { };
 
   lua = builtins.readFile ./telescope.lua;
-
 }

modules/common/neovim/config/toggleterm.nix

@@ -1,4 +1,10 @@
-{ pkgs, dsl, config, ... }: {
+{
+  pkgs,
+  dsl,
+  config,
+  ...
+}:
+{
 
   # Toggleterm provides a floating terminal inside the editor for quick access
 
@@ -15,5 +21,4 @@
     ${if config.github then (builtins.readFile ./github.lua) else ""}
     ${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
   '';
-
 }

modules/common/neovim/config/tree.nix

@@ -1,8 +1,12 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, ... }:
+{
 
   # This plugin creates a side drawer for navigating the current project
 
-  plugins = [ pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-web-devicons ];
+  plugins = [
+    pkgs.vimPlugins.nvim-tree-lua
+    pkgs.vimPlugins.nvim-web-devicons
+  ];
 
   # Disable netrw eagerly
   # https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
@@ -16,12 +20,14 @@
     hijack_netrw = true; # Works as the file manager
     sync_root_with_cwd = true; # Change project whenever currend dir changes
     respect_buf_cwd = true; # Change to exact location of focused buffer
-    update_focused_file = { # Change project based on the focused buffer
+    update_focused_file = {
+      # Change project based on the focused buffer
       enable = true;
       update_root = true;
       ignore_list = { };
     };
-    diagnostics = { # Enable LSP and linter integration
+    diagnostics = {
+      # Enable LSP and linter integration
       enable = true;
       icons = {
         hint = "";
@@ -30,7 +36,8 @@
         error = "";
       };
     };
-    renderer = { # Show files with changes vs. current commit
+    renderer = {
+      # Show files with changes vs. current commit
       icons = {
         glyphs = {
           git = {
@@ -61,7 +68,8 @@
         vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
       end
     '';
-    view = { # Set look and feel
+    view = {
+      # Set look and feel
       width = 30;
       side = "left";
       number = false;
@@ -73,5 +81,4 @@
   lua = ''
     vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
   '';
-
 }

modules/common/neovim/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
 
@@ -8,9 +13,10 @@ let
     terraform = config.terraform.enable;
     github = true;
     kubernetes = config.kubernetes.enable;
+    nixosConfiguration = config.networking.hostName; # Used for Nixd
   };
-
+in
-in {
+{
 
   options.neovim.enable = lib.mkEnableOption "Neovim.";
 
@@ -33,7 +39,9 @@ in {
 
         # Create quick aliases for launching Neovim
         programs.fish = {
-          shellAliases = { vim = "nvim"; };
+          shellAliases = {
+            vim = "nvim";
+          };
           shellAbbrs = {
             v = lib.mkForce "nvim";
             vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
@@ -41,27 +49,20 @@ 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" ];
+          mimeType = [
+            "text/plain"
+            "text/markdown"
+          ];
         };
         xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
           "text/plain" = [ "nvim.desktop" ];
           "text/markdown" = [ "nvim.desktop" ];
         };
-
       };
-
   };
-
 }

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", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
-key("n", "Y", "y$")                                         --- Copy to end of line
+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("v", "D", "y'>gp") --- Duplicate selected
-key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
+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/neovim/package/default.nix

@@ -26,13 +26,27 @@
 #   ] ++ extraConfig;
 # }
 
-{ pkgs, colors, terraform ? false, github ? false, kubernetes ? false, ... }:
+{
+  pkgs,
+  colors,
+  terraform ? false,
+  github ? false,
+  kubernetes ? false,
+  nixosConfiguration ? "default",
+  ...
+}:
 
 # Comes from nix2vim overlay:
 # https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
-  inherit colors terraform github kubernetes;
+  inherit
+    colors
+    terraform
+    github
+    kubernetes
+    nixosConfiguration
+    ;
   imports = [
     ../config/align.nix
     ../config/bufferline.nix

modules/common/programming/default.nix

@@ -1,13 +1,12 @@
-{ ... }: {
+{ ... }:
+{
 
   imports = [
     ./haskell.nix
     ./kubernetes.nix
     ./lua.nix
-    ./nix.nix
     ./python.nix
     ./rust.nix
     ./terraform.nix
   ];
-
 }

modules/common/programming/haskell.nix

@@ -1,14 +1,12 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options.haskell.enable = lib.mkEnableOption "Haskell programming language.";
 
   config = lib.mkIf config.haskell.enable {
 
     # Binary Cache for Haskell.nix
-    nix.settings.trusted-public-keys =
+    nix.settings.trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
-      [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
     nix.settings.substituters = [ "https://cache.iog.io" ];
-
   };
-
 }

modules/common/programming/kubernetes.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
 
@@ -99,12 +105,16 @@
               views = {
                 charts = {
                   bgColor = "default";
-                  defaultDialColors =
+                  defaultDialColors = [
-                    [ config.theme.colors.base0D config.theme.colors.base08 ];
+                    config.theme.colors.base0D
+                    config.theme.colors.base08
+                  ];
                   # - *blue
                   # - *red
-                  defaultChartColors =
+                  defaultChartColors = [
-                    [ config.theme.colors.base0D config.theme.colors.base08 ];
+                    config.theme.colors.base0D
+                    config.theme.colors.base08
+                  ];
                   # - *blue
                   # - *red
                 };
@@ -149,9 +159,6 @@
           };
         };
       };
-
     };
-
   };
-
 }

modules/common/programming/lua.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.lua.enable = lib.mkEnableOption "Lua programming language.";
 
@@ -8,5 +14,4 @@
       sumneko-lua-language-server # Lua LSP
     ];
   };
-
 }

modules/common/programming/nix.nix

@@ -1,18 +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 # Nix file formatter
-        nil # Nix language server
-      ];
-
-    };
-
-  };
-
-}

modules/common/programming/python.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.python.enable = lib.mkEnableOption "Python programming language.";
 
@@ -8,15 +14,14 @@
 
       home.packages = with pkgs; [
         # python310 # Standard Python interpreter
-        nodePackages.pyright # Python language server
+        pyright # Python language server
         black # Python formatter
         python310Packages.flake8 # Python linter
       ];
 
-      programs.fish.shellAbbrs = { py = "python3"; };
+      programs.fish.shellAbbrs = {
-
+        py = "python3";
+      };
     };
-
   };
-
 }

modules/common/programming/rust.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.rust.enable = lib.mkEnableOption "Rust programming language.";
 
@@ -6,12 +12,16 @@
 
     home-manager.users.${config.user} = {
 
-      programs.fish.shellAbbrs = { ca = "cargo"; };
+      programs.fish.shellAbbrs = {
-
+        ca = "cargo";
-      home.packages = with pkgs; [ cargo rustc clippy gcc ];
+      };
 
+      home.packages = with pkgs; [
+        cargo
+        rustc
+        clippy
+        gcc
+      ];
     };
-
   };
-
 }

modules/common/programming/terraform.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   options.terraform.enable = lib.mkEnableOption "Terraform tools.";
 
@@ -15,9 +21,6 @@
         terraform-ls # Language server
         tflint # Linter
       ];
-
     };
-
   };
-
 }

modules/common/repositories/default.nix

@@ -1,5 +1,8 @@
-{ ... }: {
+{ ... }:
-
+{
-  imports = [ ./dotfiles.nix ./notes.nix ];
 
+  imports = [
+    ./dotfiles.nix
+    ./notes.nix
+  ];
 }

modules/common/repositories/dotfiles.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Allows me to make sure I can work on my dotfiles locally
 
@@ -11,23 +17,17 @@
       home.activation = {
 
         # Always clone dotfiles repository if it doesn't exist
-        cloneDotfiles =
+        cloneDotfiles = config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
-          config.home-manager.users.${config.user}.lib.dag.entryAfter
+          if [ ! -d "${config.dotfilesPath}" ]; then
-          [ "writeBoundary" ] ''
+              $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
-            if [ ! -d "${config.dotfilesPath}" ]; then
+              $DRY_RUN_CMD ${pkgs.git}/bin/git \
-                $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
+                  clone ${config.dotfilesRepo} "${config.dotfilesPath}"
-                $DRY_RUN_CMD ${pkgs.git}/bin/git \
+          fi
-                    clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+        '';
-            fi
-          '';
-
       };
 
       # Set a variable for dotfiles repo, not necessary but convenient
       home.sessionVariables.DOTS = config.dotfilesPath;
-
     };
-
   };
-
 }

modules/common/repositories/notes.nix

@@ -1,4 +1,10 @@
-{ config, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # This is just a placeholder as I expect to interact with my notes in a
   # certain location
@@ -9,6 +15,22 @@
       NOTES_PATH = "${config.homePath}/dev/personal/notes/content";
     };
 
+    # Sync notes for Nextcloud automatically
+    systemd.user.timers.refresh-notes = lib.mkIf config.services.nextcloud.enable {
+      Timer = {
+        OnCalendar = "*-*-* *:0/10:50"; # Every 10 minutes
+        Unit = "refresh-notes.service";
+      };
+    };
+    systemd.user.services.refresh-notes = {
+      Unit.Description = "Get latest notes.";
+      Service = {
+        Type = "oneshot";
+        ExecStartPre = "${pkgs.git}/bin/git -C /data/git/notes reset --hard master";
+        ExecStart = "${pkgs.git}/bin/git -C /data/git/notes pull";
+        WorkingDirectory = config.homePath;
+        Environment = "PATH=${pkgs.openssh}/bin";
+      };
+    };
   };
-
 }

modules/common/shell/atuin.nix

@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   # Shell history sync
 
@@ -10,7 +11,10 @@
 
       programs.atuin = {
         enable = true;
-        flags = [ "--disable-up-arrow" "--disable-ctrl-r" ];
+        flags = [
+          "--disable-up-arrow"
+          "--disable-ctrl-r"
+        ];
         settings = {
           auto_sync = true;
           update_check = false;
@@ -27,13 +31,9 @@
           keymap_mode = "vim-normal";
         };
       };
-
     };
 
     # Give root user the same setup
-    home-manager.users.root.programs.atuin =
+    home-manager.users.root.programs.atuin = config.home-manager.users.${config.user}.programs.atuin;
-      config.home-manager.users.${config.user}.programs.atuin;
-
   };
-
 }

modules/common/shell/bash/default.nix

@@ -1,12 +1,17 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   config = {
     home-manager.users.${config.user} = {
 
       programs.bash = {
         enable = true;
-        shellAliases =
+        shellAliases = config.home-manager.users.${config.user}.programs.fish.shellAliases;
-          config.home-manager.users.${config.user}.programs.fish.shellAliases;
         initExtra = "";
         profileExtra = "";
       };
@@ -14,7 +19,6 @@
       programs.starship.enableBashIntegration = false;
       programs.zoxide.enableBashIntegration = true;
       programs.fzf.enableBashIntegration = true;
-
     };
   };
 }

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/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/charm.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   # Convenience utilities from charm.sh
 
@@ -12,7 +18,5 @@
       charm # Manage account and filesystem
       pop # Send emails from a TUI
     ];
-
   };
-
 }

modules/common/shell/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   imports = [
     ./atuin.nix
     ./bash

modules/common/shell/direnv.nix

@@ -1,10 +1,15 @@
-{ config, ... }: {
+{ config, ... }:
+{
 
   # Enables quickly entering Nix shells when changing directories
   home-manager.users.${config.user}.programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
-    config = { whitelist = { prefix = [ config.dotfilesPath ]; }; };
+    config = {
+      whitelist = {
+        prefix = [ config.dotfilesPath ];
+      };
+    };
   };
 
   # programs.direnv.direnvrcExtra = ''
@@ -28,5 +33,4 @@
     keep-outputs = true
     keep-derivations = true
   '';
-
 }

modules/common/shell/fish/default.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   users.users.${config.user}.shell = pkgs.fish;
   programs.fish.enable = true; # Needed for LightDM to remember username
@@ -46,7 +52,9 @@
         fish_user_key_bindings = {
           body = builtins.readFile ./functions/fish_user_key_bindings.fish;
         };
-        ip = { body = builtins.readFile ./functions/ip.fish; };
+        ip = {
+          body = builtins.readFile ./functions/ip.fish;
+        };
         json = {
           description = "Tidy up JSON using jq";
           body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
@@ -68,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
@@ -93,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";
 
@@ -112,8 +132,7 @@
         moon = "curl wttr.in/Moon";
 
         # Cheat Sheets
-        ssl =
+        ssl = "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
-          "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
         fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -";
         publickey = "ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub";
         forloop = "for i in (seq 1 100)";
@@ -122,7 +141,6 @@
         dc = "$DOTS/bin/docker_cleanup";
         dr = "docker run --rm -it";
         db = "docker build . -t";
-
       };
       shellInit = "";
     };
@@ -132,6 +150,5 @@
     programs.starship.enableFishIntegration = true;
     programs.zoxide.enableFishIntegration = true;
     programs.fzf.enableFishIntegration = true;
-
   };
 }

modules/common/shell/fzf.nix

@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
 
   # FZF is a fuzzy-finder for the terminal
 
@@ -25,17 +26,20 @@
           '';
         };
       };
-      shellAbbrs = { lsf = "ls -lh | fzf"; };
+      shellAbbrs = {
+        lsf = "ls -lh | fzf";
+      };
     };
 
     # Global fzf configuration
-    home.sessionVariables = let fzfCommand = "fd --type file";
+    home.sessionVariables =
-    in {
+      let
-      FZF_DEFAULT_COMMAND = fzfCommand;
+        fzfCommand = "fd --type file";
-      FZF_CTRL_T_COMMAND = fzfCommand;
+      in
-      FZF_DEFAULT_OPTS = "-m --height 50% --border";
+      {
-    };
+        FZF_DEFAULT_COMMAND = fzfCommand;
-
+        FZF_CTRL_T_COMMAND = fzfCommand;
+        FZF_DEFAULT_OPTS = "-m --height 50% --border";
+      };
   };
-
 }

modules/common/shell/git.nix

@@ -1,8 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-let home-packages = config.home-manager.users.${config.user}.home.packages;
+let
-
+  home-packages = config.home-manager.users.${config.user}.home.packages;
-in {
+in
+{
 
   options = {
     gitName = lib.mkOption {
@@ -28,28 +34,43 @@ in {
         userName = config.gitName;
         userEmail = config.gitEmail;
         extraConfig = {
-          core.pager =
+          core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
-            "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
+          interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
-          interactive.difffilter =
+          pager = {
-            "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
+            branch = "false";
-          pager = { branch = "false"; };
+          };
-          safe = { directory = config.dotfilesPath; };
+          safe = {
-          pull = { ff = "only"; };
+            directory = config.dotfilesPath;
-          push = { autoSetupRemote = "true"; };
+          };
-          init = { defaultBranch = "master"; };
+          pull = {
-          rebase = { autosquash = "true"; };
+            ff = "only";
+          };
+          push = {
+            autoSetupRemote = "true";
+          };
+          init = {
+            defaultBranch = "master";
+          };
+          rebase = {
+            autosquash = "true";
+          };
           gpg = {
             format = "ssh";
             ssh.allowedSignersFile = "~/.config/git/allowed-signers";
           };
-          commit.gpgsign = true;
+          # commit.gpgsign = true;
-          tag.gpgsign = true;
+          # tag.gpgsign = true;
         };
-        ignores = [ ".direnv/**" "result" ];
+        ignores = [
-        includes = [{
+          ".direnv/**"
-          path = "~/.config/git/personal";
+          "result"
-          condition = "gitdir:~/dev/personal/";
+        ];
-        }];
+        includes = [
+          {
+            path = "~/.config/git/personal";
+            condition = "gitdir:~/dev/personal/";
+          }
+        ];
       };
 
       # Personal git config
@@ -59,6 +80,10 @@ in {
             name = "${config.fullName}"
             email = "7386960+nmasur@users.noreply.github.com"
             signingkey = ~/.ssh/id_ed25519
+        [commit]
+            gpgsign = true
+        [tag]
+            gpgsign = true
       '';
 
       xdg.configFile."git/allowed-signers".text = ''
@@ -82,13 +107,17 @@ in {
         gl = "git log --graph --decorate --oneline -20";
         gll = "git log --graph --decorate --oneline";
         gco = "git checkout";
-        gcom = ''
+        gcom = ''git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
-          git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
         gcob = "git switch -c";
         gb = "git branch";
         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";
@@ -97,58 +126,70 @@ in {
       };
 
       # Required for fish commands
-      home.packages = with pkgs; [ fish fzf bat ];
+      home.packages = with pkgs; [
+        fish
+        fzf
+        bat
+      ];
 
-      programs.fish.functions = lib.mkIf (builtins.elem pkgs.fzf home-packages
+      programs.fish.functions =
-        && builtins.elem pkgs.bat home-packages) {
+        lib.mkIf (builtins.elem pkgs.fzf home-packages && builtins.elem pkgs.bat home-packages)
-          git = { body = builtins.readFile ./fish/functions/git.fish; };
+          {
-          git-add-fuzzy = {
+            git = {
-            body = builtins.readFile ./fish/functions/git-add-fuzzy.fish;
+              body = builtins.readFile ./fish/functions/git.fish;
+            };
+            git-add-fuzzy = {
+              body = builtins.readFile ./fish/functions/git-add-fuzzy.fish;
+            };
+            git-fuzzy-branch = {
+              argumentNames = "header";
+              body = builtins.readFile ./fish/functions/git-fuzzy-branch.fish;
+            };
+            git-checkout-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "checkout branch...")
+                and git checkout $branch
+              '';
+            };
+            git-delete-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "delete branch...")
+                and git branch -d $branch
+              '';
+            };
+            git-force-delete-fuzzy = {
+              body = ''
+                set branch (git-fuzzy-branch "force delete branch...")
+                and git branch -D $branch
+              '';
+            };
+            git-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...")
+                and git merge $branch
+              '';
+            };
+            git-show-fuzzy = {
+              body = builtins.readFile ./fish/functions/git-show-fuzzy.fish;
+            };
+            git-commits = {
+              body = builtins.readFile ./fish/functions/git-commits.fish;
+            };
+            git-history = {
+              body = builtins.readFile ./fish/functions/git-history.fish;
+            };
+            uncommitted = {
+              description = "Find uncommitted git repos";
+              body = builtins.readFile ./fish/functions/uncommitted.fish;
+            };
           };
-          git-fuzzy-branch = {
-            argumentNames = "header";
-            body = builtins.readFile ./fish/functions/git-fuzzy-branch.fish;
-          };
-          git-checkout-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "checkout branch...")
-              and git checkout $branch
-            '';
-          };
-          git-delete-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "delete branch...")
-              and git branch -d $branch
-            '';
-          };
-          git-force-delete-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "force delete branch...")
-              and git branch -D $branch
-            '';
-          };
-          git-merge-fuzzy = {
-            body = ''
-              set branch (git-fuzzy-branch "merge from...")
-              and git merge $branch
-            '';
-          };
-          git-show-fuzzy = {
-            body = builtins.readFile ./fish/functions/git-show-fuzzy.fish;
-          };
-          git-commits = {
-            body = builtins.readFile ./fish/functions/git-commits.fish;
-          };
-          git-history = {
-            body = builtins.readFile ./fish/functions/git-history.fish;
-          };
-          uncommitted = {
-            description = "Find uncommitted git repos";
-            body = builtins.readFile ./fish/functions/uncommitted.fish;
-          };
-        };
     };
-
   };
-
 }

modules/common/shell/github.nix

@@ -1,40 +1,46 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   home-manager.users.${config.user} = {
 
-    programs.gh =
+    programs.gh = lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
-      lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
+      enable = true;
-        enable = true;
+      gitCredentialHelper.enable = true;
-        gitCredentialHelper.enable = true;
+      settings.git_protocol = "https";
-        settings.git_protocol = "https";
+      extensions = [
-        extensions = [ pkgs.gh-collaborators ];
+        pkgs.gh-collaborators
+        pkgs.gh-dash
+      ];
+    };
+
+    programs.fish = lib.mkIf config.home-manager.users.${config.user}.programs.gh.enable {
+      shellAbbrs = {
+        ghr = "gh repo view -w";
+        gha = "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
+        grw = "gh run watch";
+        grf = "gh run view --log-failed";
+        grl = "gh run view --log";
+        ghpr = "gh pr create && sleep 3 && gh run watch";
+
+        # https://github.com/cli/cli/discussions/4067
+        prs = "gh search prs --state=open --review-requested=@me";
       };
-
+      functions = {
-    programs.fish =
+        repos = {
-      lib.mkIf config.home-manager.users.${config.user}.programs.gh.enable {
+          description = "Clone GitHub repositories";
-        shellAbbrs = {
+          argumentNames = "organization";
-          ghr = "gh repo view -w";
+          body = ''
-          gha =
+            set directory (gh-repos $organization)
-            "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
+            and cd $directory
-          grw = "gh run watch";
+          '';
-          grf = "gh run view --log-failed";
-          grl = "gh run view --log";
-          ghpr = "gh pr create && sleep 3 && gh run watch";
-
-          # https://github.com/cli/cli/discussions/4067
-          prs = "gh search prs --state=open --review-requested=@me";
-        };
-        functions = {
-          repos = {
-            description = "Clone GitHub repositories";
-            argumentNames = "organization";
-            body = ''
-              set directory (gh-repos $organization)
-              and cd $directory
-            '';
-          };
         };
       };
+    };
 
     home.packages = [
       (pkgs.writeShellScriptBin "gh-repos" ''
@@ -76,7 +82,5 @@
         }
       '')
     ];
-
   };
-
 }

modules/common/shell/jujutsu.nix

@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
 
   config = {
 
@@ -9,12 +10,9 @@
       settings = {
         user = {
           name = config.home-manager.users.${config.user}.programs.git.userName;
-          email =
+          email = config.home-manager.users.${config.user}.programs.git.userEmail;
-            config.home-manager.users.${config.user}.programs.git.userEmail;
         };
       };
     };
-
   };
-
 }

modules/common/shell/nixpkgs.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   home-manager.users.${config.user} = {
 
     programs.fish = {
@@ -62,22 +68,22 @@
 
     # Create nix-index if doesn't exist
     home.activation.createNixIndex =
-      let cacheDir = "${config.homePath}/.cache/nix-index";
+      let
-      in lib.mkIf
+        cacheDir = "${config.homePath}/.cache/nix-index";
-      config.home-manager.users.${config.user}.programs.nix-index.enable
+      in
-      (config.home-manager.users.${config.user}.lib.dag.entryAfter
+      lib.mkIf config.home-manager.users.${config.user}.programs.nix-index.enable (
-        [ "writeBoundary" ] ''
+        config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
           if [ ! -d ${cacheDir} ]; then
               $DRY_RUN_CMD ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
           fi
-        '');
+        ''
+      );
 
     # Set automatic generation cleanup for home-manager
     nix.gc = {
       automatic = config.nix.gc.automatic;
       options = config.nix.gc.options;
     };
-
   };
 
   nix = {
@@ -92,7 +98,10 @@
     };
 
     # For security, only allow specific users
-    settings.allowed-users = [ "@wheel" config.user ];
+    settings.allowed-users = [
+      "@wheel"
+      config.user
+    ];
 
     # Enable features in Nix commands
     extraOptions = ''
@@ -110,8 +119,7 @@
       # Add community Cachix to binary cache
       # Don't use with macOS because blocked by corporate firewall
       builders-use-substitutes = true;
-      substituters =
+      substituters = lib.mkIf (!pkgs.stdenv.isDarwin) [ "https://nix-community.cachix.org" ];
-        lib.mkIf (!pkgs.stdenv.isDarwin) [ "https://nix-community.cachix.org" ];
       trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
@@ -119,9 +127,6 @@
       # Scans and hard links identical files in the store
       # Not working with macOS: https://github.com/NixOS/nix/issues/7273
       auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
-
     };
-
   };
-
 }

modules/common/shell/starship.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
 
   home-manager.users.${config.user}.programs.starship = {
     enable = true;
@@ -29,7 +35,9 @@
         truncate_to_repo = true;
         truncation_length = 100;
       };
-      git_branch = { format = "[$symbol$branch]($style)"; };
+      git_branch = {
+        format = "[$symbol$branch]($style)";
+      };
       git_commit = {
         format = "( @ [$hash]($style) )";
         only_detached = false;
@@ -56,8 +64,9 @@
         format = "[$symbol $name]($style)";
         symbol = "❄️";
       };
-      python = { format = "[\${version}\\(\${virtualenv}\\)]($style)"; };
+      python = {
+        format = "[\${version}\\(\${virtualenv}\\)]($style)";
+      };
     };
   };
-
 }