replace caddy-cloudflare overlay with nixpkgs pr plugin override

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/285e26465a0bae510897ca04da26ce6307c652b4?narHash=sha256-kcBiIrmqzt3bNTr2GMBfAyA%2Bon8BEKO1iKzzDFQZkjI%3D' (2024-04-26)
  → 'github:nix-community/disko/d57058eb09dd5ec00c746df34fe0a603ea744370?narHash=sha256-W7%2BrtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E%3D' (2024-05-02)
• Updated input 'firefox-darwin':
    'github:bandithedoge/nixpkgs-firefox-darwin/7e82af679667cf9d56075dfa375b32c317aa708d?narHash=sha256-Ep8jPm%2BQ832byS7VtlkdXEEWGFhk5BMX0CjkVtC1G4E%3D' (2024-04-24)
  → 'github:bandithedoge/nixpkgs-firefox-darwin/7e9014891eebabffa68351e3360da3fbc59b8066?narHash=sha256-kTAMHZ1DDGauq3f5IzPw%2BEtVOgWdctLPUMJiqciqOx0%3D' (2024-05-05)
• Updated input 'home-manager':
    'github:nix-community/home-manager/c1609d584a6b5e9e6a02010f51bd368cb4782f8e?narHash=sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ%3D' (2024-04-27)
  → 'github:nix-community/home-manager/e0825ea2112d09d9f0680833cd716f6aee3b973f?narHash=sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA%3D' (2024-05-04)
• Updated input 'nextcloud-snappymail':
    'https://snappymail.eu/repository/nextcloud/snappymail-2.36.1-nextcloud.tar.gz?narHash=sha256-CsAUnbA/9XiVuk96pOK%2BE%2B%2Blp8BlJITtfExWcb9rqPk%3D' (2024-04-26)
  → 'https://snappymail.eu/repository/nextcloud/snappymail-2.36.1-nextcloud.tar.gz?narHash=sha256-6mel49dSTujJnpdUt1aOJ87duXU/DBqpuqgZOKP1YII%3D' (2024-04-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856?narHash=sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY%3D' (2024-04-25)
  → 'github:nixos/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f?narHash=sha256-4cPymbty65RvF1DWQfc%2BBc8B233A1BWxJnNULJKQ1EY%3D' (2024-05-02)
• Updated input 'nur':
    'github:nix-community/nur/1348a217ce75f5171b65873c5146b47e0d26bc83?narHash=sha256-SZTU/TQFzihktp/SPzY3yzMnrYi7EuaCIA/g4jNA8KU%3D' (2024-04-28)
  → 'github:nix-community/nur/49f72c695fb2f46c8aeb1549704246b9558b2011?narHash=sha256-G/dc755qMdAMvXuZsi1OFCzD49OWszdMSnp12%2B1eFcM%3D' (2024-05-05)
• Updated input 'nvim-lint-src':
    'github:mfussenegger/nvim-lint/f098232d70cebe90e27404928c9bc19ca7a5a7b5?narHash=sha256-QyS%2BxSIOVbJdf/vLU0o8fdZrQ%2BMssolTyg75ZSnP0fY%3D' (2024-04-16)
  → 'github:mfussenegger/nvim-lint/861a04313501563bb1b11f125ae9b7237a517b9b?narHash=sha256-aM4oWSZrZb660wEpLQnFyoBkH%2BMSi0WgfBIztk98Qtk%3D' (2024-04-30)
• Updated input 'nvim-tree-lua-src':
    'github:kyazdani42/nvim-tree.lua/5a18b9827491aa1aea710bc9b85c6b63ed0dad14?narHash=sha256-VMyVrgcgqx52QIy/q0oAuJNuxMNPAgPX3bi1LP27Iho%3D' (2024-04-25)
  → 'github:kyazdani42/nvim-tree.lua/64f61e4c913047a045ff90bd188dd3b54ee443cf?narHash=sha256-rY4FbuqBM4zOUkaA3QBc%2BUrpfTha8uGtp%2BlIzrYK%2Bcg%3D' (2024-05-04)
• Updated input 'nvim-treesitter-src':
    'github:nvim-treesitter/nvim-treesitter/0883ff05655117a3fc79ab295a640c4984cfd415?narHash=sha256-4VmW8xfayxIo4k6WA4423yTyLvzBTwidU7d8OuGH1vY%3D' (2024-04-27)
  → 'github:nvim-treesitter/nvim-treesitter/4e21361e15b1d4147830c5fe571556eb1b14e6f9?narHash=sha256-3Ae3ieCqckVAElTufJxgBRNXdWg81%2B%2BoI0qesKevcb4%3D' (2024-05-04)
• Updated input 'tree-sitter-python':
    'github:tree-sitter/tree-sitter-python/a22761025cdac6c314b7e3aa48fb44fa9e594d6a?narHash=sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7%2BCut%2BzYnMI88%3D' (2024-04-05)
  → 'github:tree-sitter/tree-sitter-python/71778c2a472ed00a64abf4219544edbf8e4b86d7?narHash=sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y%3D' (2024-05-01)
• Updated input 'wsl':
    'github:nix-community/NixOS-WSL/4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c?narHash=sha256-jgTn20s3qzar/IqhjQcEO%2BdIQbT4hBFIloVntiCURkA%3D' (2024-04-26)
  → 'github:nix-community/NixOS-WSL/acb893461a4bee4e77b1a27b1410d4995b52174c?narHash=sha256-rtv%2BnJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM%3D' (2024-04-29)

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/arrow-aws.yml

@@ -0,0 +1,158 @@
+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
+
+      # 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@v17
+
+      # Build the image
+      - name: Build Image
+        if: inputs.rebuild && inputs.action != 'destroy'
+        run: nix build .#arrow-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
+
+      # 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
+
+      # Deploys infrastructure or changes to infrastructure.
+      - name: Terraform Apply
+        if: inputs.action == 'create'
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_terraform_state_bucket: ${{ secrets.TERRAFORM_STATE_BUCKET }}
+          TF_VAR_terraform_state_key: arrow.tfstate
+          TF_VAR_ec2_size: ${{ inputs.size }}
+        run: |
+          terraform apply \
+            -auto-approve \
+            -input=false
+
+      # Removes infrastructure.
+      - name: Terraform Destroy
+        if: inputs.action == 'destroy'
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        run: |
+          terraform destroy \
+            -auto-approve \
+            -input=false
+
+      - name: Get Host IP
+        if: inputs.action == 'create'
+        id: host
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        run: terraform output -raw host_ip
+
+      - name: Wait on SSH
+        if: inputs.action == 'create'
+        run: |
+          for i in $(seq 1 15); do
+            if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
+              exit 0
+            fi
+            sleep 10
+          done
+
+      - name: Write Identity Keys to Files
+        if: inputs.action == 'create'
+        run: |
+          echo "${{ env.DEPLOY_IDENTITY_BASE64 }}" | base64 -d > deploy_ed25519
+          chmod 0600 deploy_ed25519
+          echo "${{ env.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 == "transmission.${{ 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

@@ -0,0 +1,164 @@
+name: Arrow
+
+run-name: Arrow - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
+
+env:
+  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"
+  AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_SECRET_KEY }}
+  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:
+    inputs:
+      rebuild:
+        type: boolean
+        default: false
+      action:
+        type: choice
+        required: true
+        default: create
+        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:
+    name: Build and Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo Code
+        uses: actions/checkout@v4
+
+      # 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
+
+      # Install Nix
+      - name: Install Nix
+        if: inputs.rebuild && inputs.action != 'destroy'
+        uses: cachix/install-nix-action@v17
+
+      # Build the image
+      - name: Build Image
+        if: inputs.rebuild && inputs.action != 'destroy'
+        run: nix build .#arrow
+
+      - name: Upload Image to S3
+        if: inputs.rebuild && inputs.action != 'destroy'
+        run: |
+          aws s3 cp \
+            result/iso/nixos.iso \
+            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
+
+      # 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
+
+      # Deploys infrastructure or changes to infrastructure.
+      - name: Terraform Apply
+        if: inputs.action == 'create'
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_vultr_plan: ${{ inputs.plan }}
+        run: |
+          terraform apply \
+            -auto-approve \
+            -input=false
+
+      # Removes infrastructure.
+      - name: Terraform Destroy
+        if: inputs.action == 'destroy'
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        run: |
+          terraform destroy \
+            -auto-approve \
+            -input=false
+
+      - name: Get Host IP
+        if: inputs.action == 'create'
+        id: host
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        run: terraform output -raw host_ip
+
+      - name: Wait on SSH
+        if: inputs.action == 'create'
+        run: |
+          for i in $(seq 1 15); do
+            if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
+              exit 0
+            fi
+            sleep 10
+          done
+
+      - name: Write Identity Keys to Files
+        if: inputs.action == 'create'
+        run: |
+          echo "${{ env.DEPLOY_IDENTITY_BASE64 }}" | base64 -d > deploy_ed25519
+          chmod 0600 deploy_ed25519
+          echo "${{ env.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 == "transmission.${{ 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

@@ -0,0 +1,20 @@
+name: Check Build
+
+on:
+  workflow_dispatch: # allows manual triggering
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - name: Check Nixpkgs Inputs
+        uses: DeterminateSystems/flake-checker-action@v5
+      - name: Add Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check the Flake
+        run: nix flake check

.github/workflows/update.yml

@@ -0,0 +1,69 @@
+name: Update Flake
+
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
+
+permissions:
+  contents: write
+  pull-requests: write
+  checks: write
+
+jobs:
+  lockfile:
+    name: Lockfile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - name: Check Nixpkgs Inputs
+        uses: DeterminateSystems/flake-checker-action@v5
+      - name: Add Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@v19
+        id: update
+        with:
+          pr-title: "Update flake.lock" # Title of PR to be created
+          pr-labels: |                  # Labels to be set on the PR
+            dependencies
+            automated
+          pr-body: |
+            Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action.
+
+            ```
+            {{ env.GIT_COMMIT_MESSAGE }}
+            ```
+      - name: Check the Flake
+        id: check
+        run: nix flake check
+      - name: Update Check Status
+        uses: LouisBrunner/checks-action@v1.6.1
+        if: always()
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: Update Flake
+          conclusion: ${{ job.status }}
+          output: |
+            {"summary":"${{ steps.check.outputs.stdout }}"}
+      - name: Enable Pull Request Automerge
+        if: success()
+        run: |
+          gh pr merge \
+            --rebase \
+            --auto \
+            ${{ steps.update.outputs.pull-request-number }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Close Pull Request If Failed
+        if: failure()
+        run: |
+          gh pr close \
+            --comment "Auto-closing pull request" \
+            --delete-branch \
+            ${{ steps.update.outputs.pull-request-number }}
+        env:
+          GH_TOKEN: ${{ github.token }}

.gitignore

@@ -1,11 +1,9 @@
 .DS_Store
-nvim.configlink/dirs/*
-nvim.configlink/.netrwhist
-nvim.configlink/plugin/**
-nvim.configlink/plugged/**
-nvim.configlink/autoload/**
-fish.configlink/config.fish.bac
-fish.configlink/functions/vim.fish
-fish_variables
-homebrew/*.lock.json
 *.bak
+*.db
+*.qcow2
+**/.direnv/**
+result
+private/**
+templates/**/flake.lock
+!private/**.age

.stylua.toml

@@ -0,0 +1 @@
+indent_type = "Spaces"

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Noah Masur
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -1,40 +0,0 @@
-bootstrap:
-	./scripts/bootstrap
-	./scripts/setup_symlinks
-
-all:
-	./scripts/bootstrap
-	./scripts/setup_symlinks
-	./scripts/setup_fish
-	./scripts/brews
-	./scripts/update_rust_analyzer
-	./scripts/rust
-	./scripts/cargos
-	./scripts/setup_cheatsheet
-	./scripts/setup_ytfzf
-
-fish: bootstrap
-	./scripts/setup_fish
-
-macos: bootstrap
-	./scripts/configure_macos
-
-brews: bootstrap
-	./scripts/brews
-
-casks: bootstrap
-	./scripts/casks
-
-rust:
-	./scripts/update_rust_analyzer
-	./scripts/rust
-
-cargos: rust
-	./scripts/rust
-
-programs:
-	./scripts/setup_cheatsheet
-	./scripts/setup_ytfzf
-
-python: brews
-	npm install -g pyright

README.md

@@ -0,0 +1,95 @@
+# System Configurations
+
+This repository contains configuration files for my NixOS, macOS, and WSL
+hosts.
+
+They are organized and managed by [Nix](https://nixos.org), so some of the
+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)   |
+| Window Manager | [i3](https://i3wm.org/)                             | [Link](./modules/nixos/graphical/i3.nix)      |
+| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./modules/nixos/graphical/polybar.nix) |
+| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix)   |
+| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./modules/nixos/graphical/rofi.nix)    |
+
+## User Features
+
+| Feature      | Program                                                                          | Configuration                                      |
+| ---          | ---                                                                              | ---                                                |
+| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
+| Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
+| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
+| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starship.nix)         |
+| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)          |
+| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)                |
+| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
+| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
+| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |
+| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./modules/common/applications/nautilus.nix) |
+| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./modules/common/applications/media.nix)    |
+| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./modules/common/applications/media.nix)    |
+
+## macOS Features
+
+| Feature  | Program                                     | Configuration                        |
+| ---      | ---                                         | ---                                  |
+| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
+
+# Diagram
+
+![Diagram](https://github.com/nmasur/dotfiles/assets/7386960/4cc22285-cea1-4831-b387-a82241184381)
+
+---
+
+# Unique Configurations
+
+This repo contains a few more elaborate elements of configuration.
+
+- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
+and source-controlled plugins, differing based on installed LSPs, for example.
+- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based
+dynamically on enabled services rendered with Nix.
+- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix.
+- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
+agenix.
+- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
+including Firefox userChrome.
+
+---
+
+# Installation
+
+Click [here](./docs/installation.md) for detailed installation instructions.
+
+# Neovim
+
+Try out my Neovim config with nix:
+
+```bash
+nix run github:nmasur/dotfiles#neovim
+```
+
+Or build it as a package:
+
+```bash
+nix build github:nmasur/dotfiles#neovim
+```
+
+If you already have a Neovim configuration, you may need to move it out of
+`~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise both
+configs might conflict with each other.
+
+# Flake Templates
+
+You can also use the [templates](./templates/) as flakes for starting new
+projects:
+
+```bash
+nix flake init --template github:nmasur/dotfiles#poetry
+```

alacritty.configlink/alacritty.yml

@@ -1,839 +0,0 @@
-# Configuration for Alacritty, the GPU enhanced terminal emulator.
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty itself.
-#env:
-  # TERM variable
-  #
-  # This value is used to set the `$TERM` environment variable for
-  # each instance of Alacritty. If it is not present, alacritty will
-  # check the local terminfo database and use `alacritty` if it is
-  # available, otherwise `xterm-256color` is used.
-  #TERM: alacritty
-  #TERM: xterm-256color
-
-window:
-  # Window dimensions (changes require restart)
-  #
-  # Specified in number of columns/lines, not pixels.
-  # If both are `0`, this setting is ignored.
-  dimensions:
-    columns: 130
-    lines: 50
-
-  # Window position (changes require restart)
-  #
-  # Specified in number of pixels.
-  # If the position is not set, the window manager will handle the placement.
-  #position:
-  #  x: 0
-  #  y: 0
-
-  # Window padding (changes require restart)
-  #
-  # Blank space added around the window in pixels. This padding is scaled
-  # by DPI and the specified value is always added at both opposing sides.
-  padding:
-    x: 20
-    y: 20
-
-  # Spread additional padding evenly around the terminal content.
-  #dynamic_padding: false
-
-  # Window decorations
-  #
-  # Values for `decorations`:
-  #     - full: Borders and title bar
-  #     - none: Neither borders nor title bar
-  #
-  # Values for `decorations` (macOS only):
-  #     - transparent: Title bar, transparent background and title bar buttons
-  #     - buttonless: Title bar, transparent background, but no title bar buttons
-  decorations: full
-
-  # Startup Mode (changes require restart)
-  #
-  # Values for `startup_mode`:
-  #   - Windowed
-  #   - Maximized
-  #   - Fullscreen
-  #
-  # Values for `startup_mode` (macOS only):
-  #   - SimpleFullscreen
-  startup_mode: SimpleFullscreen
-
-  # Window title
-  #title: Alacritty
-
-  # Window class (Linux/BSD only):
-  #class:
-    # Application instance name
-    #instance: Alacritty
-    # General application class
-    #general: Alacritty
-
-  # GTK theme variant (Linux/BSD only)
-  #
-  # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`.
-  # Set this to `None` to use the default theme variant.
-  #gtk_theme_variant: None
-
-scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  history: 10000
-
-  # Scrolling distance multiplier.
-  #multiplier: 3
-
-# Font configuration
-font:
-  # Normal (roman) font face
-  normal:
-    # Font family
-    #
-    # Default:
-    #   - (macOS) Menlo
-    #   - (Linux/BSD) monospace
-    #   - (Windows) Consolas
-    #family: Fira Code
-    #family: Noto Sans Mono
-    family: Fira Mono for Powerline
-
-    # The `style` can be specified to pick a specific face.
-    #style: Regular
-
-  # Bold font face
-  #bold:
-    # Font family
-    #
-    # If the bold family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Bold
-
-  # Italic font face
-  #italic:
-    # Font family
-    #
-    # If the italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Italic
-
-  # Bold italic font face
-  #bold_italic:
-    # Font family
-    #
-    # If the bold italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Bold Italic
-
-  # Point size
-  size: 18.0
-
-  # Offset is the extra space around each character. `offset.y` can be thought of
-  # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
-  #offset:
-  #  x: 0
-  #  y: 0
-
-  # Glyph offset determines the locations of the glyphs within their cells with
-  # the default being at the bottom. Increasing `x` moves the glyph to the right,
-  # increasing `y` moves the glyph upward.
-  #glyph_offset:
-  #  x: 0
-  #  y: 0
-
-  # Thin stroke font rendering (macOS only)
-  #
-  # Thin strokes are suitable for retina displays, but for non-retina screens
-  # it is recommended to set `use_thin_strokes` to `false`.
-  #use_thin_strokes: true
-
-# If `true`, bold text is drawn using the bright color variants.
-#draw_bold_text_with_bright_colors: false
-
-# Colors (Tomorrow Night)
-#colors:
-  # Default colors
-  #primary:
-  #  background: '#1d1f21'
-  #  foreground: '#c5c8c6'
-
-    # Bright and dim foreground colors
-    #
-    # The dimmed foreground color is calculated automatically if it is not present.
-    # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors`
-    # is `false`, the normal foreground color will be used.
-    #dim_foreground: '#828482'
-    #bright_foreground: '#eaeaea'
-
-  # Cursor colors
-  #
-  # Colors which should be used to draw the terminal cursor.
-  #
-  # Allowed values are CellForeground and CellBackground, which reference the
-  # affected cell, or hexadecimal colors like #ff00ff.
-  #cursor:
-  #  text: CellBackground
-  #  cursor: CellForeground
-
-  # Vi mode cursor colors
-  #
-  # Colors for the cursor when the vi mode is active.
-  #
-  # Allowed values are CellForeground and CellBackground, which reference the
-  # affected cell, or hexadecimal colors like #ff00ff.
-  #vi_mode_cursor:
-  #  text: CellBackground
-  #  cursor: CellForeground
-
-  # Selection colors
-  #
-  # Colors which should be used to draw the selection area.
-  #
-  # Allowed values are CellForeground and CellBackground, which reference the
-  # affected cell, or hexadecimal colors like #ff00ff.
-  #selection:
-  #  text: CellBackground
-  #  background: CellForeground
-
-  # Search colors
-  #
-  # Colors used for the search bar and match highlighting.
-  #
-  # Allowed values are CellForeground and CellBackground, which reference the
-  # affected cell, or hexadecimal colors like #ff00ff.
-  #search:
-  #  matches:
-  #    foreground: '#000000'
-  #    background: '#ffffff'
-  #
-  #  bar:
-  #    background: CellForeground
-  #    foreground: CellBackground
-
-  # Normal colors
-  #normal:
-  #  black:   '#1d1f21'
-  #  red:     '#cc6666'
-  #  green:   '#b5bd68'
-  #  yellow:  '#f0c674'
-  #  blue:    '#81a2be'
-  #  magenta: '#b294bb'
-  #  cyan:    '#8abeb7'
-  #  white:   '#c5c8c6'
-
-  # Bright colors
-  #bright:
-  #  black:   '#666666'
-  #  red:     '#d54e53'
-  #  green:   '#b9ca4a'
-  #  yellow:  '#e7c547'
-  #  blue:    '#7aa6da'
-  #  magenta: '#c397d8'
-  #  cyan:    '#70c0b1'
-  #  white:   '#eaeaea'
-
-  # Dim colors
-  #
-  # If the dim colors are not set, they will be calculated automatically based
-  # on the `normal` colors.
-  #dim:
-  #  black:   '#131415'
-  #  red:     '#864343'
-  #  green:   '#777c44'
-  #  yellow:  '#9e824c'
-  #  blue:    '#556a7d'
-  #  magenta: '#75617b'
-  #  cyan:    '#5b7d78'
-  #  white:   '#828482'
-
-  # Indexed Colors
-  #
-  # The indexed colors include all colors from 16 to 256.
-  # When these are not set, they're filled with sensible defaults.
-  #
-  # Example:
-  #   `- { index: 16, color: '#ff00ff' }`
-  #
-  #indexed_colors: []
-
-# Bell
-#
-# The bell is rung every time the BEL control character is received.
-#bell:
-  # Visual Bell Animation
-  #
-  # Animation effect for flashing the screen when the visual bell is rung.
-  #
-  # Values for `animation`:
-  #   - Ease
-  #   - EaseOut
-  #   - EaseOutSine
-  #   - EaseOutQuad
-  #   - EaseOutCubic
-  #   - EaseOutQuart
-  #   - EaseOutQuint
-  #   - EaseOutExpo
-  #   - EaseOutCirc
-  #   - Linear
-  #animation: EaseOutExpo
-
-  # Duration of the visual bell flash. A `duration` of `0` will disable the
-  # visual bell animation.
-  #duration: 0
-
-  # Visual bell animation color.
-  #color: '#ffffff'
-
-  # Bell Command
-  #
-  # This program is executed whenever the bell is rung.
-  #
-  # When set to `command: None`, no command will be executed.
-  #
-  # Example:
-  #   command:
-  #     program: notify-send
-  #     args: ["Hello, World!"]
-  #
-  #command: None
-
-# Background opacity
-#
-# Window opacity as a floating point number from `0.0` to `1.0`.
-# The value `0.0` is completely transparent and `1.0` is opaque.
-#background_opacity: 1.0
-
-#selection:
-  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
-
-  # When set to `true`, selected text will be copied to the primary clipboard.
-  #save_to_clipboard: false
-
-# Allow terminal applications to change Alacritty's window title.
-#dynamic_title: true
-
-#cursor:
-  # Cursor style
-  #
-  # Values for `style`:
-  #   - ▇ Block
-  #   - _ Underline
-  #   - | Beam
-  #style: Block
-
-  # Vi mode cursor style
-  #
-  # If the vi mode cursor style is `None` or not specified, it will fall back to
-  # the style of the active value of the normal cursor.
-  #
-  # See `cursor.style` for available options.
-  #vi_mode_style: Block
-
-  # If this is `true`, the cursor will be rendered as a hollow box when the
-  # window is not focused.
-  #unfocused_hollow: true
-
-  # Thickness of the cursor relative to the cell width as floating point number
-  # from `0.0` to `1.0`.
-  #thickness: 0.15
-
-# Live config reload (changes require restart)
-#live_config_reload: true
-
-# Shell
-#
-# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
-# Entries in `shell.args` are passed unmodified as arguments to the shell.
-#
-# Default:
-#   - (macOS) /bin/bash --login
-#   - (Linux/BSD) user login shell
-#   - (Windows) powershell
-shell:
-  program: /usr/local/bin/fish
-  args:
-    - --login
-    - --init-command
-    - tmux a -t noah || tmux new -s noah
-
-# Startup directory
-#
-# Directory the shell is started in. If this is unset, or `None`, the working
-# directory of the parent process will be used.
-#working_directory: None
-
-# WinPTY backend (Windows only)
-#
-# Alacritty defaults to using the newer ConPTY backend if it is available,
-# since it resolves a lot of bugs and is quite a bit faster. If it is not
-# available, the WinPTY backend will be used instead.
-#
-# Setting this option to `true` makes Alacritty use the legacy WinPTY backend,
-# even if the ConPTY backend is available.
-#winpty_backend: false
-
-# Send ESC (\x1b) before characters when alt is pressed.
-#alt_send_esc: true
-
-#mouse:
-  # Click settings
-  #
-  # The `double_click` and `triple_click` settings control the time
-  # alacritty should wait for accepting multiple clicks as one double
-  # or triple click.
-  #double_click: { threshold: 300 }
-  #triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  #hide_when_typing: false
-
-  #url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a URL.
-    # The URL is always added to the command as the last parameter.
-    #
-    # When set to `launcher: None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux/BSD) xdg-open
-    #   - (Windows) explorer
-    #launcher:
-    #  program: xdg-open
-    #  args: []
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when clicking
-    # on them. The available modifiers are documented in the key binding section.
-    #modifiers: None
-
-# Mouse bindings
-#
-# Mouse bindings are specified as a list of objects, much like the key
-# bindings further below.
-#
-# To trigger mouse bindings when an application running within Alacritty captures the mouse, the
-# `Shift` modifier is automatically added as a requirement.
-#
-# Each mouse binding will specify a:
-#
-# - `mouse`:
-#
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# - `action` (see key bindings)
-#
-# And optionally:
-#
-# - `mods` (see key bindings)
-#mouse_bindings:
-#  - { mouse: Middle, action: PasteSelection }
-
-# Key bindings
-#
-# Key bindings are specified as a list of objects. For example, this is the
-# default paste binding:
-#
-# `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Each key binding will specify a:
-#
-# - `key`: Identifier of the key pressed
-#
-#    - A-Z
-#    - F1-F24
-#    - Key0-Key9
-#
-#    A full list with available key codes can be found here:
-#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#
-#    Instead of using the name of the keys, the `key` field also supports using
-#    the scancode of the desired key. Scancodes have to be specified as a
-#    decimal number. This command will allow you to display the hex scancodes
-#    for certain keys:
-#
-#       `showkey --scancodes`.
-#
-# Then exactly one of:
-#
-# - `chars`: Send a byte sequence to the running application
-#
-#    The `chars` field writes the specified string to the terminal. This makes
-#    it possible to pass escape sequences. To find escape codes for bindings
-#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
-#    of tmux. Note that applications use terminfo to map escape sequences back
-#    to keys. It is therefore required to update the terminfo when changing an
-#    escape sequence.
-#
-# - `action`: Execute a predefined action
-#
-#   - ToggleViMode
-#   - SearchForward
-#   - SearchBackward
-#   - Copy
-#   - Paste
-#   - PasteSelection
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollHalfPageUp
-#   - ScrollHalfPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#   - Hide
-#   - Minimize
-#   - Quit
-#   - ToggleFullscreen
-#   - SpawnNewInstance
-#   - ClearLogNotice
-#   - ClearSelection
-#   - ReceiveChar
-#   - None
-#
-#   (`mode: Vi` only):
-#   - Open
-#   - Up
-#   - Down
-#   - Left
-#   - Right
-#   - First
-#   - Last
-#   - FirstOccupied
-#   - High
-#   - Middle
-#   - Low
-#   - SemanticLeft
-#   - SemanticRight
-#   - SemanticLeftEnd
-#   - SemanticRightEnd
-#   - WordRight
-#   - WordLeft
-#   - WordRightEnd
-#   - WordLeftEnd
-#   - Bracket
-#   - ToggleNormalSelection
-#   - ToggleLineSelection
-#   - ToggleBlockSelection
-#   - ToggleSemanticSelection
-#   - SearchNext
-#   - SearchPrevious
-#   - SearchStart
-#   - SearchEnd
-#
-#   (macOS only):
-#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
-#
-#   (Linux/BSD only):
-#   - CopySelection: Copies into selection buffer
-#
-# - `command`: Fork and execute a specified command plus arguments
-#
-#    The `command` field must be a map containing a `program` string and an
-#    `args` array of command line parameter strings. For example:
-#       `{ program: "alacritty", args: ["-e", "vttest"] }`
-#
-# And optionally:
-#
-# - `mods`: Key modifiers to filter binding actions
-#
-#    - Command
-#    - Control
-#    - Option
-#    - Super
-#    - Shift
-#    - Alt
-#
-#    Multiple `mods` can be combined using `|` like this:
-#       `mods: Control|Shift`.
-#    Whitespace and capitalization are relevant and must match the example.
-#
-# - `mode`: Indicate a binding for only specific terminal reported modes
-#
-#    This is mainly used to send applications the correct escape sequences
-#    when in different modes.
-#
-#    - AppCursor
-#    - AppKeypad
-#    - Alt
-#
-#    A `~` operator can be used before a mode to apply the binding whenever
-#    the mode is *not* active, e.g. `~Alt`.
-#
-# Bindings are always filled by default, but will be replaced when a new
-# binding with the same triggers is defined. To unset a default binding, it can
-# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
-# a no-op if you do not wish to receive input characters for that binding.
-#
-# If the same trigger is assigned to multiple actions, all of them are executed
-# in the order they were defined in.
-key_bindings:
-  - { key: F, mods: Super, action: ToggleSimpleFullscreen }
-
-  # Reference for escape codes: https://www.gaijin.at/en/infos/ascii-ansi-character-table
-
-  - { key: L, mods : Super, chars: "\x1F" } # CMD-L sends null key for fish
-  - { key: H, mods : Super|Shift, chars: "\x02p" } # CMD-SHIFT-H previous tmux window
-  - { key: L, mods : Super|Shift, chars: "\x02n" } # CMD-SHIFT-L next tmux window
-
-  - { key: Return,      mods : Shift,          chars: "\x1b[13;2u"      }
-  - { key: Return,      mods : Control,        chars: "\x1b[13;5u"      }
-  - { key: Return,      mods : Control|Shift,  chars: "\x1b[13;6u"      }
-
-  - { key: N,           mods: Command,         action: SpawnNewInstance }
-  - { key: PageUp,                             action: ScrollPageUp     }
-  - { key: PageUp,      mode: Alt,             chars: "\x1B[5~"         }
-  - { key: PageUp,      mods: Shift,           chars: "\x1B[5~"         }
-  - { key: PageDown,                           action: ScrollPageDown   }
-  - { key: PageDown,    mode: Alt,             chars: "\x1B[6~"         }
-  - { key: PageDown,    mods: Shift,           chars: "\x1B[6~"         }
-  - { key: Home,                               action: ScrollToTop      }
-  - { key: Home,        mode: Alt,             chars: "\x1BOH"          }
-  - { key: Home,        mods: Shift,           chars: "\x1B[H"          }
-  - { key: End,                                action: ScrollToBottom   }
-  - { key: End,         mode: Alt,             chars: "\x1BOF"          }
-  - { key: End,         mods: Shift,           chars: "\x1B[F"          }
-  - { key: Tab,         mods: Alt,             chars: "\x1B\t"          }
-  - { key: Tab,         mods: Alt|Shift,       chars: "\x1B\x1B[Z"      }
-  - { key: Back,                               chars: "\x7F"            }
-  - { key: Back,        mods: Alt,             chars: "\x1B\x7F"        }
-  - { key: Back,        mods: Alt|Shift,       chars: "\x1B\x08"        }
-  - { key: Space,       mods: Control,         chars: "\x00"            }
-  - { key: Space,       mods: Alt,             chars: "\x20"            }
-  - { key: Left,        mods: Alt,             chars: "\x1Bb"           }
-  - { key: Left,        mods: Alt|Shift,       chars: "\x1B\x1B[D"      }
-  - { key: Right,       mods: Alt,             chars: "\x1Bf"           }
-  - { key: Right,       mods: Alt|Shift,       chars: "\x1B\x1B[C"      }
-  - { key: Down,        mods: Alt,             chars: "\x1B\x1B[B"      }
-  - { key: Down,        mods: Alt|Shift,       chars: "\x1B\x1B[B"      }
-  - { key: Up,          mods: Alt,             chars: "\x1B\x1B[A"      }
-  - { key: Up,          mods: Alt|Shift,       chars: "\x1B\x1B[A"      }
-  - { key: A,           mods: Alt,             chars: "\x1Ba"           }
-  - { key: A,           mods: Alt|Shift,       chars: "\x1BA"           }
-  - { key: B,           mods: Alt,             chars: "\x1Bb"           }
-  - { key: B,           mods: Alt|Shift,       chars: "\x1BB"           }
-  - { key: C,           mods: Alt,             chars: "\x1Bc"           }
-  - { key: C,           mods: Alt|Shift,       chars: "\x1BC"           }
-  - { key: D,           mods: Alt,             chars: "\x1Bd"           }
-  - { key: D,           mods: Alt|Shift,       chars: "\x1BD"           }
-  - { key: E,           mods: Alt,             chars: "\x1Be"           }
-  - { key: E,           mods: Alt|Shift,       chars: "\x1BE"           }
-  - { key: F,           mods: Alt,             chars: "\x1Bf"           }
-  - { key: F,           mods: Alt|Shift,       chars: "\x1BF"           }
-  - { key: G,           mods: Alt,             chars: "\x1Bg"           }
-  - { key: G,           mods: Alt|Shift,       chars: "\x1BG"           }
-  - { key: H,           mods: Alt,             chars: "\x1Bh"           }
-  - { key: H,           mods: Alt|Shift,       chars: "\x1BH"           }
-  - { key: I,           mods: Alt,             chars: "\x1Bi"           }
-  - { key: I,           mods: Alt|Shift,       chars: "\x1BI"           }
-  - { key: J,           mods: Alt,             chars: "\x1Bj"           }
-  - { key: J,           mods: Alt|Shift,       chars: "\x1BJ"           }
-  - { key: K,           mods: Alt,             chars: "\x1Bk"           }
-  - { key: K,           mods: Alt|Shift,       chars: "\x1BK"           }
-  - { key: L,           mods: Alt,             chars: "\x1Bl"           }
-  - { key: L,           mods: Alt|Shift,       chars: "\x1BL"           }
-  - { key: M,           mods: Alt,             chars: "\x1Bm"           }
-  - { key: M,           mods: Alt|Shift,       chars: "\x1BM"           }
-  - { key: N,           mods: Alt,             chars: "\x1Bn"           }
-  - { key: N,           mods: Alt|Shift,       chars: "\x1BN"           }
-  - { key: O,           mods: Alt,             chars: "\x1Bo"           }
-  - { key: O,           mods: Alt|Shift,       chars: "\x1BO"           }
-  - { key: P,           mods: Alt,             chars: "\x1Bp"           }
-  - { key: P,           mods: Alt|Shift,       chars: "\x1BP"           }
-  - { key: Q,           mods: Alt,             chars: "\x1Bq"           }
-  - { key: Q,           mods: Alt|Shift,       chars: "\x1BQ"           }
-  - { key: R,           mods: Alt,             chars: "\x1Br"           }
-  - { key: R,           mods: Alt|Shift,       chars: "\x1BR"           }
-  - { key: S,           mods: Alt,             chars: "\x1Bs"           }
-  - { key: S,           mods: Alt|Shift,       chars: "\x1BS"           }
-  - { key: T,           mods: Alt,             chars: "\x1Bt"           }
-  - { key: T,           mods: Alt|Shift,       chars: "\x1BT"           }
-  - { key: U,           mods: Alt,             chars: "\x1Bu"           }
-  - { key: U,           mods: Alt|Shift,       chars: "\x1BU"           }
-  - { key: V,           mods: Alt,             chars: "\x1Bv"           }
-  - { key: V,           mods: Alt|Shift,       chars: "\x1BV"           }
-  - { key: W,           mods: Alt,             chars: "\x1Bw"           }
-  - { key: W,           mods: Alt|Shift,       chars: "\x1BW"           }
-  - { key: X,           mods: Alt,             chars: "\x1Bx"           }
-  - { key: X,           mods: Alt|Shift,       chars: "\x1BX"           }
-  - { key: Y,           mods: Alt,             chars: "\x1By"           }
-  - { key: Y,           mods: Alt|Shift,       chars: "\x1BY"           }
-  - { key: Z,           mods: Alt,             chars: "\x1Bz"           }
-  - { key: Z,           mods: Alt|Shift,       chars: "\x1BZ"           }
-  - { key: Key1,        mods: Alt,             chars: "\x1B1"           }
-  - { key: Key1,        mods: Alt|Shift,       chars: "\x1B!"           }
-  - { key: Key2,        mods: Alt,             chars: "\x1B2"           }
-  - { key: Key2,        mods: Alt|Shift,       chars: "\x1B#"           }
-  - { key: Key3,        mods: Alt,             chars: "\x1B3"           }
-  - { key: Key3,        mods: Alt|Shift,       chars: "\x1B#"           }
-  - { key: Key4,        mods: Alt,             chars: "\x1B4"           }
-  - { key: Key4,        mods: Alt|Shift,       chars: "\x1B$"           }
-  - { key: Key5,        mods: Alt,             chars: "\x1B5"           }
-  - { key: Key5,        mods: Alt|Shift,       chars: "\x1B%"           }
-  - { key: Key6,        mods: Alt,             chars: "\x1B6"           }
-  - { key: Key6,        mods: Alt|Shift,       chars: "\x1B^"           }
-  - { key: Key7,        mods: Alt,             chars: "\x1B7"           }
-  - { key: Key7,        mods: Alt|Shift,       chars: "\x1B&"           }
-  - { key: Key8,        mods: Alt,             chars: "\x1B8"           }
-  - { key: Key8,        mods: Alt|Shift,       chars: "\x1B*"           }
-  - { key: Key9,        mods: Alt,             chars: "\x1B9"           }
-  - { key: Key9,        mods: Alt|Shift,       chars: "\x1B("           }
-  - { key: Key0,        mods: Alt,             chars: "\x1B0"           }
-  - { key: Key0,        mods: Alt|Shift,       chars: "\x1B)"           }
-  - { key: Minus,       mods: Alt,             chars: "\x1B-"           }
-  - { key: Minus,       mods: Alt|Shift,       chars: "\x1B_"           }
-  - { key: Equals,      mods: Alt,             chars: "\x1B="           }
-  - { key: Equals,      mods: Alt|Shift,       chars: "\x1B+"           }
-  - { key: LBracket,    mods: Alt,             chars: "\x1B["           }
-  - { key: LBracket,    mods: Alt|Shift,       chars: "\x1B{"           }
-  - { key: RBracket,    mods: Alt,             chars: "\x1B]"           }
-  - { key: RBracket,    mods: Alt|Shift,       chars: "\x1B}"           }
-  - { key: Backslash,   mods: Alt,             chars: "\x1B\\"          }
-  - { key: Backslash,   mods: Alt|Shift,       chars: "\x1B|"           }
-  - { key: Semicolon,   mods: Alt,             chars: "\x1B;"           }
-  - { key: Semicolon,   mods: Alt|Shift,       chars: "\x1B:"           }
-  - { key: Apostrophe,  mods: Alt,             chars: "\x1B'"           }
-  - { key: Apostrophe,  mods: Alt|Shift,       chars: "\x1B\""          }
-  - { key: Comma,       mods: Alt,             chars: "\x1B,"           }
-  - { key: Comma,       mods: Alt|Shift,       chars: "\x1B<"           }
-  - { key: Period,      mods: Alt,             chars: "\x1B."           }
-  - { key: Period,      mods: Alt|Shift,       chars: "\x1B>"           }
-  - { key: Slash,       mods: Alt,             chars: "\x1B/"           }
-  - { key: Slash,       mods: Alt|Shift,       chars: "\x1B?"           }
-  - { key: Grave,       mods: Alt,             chars: "\x1B`"           }
-  - { key: Grave,       mods: Alt|Shift,       chars: "\x1B~"           }
-  # - { key: E, mods: Alt, chars: "\x1be" }         # Send ALT-E for fish
-
-  #- { key: Paste,                                action: Paste          }
-  #- { key: Copy,                                 action: Copy           }
-  #- { key: L,         mods: Control,             action: ClearLogNotice }
-  #- { key: L,         mods: Control, mode: ~Vi,  chars: "\x0c"          }
-  #- { key: PageUp,    mods: Shift,   mode: ~Alt, action: ScrollPageUp,  }
-  #- { key: PageDown,  mods: Shift,   mode: ~Alt, action: ScrollPageDown }
-  #- { key: Home,      mods: Shift,   mode: ~Alt, action: ScrollToTop,   }
-  #- { key: End,       mods: Shift,   mode: ~Alt, action: ScrollToBottom }
-
-  # Vi Mode
-  #- { key: Space,  mods: Shift|Control, mode: Vi, action: ScrollToBottom          }
-  #- { key: Space,  mods: Shift|Control,           action: ToggleViMode            }
-  #- { key: Escape,                      mode: Vi, action: ClearSelection          }
-  #- { key: I,                           mode: Vi, action: ScrollToBottom          }
-  #- { key: I,                           mode: Vi, action: ToggleViMode            }
-  #- { key: Y,      mods: Control,       mode: Vi, action: ScrollLineUp            }
-  #- { key: E,      mods: Control,       mode: Vi, action: ScrollLineDown          }
-  #- { key: G,                           mode: Vi, action: ScrollToTop             }
-  #- { key: G,      mods: Shift,         mode: Vi, action: ScrollToBottom          }
-  #- { key: B,      mods: Control,       mode: Vi, action: ScrollPageUp            }
-  #- { key: F,      mods: Control,       mode: Vi, action: ScrollPageDown          }
-  #- { key: U,      mods: Control,       mode: Vi, action: ScrollHalfPageUp        }
-  #- { key: D,      mods: Control,       mode: Vi, action: ScrollHalfPageDown      }
-  #- { key: Y,                           mode: Vi, action: Copy                    }
-  #- { key: Y,                           mode: Vi, action: ClearSelection          }
-  #- { key: Copy,                        mode: Vi, action: ClearSelection          }
-  #- { key: V,                           mode: Vi, action: ToggleNormalSelection   }
-  #- { key: V,      mods: Shift,         mode: Vi, action: ToggleLineSelection     }
-  #- { key: V,      mods: Control,       mode: Vi, action: ToggleBlockSelection    }
-  #- { key: V,      mods: Alt,           mode: Vi, action: ToggleSemanticSelection }
-  #- { key: Return,                      mode: Vi, action: Open                    }
-  #- { key: K,                           mode: Vi, action: Up                      }
-  #- { key: J,                           mode: Vi, action: Down                    }
-  #- { key: H,                           mode: Vi, action: Left                    }
-  #- { key: L,                           mode: Vi, action: Right                   }
-  #- { key: Up,                          mode: Vi, action: Up                      }
-  #- { key: Down,                        mode: Vi, action: Down                    }
-  #- { key: Left,                        mode: Vi, action: Left                    }
-  #- { key: Right,                       mode: Vi, action: Right                   }
-  #- { key: Key0,                        mode: Vi, action: First                   }
-  #- { key: Key4,   mods: Shift,         mode: Vi, action: Last                    }
-  #- { key: Key6,   mods: Shift,         mode: Vi, action: FirstOccupied           }
-  #- { key: H,      mods: Shift,         mode: Vi, action: High                    }
-  #- { key: M,      mods: Shift,         mode: Vi, action: Middle                  }
-  #- { key: L,      mods: Shift,         mode: Vi, action: Low                     }
-  #- { key: B,                           mode: Vi, action: SemanticLeft            }
-  #- { key: W,                           mode: Vi, action: SemanticRight           }
-  #- { key: E,                           mode: Vi, action: SemanticRightEnd        }
-  #- { key: B,      mods: Shift,         mode: Vi, action: WordLeft                }
-  #- { key: W,      mods: Shift,         mode: Vi, action: WordRight               }
-  #- { key: E,      mods: Shift,         mode: Vi, action: WordRightEnd            }
-  #- { key: Key5,   mods: Shift,         mode: Vi, action: Bracket                 }
-  #- { key: Slash,                       mode: Vi, action: SearchForward           }
-  #- { key: Slash,  mods: Shift,         mode: Vi, action: SearchBackward          }
-  #- { key: N,                           mode: Vi, action: SearchNext              }
-  #- { key: N,      mods: Shift,         mode: Vi, action: SearchPrevious          }
-
-  # (Windows, Linux, and BSD only)
-  #- { key: V,        mods: Control|Shift,           action: Paste            }
-  #- { key: C,        mods: Control|Shift,           action: Copy             }
-  #- { key: F,        mods: Control|Shift,           action: SearchForward    }
-  #- { key: B,        mods: Control|Shift,           action: SearchBackward   }
-  #- { key: C,        mods: Control|Shift, mode: Vi, action: ClearSelection   }
-  #- { key: Insert,   mods: Shift,                   action: PasteSelection   }
-  #- { key: Key0,     mods: Control,                 action: ResetFontSize    }
-  #- { key: Equals,   mods: Control,                 action: IncreaseFontSize }
-  #- { key: Add,      mods: Control,                 action: IncreaseFontSize }
-  #- { key: Subtract, mods: Control,                 action: DecreaseFontSize }
-  #- { key: Minus,    mods: Control,                 action: DecreaseFontSize }
-
-  # (Windows only)
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: K,      mods: Command, mode: ~Vi, chars: "\x0c"            }
-  #- { key: Key0,   mods: Command,            action: ResetFontSize    }
-  #- { key: Equals, mods: Command,            action: IncreaseFontSize }
-  #- { key: Add,    mods: Command,            action: IncreaseFontSize }
-  #- { key: Minus,  mods: Command,            action: DecreaseFontSize }
-  #- { key: K,      mods: Command,            action: ClearHistory     }
-  #- { key: V,      mods: Command,            action: Paste            }
-  #- { key: C,      mods: Command,            action: Copy             }
-  #- { key: C,      mods: Command, mode: Vi,  action: ClearSelection   }
-  #- { key: H,      mods: Command,            action: Hide             }
-  #- { key: M,      mods: Command,            action: Minimize         }
-  #- { key: Q,      mods: Command,            action: Quit             }
-  #- { key: W,      mods: Command,            action: Quit             }
-  #- { key: N,      mods: Command,            action: SpawnNewInstance }
-  #- { key: F,      mods: Command|Control,    action: ToggleFullscreen }
-  #- { key: F,      mods: Command,            action: SearchForward    }
-  #- { key: B,      mods: Command,            action: SearchBackward   }
-
-#debug:
-  # Display the time it takes to redraw each frame.
-  #render_timer: false
-
-  # Keep the log file after quitting Alacritty.
-  #persistent_logging: false
-
-  # Log level
-  #
-  # Values for `log_level`:
-  #   - None
-  #   - Error
-  #   - Warn
-  #   - Info
-  #   - Debug
-  #   - Trace
-  #log_level: Warn
-
-  # Print all received window events.
-  #print_events: false

apps/README.md

@@ -0,0 +1,9 @@
+# Apps
+
+These are all my miscellaneous utilies and scripts to accompany this project.
+
+They can be run with:
+
+```
+nix run github:nmasur/dotfiles#appname
+```

apps/default.nix

@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+rec {
+
+  # Show quick helper
+  default = import ./help.nix { inherit pkgs; };
+
+  # Format primary disk
+  format-root = import ./format-root.nix { inherit pkgs; };
+
+  # Format and install from nothing (deprecated)
+  installer = import ./installer.nix { inherit pkgs; };
+
+  # Display the readme for this repository
+  readme = import ./readme.nix { inherit pkgs; };
+
+  # Rebuild
+  rebuild = import ./rebuild.nix { inherit pkgs; };
+
+  # Load the SSH key for this machine
+  loadkey = import ./loadkey.nix { inherit pkgs; };
+
+  # Encrypt secret for all machines
+  encrypt-secret = import ./encrypt-secret.nix { inherit pkgs; };
+
+  # Re-encrypt secrets for all machines
+  reencrypt-secrets = import ./reencrypt-secrets.nix { inherit pkgs; };
+
+  # Connect machine metrics to Netdata Cloud
+  netdata = import ./netdata-cloud.nix { inherit pkgs; };
+
+  # Run neovim as an app
+  neovim = import ./neovim.nix { inherit pkgs; };
+  nvim = neovim;
+}

apps/encrypt-secret.nix

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

apps/format-root.nix

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

apps/help.nix

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

apps/installer.nix

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

apps/loadkey.nix

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

apps/neovim.nix

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

apps/netdata-cloud.nix

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

apps/readme.nix

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

apps/rebuild.nix

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

apps/reencrypt-secrets.nix

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

bin/biggest

@@ -1,4 +0,0 @@
-#!/usr/local/bin/nu
-
-ls | sort-by size | reverse | keep 10
-

bin/biggest-files

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls **/* | where type == File | sort-by size | reverse | keep 10

bin/calc

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Run a quick calculation with Ruby
-#
-#   Usage: calc "1/2"
-
-class Integer
-  def /(other)
-    fdiv(other)
-  end
-end
-
-puts eval(ARGV.join(""))

bin/connect_aws/Dockerfile

@@ -1,16 +0,0 @@
-FROM alpine:latest
-
-COPY requirements.txt /
-
-RUN apk update && \
-    apk add \
-    openssh \
-    python \
-    py-pip \
-    && \
-    pip install -r requirements.txt
-
-COPY connect_cloud.sh /
-COPY connect_cloud.py /
-
-ENTRYPOINT ["/connect_cloud.sh"]

bin/connect_aws/connect_cloud.py

@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-
-"""Connect to Cloud instances"""
-
-import os
-import sys
-import argparse
-import boto3
-
-# Initiate the parser
-parser = argparse.ArgumentParser("Type the name of the connection you want")
-parser.add_argument('profile', metavar='P', nargs='?',
-                    help='an account to use')
-parser.add_argument('environment', metavar='E', nargs='?',
-                    help='an environment to specify')
-args = parser.parse_args()
-
-# Get AWS credentials profile
-profile_map = {
-    'gs' : {
-        'profile': 'ghoststory',
-        'prod': 'id_rsa_gstory_prod.pem',
-        'dev': 'id_rsa_gstory_prod.pem',
-        'username': 'centos',
-    },
-    'di' : {
-        'profile': 't2indies',
-        'prod': 'disintegration-prod.pem',
-        'dev': 'disintegration-dev.pem',
-        'username': 'centos',
-    },
-    'pd' : {
-        'profile': 't2indies',
-        'prod': 't2indies-prod.pem',
-        'dev': 't2indies-dev.pem',
-        'username': 'centos',
-    },
-    'corp' : {
-        'profile': 't2corp',
-        'prod': 'take2games-corp.pem',
-        'dev': 'take2games-corp.pem',
-        'username': 'ec2-user',
-    },
-    'ksp' : {
-        'profile': 'kerbal',
-        'prod': 'kerbal_prod_key.pem',
-        'dev': 'kerbal_dev_key.pem',
-        'username': 'centos',
-    },
-}
-profile_dict = profile_map.get(args.profile)
-profile = profile_dict['profile']
-
-# Connect to AWS
-session = boto3.Session(profile_name=profile)
-client = session.client('ec2', verify=False)
-
-response = client.describe_instances()
-
-print(len(response['Reservations']), "total instances\n")
-
-matched_instances = []
-for instance_wrapper in response['Reservations']:
-    instance = instance_wrapper['Instances'][0]
-    is_matched_env = False
-    is_matched_role = False
-    for tag in instance.get('Tags', []):
-        if tag['Key'] == "site_env" and args.environment in tag['Value']:
-            is_matched_env = True
-        if tag['Key'] == "role" and tag['Value'] == 'host':
-            is_matched_role = True
-        if tag['Key'] == "Name":
-            instance['Name'] = tag['Value']
-    if is_matched_env and is_matched_role:
-        matched_instances.append(instance)
-
-for instance in matched_instances:
-    print(instance['Name'])
-    print(instance['PublicIpAddress'])
-    print("")
-
-with open("aws_connect", 'w') as outfile:
-    outfile.write("ssh-keyscan {} >> ~/.ssh/known_hosts\n".format(matched_instances[0]['PublicIpAddress']))
-    outfile.write("ssh -i ~/.ssh/{} {}@{}".format(profile_dict[args.environment], profile_dict['username'], matched_instances[0]['PublicIpAddress']))
-os.chmod("aws_connect", 0o755)

bin/connect_aws/connect_cloud.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-python connect_cloud.py "$@"
-
-/aws_connect

bin/connect_aws/requirements.txt

@@ -1,8 +0,0 @@
-boto3==1.9.239
-botocore==1.12.239
-docutils==0.15.2
-jmespath==0.9.4
-python-dateutil==2.8.0
-s3transfer==0.2.1
-six==1.12.0
-urllib3==1.25.8

bin/git_set_upstream

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Copied from David Pedersen: https://github.com/davidpdrsn/dotfiles/blob/master/bin/git-pp
-
-set -e
-
-git_branch_name() {
-  val=$( git branch 2>/dev/null | grep '^\*' | colrm 1 2 )
-  echo "$val"
-}
-
-git push --set-upstream origin "$(git_branch_name)"

bin/jira-checkout

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Adapted from: https://seb.jambor.dev/posts/improving-shell-workflows-with-fzf/
-# Requires the following variables to be set:
-# - ATLASSIAN_EMAIL
-# - ATLASSIAN_API_TOKEN
-# - JIRA_HOSTNAME
-# - JIRA_PROJECT
-
-choose_issue() {
-    jq_template='"\(.key): \(.fields.summary)"'
-    query="project=$JIRA_PROJECT AND status not in (\"Done\") AND assignee=currentUser()"
-
-    branch_name=$(
-    curl \
-      --data-urlencode "jql=$query" \
-      --get \
-      --user "$ATLASSIAN_EMAIL:$ATLASSIAN_API_TOKEN" \
-      --silent \
-      --compressed \
-      "https://$JIRA_HOSTNAME/rest/api/2/search" |
-      jq ".issues[] | $jq_template" |
-      sed -e 's/"\(.*\)"/\1/' |
-    fzf \
-      --preview='jira-details {1}' \
-      --preview-window=top:wrap |
-    sed -e 's/: /:/' -e 's/[^a-zA-Z0-9:]/-/g' |
-    awk -F ":" '{printf "%s/%s", $1, tolower($2)}'
-    )
-
-    echo "$branch_name"
-}
-
-issue_branch=$(choose_issue)
-if [ -n "$issue_branch" ]; then
-    echo "git checkout -b \"$issue_branch\""
-fi

bin/jira-details

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Adapted from: https://seb.jambor.dev/posts/improving-shell-workflows-with-fzf/
-# Requires the following variables to be set:
-# - ATLASSIAN_EMAIL
-# - ATLASSIAN_API_TOKEN
-# - JIRA_HOSTNAME
-# - JIRA_PROJECT (for other script)
-
-issue_details() {
-    jira_key=$(echo "$1" | cut -d":" -f1)
-    jq_template='"'\
-'# \(.key): \(.fields.summary)\n'\
-'\n'\
-'*Created*: \(.fields.created)\n'\
-'*Status*: \(.fields.status.statusCategory.name)\n'\
-'*Reporter*: \(.fields.reporter.displayName)\n'\
-'*Priority*: \(.fields.priority.name)\n'\
-"*Epic*: https://$JIRA_HOSTNAME/browse/\(.fields.customfield_10014)\n"\
-'\n'\
-'## Link\n\n'\
-"https://$JIRA_HOSTNAME/browse/\(.key)\n"\
-'\n'\
-'## Description\n\n'\
-'\(.fields.description)'\
-'"'
-    curl \
-      --get \
-      --user "$ATLASSIAN_EMAIL:$ATLASSIAN_API_TOKEN" \
-      --silent \
-      --compressed \
-      "https://$JIRA_HOSTNAME/rest/api/2/issue/$jira_key" |
-    jq "$jq_template" |
-    xargs printf |
-    bat -l md --color always --style plain
-}
-
-issue_details "$1"

bin/kube-dashboard

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-kubectl -n kube-system get secret $(kubectl -n kube-system get secret | grep dashboard-admin | awk '{print $1}') -o json | jq -j --raw-output '.data.token' | base64 --decode | pbcopy
-
-open http://localhost:8001/api/v1/namespaces/default/services/https:kubernetes-dashboard:https/proxy/#!/login
-
-kubectl proxy

bin/newest

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls | sort-by modified | reverse | keep 5

bin/nuke

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-nuke() {
-  local pid
-  pid=$(ps -ef | grep -v ^root | sed 1d | fzf -m | awk '{print $2}')
-
-  if [ "x$pid" != "x" ]
-  then
-    echo $pid | xargs kill -${1:-9}
-  fi
-}
-
-nuke

bin/oldest

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls | sort-by modified | keep 5

bin/pod

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Credit: https://github.com/junegunn/fzf/blob/master/ADVANCED.md
-
-read -ra tokens < <(
-  kubectl get pods --all-namespaces |
-    fzf --info=inline --layout=reverse --header-lines=1 --border \
-        --prompt "$(kubectl config current-context | sed 's/-context$//')> " \
-        --header $'Press CTRL-O to open log in editor\n\n' \
-        --bind ctrl-/:toggle-preview \
-        --bind "ctrl-o:execute:${EDITOR:-vim} <(kubectl logs --namespace {1} {2}) > /dev/tty" \
-        --preview-window up,follow \
-        --preview 'kubectl logs --follow --tail=100000 --namespace {1} {2}' "$@"
-)
-[ ${#tokens} -gt 1 ] &&
-  kubectl exec -it --namespace "${tokens[0]}" "${tokens[1]}" -- /bin/sh

bin/quick-edit

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Credit: https://github.com/junegunn/fzf/blob/master/ADVANCED.md
-# Requires bash.
-
-# 1. Search for text in files using Ripgrep
-# 2. Interactively narrow down the list using fzf
-# 3. Open the file in Vim
-IFS=: read -ra selected < <(
-  rg \
-      --color=always \
-      --line-number \
-      --no-heading \
-      --smart-case \
-      --iglob !/Library/** \
-      --iglob !/System/** \
-      --iglob "!Users/$HOME/Library/*" \
-      "${*:-}" |
-    fzf --ansi \
-        --color "hl:-1:underline,hl+:-1:underline:reverse" \
-        --delimiter : \
-        --preview 'bat --color=always {1} --highlight-line {2}' \
-        --preview-window 'up,60%,border-bottom,+{2}+3/3,~3'
-)
-[ -n "${selected[0]}" ] && nvim "${selected[0]}" "+${selected[1]}"

bin/reset_1p

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-security find-generic-password -s 1Password -w | op signin enterprise_console --output=raw > $HOME/.op_tmux_token_tmp
- 

bin/symlinks

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls -al | where type == Symlink | select name target

bin/uplink-delete-bucket

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-bucket="$1"
-access="$2"
-uplink ls ${access:+--access "$access"} "sj://$bucket/" | awk '{print $NF}' | xargs -I {} uplink rm ${access:+--access "$access"} "sj://$bucket/{}"

bin/vimv

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-# Lists the current directory's files in Vim, so you can edit it and save to rename them
-# USAGE: vimv [file1 file2]
-# https://github.com/thameera/vimv
-
-declare -r FILENAMES_FILE=$(mktemp "${TMPDIR:-/tmp}/vimv.XXX")
-
-trap '{ rm -f "${FILENAMES_FILE}" ; }' EXIT
-
-if [ $# -ne 0 ]; then
-    src=( "$@" )
-else
-    IFS=$'\r\n' GLOBIGNORE='*' command eval 'src=($(ls))'
-fi
-
-for ((i=0;i<${#src[@]};++i)); do
-    echo "${src[i]}" >> "${FILENAMES_FILE}"
-done
-
-${EDITOR:-vi} "${FILENAMES_FILE}"
-
-IFS=$'\r\n' GLOBIGNORE='*' command eval 'dest=($(cat "${FILENAMES_FILE}"))'
-
-if (( ${#src[@]} != ${#dest[@]} )); then
-    echo "WARN: Number of files changed. Did you delete a line by accident? Aborting.." >&2
-    exit 1
-fi
-
-declare -i count=0
-for ((i=0;i<${#src[@]};++i)); do
-    if [ "${src[i]}" != "${dest[i]}" ]; then
-        mkdir -p "$(dirname "${dest[i]}")"
-        if git ls-files --error-unmatch "${src[i]}" > /dev/null 2>&1; then
-            git mv "${src[i]}" "${dest[i]}"
-        else
-            mv "${src[i]}" "${dest[i]}"
-        fi
-        ((++count))
-    fi
-done
-
-echo "$count" files renamed.

bin/weather_cached

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-CACHE_FILE="$HOME/.tmux/.weather_cache"
-CACHE_TIME="$(stat -f %m "$CACHE_FILE")"
-NOW_TIME=$(date +%s)
-TIME_PASSED=$((NOW_TIME-CACHE_TIME))
-if [ "$TIME_PASSED" -gt "1200" ]
-then
-    curl -m 2 -s "wttr.in/$WEATHER_CITY?format=%c%t" > "$CACHE_FILE"
-fi
-cat "$CACHE_FILE"

cargo/Cargofile

@@ -1,6 +0,0 @@
-# Packages to install with Cargo
-
-toml-cli # Parse TOML from the command line
-rates    # See exchange rates
-wrangler # Cloudflare Workers CLI
-csview   # Quick display CSV as tables

colorscheme/README.md

@@ -0,0 +1,5 @@
+# Colorschemes
+
+Color information for different themes is found here. The colors are sourced
+and used with [base16](https://github.com/chriskempson/base16) format
+consistently across the system.

colorscheme/everforest/default.nix

@@ -0,0 +1,22 @@
+{
+  name = "everforest"; # dark, hard
+  author = "Sainnhe Park";
+  dark = {
+    base00 = "#2b3339"; # Default Background
+    base01 = "#323c41"; # Lighter Background
+    base02 = "#503946"; # Selection Background
+    base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
+    base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
+    base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
+    base06 = "#e9e8d2"; # Light Foreground (Not often used)
+    base07 = "#fff9e8"; # Light Background (Not often used)
+    base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
+    base09 = "#d699b6"; # Integers, Boolean, Constants, ...
+    base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
+    base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
+    base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
+    base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
+    base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  };
+}

colorscheme/gruvbox-dark/default.nix

@@ -0,0 +1,44 @@
+# Gruvbox with a darker background for greater contrast
+
+{
+  name = "gruvbox-dark"; # Dark, Medium
+  author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
+  dark = {
+    base00 = "#1D2122"; # ---- This is the change from normal gruvbox
+    base01 = "#3c3836"; # ---
+    base02 = "#504945"; # --
+    base03 = "#665c54"; # -
+    base04 = "#bdae93"; # +
+    base05 = "#d5c4a1"; # ++
+    base06 = "#ebdbb2"; # +++
+    base07 = "#fbf1c7"; # ++++
+    base08 = "#fb4934"; # red
+    base09 = "#fe8019"; # orange
+    base0A = "#fabd2f"; # yellow
+    base0B = "#b8bb26"; # green
+    base0C = "#8ec07c"; # aqua/cyan
+    base0D = "#83a598"; # blue
+    base0E = "#d3869b"; # purple
+    base0F = "#d65d0e"; # brown
+    batTheme = "gruvbox-dark";
+  };
+  light = {
+    base00 = "#fbf1c7"; # ----
+    base01 = "#ebdbb2"; # ---
+    base02 = "#d5c4a1"; # --
+    base03 = "#bdae93"; # -
+    base04 = "#665c54"; # +
+    base05 = "#504945"; # ++
+    base06 = "#3c3836"; # +++
+    base07 = "#1D2122"; # ++++ Adjusted darker here
+    base08 = "#9d0006"; # red
+    base09 = "#af3a03"; # orange
+    base0A = "#b57614"; # yellow
+    base0B = "#79740e"; # green
+    base0C = "#427b58"; # aqua/cyan
+    base0D = "#076678"; # blue
+    base0E = "#8f3f71"; # purple
+    base0F = "#d65d0e"; # brown
+    batTheme = "gruvbox-light";
+  };
+}

colorscheme/gruvbox/default.nix

@@ -0,0 +1,42 @@
+{
+  name = "gruvbox"; # Dark, Medium
+  author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
+  dark = {
+    base00 = "#282828"; # ----
+    base01 = "#3c3836"; # ---
+    base02 = "#504945"; # --
+    base03 = "#665c54"; # -
+    base04 = "#bdae93"; # +
+    base05 = "#d5c4a1"; # ++
+    base06 = "#ebdbb2"; # +++
+    base07 = "#fbf1c7"; # ++++
+    base08 = "#fb4934"; # red
+    base09 = "#fe8019"; # orange
+    base0A = "#fabd2f"; # yellow
+    base0B = "#b8bb26"; # green
+    base0C = "#8ec07c"; # aqua/cyan
+    base0D = "#83a598"; # blue
+    base0E = "#d3869b"; # purple
+    base0F = "#d65d0e"; # brown
+    batTheme = "gruvbox-dark";
+  };
+  light = {
+    base00 = "#fbf1c7"; # ----
+    base01 = "#ebdbb2"; # ---
+    base02 = "#d5c4a1"; # --
+    base03 = "#bdae93"; # -
+    base04 = "#665c54"; # +
+    base05 = "#504945"; # ++
+    base06 = "#3c3836"; # +++
+    base07 = "#282828"; # ++++
+    base08 = "#9d0006"; # red
+    base09 = "#af3a03"; # orange
+    base0A = "#b57614"; # yellow
+    base0B = "#79740e"; # green
+    base0C = "#427b58"; # aqua/cyan
+    base0D = "#076678"; # blue
+    base0E = "#8f3f71"; # purple
+    base0F = "#d65d0e"; # brown
+    batTheme = "gruvbox-light";
+  };
+}

colorscheme/nord/default.nix

@@ -0,0 +1,23 @@
+{
+  name = "nord";
+  author = "arcticicestudio";
+  dark = {
+    base00 = "#2E3440";
+    base01 = "#3B4252";
+    base02 = "#434C5E";
+    base03 = "#4C566A";
+    base04 = "#D8DEE9";
+    base05 = "#E5E9F0";
+    base06 = "#ECEFF4";
+    base07 = "#8FBCBB";
+    base08 = "#88C0D0";
+    base09 = "#81A1C1";
+    base0A = "#5E81AC";
+    base0B = "#BF616A";
+    base0C = "#D08770";
+    base0D = "#EBCB8B";
+    base0E = "#A3BE8C";
+    base0F = "#B48EAD";
+    batTheme = "nord";
+  };
+}

disks/README.md

@@ -0,0 +1,5 @@
+# Disks
+
+These are my [disko](https://github.com/nix-community/disko) configurations,
+which allow me to save desired disk formatting layouts as a declarative file so
+I don't have to remember how to format my disks later on.

disks/root.nix

@@ -0,0 +1,39 @@
+{ disk, ... }:
+{
+  disk = {
+    boot = {
+      type = "disk";
+      device = disk;
+      content = {
+        type = "gpt";
+        partitions = {
+          # Boot partition
+          ESP = rec {
+            size = "512MiB";
+            type = "EF00";
+            label = "boot";
+            device = "/dev/disk/by-label/${label}";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+              extraArgs = [ "-n ${label}" ];
+            };
+          };
+          # Root partition ext4
+          root = rec {
+            size = "100%";
+            label = "nixos";
+            device = "/dev/disk/by-label/${label}";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+              extraArgs = [ "-L ${label}" ];
+            };
+          };
+        };
+      };
+    };
+  };
+}

disks/zfs.nix

@@ -0,0 +1,98 @@
+{ pool, disks, ... }:
+{
+  disk = lib.genAttrs disks (disk: {
+    "${disk}" = {
+      type = "disk";
+      device = "/dev/${disk}";
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [
+          {
+            type = "partition";
+            name = "zfs";
+            start = "128MiB";
+            end = "100%";
+            content = {
+              type = "zfs";
+              pool = pool;
+            };
+          }
+        ];
+      };
+    };
+  });
+  zpool = {
+    "${pool}" = {
+      type = "zpool";
+      mode = "raidz1";
+      rootFsOptions = {
+        compression = "on"; # lz4 by default
+        "com.sun:auto-snapshot" = "false";
+        ashift = "12";
+      };
+      # mountpoint = "/";
+
+      datasets = {
+        root = {
+          zfs_type = "filesystem";
+          mountpoint = null;
+          options."com.sun:auto-snapshot" = "false";
+        };
+        # "media/movies" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/movies";
+        #   options.recordsize = "1M";
+        # };
+        # "media/tv" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/tv";
+        #   options.recordsize = "1M";
+        # };
+        # "media/books" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/books";
+        # };
+        # archive = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/archive";
+        #   options.compression = "zstd";
+        #   options."com.sun:auto-snapshot" = "true";
+        # };
+        # zfs_unmounted_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "none";
+        # };
+        # zfs_legacy_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "legacy";
+        #   mountpoint = "/zfs_legacy_fs";
+        # };
+        # zfs_testvolume = {
+        #   zfs_type = "volume";
+        #   size = "10M";
+        #   content = {
+        #     type = "filesystem";
+        #     format = "ext4";
+        #     mountpoint = "/ext4onzfs";
+        #   };
+        # };
+        # encrypted = {
+        #   zfs_type = "filesystem";
+        #   size = "20M";
+        #   options = {
+        #     mountpoint = "none";
+        #     encryption = "aes-256-gcm";
+        #     keyformat = "passphrase";
+        #     keylocation = "file:///tmp/secret.key";
+        #   };
+        # };
+        # "encrypted/test" = {
+        #   zfs_type = "filesystem";
+        #   size = "2M";
+        #   mountpoint = "/zfs_crypted";
+        # };
+      };
+    };
+  };
+}

docs/README.md

@@ -0,0 +1,4 @@
+# Documentation
+
+Reference documents for some of the more complicated services and maintenance
+tasks.

docs/installation.md

@@ -0,0 +1,73 @@
+[Back to README](../README.md)
+
+---
+
+# Installation
+
+## NixOS - From Live Disk
+
+Format drives and build system from any NixOS host, including the live
+installer disk:
+
+**This will erase your drives; use at your own risk!**
+
+```bash
+lsblk # Choose the disk you want to wipe
+nix-shell -p nixVersions.stable
+nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
+```
+
+## NixOS - From Existing System
+
+If you're already running NixOS, you can switch to this configuration with the
+following command:
+
+```bash
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
+```
+
+## Windows - From NixOS WSL
+
+After [installing NixOS on
+WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
+the WSL configuration:
+
+```
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
+```
+
+You should also download the
+[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
+font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
+move the `windows/alacritty.yml` file to
+`C:\Users\<user>\AppData\Roaming\alacritty`.
+
+## macOS
+
+To get started on a bare macOS installation, first install Nix:
+
+```bash
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+```
+
+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 \
+    run nix-darwin -- switch \
+    --flake github:nmasur/dotfiles#lookingglass
+```
+
+Once installed, you can continue to update the macOS configuration:
+
+```bash
+darwin-rebuild switch --flake ~/dev/personal/dotfiles
+```
+

docs/repair-nextcloud.md

@@ -0,0 +1,82 @@
+# Repairing Nextcloud
+
+You can run the maintenance commands like this:
+
+```
+sudo -u nextcloud nextcloud-occ maintenance:mode --on
+sudo -u nextcloud nextcloud-occ maintenance:repair
+sudo -u nextcloud nextcloud-occ maintenance:mode --off
+```
+
+## Rescan Files
+
+```
+sudo -u nextcloud nextcloud-occ files:scan --all
+```
+
+## Converting from SQLite to MySQL (mariadb)
+
+First: keep Nextcloud set to SQLite as its dbtype, and separately launch MySQL
+as a service by copying the configuration found
+[here](https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/web-apps/nextcloud.nix).
+
+No password is necessary, since the user-based auth works with UNIX sockets.
+
+You can connect to the MySQL instance like this:
+
+```
+sudo -u nextcloud mysql -S /run/mysqld/mysqld.sock
+```
+
+Create a blank database for Nextcloud:
+
+```sql
+create database nextcloud;
+```
+
+Now setup the [conversion](https://docs.nextcloud.com/server/17/admin_manual/configuration_database/db_conversion.html):
+
+```
+sudo -u nextcloud nextcloud-occ db:convert-type mysql nextcloud localhost nextcloud
+```
+
+Ignore the password prompt. Proceed with the conversion.
+
+Now `config.php` will be updated but the override config from NixOS will not
+be. Now update your NixOS configuration:
+
+- Remove the `mysql` service you created.
+- Set `dbtype` to `mysql`.
+- Set `database.createLocally` to `true`.
+
+Rebuild your configuration.
+
+Now, make sure to enable [4-byte
+support](https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/mysql_4byte_support.html)
+in the database.
+
+## Backing Up MySQL Database
+
+Use this mysqldump command:
+
+```
+sudo -u nextcloud mysqldump -S /run/mysqld/mysqld.sock --default-character-set=utf8mb4 nextcloud > backup.sql
+```
+
+## Converting to Postgres
+
+Same as MySQL, but run this command instead:
+
+```
+sudo -u nextcloud nextcloud-occ db:convert-type pgsql nextcloud /run/postgresql/ nextcloud
+```
+
+Then set the `dbtype` to `pgsql`.
+
+## Backing Up Postgres Database
+
+Use this pg_dump command:
+
+```
+sudo -u nextcloud pg_dump nextcloud > backup.sql
+```

docs/restore-calibre.md

@@ -0,0 +1,23 @@
+# Restoring Calibre From Backup
+
+The `metadata.db` holds the library and `app.db` and `gdrive.db` contain the
+web/account information.
+
+Place books directories in `/data/books/`.
+
+Place `metadata.db` in `/var/lib/calibre-web-db/`.
+
+Symlink `metadata.db` to the library:
+
+```
+sudo ln -s /var/lib/calibre-web-db/metadata.db /data/books/metadata.db
+```
+
+Place `app.db` and `gdrive.db` in `/var/lib/calibre-web/`.
+
+Restart Calibre:
+
+```
+sudo systemctl restart calibre-web.service
+```
+

docs/zfs.md

@@ -0,0 +1,45 @@
+# ZFS
+
+Swan runs its root on ext4. The ZFS drives are managed imperatively (this
+[disko configuration](../disks/zfs.nix) is an unused work-in-progress).
+
+The basic ZFS settings are managed [here](../modules/nixos/hardware/zfs.nix).
+
+## Creating a New Dataset
+
+```
+sudo zfs create tank/mydataset
+sudo zfs set compression=zstd tank/myzstddataset
+sudo zfs set mountpoint=/data/mydataset tank/mydataset
+```
+
+## Maintenance
+
+### Get Status
+
+```
+sudo zpool status
+```
+
+### Replace Disk
+
+```
+sudo zdb
+sudo zpool status -g # Show by GUID
+sudo zpool offline tank <GUID>
+sudo zpool status
+# Remove old disk, insert new disk
+sudo zdb
+sudo zpool replace tank <OLD GUID> /dev/disk/by-id/<NEW PATH>
+sudo zpool status
+```
+
+## Initial Setup
+
+```
+sudo zpool create tank raidz1 sda sdb sdc
+sudo zpool set ashift=12 tank
+sudo zpool set autoexpand=on tank
+sudo zpool set compression=on tank
+```
+

fd/fdignore.symlink

@@ -1,8 +0,0 @@
-!.env*
-!.github/
-!.gitignore
-!*.tfvars
-.terraform/
-.target/
-/Library/
-target

fish.configlink/completions/nomad.fish

@@ -1,9 +0,0 @@
-
-function __complete_nomad
-    set -lx COMP_LINE (commandline -cp)
-    test -z (commandline -ct)
-    and set COMP_LINE "$COMP_LINE "
-    /usr/local/bin/nomad
-end
-complete -f -c nomad -a "(__complete_nomad)"
-

fish.configlink/conf.d/nix-env.fish

@@ -1,138 +0,0 @@
-# Setup Nix
-
-# We need to distinguish between single-user and multi-user installs.
-# This is difficult because there's no official way to do this.
-# We could look for the presence of /nix/var/nix/daemon-socket/socket but this will fail if the
-# daemon hasn't started yet. /nix/var/nix/daemon-socket will exist if the daemon has ever run, but
-# I don't think there's any protection against accidentally running `nix-daemon` as a user.
-# We also can't just look for /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh because
-# older single-user installs used the default profile instead of a per-user profile.
-# We can still check for it first, because all multi-user installs should have it, and so if it's
-# not present that's a pretty big indicator that this is a single-user install. If it does exist,
-# we still need to verify the install type. To that end we'll look for a root owner and sticky bit
-# on /nix/store. Multi-user installs set both, single-user installs don't. It's certainly possible
-# someone could do a single-user install as root and then manually set the sticky bit but that
-# would be extremely unusual.
-
-set -l nix_profile_path /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-set -l single_user_profile_path ~/.nix-profile/etc/profile.d/nix.sh
-if test -e $nix_profile_path
-  # The path exists. Double-check that this is a multi-user install.
-  # We can't just check for ~/.nix-profile/… because this may be a single-user install running as
-  # the wrong user.
-
-  # stat is not portable. Splitting the output of ls -nd is reliable on most platforms.
-  set -l owner (string split -n ' ' (ls -nd /nix/store 2>/dev/null))[3]
-  if not test -k /nix/store -a $owner -eq 0
-    # /nix/store is either not owned by root or not sticky. Assume single-user.
-    set nix_profile_path $single_user_profile_path
-  end
-else
-  # The path doesn't exist. Assume single-user
-  set nix_profile_path $single_user_profile_path
-end
-
-if test -e $nix_profile_path
-  # Source the nix setup script
-  # We're going to run the regular Nix profile under bash and then print out a few variables
-  for line in (env -u BASH_ENV bash -c '. "$0"; for name in PATH "${!NIX_@}"; do printf "%s=%s\0" "$name" "${!name}"; done' $nix_profile_path | string split0)
-    set -xg (string split -m 1 = $line)
-  end
-
-  # Insert Nix's fish share directories into fish's special variables.
-  # nixpkgs-installed fish tries to set these up already if NIX_PROFILES is defined, which won't
-  # be the case when sourcing $__fish_data_dir/share/config.fish normally, but might be for a
-  # recursive invocation. To guard against that, we'll only insert paths that don't already exit.
-  # Furthermore, for the vendor_conf.d sourcing, we'll use the pre-existing presence of a path in
-  # $fish_function_path to determine whether we want to source the relevant vendor_conf.d folder.
-
-  # To start, let's locally define NIX_PROFILES if it doesn't already exist.
-  set -al NIX_PROFILES
-  if test (count $NIX_PROFILES) -eq 0
-    set -a NIX_PROFILES $HOME/.nix-profile
-  end
-  # Replicate the logic from nixpkgs version of $__fish_data_dir/__fish_build_paths.fish.
-  set -l __nix_profile_paths (string split ' ' -- $NIX_PROFILES)[-1..1]
-  set -l __extra_completionsdir \
-    $__nix_profile_paths/etc/fish/completions \
-    $__nix_profile_paths/share/fish/vendor_completions.d
-  set -l __extra_functionsdir \
-    $__nix_profile_paths/etc/fish/functions \
-    $__nix_profile_paths/share/fish/vendor_functions.d
-  set -l __extra_confdir \
-    $__nix_profile_paths/etc/fish/conf.d \
-    $__nix_profile_paths/share/fish/vendor_conf.d \
-
-  ### Configure fish_function_path ###
-  # Remove any of our extra paths that may already exist.
-  # Record the equivalent __extra_confdir path for any function path that exists.
-  set -l existing_conf_paths
-  for path in $__extra_functionsdir
-    if set -l idx (contains --index -- $path $fish_function_path)
-      set -e fish_function_path[$idx]
-      set -a existing_conf_paths $__extra_confdir[(contains --index -- $path $__extra_functionsdir)]
-    end
-  end
-  # Insert the paths before $__fish_data_dir.
-  if set -l idx (contains --index -- $__fish_data_dir/functions $fish_function_path)
-    # Fish has no way to simply insert into the middle of an array.
-    set -l new_path $fish_function_path[1..$idx]
-    set -e new_path[$idx]
-    set -a new_path $__extra_functionsdir
-    set fish_function_path $new_path $fish_function_path[$idx..-1]
-  else
-    set -a fish_function_path $__extra_functionsdir
-  end
-
-  ### Configure fish_complete_path ###
-  # Remove any of our extra paths that may already exist.
-  for path in $__extra_completionsdir
-    if set -l idx (contains --index -- $path $fish_complete_path)
-      set -e fish_complete_path[$idx]
-    end
-  end
-  # Insert the paths before $__fish_data_dir.
-  if set -l idx (contains --index -- $__fish_data_dir/completions $fish_complete_path)
-    set -l new_path $fish_complete_path[1..$idx]
-    set -e new_path[$idx]
-    set -a new_path $__extra_completionsdir
-    set fish_complete_path $new_path $fish_complete_path[$idx..-1]
-  else
-    set -a fish_complete_path $__extra_completionsdir
-  end
-
-  ### Source conf directories ###
-  # The built-in directories were already sourced during shell initialization.
-  # Any __extra_confdir that came from $__fish_data_dir/__fish_build_paths.fish was also sourced.
-  # As explained above, we're using the presence of pre-existing paths in $fish_function_path as a
-  # signal that the corresponding conf dir has also already been sourced.
-  # In order to simulate this, we'll run through the same algorithm as found in
-  # $__fish_data_dir/config.fish except we'll avoid sourcing the file if it comes from an
-  # already-sourced location.
-  # Caveats:
-  # * Files will be sourced in a different order than we'd ideally do (because we're coming in
-  #   after the fact to source them).
-  # * If there are existing extra conf paths, files in them may have been sourced that should have
-  #   been suppressed by paths we're inserting in front.
-  # * Similarly any files in $__fish_data_dir/vendor_conf.d that should have been suppressed won't
-  #   have been.
-  set -l sourcelist
-  for file in $__fish_config_dir/conf.d/*.fish $__fish_sysconf_dir/conf.d/*.fish
-    # We know these paths were sourced already. Just record them.
-    set -l basename (string replace -r '^.*/' '' -- $file)
-    contains -- $basename $sourcelist
-    or set -a sourcelist $basename
-  end
-  for root in $__extra_confdir
-    for file in $root/*.fish
-      set -l basename (string replace -r '^.*/' '' -- $file)
-      contains -- $basename $sourcelist
-      and continue
-      set -a sourcelist $basename
-      contains -- $root $existing_conf_paths
-      and continue # this is a pre-existing path, it will have been sourced already
-      [ -f $file -a -r $file ]
-      and source $file
-    end
-  end
-end

fish.configlink/config.fish

@@ -1,41 +0,0 @@
-#!/usr/local/bin/fish
-
-if status --is-interactive
-
-    # Add directories to path
-    set PATH $PATH \
-        /usr/local/bin \
-        ~/.local/bin \
-        $DOTS/bin \
-        ~/.cargo/bin
-
-    # Use `vi` in the shell with cursor shapes
-    fish_vi_key_bindings
-    bind yy fish_clipboard_copy
-    bind Y fish_clipboard_copy
-    bind -M visual y fish_clipboard_copy
-    bind p fish_clipboard_paste
-    set -g fish_vi_force_cursor
-    set -g fish_cursor_default block
-    set -g fish_cursor_insert line
-    set -g fish_cursor_visual block
-    set -g fish_cursor_replace_one underscore
-    fish_vi_cursor
-
-    # Autojump
-    zoxide init fish | source
-
-    # Colors
-    if test -e $DOTS/fish.configlink/fish_colors
-        command cat $DOTS/fish.configlink/fish_colors
-    end
-
-    # Fuzzy finder
-    fzf_key_bindings
-    set -gx FZF_DEFAULT_COMMAND 'fd --type file'
-    set -g FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
-    set -g FZF_DEFAULT_OPTS '-m --height 50% --border'
-
-    # Use `starship` prompt
-    starship init fish | source
-end

fish.configlink/fish_colors

@@ -1 +0,0 @@
-]4;1;rgb:cc/24/1d]4;2;rgb:98/97/1a]4;3;rgb:d7/99/21]4;4;rgb:45/85/88]4;5;rgb:b1/62/86]4;6;rgb:68/9d/6a]11;rgb:28/28/28]10;rgb:eb/db/b2]4;0;rgb:28/28/28]4;7;rgb:a8/99/84]4;8;rgb:92/83/74]4;9;rgb:fb/59/34]4;10;rgb:b8/bb/26]4;11;rgb:fa/bd/2f]4;12;rgb:83/a5/98]4;13;rgb:d3/86/9b]4;14;rgb:8e/c0/7c]4;15;rgb:eb/db/b2]4;236;rgb:32/30/2f]4;234;rgb:1d/20/21]4;235;rgb:28/28/28]4;237;rgb:3c/38/36]4;239;rgb:50/49/45]4;241;rgb:66/5c/54]4;243;rgb:7c/6f/64]4;244;rgb:92/83/74]4;245;rgb:92/83/74]4;228;rgb:f2/e5/bc]4;230;rgb:f9/f5/d7]4;229;rgb:fb/f1/c7]4;223;rgb:eb/db/b2]4;250;rgb:d5/c4/a1]4;248;rgb:bd/ae/93]4;246;rgb:a8/99/84]4;167;rgb:fb/49/34]4;142;rgb:b8/bb/26]4;214;rgb:fa/bd/2f]4;109;rgb:83/a5/98]4;175;rgb:d3/86/9b]4;108;rgb:8e/c0/7c]4;208;rgb:fe/80/19]4;88;rgb:9d/00/06]4;100;rgb:79/74/0e]4;136;rgb:b5/76/14]4;24;rgb:07/66/78]4;96;rgb:8f/3f/71]4;66;rgb:42/7b/58]4;130;rgb:af/3a/03

fish.configlink/functions/abbrs.fish

@@ -1,143 +0,0 @@
-#!/usr/local/bin/fish
-
-function abbrs --description 'All abbreviations'
-
-    # Directory aliases
-    abbr -a l 'ls'
-    abbr -a lh 'ls -lh'
-    abbr -a ll 'ls -alhF'
-    abbr -a lf 'ls -lh | fzf'
-    abbr -a c 'cd'
-    abbr -a -- - 'cd -'
-    abbr -a proj 'cd $PROJ'
-    abbr -a mkd 'mkdir -pv'
-
-    # Tmux
-    abbr -a ta 'tmux attach-session'
-    abbr -a tan 'tmux attach-session -t noah'
-    abbr -a tnn 'tmux new-session -s noah'
-
-    # Git
-    abbr -a g 'git'
-    abbr -a gs 'git status'
-    abbr -a gd 'git diff'
-    abbr -a gds 'git diff --staged'
-    abbr -a gdp 'git diff HEAD^'
-    abbr -a ga 'git add'
-    abbr -a gaa 'git add -A'
-    abbr -a gac 'git commit -am'
-    abbr -a gc 'git commit -m'
-    abbr -a gca 'git commit --amend'
-    abbr -a gu 'git pull'
-    abbr -a gp 'git push'
-    abbr -a gpp 'git_set_upstream'
-    abbr -a gl 'git log --graph --decorate --oneline -20'
-    abbr -a gll 'git log --graph --decorate --oneline'
-    abbr -a gco 'git checkout'
-    abbr -a gcom 'git checkout master'
-    abbr -a gcob 'git checkout -b'
-    abbr -a gb 'git branch'
-    abbr -a gbd 'git branch -d'
-    abbr -a gbD 'git branch -D'
-    abbr -a gr 'git reset'
-    abbr -a grh 'git reset --hard'
-    abbr -a gm 'git merge'
-    abbr -a gcp 'git cherry-pick'
-    abbr -a cdg 'cd (git rev-parse --show-toplevel)'
-
-    # GitHub
-    abbr -a ghr 'gh repo view -w'
-    abbr -a gha 'gh run list | head -1 | awk \'{ print $NF }\' | xargs gh run view'
-    abbr -a grw 'gh run watch'
-    abbr -a grf 'gh run view --log-failed'
-    abbr -a grl 'gh run view --log'
-
-    # Vim
-    if command -v nvim > /dev/null
-        alias --save vim='nvim'
-        abbr -a vimrc 'vim $HOME/.config/nvim/init.lua'
-    else
-        alias --save vim='vim'
-        abbr -a vimrc 'vim $HOME/.vimrc'
-    end
-    abbr -a v 'vim'
-    abbr -a vl 'vim -c "normal! `0"'
-    abbr -a vll 'vim -c "Hist"'
-
-    # Notes
-    abbr -a qn 'quicknote'
-    abbr -a sn 'syncnotes'
-    abbr -a work 'vim $NOTES_PATH/work.md'
-
-    # Improved CLI Tools
-    abbr -a cat 'bat'          # Swap cat with bat
-    abbr -a h 'http -Fh --all' # Curl site for headers
-
-    # Fun CLI Tools
-    abbr goo 'googler'
-    abbr gooj 'googler -j'
-    abbr weather 'curl wttr.in/$WEATHER_CITY'
-    abbr moon 'curl wttr.in/Moon'
-
-    # Dotfile and config shortcuts
-    abbr -a s 'sudo'
-    abbr -a boot '$DOTS/scripts/bootstrap'
-    abbr -a sshc 'vim ~/.ssh/config'
-    abbr -a hosts 'sudo nvim /etc/hosts'
-    abbr -a frc 'vim $HOME/.config/fish/config.fish'
-    abbr -a falias 'vim $HOME/.config/fish/functions/abbrs.fish'
-
-    # Cheat Sheets
-    abbr -a ssl 'openssl req -new -newkey rsa:2048 -nodes' \
-                '-keyout server.key -out server.csr'
-    abbr -a fingerprint 'ssh-keyscan myhost.com | ssh-keygen -lf -'
-    abbr -a publickey 'ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub'
-    abbr -a forloop 'for i in (seq 1 100)'
-    abbr -a gatekeeper 'sudo spctl --master-disable'
-
-    # Docker
-    abbr -a dc '$DOTS/bin/docker_cleanup'
-    abbr -a dr 'docker run --rm -it'
-    abbr -a db 'docker build . -t'
-    abbr -a ds 'docker ps -a'
-    abbr -a de 'docker exec -it'
-    abbr -a dpy 'docker run --rm -it -v $PWD:/project python:alpine python'
-    abbr -a alp 'docker run --rm -it -v $PWD:/project alpine sh'
-
-    # Terraform
-    abbr -a te 'terraform'
-    abbr -a tap 'terraform apply'
-
-    # Kubernetes
-    abbr -a k 'kubectl'
-    abbr -a pods 'kubectl get pods -A'
-    abbr -a nodes 'kubectl get nodes'
-    abbr -a deploys 'kubectl get deployments -A'
-    abbr -a dash 'kube-dashboard'
-    abbr -a ks 'k9s'
-
-    # Cloud
-    abbr -a awsc 'vim ~/.aws/credentials'
-
-    # Python
-    abbr -a py 'python'
-    abbr -a po 'poetry'
-    abbr -a pr 'poetry run python'
-    abbr -a pl 'poetry run pylint *'
-    abbr -a black 'poetry run black --target-version py38 .'
-    abbr -a bl 'poetry run black --target-version py38 .'
-
-    # Rust
-    abbr -a ca 'cargo'
-
-    # macOS
-    abbr -a casks 'vim $DOTS/homebrew/Caskfile'
-    abbr -a t 'trash'
-
-    # Linux
-    if [ (uname) = "Linux" ]
-        linux
-    end
-
-
-end

fish.configlink/functions/brews.fish

@@ -1,10 +0,0 @@
-function brews --description "Open Homebrew bundles file"
-    set -lx brewdir $DOTS/homebrew
-    set -l brewfile (basename $brewdir/*.Brewfile \
-        | fzf \
-            --height 70% \
-            --preview-window right:70% \
-            --preview 'bat --color=always $brewdir/{}' \
-    )
-    and vim $brewdir/$brewfile
-end

fish.configlink/functions/brewsearch.fish

@@ -1,9 +0,0 @@
-function brewsearch --description "Install brew plugins"
-    set -l inst (brew formulae | eval "fzf $FZF_DEFAULT_OPTS -m --header='[press ctrl-i for info, enter to install]' --bind 'ctrl-i:preview(brew info {})'")
-
-    if not test (count $inst) = 0
-        for prog in $inst
-            brew install "$prog"
-        end
-    end
-end

fish.configlink/functions/commandline-git-commits.fish

@@ -1,10 +0,0 @@
-#!/usr/local/bin/fish
-
-function commandline-git-commits
-    set commit (git-commits)
-    if [ $commit ]
-        commandline -i "$commit"
-    else
-        commandline -i "HEAD"
-    end
-end

fish.configlink/functions/copy.fish

@@ -1,3 +0,0 @@
-function copy --description 'Copy file contents into clipboard'
-    cat $argv | pbcopy
-end

fish.configlink/functions/edit.fish

@@ -1,6 +0,0 @@
-function edit --description "Open a file in Vim"
-    set vimfile (fzf)
-    and set vimfile (echo $vimfile | tr -d '\r')
-    and commandline -r "vim $vimfile"
-    and commandline -f execute
-end

fish.configlink/functions/envs.fish

@@ -1,3 +0,0 @@
-function envs --description 'Set from a bash environment variables file'
-    set -gx (cat $argv | tr "=" " " | string split ' ')
-end

fish.configlink/functions/fcd.fish

@@ -1,11 +0,0 @@
-function fcd --description 'Jump to directory' -a 'directory'
-    if test -z $directory
-        set directory "$HOME"
-    end
-    if ! test -d $directory
-        echo "Directory not found: $directory"
-        return 1
-    end
-    set jump (fd -t d . $directory | fzf)
-    and cd $jump $argv;
-end

fish.configlink/functions/fish_user_key_bindings.fish

@@ -1,9 +0,0 @@
-#!/usr/local/bin/fish
-
-function fish_user_key_bindings
-    bind -M insert \co 'edit'
-    bind -M insert \ce 'recent'
-    bind -M insert \cg 'commandline-git-commits'
-    bind -M insert \x1F accept-autosuggestion
-    bind -M default \x1F accept-autosuggestion
-end

fish.configlink/functions/fzf_key_bindings.fish

@@ -1 +0,0 @@
-/usr/local/opt/fzf/shell/key-bindings.fish

fish.configlink/functions/generate_fish_colors.fish

@@ -1,8 +0,0 @@
-# This function creates an output file of just the printf values for
-# modifying the shell colors. This output file is used to load the
-# current colors into my shell much faster than running the function on
-# prompt.
-
-function generate_fish_colors --description "Create fish colors file"
-    theme_gruvbox dark > $DOTS/fish.configlink/fish_colors
-end

fish.configlink/functions/git-add-fuzzy.fish

@@ -1,15 +0,0 @@
-function git-add-fuzzy
-    set gitfile (git status -s \
-        | fzf \
-            --height 50% \
-            -m \
-            --preview-window right:70% \
-            --preview 'set -l IFS; set gd (git diff --color=always (echo {} | awk \'{$1=$1};1\' | cut -d" " -f2)); if test "$gd"; echo "$gd"; else; bat --color=always (echo {} | awk \'{$1=$1};1\' | cut -d" " -f2); end')
-    and for gf in $gitfile
-        set gf (echo $gf \
-            | awk '{$1=$1};1' \
-            | cut -d' ' -f2 \
-            )
-        and git add $gf
-    end
-end

fish.configlink/functions/git-checkout-fuzzy.fish

@@ -1,4 +0,0 @@
-function git-checkout-fuzzy
-    set branch (git-fuzzy-branch "checkout branch...")
-    and git checkout $branch
-end

fish.configlink/functions/git-commits.fish

@@ -1,10 +0,0 @@
-function git-commits
-    set commitline (git log \
-        --pretty="format:%C(auto)%ar %h%d %s" \
-        | fzf \
-            --height 50% \
-            --preview 'git show --color=always (echo {} | cut -d" " -f4)' \
-            )
-    and set commit (echo $commitline | cut -d" " -f4)
-    and echo $commit
-end

fish.configlink/functions/git-delete-fuzzy.fish

@@ -1,4 +0,0 @@
-function git-delete-fuzzy
-    set branch (git-fuzzy-branch "delete branch...")
-    and git branch -d $branch
-end

fish.configlink/functions/git-force-delete-fuzzy.fish

@@ -1,4 +0,0 @@
-function git-force-delete-fuzzy
-    set branch (git-fuzzy-branch "force delete branch...")
-    and git branch -D $branch
-end

fish.configlink/functions/git-fuzzy-branch.fish

@@ -1,12 +0,0 @@
-function git-fuzzy-branch -a header
-    set -l current (git rev-parse --abbrev-ref HEAD | tr -d '\n')
-    set -l branch (git branch \
-        --format "%(refname:short)" \
-        | fzf \
-            --height 50% \
-            --header="On $current, $header" \
-            --preview-window right:70% \
-            --preview 'git log {} --color=always --pretty="format:%C(auto)%ar %h%d %s"' \
-            )
-    and echo $branch
-end

fish.configlink/functions/git-history.fish

@@ -1,16 +0,0 @@
-function git-history
-    if not count $argv > /dev/null
-        echo "Must provide filename."
-        return 1
-    end
-    set commitline ( git log \
-        --follow \
-        --pretty="format:%C(auto)%ar %h%d %s" \
-        -- ./$argv \
-        | fzf \
-            --height 100% \
-            --preview "git diff --color=always (echo {} | cut -d' ' -f4)^1..(echo {} | cut -d' ' -f4) -- ./$argv" \
-            )
-    and set commit (echo $commitline | cut -d" " -f4)
-    and echo $commit
-end

fish.configlink/functions/git-merge-fuzzy.fish

@@ -1,4 +0,0 @@
-function git-merge-fuzzy
-    set branch (git-fuzzy-branch "merge from...")
-    and git merge $branch
-end

fish.configlink/functions/git-show-fuzzy.fish

@@ -1,8 +0,0 @@
-function git-show-fuzzy
-    set commitline (git log \
-       --pretty="format:%C(auto)%ar %h%d %s" \
-       | fzf \
-       )
-    and set commit (echo $commitline | cut -d" " -f4 )
-    and git show $commit
-end

fish.configlink/functions/git.fish

@@ -1,39 +0,0 @@
-function git
-    if contains f $argv
-        switch $argv[1]
-            case "checkout"
-                git-checkout-fuzzy
-            case "add"
-                git-add-fuzzy
-            case "show"
-                git-show-fuzzy
-            case "merge"
-                git-merge-fuzzy
-            case "branch"
-                if test "$argv[2]" = "-d"
-                    git-delete-fuzzy
-                else if test "$argv[2]" = "-D"
-                    git-force-delete-fuzzy
-                else
-                    echo "Not a fuzzy option."
-                    return 1
-                end
-            case "reset"
-                set commit (git-commits)
-                and if test "$argv[2]" = "--hard"
-                    git reset --hard $commit
-                else
-                    git reset $commit
-                end
-            case "*"
-                echo "No fuzzy option."
-                return 1
-            end
-    else
-        if count $argv > /dev/null
-            command git $argv
-        else
-            command git status -sb
-        end
-    end
-end

fish.configlink/functions/ip.fish

@@ -1,7 +0,0 @@
-function ip
-    if count $argv > /dev/null
-        curl ipinfo.io/$argv
-    else
-        curl checkip.amazonaws.com
-    end
-end

fish.configlink/functions/journal.fish

@@ -1,10 +0,0 @@
-function journal --description "Create today's journal"
-    note-dates
-    if [ -f $TODAY_NOTE_FILE ]
-        echo "Already exists."
-    else
-        note-header
-        printf $JOURNAL_HEADER > $TODAY_NOTE_FILE
-        echo "New journal added."
-    end
-end

fish.configlink/functions/json.fish

@@ -1,3 +0,0 @@
-function json --description "Tidy up JSON with jq"
-    pbpaste | jq '.' | pbcopy
-end

fish.configlink/functions/linux.fish

@@ -1,4 +0,0 @@
-function linux --description "Load only on Linux"
-    alias pbcopy='xclip -selection clipboard -in'
-    alias pbpaste='xclip -selection clipboard -out'
-end

fish.configlink/functions/ls.fish

@@ -1,3 +0,0 @@
-function ls --description "Use exa to list files"
-    exa $argv
-end

fish.configlink/functions/meeting.fish

@@ -1,11 +0,0 @@
-function meeting --description "Describe a meeting" -a "name"
-    note-dates
-    set today_date (date -j +"%Y-%m-%d")
-    set time (date +"%I:%M%p" | tr '[:upper:]' '[:lower:]')
-    set meeting_name (echo $name | tr ' ' '-' | tr '[:upper:]' '[:lower:]')
-    set meeting_note $today_date-$meeting_name
-    set meeting_file meetings/$meeting_note.md
-    printf "[$TODAY_NOTE](../journal/$TODAY_NOTE.md) | #meeting\n\n# $name\n\n---\n\n" > $NOTES_PATH/$meeting_file
-    printf "\n\n---\n\n$time - [$name](../$meeting_file)\n\n---\n\n" >> $TODAY_NOTE_FILE
-    vim $NOTES_PATH/$meeting_file
-end

fish.configlink/functions/note-dates.fish

@@ -1,7 +0,0 @@
-function note-dates
-    set -g TODAY_NOTE (date +"%Y-%m-%d_%a")
-    set -g YESTERDAY_NOTE (date -jv "-1d" +"%Y-%m-%d_%a")
-    set -g TOMORROW_NOTE (date -jv "+1d" +"%Y-%m-%d_%a")
-    set -g LONG_DATE (date +"%A, %B %e, %Y" | sed 's/  */ /g')
-    set -g TODAY_NOTE_FILE $NOTES_PATH/journal/$TODAY_NOTE.md
-end

fish.configlink/functions/note-header.fish

@@ -1,4 +0,0 @@
-function note-header
-    set -g CURRENT_WEATHER (curl -s "https://wttr.in/?format=1")
-    set -g JOURNAL_HEADER "[Yesterday]($YESTERDAY_NOTE.md) | [Home](home.md) | [Tomorrow]($TOMORROW_NOTE.md)\n\n$LONG_DATE\n$CURRENT_WEATHER\n#journal\n\n---\n\n"
-end

fish.configlink/functions/note.fish

@@ -1,10 +0,0 @@
-function note --description "Edit or create a note" -a "filename"
-    if test -n "$filename"
-        vim $NOTES_PATH/$filename.md
-    else
-        set file (ls $NOTES_PATH | fzf)
-        if [ $status -eq 0 ]
-            vim $NOTES_PATH/$file
-        end
-    end
-end

fish.configlink/functions/ping.fish

@@ -1,3 +0,0 @@
-function ping --description "Improved ping" -a "target"
-    prettyping --nolegend $target
-end

fish.configlink/functions/prj.fish

@@ -1,4 +0,0 @@
-function prj --description "cd to a project"
-    set projdir (ls $PROJ | fzf)
-    and cd $PROJ/$projdir
-end

fish.configlink/functions/psf.fish

@@ -1,3 +0,0 @@
-function psf --description "Search for open process" -a "process"
-    ps aux | rg -v "$USER.*rg $argv" | rg $argv
-end

fish.configlink/functions/qr.fish

@@ -1,3 +0,0 @@
-function qr
-    qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png
-end

fish.configlink/functions/quicknote.fish

@@ -1,5 +0,0 @@
-function quicknote --description "Write a quick note" -a "note"
-    note-dates
-    set time (date +"%I:%M%p" | tr '[:upper:]' '[:lower:]')
-    printf "\n\n---\n\n#### $time\n$note\n" >> $TODAY_NOTE_FILE
-end

fish.configlink/functions/recent.fish

@@ -1,6 +0,0 @@
-function recent --description "Open a recent file in Vim"
-    set vimfile (fd -t f --exec stat -f "%m%t%N" | sort -nr | cut -f2 | fzf)
-    and set vimfile (echo $vimfile | tr -d '\r')
-    and commandline -r "vim $vimfile"
-    and commandline -f execute
-end

fish.configlink/functions/reload.fish

@@ -1,3 +0,0 @@
-function reload --description "Reload fish configuration"
-    source $DOTS/fish.configlink/config.fish
-end