fix: qcow-efi requires specific filesystem label

this will allow us to connect to the machine for nixos-anywhere

.github/workflows/arrow-aws.yml

@@ -3,7 +3,7 @@ name: Arrow (AWS)
 run-name: Arrow (AWS) - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
 
 env:
-  TERRAFORM_DIRECTORY: hosts/arrow/aws
+  TERRAFORM_DIRECTORY: deploy/aws
   DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
   ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
   ZONE_NAME: masu.rs

.github/workflows/flame.yml

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

README.md

@@ -8,38 +8,38 @@ configuration may be difficult to translate to a non-Nix system.
 
 ## System Features
 
-| Feature        | Program                                             | Configuration                                 |
+| Feature        | Program                                             | Configuration                                                                     |
-|----------------|-----------------------------------------------------|-----------------------------------------------|
+|----------------|-----------------------------------------------------|-----------------------------------------------------------------------------------|
-| OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
+| OS             | [NixOS](https://nixos.org)                          | [Link](./platforms/nixos)                                                         |
-| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
+| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./platforms/nixos/modules/nmasur/profiles/gui.nix)                         |
-| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
+| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./platforms/home-manager/modules/nmasur/presets/services/picom.nix)        |
-| Window Manager | [i3](https://i3wm.org/)                             | [Link](./modules/nixos/graphical/i3.nix)      |
+| Window Manager | [i3](https://i3wm.org/)                             | [Link](./platforms/home-manager/modules/nmasur/presets/services/i3.nix)           |
-| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./modules/nixos/graphical/polybar.nix) |
+| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./platforms/home-manager/modules/nmasur/presets/services/polybar.nix)      |
-| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix)   |
+| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./platforms/home-manager/modules/nmasur/presets/fonts.nix)                 |
-| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./modules/nixos/graphical/rofi.nix)    |
+| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix) |
 
 ## User Features
 
-| Feature      | Program                                                                          | Configuration                                      |
+| Feature      | Program                                                                          | Configuration                                                                 |
-|--------------|----------------------------------------------------------------------------------|----------------------------------------------------|
+|--------------|----------------------------------------------------------------------------------|-------------------------------------------------------------------------------|
-| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
+| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./platforms/home-manager)                                              |
-| Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
+| Terminal     | [Ghostty](https://sw.kovidgoyal.net/kitty/)                                      | [Link](./platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix)  |
-| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
+| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./platforms/home-manager/modules/nmasur/presets/programs/fish.nix)     |
-| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starship.nix)        |
+| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./platforms/home-manager/modules/nmasur/presets/programs/starship.nix) |
-| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)          |
+| 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)                |
+| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/x86_64-linux/tempest/default.nix)                              |
-| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
+| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./pkgs/applications/editors/neovim/nmasur/neovim/package.nix)          |
-| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
+| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./platforms/home-manager/modules/nmasur/presets/programs/firefox.nix)  |
-| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |
+| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./platforms/home-manager/modules/nmasur/presets/programs/aerc.nix)     |
-| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./modules/common/applications/nautilus.nix) |
+| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./platforms/home-manager/modules/nmasur/presets/programs/nautilus.nix) |
-| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./modules/common/applications/media.nix)    |
+| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./platforms/home-manager/modules/nmasur/presets/programs/zathura.nix)  |
-| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./modules/common/applications/media.nix)    |
+| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./platforms/home-manager/modules/nmasur/presets/programs/mpv.nix)      |
 
 ## macOS Features
 
 | Feature  | Program                                     | Configuration                        |
 |----------|---------------------------------------------|--------------------------------------|
-| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
+| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./platforms/home-manager/modules/nmasur/presets/services/hammerspoon/) |
 
 # Diagram
 
@@ -51,15 +51,16 @@ configuration may be difficult to translate to a non-Nix system.
 
 This repo contains a few more elaborate elements of configuration.
 
-- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
+- [Neovim config](./pkgs/applications/editors/neovim/nmasur/neovim/package.nix)
-and source-controlled plugins, differing based on installed LSPs, for example.
+generated with Nix2Vim and source-controlled plugins,
-- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based
+differing based on installed LSPs, for example. - [Caddy
-dynamically on enabled services rendered with Nix.
+JSON](./platforms/nixos/modules/nmasur/presets/services/caddy.nix) file (routes,
-- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix.
+etc.) based dynamically on enabled services rendered with Nix. - [Grafana
-- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
+config](./platforms/nixos/modules/nmasur/presets/services/grafana/grafana.nix)
-agenix.
+rendered with Nix. - Custom [secrets
-- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
+deployment](./platforms/nixos/modules/secrets.nix) similar to agenix. - Base16
-including Firefox userChrome.
+[colorschemes](./colorscheme/) applied to multiple applications, including
+Firefox userChrome.
 
 ---
 

apps/README.md

@@ -1,9 +0,0 @@
-# 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

@@ -1,31 +0,0 @@
-{ 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; };
-
-  # Run neovim as an app
-  neovim = import ./neovim.nix { inherit pkgs; };
-  nvim = neovim;
-}

apps/encrypt-secret.nix

@@ -1,19 +0,0 @@
-{ 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

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-
-  # This script will partition and format drives; use at your own risk!
-
-  type = "app";
-
-  program = pkgs.lib.getExe pkgs.nmasur.format-root;
-}

apps/help.nix

@@ -1,24 +0,0 @@
-{ 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." }}' \
-      echo ""
-      echo ""
-    ''
-  );
-}

apps/installer.nix

@@ -1,50 +0,0 @@
-{ 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

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-
-  # TODO: just replace with packages instead of apps
-
-  type = "app";
-
-  program = "${pkgs.nmasur.loadkey}/bin/loadkey";
-}

apps/neovim.nix

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

apps/readme.nix

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

apps/rebuild.nix

@@ -1,17 +0,0 @@
-{ 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

@@ -1,27 +0,0 @@
-{ 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."
-    ''
-  );
-}

deploy/oracle/main.tf

@@ -0,0 +1,115 @@
+terraform {
+  backend "s3" {
+    bucket       = "noahmasur-terraform"
+    key          = "flame.tfstate"
+    region       = "us-east-1"
+    use_lockfile = true
+  }
+  required_version = ">= 1.0.0"
+  required_providers {
+    oci = {
+      source  = "oracle/oci"
+      version = "7.7.0"
+    }
+  }
+}
+
+provider "oci" {
+  auth         = "APIKey"
+  tenancy_ocid = var.compartment_ocid
+  user_ocid    = "ocid1.user.oc1..aaaaaaaa6lro2eoxdajjypjysepvzcavq5yn4qyozjyebxdiaoqziribuqba"
+  private_key  = var.oci_private_key
+  fingerprint  = "dd:d0:da:6d:83:46:8b:b3:d9:45:2b:c7:56:ae:30:94"
+  region       = "us-ashburn-1"
+}
+
+# Get the latest Ubuntu image OCID
+# We'll filter for a recent Ubuntu LTS version (e.g., 22.04 or 24.04) and pick the latest.
+# Note: Image OCIDs are region-specific. This data source helps find the correct one.
+data "oci_core_images" "ubuntu_image" {
+  compartment_id   = var.compartment_ocid
+  operating_system = "Canonical Ubuntu"
+  # Adjust this version if you prefer a different Ubuntu LTS (e.g., "24.04")
+  operating_system_version = "24.04"
+  shape                    = var.instance_shape # Filter by the shape to ensure compatibility
+  sort_by                  = "TIMECREATED"
+  sort_order               = "DESC"
+}
+
+# resource "oci_core_image" "my_custom_image" {
+#   compartment_id = var.compartment_ocid
+#   display_name   = "noah-nixos"
+
+#   image_source_details {
+#     source_type = "objectStorageTuple" # Use this if specifying namespace, bucket, and object name
+#     # source_type  = "objectStorageUri"  # Use this if you have a pre-authenticated request URL (PAR)
+#     namespace_name = var.object_storage_namespace
+#     bucket_name    = var.object_storage_bucket_name
+#     object_name    = var.object_storage_object_name
+
+#     source_image_type = "QCOW2" # e.g., "QCOW2", "VMDK"
+
+#     # These properties help OCI understand how to launch instances from this image
+#     # Adjust based on your custom image's OS and boot mode
+#     operating_system         = "NixOS" # e.g., "CentOS", "Debian", "Windows"
+#     operating_system_version = "25.05" # e.g., "7", "11", "2019"
+#   }
+
+#   launch_mode = "PARAVIRTUALIZED" # Or "NATIVE", "EMULATED", "CUSTOM"
+#   # Optional: for specific launch options if your image requires them
+#   # launch_options {
+#   #   boot_volume_type = "PARAVIRTUALIZED"
+#   #   firmware         = "UEFI_64" # Or "BIOS"
+#   #   network_type     = "PARAVIRTUALIZED"
+#   # }
+
+#   # Time out for image import operation. Can take a while for large images.
+#   timeouts {
+#     create = "60m" # Default is 20m, often needs to be increased
+#   }
+# }
+
+data "oci_identity_availability_domains" "ads" {
+  compartment_id = var.compartment_ocid
+}
+
+resource "oci_core_instance" "my_compute_instance" {
+  compartment_id      = var.compartment_ocid
+  availability_domain = data.oci_identity_availability_domains.ads.availability_domains[0].name
+  shape               = var.instance_shape
+  display_name        = var.instance_display_name
+
+  source_details {
+    source_type = "image"
+    # Use the OCID of the latest Ubuntu image found by the data source
+    source_id = data.oci_core_images.ubuntu_image.images[0].id
+    # # Use the OCID of the newly imported custom image
+    # source_id = oci_core_image.my_custom_image.id
+    # Specify the boot volume size
+    boot_volume_size_in_gbs = var.boot_volume_size_in_gbs
+    boot_volume_vpus_per_gb = 20 # Highest free tier option
+  }
+
+  # launch_options {
+  #   is_consistent_volume_naming_enabled = true              # Sets boot device path to /dev/oracleoci/oraclevda
+  #   network_type                        = "PARAVIRTUALIZED" # I think this is the default?
+  # }
+
+  create_vnic_details {
+    subnet_id        = oci_core_subnet.my_public_subnet.id # Use the created subnet's ID
+    display_name     = "primary_vnic"
+    assign_public_ip = true
+    hostname_label   = "flame"
+  }
+
+  metadata = {
+    ssh_authorized_keys = var.ssh_public_key
+    user_data           = base64encode(var.cloud_init_script)
+  }
+
+  # Optional: For flexible shapes (e.g., VM.Standard.E4.Flex), you might need to specify OCPUs and memory
+  shape_config {
+    ocpus         = 4
+    memory_in_gbs = 24
+  }
+}

deploy/oracle/network.tf

@@ -0,0 +1,126 @@
+resource "oci_core_vcn" "my_vpc" {
+  compartment_id = var.compartment_ocid
+  display_name   = "main"
+  cidr_block     = "10.0.0.0/16"
+  is_ipv6enabled = false
+  dns_label      = "mainvcn" # Must be unique within your tenancy
+}
+
+resource "oci_core_internet_gateway" "my_igw" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.my_vpc.id
+  display_name   = "main-igw"
+  enabled        = true
+}
+
+resource "oci_core_route_table" "my_public_route_table" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.my_vpc.id
+  display_name   = "main-public-rt"
+
+  # Default route to the Internet Gateway
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_internet_gateway.my_igw.id
+  }
+}
+
+resource "oci_core_security_list" "my_public_security_list" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.my_vpc.id
+  display_name   = "main-public-sl"
+
+  # Egress Rules (Allow all outbound traffic)
+  egress_security_rules {
+    destination      = "0.0.0.0/0"
+    destination_type = "CIDR_BLOCK"
+    protocol         = "all"
+  }
+
+  # Ingress Rules
+  ingress_security_rules {
+    # SSH (TCP 22)
+    protocol    = "6" # TCP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    tcp_options {
+      min = 22
+      max = 22
+    }
+  }
+
+  ingress_security_rules {
+    # HTTP (TCP 80)
+    protocol    = "6" # TCP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    tcp_options {
+      min = 80
+      max = 80
+    }
+  }
+
+  ingress_security_rules {
+    # HTTPS (TCP 443)
+    protocol    = "6" # TCP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    tcp_options {
+      min = 443
+      max = 443
+    }
+  }
+
+  ingress_security_rules {
+    # Custom Minecraft
+    protocol    = "6" # TCP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    tcp_options {
+      min = 49732
+      max = 49732
+    }
+  }
+
+  ingress_security_rules {
+    # HTTPS (UDP 443) - For QUIC or specific UDP services
+    protocol    = "17" # UDP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    udp_options {
+      min = 443
+      max = 443
+    }
+  }
+
+  ingress_security_rules {
+    # ICMP (Ping)
+    protocol    = "1" # ICMP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    icmp_options {
+      type = 3 # Destination Unreachable (common for connectivity checks)
+      code = 4 # Fragmentation needed
+    }
+  }
+  ingress_security_rules {
+    protocol    = "1" # ICMP
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    icmp_options {
+      type = 8 # Echo Request (ping)
+    }
+  }
+}
+
+resource "oci_core_subnet" "my_public_subnet" {
+  compartment_id             = var.compartment_ocid
+  vcn_id                     = oci_core_vcn.my_vpc.id
+  display_name               = "main-public-subnet"
+  cidr_block                 = "10.0.0.0/24"
+  prohibit_public_ip_on_vnic = false # Allows instances in this subnet to get public IPs
+  route_table_id             = oci_core_route_table.my_public_route_table.id
+  security_list_ids          = [oci_core_security_list.my_public_security_list.id]
+  dns_label                  = "mainsub" # Must be unique within the VCN
+}

deploy/oracle/outputs.tf

@@ -0,0 +1,19 @@
+output "host_ip" {
+  description = "The public IP address of the launched instance."
+  value       = oci_core_instance.my_compute_instance.public_ip
+}
+
+output "instance_id" {
+  description = "The OCID of the launched instance."
+  value       = oci_core_instance.my_compute_instance.id
+}
+
+output "vpc_ocid" {
+  description = "The OCID of the created VCN."
+  value       = oci_core_vcn.my_vpc.id
+}
+
+output "subnet_ocid" {
+  description = "The OCID of the created public subnet."
+  value       = oci_core_subnet.my_public_subnet.id
+}

deploy/oracle/variables.tf

@@ -0,0 +1,63 @@
+variable "boot_volume_size_in_gbs" {
+  description = "The size of the boot volume in GBs."
+  type        = number
+  default     = 150
+}
+
+variable "cloud_init_script" {
+  description = "A cloud-init script to run on instance launch."
+  type        = string
+  default     = <<-EOF
+              #!/bin/bash
+              echo "Hello from cloud-init!" > /home/ubuntu/cloud-init-output.txt
+              EOF
+}
+
+variable "compartment_ocid" {
+  description = "The OCID of the compartment where the instance will be created."
+  type        = string
+  default     = "ocid1.tenancy.oc1..aaaaaaaaudwr2ozedhjnrn76ofjgglgug6gexknjisd7gb7tkj3mjdp763da"
+}
+
+variable "instance_display_name" {
+  description = "A user-friendly name for the instance."
+  type        = string
+  default     = "noah-nixos"
+}
+
+variable "instance_shape" {
+  description = "The shape of the OCI compute instance."
+  type        = string
+  default     = "VM.Standard.A1.Flex" # Example shape. Choose one available in your region/AD.
+}
+
+variable "object_storage_namespace" {
+  description = "Your OCI Object Storage namespace (usually your tenancy name)."
+  type        = string
+  default     = "idptr5akf9pf"
+}
+
+variable "object_storage_bucket_name" {
+  description = "The name of the Object Storage bucket where your custom image is located."
+  type        = string
+  default     = "noahmasur-images"
+}
+
+variable "object_storage_object_name" {
+  description = "The object name (file name) of your custom image in Object Storage."
+  type        = string
+  default     = "nixos.qcow2"
+}
+
+variable "oci_private_key" {
+  type        = string
+  description = "API private key for Oracle Cloud management"
+  sensitive   = true
+}
+
+variable "ssh_public_key" {
+  description = "Your public SSH key content."
+  type        = string
+  # default     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+  default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpPU2G9rSF8Q6waH62IJexDCQ6lY+8ZyVufGE3xMDGw actions-deploy"
+}

disks/README.md

@@ -1,5 +0,0 @@
-# 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.

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741229100,
+        "lastModified": 1751313918,
-        "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=",
+        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab",
+        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740485968,
+        "lastModified": 1750903843,
-        "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+        "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+        "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1747046372,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -148,6 +148,45 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "helix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1751378814,
+        "narHash": "sha256-pdYjEgdVYEerzxxmrM0GJAFGZ+J50NRD0rtDZ16SuTM=",
+        "owner": "helix-editor",
+        "repo": "helix",
+        "rev": "6a090471a800b1001bdfd2b6e0b710c1cd439a4e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "helix-editor",
+        "repo": "helix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -155,11 +194,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741378606,
+        "lastModified": 1751485527,
-        "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
+        "narHash": "sha256-E2AtD5UUeU50xco4gmgsCOs7tnBNsVi7+CdCZ4yQUrA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
+        "rev": "25f003f8a9eae31a11938d53cb23e0b4a3c08d3a",
         "type": "github"
       },
       "original": {
@@ -180,11 +219,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1739821351,
+        "lastModified": 1742156590,
-        "narHash": "sha256-QlVtMzAhECs9Esq3txqVW7/vM78ipB5IcI8uyCbTP7A=",
+        "narHash": "sha256-aTM/2CrNN5utdVEQGsOA+kl4UozgH7VPLBQL5OXtBrg=",
         "owner": "hraban",
         "repo": "mac-app-util",
-        "rev": "c00d5b21ca1fdab8acef65e696795f0f15ec1158",
+        "rev": "341ede93f290df7957047682482c298e47291b4d",
         "type": "github"
       },
       "original": {
@@ -193,58 +232,6 @@
         "type": "github"
       }
     },
-    "nextcloud-cookbook": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726214817,
-        "narHash": "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=",
-        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
-      }
-    },
-    "nextcloud-external": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729501365,
-        "narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
-      }
-    },
-    "nextcloud-news": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729667622,
-        "narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
-      }
-    },
-    "nextcloud-snappymail": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1728502660,
-        "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
-      }
-    },
     "nix2vim": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -253,11 +240,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740943170,
+        "lastModified": 1745846717,
-        "narHash": "sha256-A0F7T/euSMen004cVQN/ZkMpLkgLXDs+mq/merhd+0Y=",
+        "narHash": "sha256-GjwZEjCrI1/tQYylAQ+hU5JYD2hJI+rZmfICCIniWuE=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "a562f32ff2393d0ed198103c65a3035bcdf83d4d",
+        "rev": "0cd899a39b56d665115f72ffc7c37e0f4cf41dbe",
         "type": "github"
       },
       "original": {
@@ -289,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740947705,
+        "lastModified": 1747663185,
-        "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=",
+        "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "507911df8c35939050ae324caccc7cf4ffb76565",
+        "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
         "type": "github"
       },
       "original": {
@@ -304,11 +291,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741246872,
+        "lastModified": 1751271578,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
         "type": "github"
       },
       "original": {
@@ -334,6 +321,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -343,11 +346,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1741383898,
+        "lastModified": 1751485261,
-        "narHash": "sha256-hIiLfvj0qZjBLhk5eBhIv8SZJ+bI8d06Hxp480mJ1aI=",
+        "narHash": "sha256-QtPZgSHeBdS6yr2E9SUjqusslh3ztxskn54vIwl3pzU=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "54352c3c3110f34e71a2ae9a0210aa6955555760",
+        "rev": "864d4a94df15802c83c212c2a9fe1d44eb6e78d5",
         "type": "github"
       },
       "original": {
@@ -360,28 +363,80 @@
       "inputs": {
         "darwin": "darwin",
         "disko": "disko",
+        "helix": "helix",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
-        "nextcloud-cookbook": "nextcloud-cookbook",
-        "nextcloud-external": "nextcloud-external",
-        "nextcloud-news": "nextcloud-news",
-        "nextcloud-snappymail": "nextcloud-snappymail",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
-        "tree-sitter-bash": "tree-sitter-bash",
-        "tree-sitter-ini": "tree-sitter-ini",
-        "tree-sitter-lua": "tree-sitter-lua",
-        "tree-sitter-puppet": "tree-sitter-puppet",
-        "tree-sitter-python": "tree-sitter-python",
-        "tree-sitter-rasi": "tree-sitter-rasi",
-        "tree-sitter-vimdoc": "tree-sitter-vimdoc",
         "wsl": "wsl",
+        "yazi": "yazi",
+        "zellij-switch": "zellij-switch",
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1740623427,
+        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747363019,
+        "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1736476219,
+        "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1689347925,
@@ -412,118 +467,33 @@
         "type": "github"
       }
     },
-    "tree-sitter-bash": {
+    "systems_3": {
-      "flake": false,
       "locked": {
-        "lastModified": 1738310128,
+        "lastModified": 1681028828,
-        "narHash": "sha256-ODWgFpCLLPgzNYXFhfAVvDXPr5bW8/49ezsaS9MOWMk=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "tree-sitter",
+        "owner": "nix-systems",
-        "repo": "tree-sitter-bash",
+        "repo": "default",
-        "rev": "0c46d792d54c536be5ff7eb18eb95c70fccdb232",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "tree-sitter",
+        "owner": "nix-systems",
-        "ref": "master",
+        "repo": "default",
-        "repo": "tree-sitter-bash",
         "type": "github"
       }
     },
-    "tree-sitter-ini": {
+    "systems_4": {
-      "flake": false,
       "locked": {
-        "lastModified": 1725233451,
+        "lastModified": 1681028828,
-        "narHash": "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "justinmk",
+        "owner": "nix-systems",
-        "repo": "tree-sitter-ini",
+        "repo": "default",
-        "rev": "962568c9efa71d25720ab42c5d36e222626ef3a6",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "justinmk",
+        "owner": "nix-systems",
-        "repo": "tree-sitter-ini",
+        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tree-sitter-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738303275,
-        "narHash": "sha256-mE84uI5AKbLvX5CM7NvA59Z8Ux+QFdqVjZf4hi06NAM=",
-        "owner": "MunifTanjim",
-        "repo": "tree-sitter-lua",
-        "rev": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "ref": "main",
-        "repo": "tree-sitter-lua",
-        "type": "github"
-      }
-    },
-    "tree-sitter-puppet": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734835631,
-        "narHash": "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=",
-        "owner": "amaanq",
-        "repo": "tree-sitter-puppet",
-        "rev": "15f192929b7d317f5914de2b4accd37b349182a6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "amaanq",
-        "repo": "tree-sitter-puppet",
-        "type": "github"
-      }
-    },
-    "tree-sitter-python": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738275152,
-        "narHash": "sha256-t9etfZcrliF7f9hfiomh2U9P+3ufAm8iSK1y9rOhP7s=",
-        "owner": "tree-sitter",
-        "repo": "tree-sitter-python",
-        "rev": "710796b8b877a970297106e5bbc8e2afa47f86ec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tree-sitter",
-        "ref": "master",
-        "repo": "tree-sitter-python",
-        "type": "github"
-      }
-    },
-    "tree-sitter-rasi": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716296585,
-        "narHash": "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=",
-        "owner": "Fymyte",
-        "repo": "tree-sitter-rasi",
-        "rev": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Fymyte",
-        "repo": "tree-sitter-rasi",
-        "type": "github"
-      }
-    },
-    "tree-sitter-vimdoc": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729686839,
-        "narHash": "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=",
-        "owner": "neovim",
-        "repo": "tree-sitter-vimdoc",
-        "rev": "d2e4b5c172a109966c2ce0378f73df6cede39400",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "tree-sitter-vimdoc",
         "type": "github"
       }
     },
@@ -556,11 +526,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741192150,
+        "lastModified": 1749574455,
-        "narHash": "sha256-wB140alXVla1Rw/kENerUoma2qO1Jy5IYWbmiSqmJu0=",
+        "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "0e4ccdb8181da2c6193c047b50ffee5f1a3b6dc1",
+        "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09",
         "type": "github"
       },
       "original": {
@@ -569,6 +539,50 @@
         "type": "github"
       }
     },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1751469973,
+        "narHash": "sha256-5Y1aVAYFmV20kmkhcHEQrDDvHiJVQGyYhD1SBCp639E=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "c7f800ad7ecf76e3431ad1b7005fa24b53726802",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
+    },
+    "zellij-switch": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_3",
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1742588229,
+        "narHash": "sha256-IPg0pBw0ciF+xl6viq3nK+dvZoDZrfBDui7dkPLz258=",
+        "owner": "mostafaqanbaryan",
+        "repo": "zellij-switch",
+        "rev": "0e3c303c19890ccb03589230ac5a7c4307e573e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mostafaqanbaryan",
+        "repo": "zellij-switch",
+        "type": "github"
+      }
+    },
     "zenyd-mpv-scripts": {
       "flake": false,
       "locked": {

flake.nix

@@ -34,12 +34,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # # Use official Firefox binary for macOS
-    # firefox-darwin = {
-    #   url = "github:bandithedoge/nixpkgs-firefox-darwin";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
-
     # Better App install management in macOS
     mac-app-util = {
       url = "github:hraban/mac-app-util";
@@ -52,12 +46,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # # Wallpapers
-    # wallpapers = {
-    #   url = "gitlab:exorcist365/wallpapers";
-    #   flake = false;
-    # };
-
     # Used to generate NixOS images for other platforms
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
@@ -70,417 +58,206 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # # Neovim plugins
-    # base16-nvim-src = {
-    #   url = "github:RRethy/base16-nvim";
-    #   flake = false;
-    # };
-    # nvim-lspconfig-src = {
-    #   # https://github.com/neovim/nvim-lspconfig/tags
-    #   url = "github:neovim/nvim-lspconfig/v0.1.8";
-    #   flake = false;
-    # };
-    # cmp-nvim-lsp-src = {
-    #   url = "github:hrsh7th/cmp-nvim-lsp";
-    #   flake = false;
-    # };
-    # baleia-nvim-src = {
-    #   # https://github.com/m00qek/baleia.nvim/tags
-    #   url = "github:m00qek/baleia.nvim";
-    #   flake = false;
-    # };
-    # nvim-treesitter-src = {
-    #   # https://github.com/nvim-treesitter/nvim-treesitter/tags
-    #   url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
-    #   flake = false;
-    # };
-    # telescope-nvim-src = {
-    #   # https://github.com/nvim-telescope/telescope.nvim/releases
-    #   url = "github:nvim-telescope/telescope.nvim/0.1.8";
-    #   flake = false;
-    # };
-    # telescope-project-nvim-src = {
-    #   url = "github:nvim-telescope/telescope-project.nvim";
-    #   flake = false;
-    # };
-    # toggleterm-nvim-src = {
-    #   # https://github.com/akinsho/toggleterm.nvim/tags
-    #   url = "github:akinsho/toggleterm.nvim/v2.12.0";
-    #   flake = false;
-    # };
-    # bufferline-nvim-src = {
-    #   # https://github.com/akinsho/bufferline.nvim/releases
-    #   url = "github:akinsho/bufferline.nvim/v4.6.1";
-    #   flake = false;
-    # };
-    # nvim-tree-lua-src = {
-    #   url = "github:kyazdani42/nvim-tree.lua";
-    #   flake = false;
-    # };
-    # hmts-nvim-src = {
-    #   url = "github:calops/hmts.nvim";
-    #   flake = false;
-    # };
-    # fidget-nvim-src = {
-    #   # https://github.com/j-hui/fidget.nvim/tags
-    #   url = "github:j-hui/fidget.nvim/v1.4.5";
-    #   flake = false;
-    # };
-    # nvim-lint-src = {
-    #   url = "github:mfussenegger/nvim-lint";
-    #   flake = false;
-    # };
-    # tiny-inline-diagnostic-nvim-src = {
-    #   url = "github:rachartier/tiny-inline-diagnostic.nvim";
-    #   flake = false;
-    # };
-    # snipe-nvim-src = {
-    #   url = "github:leath-dub/snipe.nvim";
-    #   flake = false;
-    # };
-
-    # Tree-Sitter Grammars
-    tree-sitter-bash = {
-      url = "github:tree-sitter/tree-sitter-bash/master";
-      flake = false;
-    };
-    tree-sitter-python = {
-      url = "github:tree-sitter/tree-sitter-python/master";
-      flake = false;
-    };
-    tree-sitter-lua = {
-      url = "github:MunifTanjim/tree-sitter-lua/main";
-      flake = false;
-    };
-    tree-sitter-ini = {
-      url = "github:justinmk/tree-sitter-ini";
-      flake = false;
-    };
-    tree-sitter-puppet = {
-      url = "github:amaanq/tree-sitter-puppet";
-      flake = false;
-    };
-    tree-sitter-rasi = {
-      url = "github:Fymyte/tree-sitter-rasi";
-      flake = false;
-    };
-    tree-sitter-vimdoc = {
-      url = "github:neovim/tree-sitter-vimdoc";
-      flake = false;
-    };
-
     # MPV Scripts
     zenyd-mpv-scripts = {
       url = "github:zenyd/mpv-scripts";
       flake = false;
     };
 
-    # # Git alternative
+    # Zellij Switcher
-    # # Fixes: https://github.com/martinvonz/jj/issues/4784
+    zellij-switch = {
-    # jujutsu = {
+      url = "github:mostafaqanbaryan/zellij-switch";
-    #   url = "github:martinvonz/jj";
+      inputs.nixpkgs.follows = "nixpkgs";
-    #   inputs.nixpkgs.follows = "nixpkgs";
+    };
-    # };
 
-    # Nextcloud Apps
+    # Text editor
-    nextcloud-news = {
+    helix = {
-      # https://github.com/nextcloud/news/releases
+      url = "github:helix-editor/helix";
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
-      flake = false;
     };
-    nextcloud-external = {
+
-      # https://github.com/nextcloud-releases/external/releases
+    # Terminal file manager
-      url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
+    yazi = {
-      flake = false;
+      url = "github:sxyazi/yazi";
-    };
+      inputs.nixpkgs.follows = "nixpkgs";
-    nextcloud-cookbook = {
-      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
-      flake = false;
-    };
-    nextcloud-snappymail = {
-      # https://github.com/the-djmaze/snappymail/releases
-      # https://snappymail.eu/repository/nextcloud
-      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
-      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
-      flake = false;
     };
+
+    # # Nextcloud Apps
+    # nextcloud-news = {
+    #   # https://github.com/nextcloud/news/releases
+    #   url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
+    #   flake = false;
+    # };
+    # nextcloud-external = {
+    #   # https://github.com/nextcloud-releases/external/releases
+    #   url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
+    #   flake = false;
+    # };
+    # nextcloud-cookbook = {
+    #   # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
+    #   url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
+    #   flake = false;
+    # };
+    # nextcloud-snappymail = {
+    #   # https://github.com/the-djmaze/snappymail/releases
+    #   # https://snappymail.eu/repository/nextcloud
+    #   url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
+    #   # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
+    #   flake = false;
+    # };
   };
 
   outputs =
     { nixpkgs, ... }@inputs:
 
     let
-
+      hostnames =
-      # Global configuration for my systems
-      globals =
         let
           baseName = "masu.rs";
         in
-        rec {
+        {
-          user = "noah";
+          audiobooks = "read.${baseName}";
-          fullName = "Noah Masur";
+          bookmarks = "keep.${baseName}";
-          gitName = fullName;
+          books = "books.${baseName}";
-          gitEmail = "7386960+nmasur@users.noreply.github.com";
+          budget = "money.${baseName}";
-          mail.server = "noahmasur.com";
+          content = "cloud.${baseName}";
-          mail.imapHost = "imap.purelymail.com";
+          download = "download.${baseName}";
-          mail.smtpHost = "smtp.purelymail.com";
+          files = "files.${baseName}";
-          dotfilesRepo = "https://github.com/nmasur/dotfiles";
+          git = "git.${baseName}";
-          hostnames = {
+          imap = "imap.purelymail.com";
-            audiobooks = "read.${baseName}";
+          influxdb = "influxdb.${baseName}";
-            books = "books.${baseName}";
+          irc = "irc.${baseName}";
-            budget = "money.${baseName}";
+          mail = "noahmasur.com";
-            content = "cloud.${baseName}";
+          mathesar = "mathesar.${baseName}";
-            download = "download.${baseName}";
+          metrics = "metrics.${baseName}";
-            files = "files.${baseName}";
+          minecraft = "minecraft.${baseName}";
-            git = "git.${baseName}";
+          n8n = "n8n.${baseName}";
-            imap = "imap.purelymail.com";
+          notifications = "ntfy.${baseName}";
-            influxdb = "influxdb.${baseName}";
+          paperless = "paper.${baseName}";
-            irc = "irc.${baseName}";
+          photos = "photos.${baseName}";
-            mail = "noahmasur.com";
+          postgresql = "pg.${baseName}";
-            metrics = "metrics.${baseName}";
+          prometheus = "prom.${baseName}";
-            minecraft = "minecraft.${baseName}";
+          secrets = "vault.${baseName}";
-            n8n = "n8n.${baseName}";
+          smtp = "smtp.purelymail.com";
-            notifications = "ntfy.${baseName}";
+          status = "status.${baseName}";
-            paperless = "paper.${baseName}";
+          stream = "stream.${baseName}";
-            photos = "photos.${baseName}";
+          transmission = "transmission.${baseName}";
-            prometheus = "prom.${baseName}";
-            secrets = "vault.${baseName}";
-            smtp = "smtp.purelymail.com";
-            status = "status.${baseName}";
-            stream = "stream.${baseName}";
-            transmission = "transmission.${baseName}";
-          };
         };
 
-      # Common overlays to always use
-      overlays = [
-        inputs.nur.overlays.default
-        inputs.nix2vim.overlay
-        # inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784
-        # (import ./overlays/neovim-plugins.nix inputs)
-        # (import ./overlays/tree-sitter.nix inputs)
-        # (import ./overlays/mpv-scripts.nix inputs)
-        # (import ./overlays/nextcloud-apps.nix inputs)
-        # (import ./overlays/pkgs.nix)
-      ] ++ (import ./overlays inputs);
-
-      # System types to support.
-      supportedSystems = [
-        "x86_64-linux"
-        "x86_64-darwin"
-        "aarch64-linux"
-        "aarch64-darwin"
-      ];
-
-      # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
-      # { system -> pkgs }
-      pkgsBySystem = forAllSystems (
-        system:
-        import nixpkgs {
-          inherit system overlays;
-          config.permittedInsecurePackages = [ "litestream-0.3.13" ];
-          config.allowUnfree = true;
-        }
-      );
-      # stablePkgsBySystem = forAllSystems (system: import nixpkgs { inherit system overlays; });
-
-      buildHome =
-        { pkgs, modules }:
-        inputs.home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = modules ++ [
-            ./platforms/home-manager
-          ];
-        };
-
-      buildNixos =
-        { pkgs, modules }:
-        nixpkgs.lib.nixosSystem {
-          inherit pkgs;
-          modules = modules ++ [
-            inputs.home-manager.nixosModules.home-manager
-            inputs.disko.nixosModules.disko
-            inputs.wsl.nixosModules.wsl
-            ./platforms/nixos
-            {
-              home-manager.extraSpecialArgs = {
-                hostnames = globals.hostnames;
-              };
-            }
-          ];
-          specialArgs = {
-            hostnames = globals.hostnames;
-          };
-        };
-
-      buildDarwin =
-        { pkgs, modules }:
-        inputs.darwin.lib.darwinSystem {
-          inherit pkgs;
-          modules = modules ++ [
-            inputs.home-manager.darwinModules.home-manager
-            inputs.mac-app-util.darwinModules.default
-            ./platforms/nix-darwin
-          ];
-        };
-
-      x86_64-linux-hosts = (import ./hosts-by-platform nixpkgs).x86_64-linux-hosts;
-      aarch64-linux-hosts = (import ./hosts-by-platform nixpkgs).aarch64-linux-hosts;
-      aarch64-darwin-hosts = (import ./hosts-by-platform nixpkgs).aarch64-darwin-hosts;
-
     in
     rec {
 
-      # The plan
+      lib = import ./lib inputs;
-      # Import all the host configurations as modules
+      flattenAttrset = attrs: builtins.foldl' lib.mergeAttrs { } (builtins.attrValues attrs);
-      # Setup the modules as nixosModules, homeModules, darwinModules
-      # Create nixosConfigurations using the different pkgs for each system
-      # What to do with home config?
 
-      nixosModules = x86_64-linux-hosts // aarch64-linux-hosts;
+      nixosConfigurations = flattenAttrset (
-      darwinModules = aarch64-darwin-hosts;
+        builtins.mapAttrs (
+          system: hosts:
+          builtins.mapAttrs (
+            name: module:
+            lib.buildNixos {
+              inherit system module;
+              specialArgs = { inherit hostnames; };
+            }
+          ) hosts
+        ) lib.linuxHosts
+      );
 
-      inherit buildDarwin pkgsBySystem;
+      darwinConfigurations = flattenAttrset (
+        builtins.mapAttrs (
+          system: hosts:
+          builtins.mapAttrs (
+            name: module:
+            lib.buildDarwin {
+              inherit system module;
+              specialArgs = { inherit hostnames; };
+            }
+          ) hosts
+        ) lib.darwinHosts
+      );
 
-      # Contains my full system builds, including home-manager
+      homeModules = builtins.mapAttrs (
-      # nixos-rebuild switch --flake .#tempest
+        system: hosts:
-      nixosConfigurations =
+        builtins.mapAttrs (
-        (builtins.mapAttrs (
+          name: module: (builtins.head (lib.attrsToList module.home-manager.users)).value
-          name: module:
+        ) hosts
-          buildNixos {
+      ) lib.hosts;
-            pkgs = pkgsBySystem.x86_64-linux;
-            modules = [ module ];
-          }
-        ) x86_64-linux-hosts)
-        // (builtins.mapAttrs (
-          name: module:
-          buildNixos {
-            pkgs = pkgsBySystem.aarch64-linux;
-            modules = [ module ];
-          }
-        ) aarch64-linux-hosts);
 
-      # Contains my full Mac system builds, including home-manager
+      homeConfigurations = flattenAttrset (
-      # darwin-rebuild switch --flake .#lookingglass
+        builtins.mapAttrs (
-      darwinConfigurations = builtins.mapAttrs (
+          system: hosts:
-        name: module:
+          builtins.mapAttrs (
-        buildDarwin {
+            name: module:
-          pkgs = pkgsBySystem.aarch64-darwin;
+            lib.buildHome {
-          modules = [ module ];
+              inherit system module;
-        }
+              specialArgs = { inherit hostnames; };
-      ) aarch64-darwin-hosts;
+            }
-
+          ) hosts
-      # For quickly applying home-manager settings with:
+        ) homeModules
-      # home-manager switch --flake .#tempest
+      );
-      homeConfigurations = builtins.mapAttrs (
-        name: module:
-        buildHome {
-          pkgs = pkgsBySystem.x86_64-linux;
-          module = [ module ];
-        }
-      ) nixosModules;
 
       # Disk formatting, only used once
       diskoConfigurations = {
-        root = import ./disks/root.nix;
+        root = import ./hosts/x86_64-linux/swan/root.nix;
       };
 
+      generators = builtins.mapAttrs (
+        # x86_64-linux = { arrow = ...; swan = ...; }
+        system: hosts:
+        (lib.concatMapAttrs (name: module: {
+          "${name}-aws" = lib.generateImage {
+            inherit system module;
+            format = "amazon";
+            specialArgs = { inherit hostnames; };
+          };
+          "${name}-iso" = lib.generateImage {
+            inherit system module;
+            format = "iso";
+            specialArgs = { inherit hostnames; };
+          };
+          "${name}-qcow" = lib.generateImage {
+            inherit system module;
+            format = "qcow-efi";
+            specialArgs = { inherit hostnames; };
+            # extraModules = [ "${nixpkgs}/nixos/modules/virtualisation/oci-image.nix" ];
+          };
+        }) hosts)
+      ) lib.linuxHosts # x86_64-linux = { arrow = ...; swan = ...; }
+      ;
+
       # packages =
-      #   let
+      #   lib.forSystems lib.linuxSystems (
-      #     staff =
+      #     system: generateImagesForHosts system // lib.pkgsBySystem.${system}.nmasur
-      #       system:
+      #   )
-      #       import ./hosts/staff {
+      #   // lib.forSystems lib.darwinSystems (system: lib.pkgsBySystem.${system}.nmasur);
-      #         inherit
-      #           inputs
-      #           globals
-      #           overlays
-      #           system
-      #           ;
-      #       };
-      #     neovim =
-      #       system:
-      #       let
-      #         pkgs = import nixpkgs { inherit system overlays; };
-      #       in
-      #       import ./modules/common/neovim/package {
-      #         inherit pkgs;
-      #         colors = (import ./colorscheme/gruvbox-dark).dark;
-      #       };
-      #   in
-      #   {
-      #     x86_64-linux.staff = staff "x86_64-linux";
-      #     x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
-      #       system = "x86_64-linux";
-      #       format = "iso";
-      #       modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
-      #     };
-      #     x86_64-linux.arrow-aws = inputs.nixos-generators.nixosGenerate rec {
-      #       system = "x86_64-linux";
-      #       format = "amazon";
-      #       modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
-      #         (
-      #           { ... }:
-      #           {
-      #             boot.kernelPackages = inputs.nixpkgs.legacyPackages.x86_64-linux.linuxKernel.packages.linux_6_6;
-      #             amazonImage.sizeMB = 16 * 1024;
-      #             permitRootLogin = "prohibit-password";
-      #             boot.loader.systemd-boot.enable = inputs.nixpkgs.lib.mkForce false;
-      #             boot.loader.efi.canTouchEfiVariables = inputs.nixpkgs.lib.mkForce false;
-      #             services.amazon-ssm-agent.enable = true;
-      #             users.users.ssm-user.extraGroups = [ "wheel" ];
-      #           }
-      #         )
-      #       ];
-      #     };
 
-      #   # Package Neovim config into standalone package
+      packages = lib.forAllSystems (
-      #   x86_64-linux.neovim = neovim "x86_64-linux";
-      #   x86_64-darwin.neovim = neovim "x86_64-darwin";
-      #   aarch64-linux.neovim = neovim "aarch64-linux";
-      #   aarch64-darwin.neovim = neovim "aarch64-darwin";
-      # };
-
-      mypackages = forAllSystems (system: pkgsBySystem.${system}.nmasur);
-
-      packages = mypackages;
-
-      # Programs that can be run by calling this flake
-      apps = forAllSystems (
         system:
-        let
+        # Share the custom packages that I have placed under the nmasur namespace
-          pkgs = import nixpkgs { inherit system overlays; };
+        lib.pkgsBySystem.${system}.nmasur
-        in
+        //
-        import ./apps { inherit pkgs; }
+          # Share generated images for each relevant host
+          (if (lib.hasInfix "linux" system) then generators.${system} else { })
+
+        # //
+        #   # Oracle
+        #   {
+        #     flame-oci = nixosConfigurations.flame.config.system.build.OCIImage;
+        #   }
       );
 
       # Development environments
-      devShells = forAllSystems (
+      devShells = lib.forAllSystems (system: {
+        default = lib.pkgsBySystem.${system}.nmasur.dotfiles-devshell;
+      });
+
+      checks = lib.forAllSystems (
         system:
         let
-          pkgs = import nixpkgs { inherit system overlays; };
+          pkgs = import nixpkgs {
-        in
+            inherit system;
-        {
+            overlays = lib.overlays;
-
-          # Used to run commands and edit files in this repo
-          default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              git
-              stylua
-              nixfmt-rfc-style
-              shfmt
-              shellcheck
-            ];
           };
-        }
-      );
-
-      checks = forAllSystems (
-        system:
-        let
-          pkgs = import nixpkgs { inherit system overlays; };
         in
         {
           neovim =
@@ -499,15 +276,18 @@
         }
       );
 
-      formatter = forAllSystems (
+      formatter = lib.forAllSystems (
         system:
         let
-          pkgs = import nixpkgs { inherit system overlays; };
+          pkgs = import nixpkgs {
+            inherit system;
+            inherit (lib) overlays;
+          };
         in
         pkgs.nixfmt-rfc-style
       );
 
       # Templates for starting other projects quickly
-      templates = (import ./templates nixpkgs.lib);
+      templates = (import ./templates { inherit lib; });
     };
 }

hosts-by-platform/aarch64-linux/default.nix

@@ -1,22 +0,0 @@
-# Return a list of all NixOS hosts
-
-{ nixpkgs, ... }:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Remove this file
-  (builtins.filter (name: name != ./default.nix))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]

hosts-by-platform/aarch64-linux/flame/default.nix

@@ -1,58 +0,0 @@
-# The Flame
-# System configuration for an Oracle free server
-
-# How to install:
-# https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
-# These days, probably use nixos-anywhere instead.
-
-rec {
-  networking.hostName = "flame";
-
-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
-  };
-
-  nmasur.profiles = {
-    base.enable = true;
-    server.enable = true;
-    communications.enable = true;
-  };
-
-  home-manager.users."noah" = {
-    nmasur.settings = {
-      username = nmasur.settings.username;
-      fullName = nmasur.settings.fullName;
-    };
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-    };
-    home.stateVersion = "23.05";
-  };
-
-  system.stateVersion = "23.05";
-  # File systems must be declared in order to boot
-
-  # This is the root filesystem containing NixOS
-  # I forgot to set a clean label for it
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
-    fsType = "ext4";
-  };
-
-  # This is the boot filesystem for systemd-boot
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D5CA-237A";
-    fsType = "vfat";
-  };
-
-  # Allows private remote access over the internet
-  nmasur.presets.services.cloudflared = {
-    tunnel = {
-      id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
-      credentialsFile = ../../../private/cloudflared-flame.age;
-      ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
-    };
-  };
-}

hosts-old/aarch64-darwin/default.nix

@@ -1,18 +0,0 @@
-# Return a list of all nix-darwin hosts
-
-{ lib, ... }:
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Remove this file
-  (builtins.filter (name: name != ./default.nix))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]

hosts-old/aarch64-linux/default.nix

@@ -1,22 +0,0 @@
-# Return a list of all NixOS hosts
-
-{ nixpkgs, ... }:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Remove this file
-  (builtins.filter (name: name != ./default.nix))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]

hosts-old/x86_64-linux/arrow/default.nix

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

hosts-old/x86_64-linux/arrow/modules.nix

@@ -1,32 +0,0 @@
-{
-  inputs,
-  globals,
-  overlays,
-}:
-
-[
-  globals
-  inputs.home-manager.nixosModules.home-manager
-  {
-    nixpkgs.overlays = overlays;
-    networking.hostName = "arrow";
-    physical = false;
-    server = true;
-    gui.enable = false;
-    theme.colors = (import ../../colorscheme/gruvbox).dark;
-    publicKeys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpPU2G9rSF8Q6waH62IJexDCQ6lY+8ZyVufGE3xMDGw deploy"
-    ];
-    identityFile = "/home/${globals.user}/.ssh/id_ed25519";
-    cloudflare.enable = true;
-    services.openssh.enable = true;
-    services.caddy.enable = true;
-    services.n8n.enable = true;
-
-    # nix-index seems to eat up too much memory for Vultr
-    home-manager.users.${globals.user}.programs.nix-index.enable = inputs.nixpkgs.lib.mkForce false;
-  }
-  ../../modules/common
-  ../../modules/nixos
-]

hosts-old/x86_64-linux/default.nix

@@ -1,22 +0,0 @@
-# Return a list of all NixOS hosts
-
-{ nixpkgs, ... }:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Remove this file
-  (builtins.filter (name: name != ./default.nix))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]

hosts-old/x86_64-linux/hydra/default.nix

@@ -1,51 +0,0 @@
-# The Hydra
-# System configuration for WSL
-
-# See [readme](../README.md) to explain how this file works.
-
-{
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
-
-inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
-  specialArgs = { };
-  modules = [
-    ../../modules/common
-    ../../modules/nixos
-    ../../modules/wsl
-    globals
-    inputs.wsl.nixosModules.wsl
-    inputs.home-manager.nixosModules.home-manager
-    {
-      networking.hostName = "hydra";
-      nixpkgs.overlays = overlays;
-      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
-      gui.enable = false;
-      theme = {
-        colors = (import ../../colorscheme/gruvbox).dark;
-        dark = true;
-      };
-      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
-      wsl = {
-        enable = true;
-        wslConf.automount.root = "/mnt";
-        defaultUser = globals.user;
-        startMenuLaunchers = true;
-        nativeSystemd = true;
-        wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
-        interop.includePath = false; # Including Windows PATH will slow down Neovim command mode
-      };
-
-      neovim.enable = true;
-      mail.enable = true;
-      mail.aerc.enable = true;
-      mail.himalaya.enable = true;
-      dotfiles.enable = true;
-      lua.enable = true;
-    }
-  ];
-}

hosts-old/x86_64-linux/staff/default.nix

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

hosts/aarch64-darwin/lookingglass/default.nix

@@ -21,6 +21,7 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
+      host = "lookingglass";
     };
     nmasur.profiles = {
       common.enable = true;
@@ -29,9 +30,12 @@ rec {
       work.enable = true;
       experimental.enable = true;
     };
-    nmasur.presets.programs.git = {
+    nmasur.presets.programs.git-work.work = {
       name = "Noah-Masur_1701";
       email = "${nmasur.settings.username}@take2games.com";
     };
+    home.stateVersion = "23.05";
   };
+
+  system.stateVersion = 5;
 }

hosts/aarch64-linux/flame/default.nix

@@ -0,0 +1,168 @@
+# The Flame
+# System configuration for an Oracle free server
+
+# How to install:
+# https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
+# These days, probably use nixos-anywhere instead.
+
+rec {
+  networking.hostName = "flame";
+
+  nmasur.settings = {
+    username = "noah";
+    fullName = "Noah Masur";
+  };
+
+  nmasur.profiles = {
+    base.enable = true;
+    server.enable = true;
+    communications.enable = true;
+  };
+
+  home-manager.users."noah" = {
+    nmasur.settings = {
+      username = nmasur.settings.username;
+      fullName = nmasur.settings.fullName;
+      host = networking.hostName;
+    };
+    nmasur.profiles = {
+      common.enable = true;
+      linux-base.enable = true;
+      power-user.enable = true;
+    };
+    nmasur.presets.programs.helix.enable = true;
+    home.stateVersion = "23.05";
+  };
+
+  system.stateVersion = "23.05";
+  # File systems must be declared in order to boot
+
+  # # This is the root filesystem containing NixOS
+  # # I forgot to set a clean label for it
+  # fileSystems."/" = {
+  #   device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
+  #   fsType = "ext4";
+  # };
+
+  # # This is the boot filesystem for systemd-boot
+  # fileSystems."/boot" = {
+  #   device = "/dev/disk/by-uuid/D5CA-237A";
+  #   fsType = "vfat";
+  # };
+
+  # Allows private remote access over the internet
+  nmasur.presets.services.cloudflared = {
+    tunnel = {
+      id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
+      credentialsFile = ./cloudflared-flame.age;
+      ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
+    };
+  };
+
+  # Taken from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/oci-common.nix
+
+  # fileSystems."/" = {
+  #   device = "/dev/disk/by-label/nixos";
+  #   fsType = "ext4";
+  #   autoResize = true;
+  # };
+
+  # fileSystems."/boot" = {
+  #   device = "/dev/disk/by-label/ESP";
+  #   fsType = "vfat";
+  # };
+
+  boot.loader.efi.canTouchEfiVariables = false;
+  boot.loader.grub = {
+    device = "nodev";
+    splashImage = null;
+    extraConfig = ''
+      serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+      terminal_input --append serial
+      terminal_output --append serial
+    '';
+    efiInstallAsRemovable = true;
+    efiSupport = true;
+  };
+  boot.loader.systemd-boot.enable = false;
+
+  # https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/configuringntpservice.htm#Configuring_the_Oracle_Cloud_Infrastructure_NTP_Service_for_an_Instance
+  networking.timeServers = [ "169.254.169.254" ];
+
+  boot.growPartition = true;
+  boot.kernelParams = [
+    "net.ifnames=0"
+
+    "nvme.shutdown_timeout=10"
+    "nvme_core.shutdown_timeout=10"
+    "libiscsi.debug_libiscsi_eh=1"
+    "crash_kexec_post_notifiers"
+
+    # aarch64-linux
+    "console=ttyAMA0,115200n8"
+
+    # VNC console
+    "console=tty1"
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "virtio_net"
+    "virtio_pci"
+    "virtio_mmio"
+    "virtio_blk"
+    "virtio_scsi"
+    "9p"
+    "9pnet_virtio"
+  ];
+  boot.initrd.kernelModules = [
+    "virtio_balloon"
+    "virtio_console"
+    "virtio_rng"
+    "virtio_gpu"
+  ];
+
+  networking.useDHCP = true;
+  # networking = {
+  #   defaultGateway = "10.0.0.1";
+  #   interfaces.eth0 = {
+  #     ipAddress = throw "set your own";
+  #     prefixLength = 24;
+  #   };
+  # };
+
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        # device = "/dev/oracleoci/oraclevda"; # Consistent volume naming
+        device = "/dev/sda"; # Consistent volume naming
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+
+  # # Otherwise the instance may not have a working network-online.target,
+  # # making the fetch-ssh-keys.service fail
+  # networking.useNetworkd = true;
+}

hosts/default.nix

@@ -34,10 +34,11 @@ in
   ];
   x86_64-linux-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./x86_64-linux) [
     # Get only files ending in default.nix
-    (builtins.filter (name: lib.hasSuffix ".nix" name))
+    (builtins.filter (name: lib.hasSuffix "default.nix" name))
     # Import each host function
     (map (file: {
-      name = lib.removeSuffix ".nix" (builtins.baseNameOf file);
+      # name = lib.removeSuffix ".nix" (builtins.baseNameOf file);
+      name = builtins.baseNameOf (builtins.dirOf file);
       value = import file;
     }))
     # Convert to an attrset of hostname -> host function

hosts/x86_64-darwin/readme.md

@@ -0,0 +1 @@
+# No x86 Darwin Hosts Currently

hosts/x86_64-linux/arrow/default.nix

@@ -0,0 +1,47 @@
+# The Arrow
+# System configuration for temporary VM
+
+rec {
+  # Hardware
+  networking.hostName = "arrow";
+
+  nmasur.settings = {
+    username = "noah";
+    fullName = "Noah Masur";
+  };
+
+  nmasur.profiles = {
+    base.enable = true;
+    server.enable = true;
+  };
+
+  home-manager.users."noah" = {
+    nmasur.settings = {
+      username = nmasur.settings.username;
+      fullName = nmasur.settings.fullName;
+      host = networking.hostName;
+    };
+    nmasur.profiles = {
+      common.enable = true;
+      linux-base.enable = true;
+    };
+    home.stateVersion = "23.05";
+  };
+
+  system.stateVersion = "23.05";
+
+  # These filesystems are ignored by nixos-generators
+
+  # This is the root filesystem containing NixOS
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  # This is the boot filesystem for Grub
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
+  };
+
+}

hosts/x86_64-linux/hydra/default.nix

@@ -0,0 +1,54 @@
+# The Hydra
+# System configuration for WSL
+
+rec {
+  # Hardware
+  networking.hostName = "hydra";
+
+  nmasur.settings = {
+    username = "noah";
+    fullName = "Noah Masur";
+  };
+
+  nmasur.profiles = {
+    base.enable = true;
+    wsl.enable = true;
+  };
+
+  home-manager.users."noah" = {
+    nmasur.settings = {
+      username = nmasur.settings.username;
+      fullName = nmasur.settings.fullName;
+      host = networking.hostName;
+    };
+    nmasur.profiles = {
+      common.enable = true;
+      linux-base.enable = true;
+      power-user.enable = true;
+    };
+    home.stateVersion = "23.05";
+  };
+
+  system.stateVersion = "23.05";
+
+  # This is the root filesystem containing NixOS
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  # This is the boot filesystem for Grub
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
+  };
+
+  # Not sure what's necessary but too afraid to remove anything
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
+}

hosts/x86_64-linux/staff/default.nix

@@ -23,6 +23,7 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
+      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;
@@ -41,6 +42,9 @@ rec {
   # Not sure what's necessary but too afraid to remove anything
   # File systems must be declared in order to boot
 
+  # Required to have a boot loader to work
+  boot.loader.systemd-boot.enable = true;
+
   # This is the root filesystem containing NixOS
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";

hosts/x86_64-linux/swan/default.nix

@@ -7,21 +7,6 @@ rec {
   nmasur.settings = {
     username = "noah";
     fullName = "Noah Masur";
-    # hostnames =
-    #   let
-    #     baseName = "masu.rs";
-    #   in
-    #   {
-    #     audiobooks = "read.${baseName}";
-    #     books = "books.${baseName}";
-    #     content = "cloud.${baseName}";
-    #     download = "download.${baseName}";
-    #     files = "files.${baseName}";
-    #     paperless = "paper.${baseName}";
-    #     photos = "photos.${baseName}";
-    #     prometheus = "prom.${baseName}";
-    #     stream = "stream.${baseName}";
-    #   };
   };
 
   nmasur.profiles = {
@@ -29,20 +14,25 @@ rec {
     server.enable = true;
     home.enable = true;
     nas.enable = true;
+    shared-media.enable = true;
   };
 
   home-manager.users."noah" = {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
+      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;
       linux-base.enable = true;
+      power-user.enable = true;
     };
     home.stateVersion = "23.05";
   };
 
+  system.stateVersion = "23.05";
+
   # Not sure what's necessary but too afraid to remove anything
   boot.initrd.availableKernelModules = [
     "xhci_pci"
@@ -78,14 +68,14 @@ rec {
   # Sets root ext4 filesystem instead of declaring it manually
   disko = {
     enableConfig = true;
-    devices = (import ../../../disks/root.nix { disk = "/dev/nvme0n1"; });
+    devices = (import ./root.nix { disk = "/dev/nvme0n1"; });
   };
 
   # Allows private remote access over the internet
   nmasur.presets.services.cloudflared = {
     tunnel = {
       id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
-      credentialsFile = ../../private/cloudflared-swan.age;
+      credentialsFile = ./cloudflared-swan.age;
       ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
     };
   };

hosts/x86_64-linux/tempest/default.nix

@@ -17,10 +17,13 @@ rec {
     gaming.enable = true;
   };
 
+  nmasur.presets.services.grub.enable = true;
+
   home-manager.users."noah" = {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
+      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;
@@ -31,14 +34,11 @@ rec {
       developer.enable = true;
       experimental.enable = true;
     };
-    nmasur.presets.services.mbsync = {
-      user = nmasur.settings.username;
-      server = "noahmasur.com";
-    };
     home.stateVersion = "23.05";
   };
 
   system.stateVersion = "23.05";
+
   # Not sure what's necessary but too afraid to remove anything
   boot.initrd.availableKernelModules = [
     "nvme"
@@ -98,7 +98,7 @@ rec {
   nmasur.presets.services.cloudflared = {
     tunnel = {
       id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
-      credentialsFile = ../../../private/cloudflared-tempest.age;
+      credentialsFile = ./cloudflared-tempest.age;
       ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
     };
   };

lib/default.nix

@@ -0,0 +1,234 @@
+inputs:
+
+let
+  lib = inputs.nixpkgs.lib;
+in
+
+lib
+// rec {
+
+  # Returns all files in a directory matching a suffix
+  filesInDirectoryWithSuffix =
+    directory: suffix:
+    lib.pipe (lib.filesystem.listFilesRecursive directory) [
+      # Get only files ending in .nix
+      (builtins.filter (name: lib.hasSuffix suffix name))
+    ];
+
+  # Returns all files ending in .nix for a directory
+  nixFiles = directory: filesInDirectoryWithSuffix directory ".nix";
+
+  # Returns all files ending in default.nix for a directory
+  defaultFiles = directory: filesInDirectoryWithSuffix directory "default.nix";
+
+  # Imports all files in a directory and passes inputs
+  importOverlays =
+    directory:
+    lib.pipe (nixFiles directory) [
+      # Import each overlay file
+      (map (file: (import file) inputs))
+    ];
+
+  # Import default files as attrset with keys provided by parent directory
+  defaultFilesToAttrset =
+    directory:
+    lib.pipe (defaultFiles directory) [
+      # Import each file
+      (map (file: {
+        name = builtins.baseNameOf (builtins.dirOf file);
+        value = import file;
+      }))
+      # Convert to an attrset of parent dir name -> file
+      (builtins.listToAttrs)
+    ];
+
+  # [ package1/package.nix package2/package.nix package2/hello.sh ]
+  buildPkgsFromDirectoryAndPkgs =
+    directory: pkgs:
+    lib.pipe (filesInDirectoryWithSuffix directory "package.nix") [
+
+      # Apply callPackage to create a derivation
+      # Must use final.callPackage to avoid infinite recursion
+      # [ package1.drv package2.drv ]
+      (builtins.map (name: pkgs.callPackage name { }))
+
+      # Convert the list to an attrset with keys from pname or name attr
+      # { package1 = package1.drv, package2 = package2.drv }
+      (builtins.listToAttrs (
+        map (v: {
+          name = v."pname" or v."name";
+          value = v;
+        })
+      ))
+    ];
+
+  # Common overlays to always use
+  overlays = [
+    inputs.nur.overlays.default
+    inputs.nix2vim.overlay
+    inputs.zellij-switch.overlays.default
+    inputs.helix.overlays.default
+    inputs.yazi.overlays.default
+  ] ++ (importOverlays ../overlays);
+
+  # System types to support.
+  supportedSystems = [
+    "x86_64-linux"
+    "x86_64-darwin"
+    "aarch64-linux"
+    "aarch64-darwin"
+  ];
+
+  # Split system types by operating system
+  linuxSystems = builtins.filter (lib.hasSuffix "linux") supportedSystems;
+  darwinSystems = builtins.filter (lib.hasSuffix "darwin") supportedSystems;
+
+  # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
+  forSystems = systems: lib.genAttrs systems;
+  forAllSystems = lib.genAttrs supportedSystems;
+
+  # { x86_64-linux = { tempest = { settings = ...; }; }; };
+  hosts = forAllSystems (system: defaultFilesToAttrset ../hosts/${system});
+
+  linuxHosts = lib.filterAttrs (name: value: builtins.elem name linuxSystems) hosts;
+  darwinHosts = lib.filterAttrs (name: value: builtins.elem name darwinSystems) hosts;
+
+  # { system -> pkgs }
+  pkgsBySystem = forAllSystems (
+    system:
+    import inputs.nixpkgs {
+      inherit system overlays;
+      config.permittedInsecurePackages = [ "litestream-0.3.13" ];
+      config.allowUnfree = true;
+    }
+  );
+
+  colorscheme = defaultFilesToAttrset ../colorscheme;
+
+  homeModule = {
+    home-manager = {
+      # Include home-manager config in NixOS
+      sharedModules = nixFiles ../platforms/home-manager;
+      # Use the system-level nixpkgs instead of Home Manager's
+      useGlobalPkgs = lib.mkDefault true;
+      # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
+      # using multiple profiles for one user
+      useUserPackages = lib.mkDefault true;
+    };
+  };
+
+  buildHome =
+    {
+      system,
+      module,
+      specialArgs,
+    }:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = pkgsBySystem.${system};
+      modules = [
+        { imports = (nixFiles ../platforms/home-manager); }
+        module
+      ];
+      extraSpecialArgs = {
+        inherit colorscheme;
+      } // specialArgs;
+    };
+
+  buildNixos =
+    {
+      system,
+      module,
+      specialArgs,
+    }:
+    inputs.nixpkgs.lib.nixosSystem {
+      inherit specialArgs;
+      pkgs = pkgsBySystem.${system};
+      modules = [
+        inputs.home-manager.nixosModules.home-manager
+        inputs.disko.nixosModules.disko
+        inputs.wsl.nixosModules.wsl
+        { imports = (nixFiles ../platforms/nixos); }
+        module
+        {
+          home-manager = {
+            extraSpecialArgs = {
+              inherit colorscheme;
+            } // specialArgs;
+          } // homeModule.home-manager;
+        }
+      ];
+    };
+
+  buildDarwin =
+    {
+      system,
+      module,
+      specialArgs,
+    }:
+    inputs.darwin.lib.darwinSystem {
+      inherit system specialArgs;
+      modules = [
+        inputs.home-manager.darwinModules.home-manager
+        inputs.mac-app-util.darwinModules.default
+        {
+          imports = (nixFiles ../platforms/nix-darwin);
+          nixpkgs.pkgs = pkgsBySystem.${system};
+        }
+        module
+        {
+          home-manager = {
+            extraSpecialArgs = {
+              inherit colorscheme;
+            } // specialArgs;
+          } // homeModule.home-manager;
+        }
+      ];
+    };
+
+  generatorOptions = {
+    amazon = {
+      aws.enable = true;
+    };
+    iso = {
+      nmasur.profiles.wsl.enable = lib.mkForce false;
+      boot.loader.grub.enable = lib.mkForce false;
+    };
+    qcow-efi = {
+      nmasur.profiles.wsl.enable = lib.mkForce false;
+      boot.loader.grub.enable = lib.mkForce false;
+      fileSystems."/boot".device = lib.mkForce "/dev/disk/by-label/ESP";
+    };
+  };
+
+  generateImage =
+    {
+      system,
+      module,
+      format,
+      specialArgs,
+    }:
+    inputs.nixos-generators.nixosGenerate {
+      inherit system format;
+      pkgs = pkgsBySystem.${system};
+      modules = [
+        inputs.home-manager.nixosModules.home-manager
+        inputs.disko.nixosModules.disko
+        inputs.wsl.nixosModules.wsl
+        {
+          imports = (nixFiles ../platforms/nixos) ++ (nixFiles ../platforms/generators);
+        }
+        generatorOptions.${format}
+        module
+        {
+          home-manager = {
+            extraSpecialArgs = {
+              inherit colorscheme;
+            } // specialArgs;
+          } // homeModule.home-manager;
+        }
+      ];
+      specialArgs = {
+      } // specialArgs;
+    };
+
+}

modules/README.md

@@ -1,9 +0,0 @@
-# Modules
-
-| Module                         | Purpose                                     |
-| ---                            | ---                                         |
-| [common](./common/default.nix) | User programs and OS-agnostic configuration |
-| [darwin](./darwin/default.nix) | macOS-specific configuration                |
-| [nixos](./nixos/default.nix)   | NixOS-specific configuration                |
-| [wsl](./wsl/default.nix)       | WSL-specific configuration                  |
-

modules/common/default.nix

@@ -1,167 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-
-  imports = [
-    ./applications
-    ./mail
-    ./neovim
-    ./programming
-    ./repositories
-    ./shell
-  ];
-
-  options = {
-    # user = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Primary user of the system";
-    # };
-    # fullName = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Human readable name of the user";
-    # };
-    # userDirs = {
-    #   # Required to prevent infinite recursion when referenced by himalaya
-    #   download = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "XDG directory for downloads";
-    #     default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
-    #   };
-    # };
-    # identityFile = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Path to existing private key file.";
-    #   default = "/etc/ssh/ssh_host_ed25519_key";
-    # };
-    # homePath = lib.mkOption {
-    #   type = lib.types.path;
-    #   description = "Path of user's home directory.";
-    #   default = builtins.toPath (
-    #     if pkgs.stdenv.isDarwin then "/Users/${config.user}" else "/home/${config.user}"
-    #   );
-    # };
-    # dotfilesPath = lib.mkOption {
-    #   type = lib.types.path;
-    #   description = "Path of dotfiles repository.";
-    #   default = config.homePath + "/dev/personal/dotfiles";
-    # };
-    # dotfilesRepo = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Link to dotfiles repository HTTPS URL.";
-    # };
-    # unfreePackages = lib.mkOption {
-    #   type = lib.types.listOf lib.types.str;
-    #   description = "List of unfree packages to allow.";
-    #   default = [ ];
-    # };
-    # insecurePackages = lib.mkOption {
-    #   type = lib.types.listOf lib.types.str;
-    #   description = "List of insecure packages to allow.";
-    #   default = [ ];
-    # };
-    # hostnames = {
-    #   audiobooks = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for audiobook server (Audiobookshelf).";
-    #   };
-    #   budget = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for budgeting server (ActualBudget).";
-    #   };
-    #   files = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for files server (Filebrowser).";
-    #   };
-    #   git = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for git server (Gitea).";
-    #   };
-    #   metrics = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for metrics server.";
-    #   };
-    #   minecraft = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for Minecraft server.";
-    #   };
-    #   paperless = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for document server (paperless-ngx).";
-    #   };
-    #   photos = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for photo management (Immich).";
-    #   };
-    #   prometheus = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for Prometheus server.";
-    #   };
-    #   influxdb = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for InfluxDB2 server.";
-    #   };
-    #   secrets = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for passwords and secrets (Vaultwarden).";
-    #   };
-    #   stream = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for video/media library (Jellyfin).";
-    #   };
-    #   content = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for personal content system (Nextcloud).";
-    #   };
-    #   books = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for books library (Calibre-Web).";
-    #   };
-    #   download = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for download services.";
-    #   };
-    #   irc = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for IRC services.";
-    #   };
-    #   n8n = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for n8n automation.";
-    #   };
-    #   notifications = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for push notification services (ntfy).";
-    #   };
-    #   status = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for status page (Uptime-Kuma).";
-    #   };
-    #   transmission = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for peer2peer downloads (Transmission).";
-    #   };
-    # };
-  };
-
-  config =
-    let
-      stateVersion = "23.05";
-    in
-    {
-
-      # Allow specified unfree packages (identified elsewhere)
-      # Retrieves package object based on string name
-      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;
-
-      # Allow specified insecure packages (identified elsewhere)
-      nixpkgs.config.permittedInsecurePackages = config.insecurePackages;
-
-      # Pin a state version to prevent warnings
-      home-manager.users.${config.user}.home.stateVersion = stateVersion;
-      home-manager.users.root.home.stateVersion = stateVersion;
-    };
-}

modules/common/shell/work.nix

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

modules/darwin/homebrew.nix

@@ -0,0 +1,56 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  # Homebrew - Mac-specific packages that aren't in Nix
+  config = lib.mkIf pkgs.stdenv.isDarwin {
+
+    # # Requires Homebrew to be installed
+    system.activationScripts.preActivation.text = ''
+      if ! xcode-select --version 2>/dev/null; then
+        $DRY_RUN_CMD xcode-select --install
+      fi
+      if ! /opt/homebrew/bin/brew --version 2>/dev/null; then
+        $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      fi
+    '';
+
+    # Add homebrew paths to CLI path
+    home-manager.users.${config.user}.home.sessionPath = [
+      "/opt/homebrew/bin/"
+      "/opt/homebrew/opt/trash/bin/"
+    ];
+
+    homebrew = {
+      enable = true;
+      onActivation = {
+        autoUpdate = false; # Don't update during rebuild
+        cleanup = "zap"; # Uninstall all programs not declared
+        upgrade = true;
+      };
+      global = {
+        brewfile = true; # Run brew bundle from anywhere
+        lockfiles = false; # Don't save lockfile (since running from anywhere)
+      };
+      brews = [
+        "trash" # Delete files and folders to trash instead of rm
+      ];
+      casks = [
+        "1password" # 1Password will not launch from Nix on macOS
+        # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
+        "keybase" # GUI on Nix not available for macOS
+        # "logitech-g-hub" # Mouse and keyboard management
+        "logitune" # Logitech webcam firmware
+        "meetingbar" # Show meetings in menu bar
+        "scroll-reverser" # Different scroll style for mouse vs. trackpad
+        "notunes" # Don't launch Apple Music with the play button
+        "steam" # Not packaged for Nixon macOS
+        "epic-games" # Not packaged for Nix
+      ];
+    };
+  };
+}

overlays/bypass-paywalls-clean.nix

@@ -1,29 +0,0 @@
-inputs: _final: prev: {
-
-  # Based on:
-  # https://git.sr.ht/~rycee/nur-expressions/tree/master/item/pkgs/firefox-addons/default.nix#L34
-
-  bypass-paywalls-clean =
-    let
-      addonId = "magnolia@12.34";
-    in
-    prev.stdenv.mkDerivation rec {
-      pname = "bypass-paywalls-clean";
-      version = "4.0.6.0";
-      src = builtins.fetchGit {
-        url = "https://gitflic.ru/project/magnolia1234/bpc_uploads.git";
-        # owner = "magnolia1234";
-        # repo = "bpc_uploads";
-        ref = "main";
-        rev = "a3012f84bad9719760150832803f2ea07af8dae3";
-        # sha256 = "0000000000000000000000000000000000000000000000000000";
-      };
-      preferLocalBuild = true;
-      allowSubstitutes = true;
-      buildCommand = ''
-        dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-        mkdir -p "$dst"
-        install -v -m644 "${src}" "$dst/${addonId}.xpi"
-      '';
-    };
-}

overlays/default.nix

@@ -1,16 +0,0 @@
-# Return a list of all overlays
-
-inputs:
-
-let
-  lib = inputs.nixpkgs.lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in .nix
-  (builtins.filter (name: lib.hasSuffix ".nix" name))
-  # Remove this file
-  (builtins.filter (name: name != ./default.nix))
-  # Import each overlay file
-  (map (file: (import file) inputs))
-]

overlays/tree-sitter.nix

@@ -1,43 +0,0 @@
-inputs: _final: prev: {
-  tree-sitter-grammars = prev.tree-sitter-grammars // {
-
-    # Fix: bash highlighting doesn't work as of this commit:
-    # https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
-    tree-sitter-bash = prev.tree-sitter-grammars.tree-sitter-bash.overrideAttrs (old: {
-      src = inputs.tree-sitter-bash;
-    });
-
-    # Fix: invalid node in position. Broken as of this commit (replaced with newer):
-    # https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5
-    tree-sitter-python = prev.tree-sitter-grammars.tree-sitter-python.overrideAttrs (old: {
-      src = inputs.tree-sitter-python;
-    });
-
-    # Fix: invalid structure in position.
-    tree-sitter-lua = prev.tree-sitter-grammars.tree-sitter-lua.overrideAttrs (old: {
-      src = inputs.tree-sitter-lua;
-    });
-
-    # Add grammars not in nixpks
-    tree-sitter-ini = prev.tree-sitter.buildGrammar {
-      language = "ini";
-      version = "1.0.0";
-      src = inputs.tree-sitter-ini;
-    };
-    tree-sitter-puppet = prev.tree-sitter.buildGrammar {
-      language = "puppet";
-      version = "1.0.0";
-      src = inputs.tree-sitter-puppet;
-    };
-    tree-sitter-rasi = prev.tree-sitter.buildGrammar {
-      language = "rasi";
-      version = "0.1.1";
-      src = inputs.tree-sitter-rasi;
-    };
-    tree-sitter-vimdoc = prev.tree-sitter.buildGrammar {
-      language = "vimdoc";
-      version = "2.1.0";
-      src = inputs.tree-sitter-vimdoc;
-    };
-  };
-}

pkgs/applications/editors/neovim/nmasur/neovim/config/colors.nix

@@ -8,20 +8,39 @@
 
   # Sets Neovim colors based on Nix colorscheme
 
-  # options.colors = lib.mkOption {
+  options.colors = lib.mkOption {
-  #   type = lib.types.attrsOf lib.types.str;
+    type = lib.types.nullOr (lib.types.attrsOf lib.types.str);
-  #   description = "Attrset of base16 colorscheme key value pairs.";
+    description = "Attrset of base16 colorscheme key value pairs.";
-  # };
+    default = {
+      # Nord
+      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";
+    };
+  };
 
-  # config = lib.mkIf config.colors {
+  config = lib.mkIf (config.colors != null) {
-  #   plugins = [ pkgs.vimPlugins.base16-nvim ];
+    plugins = [ pkgs.vimPlugins.base16-nvim ];
-  #   setup.base16-colorscheme = config.colors;
+    setup.base16-colorscheme = config.colors;
-  #
+
-  #   # Telescope isn't working, shut off for now
+    # Telescope isn't working, shut off for now
-  #   lua = ''
+    lua = ''
-  #     require('base16-colorscheme').with_config {
+      require('base16-colorscheme').with_config {
-  #         telescope = false,
+          telescope = false,
-  #     }
+      }
-  #   '';
+    '';
-  # };
+  };
 }

pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix

@@ -8,9 +8,9 @@
 {
 
   # Terraform optional because non-free
-  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
+  options.enableTerraform = lib.mkEnableOption "Whether to enable Terraform LSP";
-  options.github = lib.mkEnableOption "Whether to enable GitHub features";
+  options.enableGithub = lib.mkEnableOption "Whether to enable GitHub features";
-  options.kubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
+  options.enableKubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
 
   config = {
     plugins = [
@@ -54,7 +54,7 @@
 
     use.lspconfig.terraformls.setup = dsl.callWith {
       cmd =
-        if config.terraform then
+        if config.enableTerraform then
           [
             "${pkgs.terraform-ls}/bin/terraform-ls"
             "serve"
@@ -93,7 +93,7 @@
         nix = [ "nixfmt" ];
         rust = [ "rustfmt" ];
         sh = [ "shfmt" ];
-        terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
+        terraform = if config.enableTerraform then [ "terraform_fmt" ] else [ ];
         hcl = [ "hcl" ];
       };
       formatters = {
@@ -110,7 +110,7 @@
             "-ci"
           ];
         };
-        terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+        terraform_fmt.command = if config.enableTerraform then "${pkgs.terraform}/bin/terraform" else "";
         hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
       };
     };

pkgs/applications/editors/neovim/nmasur/neovim/config/syntax.nix

@@ -2,26 +2,24 @@
 {
 
   plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (
+    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins: [
-      _plugins: with pkgs.tree-sitter-grammars; [
+      pkgs.nmasur.ini-grammar
-        tree-sitter-bash
+      pkgs.nmasur.puppet-grammar
-        tree-sitter-c
+      pkgs.nmasur.rasi-grammar
-        tree-sitter-fish
+      pkgs.nmasur.vimdoc-grammar
-        tree-sitter-hcl
+      pkgs.tree-sitter-grammars.tree-sitter-bash
-        tree-sitter-ini
+      pkgs.tree-sitter-grammars.tree-sitter-c
-        tree-sitter-json
+      pkgs.tree-sitter-grammars.tree-sitter-fish
-        tree-sitter-lua
+      pkgs.tree-sitter-grammars.tree-sitter-hcl
-        tree-sitter-markdown
+      pkgs.tree-sitter-grammars.tree-sitter-json
-        tree-sitter-markdown-inline
+      pkgs.tree-sitter-grammars.tree-sitter-lua
-        tree-sitter-nix
+      pkgs.tree-sitter-grammars.tree-sitter-markdown
-        tree-sitter-puppet
+      pkgs.tree-sitter-grammars.tree-sitter-markdown-inline
-        tree-sitter-python
+      pkgs.tree-sitter-grammars.tree-sitter-nix
-        tree-sitter-rasi
+      pkgs.tree-sitter-grammars.tree-sitter-python
-        tree-sitter-toml
+      pkgs.tree-sitter-grammars.tree-sitter-toml
-        tree-sitter-vimdoc
+      pkgs.tree-sitter-grammars.tree-sitter-yaml
-        tree-sitter-yaml
+    ]))
-      ]
-    ))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim

pkgs/applications/editors/neovim/nmasur/neovim/config/toggleterm.nix

@@ -18,7 +18,7 @@
 
   lua = ''
     ${builtins.readFile ./toggleterm.lua}
-    ${if config.github then (builtins.readFile ./github.lua) else ""}
+    ${if config.enableGithub then (builtins.readFile ./github.lua) else ""}
-    ${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
+    ${if config.enableKubernetes then (builtins.readFile ./kubernetes.lua) else ""}
   '';
 }

pkgs/applications/editors/neovim/nmasur/neovim/package.nix

@@ -28,10 +28,10 @@
 
 {
   pkgs,
-  # colors ? null,
+  colors ? null,
-  # terraform ? false,
+  enableTerraform ? false,
-  # github ? false,
+  enableGithub ? false,
-  # kubernetes ? false,
+  enableKubernetes ? false,
   ...
 }:
 
@@ -40,15 +40,15 @@
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
   inherit
-    # colors
+    colors
-    # terraform
+    enableTerraform
-    # github
+    enableGithub
-    # kubernetes
+    enableKubernetes
     ;
   imports = [
     ./config/align.nix
     ./config/bufferline.nix
-    # ./config/colors.nix
+    ./config/colors.nix
     ./config/completion.nix
     ./config/gitsigns.nix
     ./config/lsp.nix

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ini/package.nix

@@ -0,0 +1,12 @@
+{ pkgs, fetchFromGitHub }:
+
+pkgs.tree-sitter.buildGrammar {
+  language = "ini";
+  version = "1.3.0";
+  src = fetchFromGitHub {
+    owner = "justinmk";
+    repo = "tree-sitter-ini";
+    rev = "32b31863f222bf22eb43b07d4e9be8017e36fb31";
+    sha256 = "sha256-kWCaOIC81GP5EHCqzPZP9EUgYy39CZ6/8TVS6soB6Wo=";
+  };
+}

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-puppet/package.nix

@@ -0,0 +1,12 @@
+{ pkgs, fetchFromGitHub }:
+
+pkgs.tree-sitter.buildGrammar {
+  language = "puppet";
+  version = "1.3.0";
+  src = fetchFromGitHub {
+    owner = "tree-sitter-grammars";
+    repo = "tree-sitter-puppet";
+    rev = "15f192929b7d317f5914de2b4accd37b349182a6";
+    sha256 = "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=";
+  };
+}

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rasi/package.nix

@@ -0,0 +1,12 @@
+{ pkgs, fetchFromGitHub }:
+
+pkgs.tree-sitter.buildGrammar {
+  language = "rasi";
+  version = "0.1.2";
+  src = fetchFromGitHub {
+    owner = "Fymyte";
+    repo = "tree-sitter-rasi";
+    rev = "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa";
+    sha256 = "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=";
+  };
+}

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vimdoc/package.nix

@@ -0,0 +1,12 @@
+{ pkgs, fetchFromGitHub }:
+
+pkgs.tree-sitter.buildGrammar {
+  language = "vimdoc";
+  version = "3.0.0";
+  src = fetchFromGitHub {
+    owner = "neovim";
+    repo = "tree-sitter-vimdoc";
+    rev = "d2e4b5c172a109966c2ce0378f73df6cede39400";
+    sha256 = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=";
+  };
+}

pkgs/mathesar/package.nix

@@ -0,0 +1,295 @@
+{
+  runtimeShell,
+  python313,
+  python313Packages,
+  fetchFromGitHub,
+  fetchPypi,
+  fetchurl,
+  gettext,
+  unzip,
+  ...
+}:
+let
+
+  django-modern-rpc = python313Packages.buildPythonPackage rec {
+    pname = "django_modern_rpc";
+    version = "1.1.0";
+    src = fetchPypi {
+      inherit pname version;
+      hash = "sha256-+LBIfkBxe9lvfZIqPI2lFSshTZBL1NpmCWBAgToyJns=";
+    };
+    doCheck = false;
+    pyproject = true;
+    build-system = [
+      python313Packages.setuptools
+      python313Packages.wheel
+      python313Packages.poetry-core
+    ];
+  };
+  django-property-filter = python313Packages.buildPythonPackage rec {
+    pname = "django_property_filter";
+    version = "1.3.0";
+    src = fetchPypi {
+      inherit pname version;
+      hash = "sha256-dpsF4hm0S4lQ6tIRJ0bXgPjWTr1fq1NSCZP0M6L4Efk=";
+    };
+    doCheck = false;
+    pyproject = true;
+    build-system = [
+      python313Packages.setuptools
+      python313Packages.wheel
+      python313Packages.django
+      python313Packages.django-filter
+    ];
+  };
+  django-fernet-encrypted-fields = python313Packages.buildPythonPackage rec {
+    pname = "django-fernet-encrypted-fields";
+    version = "0.3.0";
+    src = fetchPypi {
+      inherit pname version;
+      hash = "sha256-OAMb2vFySm6IXuE3zGaivX3DcmxDjhiep+RHmewLqbM=";
+    };
+    doCheck = false;
+    pyproject = true;
+    build-system = [
+      python313Packages.setuptools
+      python313Packages.wheel
+    ];
+    propagatedBuildInputs = with python313Packages; [
+      django
+      cryptography
+    ];
+  };
+  drf-access-policy = python313Packages.buildPythonPackage rec {
+    pname = "drf-access-policy";
+    version = "1.5.0";
+    src = fetchPypi {
+      inherit pname version;
+      hash = "sha256-EsahQYIgjUBUSi/W8GXbc7pvYLPRJ6kpJg6A3RkrjL8=";
+    };
+    doCheck = false;
+    pyproject = true;
+    build-system = [
+      python313Packages.setuptools
+      python313Packages.wheel
+    ];
+    propagatedBuildInputs = with python313Packages; [
+      pyparsing
+      djangorestframework
+    ];
+  };
+
+  pythonPkg = python313.override {
+    self = python313;
+    packageOverrides = pyfinal: pyprev: {
+      inherit
+        django-modern-rpc
+        django-property-filter
+        django-fernet-encrypted-fields
+        drf-access-policy
+        # psycopg-binary
+        ;
+    };
+  };
+
+  python = pythonPkg.withPackages (
+    ps: with ps; [
+      gunicorn
+      django
+      clevercsv
+      django
+      dj-database-url
+      django-filter
+      django-modern-rpc
+      django-property-filter
+      djangorestframework
+      django-fernet-encrypted-fields
+      drf-access-policy
+      frozendict
+      gunicorn
+      psycopg
+      # psycopg-binary
+      psycopg2-binary
+      requests
+      sqlalchemy
+      whitenoise
+    ]
+  );
+
+  staticAssets = fetchurl {
+    url = "https://github.com/mathesar-foundation/mathesar/releases/download/0.2.2/static_files.zip";
+    sha256 = "sha256-1X2zFpCSwilUxhqHlCw/tg8C5zVcVL6CxDa9yh0ylGA=";
+  };
+
+in
+python313Packages.buildPythonApplication rec {
+  pname = "mathesar";
+  version = "0.2.2";
+  src = fetchFromGitHub {
+    owner = "mathesar-foundation";
+    repo = "mathesar";
+    rev = version;
+    sha256 = "sha256-LHxFJpPV0GJfokSPzfZQO44bBg/+QjXsk04Ry9uhUAs=";
+  };
+  format = "other";
+  nativeBuildInputs = [ unzip ];
+  propagatedBuildInputs = [
+    python.pkgs.gunicorn
+    python.pkgs.django
+  ];
+  buildInputs = [
+    gettext
+  ];
+  dependencies = [
+    pythonPkg.pkgs.clevercsv
+    pythonPkg.pkgs.django
+    pythonPkg.pkgs.dj-database-url
+    pythonPkg.pkgs.django-filter
+    pythonPkg.pkgs.django-modern-rpc
+    pythonPkg.pkgs.django-property-filter
+    pythonPkg.pkgs.djangorestframework
+    pythonPkg.pkgs.django-fernet-encrypted-fields
+    pythonPkg.pkgs.drf-access-policy
+    pythonPkg.pkgs.frozendict
+    pythonPkg.pkgs.gunicorn
+    pythonPkg.pkgs.psycopg
+    pythonPkg.pkgs.psycopg2-binary
+    pythonPkg.pkgs.requests
+    pythonPkg.pkgs.sqlalchemy
+    pythonPkg.pkgs.whitenoise
+  ];
+
+  # Manually unzip the extra zip file into a temporary directory
+  postUnpack = ''
+    mkdir -p $TMPDIR/unzipped
+    unzip ${staticAssets} -d $TMPDIR/unzipped
+  '';
+
+  # Override the default build phase to prevent it from looking for setup.py
+  # Add any non-Python build commands here if needed (e.g., building frontend assets)
+  buildPhase = ''
+    runHook preBuild
+
+    echo "Skipping standard Python build phase; application files copied in installPhase."
+    # If you had frontend assets to build, you'd run the command here, e.g.:
+    # npm install
+    # npm run build
+
+    runHook postBuild
+  '';
+
+  # This copies the application code into the Nix store output
+  installPhase = ''
+    runHook preInstall
+
+    # Destination: python's site-packages directory within $out
+    # This makes 'import mathesar', 'import db', etc. work more easily.
+    INSTALL_PATH="$out/lib/${python.libPrefix}/site-packages/${pname}"
+    mkdir -p "$INSTALL_PATH"
+
+    echo "Copying application code to $INSTALL_PATH"
+
+    # Copy all essential source directories needed at runtime
+    # Adjust this list based on mathesar's actual structure and runtime needs!
+    cp -r mathesar "$INSTALL_PATH/"
+    cp -r db "$INSTALL_PATH/"
+    cp -r config "$INSTALL_PATH/"
+    cp -r translations "$INSTALL_PATH/"
+    cp -r mathesar_ui "$INSTALL_PATH/" # If needed
+
+    # Copy the management script
+    cp manage.py "$INSTALL_PATH/"
+
+    # Copy assets from unzipped directory
+    mkdir -p "$INSTALL_PATH/mathesar/static/mathesar"
+    cp -r $TMPDIR/unzipped/static_files/* "$INSTALL_PATH/mathesar/static/mathesar"
+
+    # Create wrapper scripts in $out/bin for easy execution
+
+    mkdir -p $out/bin
+
+    # Wrapper for manage.py
+    # It ensures the app code is in PYTHONPATH and runs manage.py
+    echo "Creating manage.py wrapper..."
+    cat <<EOF > $out/bin/mathesar-manage
+    #!${python.interpreter}
+    import os
+    import sys
+
+    # Add the installation path to the Python path
+    sys.path.insert(0, "$INSTALL_PATH")
+
+    # Set DJANGO_SETTINGS_MODULE environment variable if required by mathesar
+    # You might need to adjust 'config.settings.production' to the actual settings file used
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.production')
+
+    # Change directory to where manage.py is, if necessary for relative paths
+    # os.chdir("$INSTALL_PATH")
+
+    print(f"Running manage.py from: $INSTALL_PATH/manage.py")
+    print(f"Python path includes: $INSTALL_PATH")
+    print(f"Executing with args: {sys.argv[1:]}")
+
+    # Find manage.py and execute it
+    manage_py_path = os.path.join("$INSTALL_PATH", "manage.py")
+    if not os.path.exists(manage_py_path):
+        print(f"Error: manage.py not found at {manage_py_path}", file=sys.stderr)
+        sys.exit(1)
+
+    # Prepare arguments for execute_from_command_line
+    # The first argument should be the script name itself
+    argv = [manage_py_path] + sys.argv[1:]
+
+    try:
+        from django.core.management import execute_from_command_line
+        execute_from_command_line(argv)
+    except Exception as e:
+        print(f"Error executing manage.py: {e}", file=sys.stderr)
+        # Optionally re-raise or exit with error
+        import traceback
+        traceback.print_exc()
+        sys.exit(1)
+
+    EOF
+    chmod +x $out/bin/mathesar-manage
+
+    # Wrapper for install
+    echo "Creating install wrapper..."
+    cat <<EOF > $out/bin/mathesar-install
+    #!${runtimeShell}
+    # Add the app to the Python Path
+    export PYTHONPATH="$INSTALL_PATH:\${"PYTHONPATH:-"}"
+
+    # Set Django settings module if needed
+    export DJANGO_SETTINGS_MODULE='config.settings.production'
+
+    # Change to the app directory
+    cd "$INSTALL_PATH"
+    ${python}/bin/python -m mathesar.install
+    EOF
+    chmod +x $out/bin/mathesar-install
+
+    # Wrapper for gunicorn (example)
+    # Assumes mathesar uses a standard wsgi entry point, e.g., config/wsgi.py
+    # Adjust 'config.wsgi:application' if necessary
+    echo "Creating gunicorn wrapper..."
+    cat <<EOF > $out/bin/mathesar-gunicorn
+    #!${runtimeShell}
+    # Add the app to the Python Path
+    export PYTHONPATH="$INSTALL_PATH:\${"PYTHONPATH:-"}"
+
+    # Set Django settings module if needed
+    export DJANGO_SETTINGS_MODULE='config.settings.production'
+
+    # Change to the app directory if gunicorn needs it
+    # cd "$INSTALL_PATH"
+
+    # Execute gunicorn, passing along any arguments
+    # Ensure the gunicorn package is in propagatedBuildInputs
+    exec ${python}/bin/gunicorn config.wsgi:application "\$@"
+    EOF
+    chmod +x $out/bin/mathesar-gunicorn
+
+    runHook postInstall
+  '';
+}

pkgs/misc/bypass-paywalls-clean/package.nix

@@ -5,11 +5,11 @@
 
 pkgs.stdenv.mkDerivation rec {
   pname = "bypass-paywalls-clean";
-  version = "4.0.6.0";
+  version = "4.1.1.4";
   src = builtins.fetchGit {
-    url = "https://gitflic.ru/project/magnolia1234/bpc_uploads.git";
+    url = "https://git.masu.rs/noah/bpc-uploads.git";
     ref = "main";
-    rev = "a3012f84bad9719760150832803f2ea07af8dae3";
+    rev = "9166b13355721b047878f259e04c2e9b476b4210";
   };
   preferLocalBuild = true;
   allowSubstitutes = true;

pkgs/prometheus-actual-exporter/package.nix

@@ -0,0 +1,91 @@
+{
+  lib,
+  fetchFromGitHub,
+  nodejs_20,
+  buildNpmPackage,
+  nodePackages,
+  python3,
+  gcc,
+  gnumake,
+}:
+let
+
+in
+
+buildNpmPackage (finalAttrs: rec {
+  pname = "prometheus-actual-exporter";
+
+  version = "1.1.5";
+
+  src = fetchFromGitHub {
+    owner = "sakowicz";
+    repo = "actual-budget-prometheus-exporter";
+    tag = version;
+    hash = "sha256-DAmWr1HngxAjhOJW9OnMfDqpxBcZT+Tpew/w/YYJIYU=";
+  };
+
+  patches = [ ./tsconfig.patch ];
+
+  npmDepsHash = "sha256-N8xqRYFelolNGTEhG22M7KJ7B5U/uW7o+/XfLF8rHMg=";
+
+  nativeBuildInputs = [
+    nodejs_20
+    nodePackages.typescript
+    python3
+    nodePackages.node-gyp
+    gcc
+    gnumake
+  ];
+
+  postPatch = ''
+    echo "Removing better-sqlite3 install script before npm install"
+    sed -i '/"install"/d' node_modules/better-sqlite3/package.json || true
+    sed -i '/"install"/d' package.json || true
+  '';
+
+  preBuild = ''
+    echo "Disabling prebuilt install script from better-sqlite3"
+    find node_modules/better-sqlite3 -name package.json -exec sed -i '/"install"/d' {} +
+    rm -f node_modules/better-sqlite3/build/Release/better_sqlite3.node || true
+  '';
+
+  buildPhase = ''
+    # export npm_config_build_from_source=true
+    # export npm_config_unsafe_perm=true
+    # export BINARY_SITE=none
+    # export PATH=${nodePackages.node-gyp}/bin:$PATH
+    # export npm_config_node_gyp=${nodePackages.node-gyp}/bin/node-gyp
+
+    # npm rebuild better-sqlite3 --build-from-source --verbose
+
+    npm run build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+    cp -r . $out/lib/prometheus-actual-exporter
+    makeWrapper ${lib.getExe nodejs_20} $out/bin/prometheus-actual-exporter \
+      --add-flags "$out/lib/prometheus-actual-exporter/dist/app.js"
+  '';
+
+  postInstall = ''
+    echo "Removing prebuilt .node and rebuilding better-sqlite3"
+
+    export npm_config_build_from_source=true
+    export npm_config_unsafe_perm=true
+    export BINARY_SITE=none
+    export PATH=${nodePackages.node-gyp}/bin:$PATH
+    export npm_config_node_gyp=${nodePackages.node-gyp}/bin/node-gyp
+
+    sed -i '/"install"/d' node_modules/better-sqlite3/package.json
+    rm -f node_modules/better-sqlite3/build/Release/better_sqlite3.node || true
+
+    npm rebuild better-sqlite3 --build-from-source --verbose
+  '';
+
+  meta = {
+    description = "Prometheus exporter for Actual Budget";
+    homepage = "https://github.com/sakowicz/actual-budget-prometheus-exporter";
+    mainProgram = "prometheus-actual-exporter";
+  };
+})

pkgs/prometheus-actual-exporter/tsconfig.patch

@@ -0,0 +1,12 @@
+diff --git a/tsconfig.json b/tsconfig.json
+index 5106135..3a340f6 100644
+--- a/tsconfig.json
++++ b/tsconfig.json
+@@ -8,5 +8,6 @@
+     "skipLibCheck": true,
+     "lib": ["es2020"],
+     "outDir": "./dist"
+-  }
++  },
++  "include": ["src/**/*", "app.ts"]
+ }

pkgs/tools/misc/default/package.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "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." }}'
+  echo ""
+  echo ""
+''

pkgs/tools/misc/dotfiles-devshell/package.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+pkgs.mkShell {
+  name = "dotfiles-devshell";
+  buildInputs = with pkgs; [
+    git
+    stylua
+    nixfmt-rfc-style
+    shfmt
+    shellcheck
+  ];
+}

pkgs/tools/misc/encrypt-secret/package.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "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
+''

pkgs/tools/misc/installer/package.nix

@@ -0,0 +1,44 @@
+{ 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!
+
+pkgs.writeShellScriptBin "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}
+''

pkgs/tools/misc/ocr/ocr.sh

@@ -8,7 +8,7 @@ TEXT_FILE="/tmp/ocr.txt"
 IMAGE_FILE="/tmp/ocr.png"
 
 function notify-send() {
-    /usr/bin/osascript -e "display notification \"$2\" with title \"OCR\""
+  /usr/bin/osascript -e "display notification \"$2\" with title \"OCR\""
 }
 
 PATH="/usr/local/bin/:$PATH"
@@ -32,8 +32,8 @@ STATUS=$?
 # specify /tmp/ocr.txt as the file path, tesseract would out the text to
 # /tmp/ocr.txt.txt
 cd /tmp || {
-    echo "Failed to jump to directory."
+  echo "Failed to jump to directory."
-    exit 1
+  exit 1
 }
 tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}"
 
@@ -41,8 +41,8 @@ tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}"
 # of lines in the file
 LINES=$(wc -l <$TEXT_FILE)
 if [ "$LINES" -eq 0 ]; then
-    notify-send "ocr" "no text was detected"
+  notify-send "ocr" "no text was detected"
-    exit 1
+  exit 1
 fi
 
 # Copy text to clipboard

pkgs/tools/misc/readme/package.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "readme" ''
+  ${pkgs.glow}/bin/glow --pager ${builtins.toString ../../../../README.md}
+''

pkgs/tools/misc/rebuild/package.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "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
+''

pkgs/tools/misc/reencrypt-secrets/package.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+
+# nix run github:nmasur/dotfiles#reencrypt-secrets ./private
+
+pkgs.writeShellScriptBin "reencrypt-secrets" ''
+  if [ $# -eq 0 ]; then
+    echo "Must provide directory to reencrypt."
+    exit 1
+  fi
+  encrypted=$1
+  find "''${1}" -type f -name "*.age" | while IFS= read -r encryptedfile; 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."
+''

platforms/generators/aws/default.nix

@@ -14,18 +14,19 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    # AWS settings require this
+    nmasur.presets.services.openssh-aws.enable = lib.mkDefault true;
-    permitRootLogin = "prohibit-password";
 
     # Make sure disk size is large enough
     # https://github.com/nix-community/nixos-generators/issues/150
-    amazonImage.sizeMB = 16 * 1024;
+    virtualisation.diskSize = lib.mkDefault (16 * 1024); # In MB
 
-    boot.kernelPackages = pkgs.legacyPackages.x86_64-linux.linuxKernel.packages.linux_6_6;
+    boot.kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_6_6;
     boot.loader.systemd-boot.enable = lib.mkForce false;
-    boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
+    boot.loader.efi.canTouchEfiVariables = lib.mkForce false; # Default, conflicts with tempest
-    services.amazon-ssm-agent.enable = true;
+    services.amazon-ssm-agent.enable = lib.mkDefault true;
     users.users.ssm-user.extraGroups = [ "wheel" ];
-
+    services.udisks2.enable = lib.mkForce false; # Off by default already; conflicts with gvfs for nautilus
+    boot.loader.grub.device = lib.mkForce "/dev/xvda"; # Default, conflicts with tempest
+    boot.loader.grub.efiSupport = lib.mkForce false; # Default, conflicts with tempest
   };
 }

platforms/generators/default.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-{
-  imports = lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-    # Get only files ending in .nix
-    (builtins.filter (name: lib.hasSuffix ".nix" name))
-    # Remove this file
-    (builtins.filter (name: name != ./default.nix))
-  ];
-}

platforms/home-manager/default.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-{
-  imports = lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-    # Get only files ending in .nix
-    (builtins.filter (name: lib.hasSuffix ".nix" name))
-    # Remove this file
-    (builtins.filter (name: name != ./default.nix))
-  ];
-}

platforms/home-manager/modules/nmasur/presets/fonts.nix

@@ -15,7 +15,7 @@ in
   config = lib.mkIf cfg.enable {
 
     home.packages = [
-      pkgs.victor-mono # Used for Vim and Terminal
+      pkgs.nerd-fonts.victor-mono # Used for Vim and Terminal
       pkgs.nerd-fonts.hack # For Polybar, Rofi
     ];
     fonts.fontconfig = {
@@ -33,6 +33,7 @@ in
     programs.alacritty.settings.font.normal.family = "VictorMono";
     programs.kitty.font.name = "VictorMono Nerd Font Mono";
     nmasur.presets.programs.wezterm.font = "VictorMono Nerd Font Mono";
+    programs.ghostty.settings.font-family = "VictorMono Nerd Font Mono";
     services.dunst.settings.global.font = "Hack Nerd Font 14";
   };
 }

platforms/home-manager/modules/nmasur/presets/programs/aerc.nix

@@ -183,6 +183,9 @@ in
           "audio/*" = "${pkgs.mpv}/bin/mpv -";
           "image/*" = "${pkgs.feh}/bin/feh -";
         };
+        compose = {
+          editor = config.home.sessionVariables.EDITOR;
+        };
       };
     };
     accounts.email.accounts.home.aerc = {
@@ -199,19 +202,28 @@ in
       exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} aerc %u";
     };
     xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
-      "${config.xsession.windowManager.i3.config.modifier}+Shift+e" = "exec ${
+      "${config.xsession.windowManager.i3.config.modifier}+Shift+e" =
-        # Don't name the script `aerc` or it will affect grep
+        let
-        builtins.toString (
+          terminal = config.nmasur.presets.services.i3.terminal;
-          pkgs.writeShellScript "focus-mail.sh" ''
+          startupCommand =
-            count=$(ps aux | grep -c aerc)
+            if terminal == pkgs.wezterm then
-            if [ "$count" -eq 1 ]; then
+              "start --class com.noah.aerc -- aerc"
-                i3-msg "exec --no-startup-id ${lib.getExe config.nmasur.presets.services.i3.terminal} start --class aerc -- aerc"
+            else
-                sleep 0.25
+              "--class=com.noah.aerc --command=aerc";
-            fi
+        in
-            i3-msg "[class=aerc] focus"
+        "exec ${
-          ''
+          # Don't name the script `aerc` or it will affect grep
-        )
+          builtins.toString (
-      }";
+            pkgs.writeShellScript "focus-mail.sh" ''
+              count=$(ps aux | grep -c aerc)
+              if [ "$count" -eq 1 ]; then
+                  i3-msg "exec --no-startup-id ${lib.getExe terminal} ${startupCommand}"
+                  sleep 0.25
+              fi
+              i3-msg "[class=com.noah.aerc] focus"
+            ''
+          )
+        }";
     };
 
     programs.fish.shellAbbrs = {

platforms/home-manager/modules/nmasur/presets/programs/atuin.nix

@@ -15,6 +15,7 @@ in
   config = lib.mkIf cfg.enable {
     programs.atuin = {
       enable = true;
+      daemon.enable = true;
       flags = [
         "--disable-up-arrow"
         "--disable-ctrl-r"
@@ -33,6 +34,7 @@ in
         secrets_filter = true;
         enter_accept = false;
         keymap_mode = "vim-normal";
+        records = true; # Sync v2
       };
     };
 

platforms/home-manager/modules/nmasur/presets/programs/aws-ssh/aws-ssh.nix

@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.nmasur.presets.programs.aws-ssh;
+in
+
+{
+  options.nmasur.presets.programs.aws-ssh.enable = lib.mkEnableOption "AWS SSH tools";
+
+  config = lib.mkIf cfg.enable {
+
+    # Ignore wine directories in searches
+    home.file.".ssh/aws-ssm-ssh-proxy-command.sh" = {
+      text = builtins.readFile ./aws-ssm-ssh-proxy-command.sh;
+      executable = true;
+    };
+
+  };
+}

platforms/home-manager/modules/nmasur/presets/programs/aws-ssh/aws-ssm-ssh-proxy-command.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+set -eu
+
+################################################################################
+#
+# For documentation see https://github.com/qoomon/aws-ssm-ssh-proxy-command
+#
+################################################################################
+
+getInstanceId() {
+  local instance_name="$1"
+  local instance_id=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${instance_name}" --query "Reservations[].Instances[?State.Name == 'running'].InstanceId" --output text)
+
+  echo "${instance_id}"
+}
+
+instance_name="$1"
+ssh_user="$2"
+ssh_port="$3"
+ssh_public_key_path="$4"
+
+ec2InstanceIdPattern='^m?i-[0-9a-f]{8,17}$'
+if [[ $instance_name =~ $ec2InstanceIdPattern ]]; then
+  instance_id=$instance_name
+else
+  instance_id=$(getInstanceId "$instance_name")
+
+  if [[ -z $instance_id ]]; then
+    echo "Found no running instances with name \"${instance_name}\"."
+    exit 1
+  else
+    echo "Instance ID for \"${instance_name}\": \"${instance_id}\""
+  fi
+fi
+
+REGION_SEPARATOR='--'
+if echo "$instance_id" | grep -q -e "${REGION_SEPARATOR}"; then
+  export AWS_REGION="${instance_id##*"${REGION_SEPARATOR}"}"
+  instance_id="${instance_id%%"$REGION_SEPARATOR"*}"
+fi
+
+>/dev/stderr echo "Add public key ${ssh_public_key_path} for ${ssh_user} at instance ${instance_id} for 10 seconds"
+ssh_public_key="$(cat "${ssh_public_key_path}")"
+aws ssm send-command \
+  --instance-ids "${instance_id}" \
+  --document-name 'AWS-RunShellScript' \
+  --comment "Add an SSH public key to authorized_keys for 10 seconds" \
+  --parameters commands="
+  \"
+    set -eu
+    
+    mkdir -p ~${ssh_user}/.ssh && cd ~${ssh_user}/.ssh
+
+    authorized_key='${ssh_public_key} ssm-session'
+    
+    echo \\\"\${authorized_key}\\\" >> authorized_keys
+    
+    sleep 10
+    
+    (grep -v -F \\\"\${authorized_key}\\\" authorized_keys || true) > authorized_keys~
+    mv authorized_keys~ authorized_keys
+  \"
+  "
+
+>/dev/stderr echo "Start ssm session to instance ${instance_id}"
+aws ssm start-session \
+  --target "${instance_id}" \
+  --document-name 'AWS-StartSSHSession' \
+  --parameters "portNumber=${ssh_port}"

platforms/home-manager/modules/nmasur/presets/programs/direnv.nix

@@ -17,6 +17,9 @@ in
     programs.direnv = {
       enable = true;
       nix-direnv.enable = true;
+      config = {
+        global.hide_env_diff = true;
+      };
     };
   };
 }

platforms/home-manager/modules/nmasur/presets/programs/firefox.nix

@@ -23,7 +23,7 @@ in
 
     programs.firefox = {
       enable = true;
-      package = if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
+      package = pkgs.firefox;
       profiles.default = {
         id = 0;
         name = "default";

platforms/home-manager/modules/nmasur/presets/programs/fish.nix

@@ -24,9 +24,12 @@ in
 
     nmasur.presets.programs.fish.fish_user_key_bindings = # fish
       ''
-        # Shift-Enter (defined by terminal)
+        for mode in insert default visual
-        bind -M insert \x1F accept-autosuggestion
+            # Shift-Enter (defined by terminal)
-        bind -M default \x1F accept-autosuggestion
+            bind -M $mode \x1F accept-autosuggestion
+            # Ctrl-f to accept auto-suggestions
+            bind -M $mode \cf forward-char
+        end
       '';
 
     programs.fish = {
@@ -40,6 +43,9 @@ in
           description = "Evaluate a bash-like environment variables file";
           body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
         };
+        fish_user_key_bindings = {
+          body = cfg.fish_user_key_bindings;
+        };
         ip = {
           body = lib.getExe pkgs.nmasur.ip-check;
         };

platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix

@@ -25,7 +25,13 @@ in
       functions = {
         edit = {
           description = "Open a file in Vim";
-          body = builtins.readFile ./fish/edit.fish;
+          body = # fish
+            ''
+              set vimfile (fzf)
+              and set vimfile (echo $vimfile | tr -d '\r')
+              and commandline -r "${builtins.baseNameOf config.home.sessionVariables.EDITOR} \"$vimfile\""
+              and commandline -f execute
+            '';
         };
         fcd = {
           description = "Jump to directory";
@@ -51,11 +57,40 @@ in
         };
         recent = {
           description = "Open a recent file in Vim";
-          body = builtins.readFile ./fish/recent.fish;
+          body = # fish
+            ''
+              set vimfile (fd -t f --exec /usr/bin/stat -f "%m%t%N" | sort -nr | cut -f2 | fzf)
+              and set vimfile (echo $vimfile | tr -d '\r')
+              and commandline -r "${builtins.baseNameOf config.home.sessionVariables.EDITOR} $vimfile"
+              and commandline -f execute
+            '';
         };
         search-and-edit = {
           description = "Search and open the relevant file in Vim";
-          body = builtins.readFile ./fish/search-and-edit.fish;
+          body = # fish
+            ''
+              set vimfile ( \
+                  rg \
+                    --color=always \
+                    --line-number \
+                    --no-heading \
+                    --smart-case \
+                    --iglob "!/Library/**" \
+                    --iglob "!/System/**" \
+                    --iglob "!Users/$HOME/Library/*" \
+                    ".*" \
+                  | fzf --ansi \
+                      --height "80%" \
+                      --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'
+              )
+              and set line_number (echo $vimfile | tr -d '\r' | cut -d':' -f2)
+              and set vimfile (echo $vimfile | tr -d '\r' | cut -d':' -f1)
+              and commandline -r "${builtins.baseNameOf config.home.sessionVariables.EDITOR} +$line_number \"$vimfile\""
+              and commandline -f execute
+            '';
         };
       };
       shellAbbrs = {
@@ -77,9 +112,6 @@ in
         # Ctrl-e
         bind -M insert \ce recent
         bind -M default \ce recent
-        # Ctrl-f
-        bind -M insert \cf fcd
-        bind -M default \cf fcd
         # Ctrl-p
         bind -M insert \cp projects
         bind -M default \cp projects

platforms/home-manager/modules/nmasur/presets/programs/fzf/fish/edit.fish

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

platforms/home-manager/modules/nmasur/presets/programs/fzf/fish/recent.fish

@@ -1,4 +0,0 @@
-set vimfile (fd -t f --exec /usr/bin/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

platforms/home-manager/modules/nmasur/presets/programs/fzf/fish/search-and-edit.fish

@@ -1,21 +0,0 @@
-set vimfile ( \
-    rg \
-      --color=always \
-      --line-number \
-      --no-heading \
-      --smart-case \
-      --iglob "!/Library/**" \
-      --iglob "!/System/**" \
-      --iglob "!Users/$HOME/Library/*" \
-      ".*" \
-    | fzf --ansi \
-        --height "80%" \
-        --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'
-)
-and set line_number (echo $vimfile | tr -d '\r' | cut -d':' -f2)
-and set vimfile (echo $vimfile | tr -d '\r' | cut -d':' -f1)
-and commandline -r "vim +$line_number \"$vimfile\""
-and commandline -f execute

platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix

@@ -0,0 +1,85 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.ghostty;
+in
+
+{
+
+  options.nmasur.presets.programs.ghostty.enable = lib.mkEnableOption "Ghostty terminal";
+
+  config = lib.mkIf cfg.enable {
+
+    # Set the i3 terminal
+    nmasur.presets.services.i3.terminal = config.programs.ghostty.package;
+
+    programs.ghostty = {
+      enable = true;
+
+      package = if pkgs.stdenv.isDarwin then pkgs.nur.repos.DimitarNestorov.ghostty else pkgs.ghostty;
+
+      enableFishIntegration = true;
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+      installBatSyntax = false; # The file doesn't seem to exist in the pkg
+      settings = {
+        theme = config.theme.name;
+        font-size = 16;
+        macos-titlebar-style = "hidden";
+        window-decoration = false;
+        macos-non-native-fullscreen = true;
+        quit-after-last-window-closed = lib.mkIf pkgs.stdenv.isDarwin true;
+        fullscreen = if pkgs.stdenv.isDarwin then true else false;
+        keybind = [
+          "super+t=unbind" # Pass super-t to underlying tool (e.g. zellij tabs)
+          "super+shift+]=unbind"
+          "super+shift+[=unbind"
+          "ctrl+tab=unbind"
+          "ctrl+shift+tab=unbind"
+          "ctrl+tab=text:\\x1b[9;5u"
+          "ctrl+shift+tab=text:\\x1b[9;6u"
+          "super+k=unbind"
+          "super+shift+e=unbind"
+        ];
+      };
+      themes."gruvbox" = {
+        background = config.theme.colors.base00;
+        cursor-color = config.theme.colors.base04;
+        foreground = config.theme.colors.base05;
+        palette = [
+          "0=${config.theme.colors.base00}"
+          "1=${config.theme.colors.base08}"
+          "2=${config.theme.colors.base0B}"
+          "3=${config.theme.colors.base0A}"
+          "4=${config.theme.colors.base0D}"
+          "5=${config.theme.colors.base0E}"
+          "6=${config.theme.colors.base0C}"
+          "7=${config.theme.colors.base05}"
+          "8=${config.theme.colors.base03}"
+          "9=${config.theme.colors.base08}"
+          "10=${config.theme.colors.base0B}"
+          "11=${config.theme.colors.base0A}"
+          "12=${config.theme.colors.base0C}"
+          "13=${config.theme.colors.base0E}"
+          "14=${config.theme.colors.base0C}"
+          "15=${config.theme.colors.base07}"
+          "16=${config.theme.colors.base09}"
+          "17=${config.theme.colors.base0F}"
+          "18=${config.theme.colors.base01}"
+          "19=${config.theme.colors.base02}"
+          "20=${config.theme.colors.base04}"
+          "21=${config.theme.colors.base06}"
+        ];
+        selection-background = config.theme.colors.base02;
+        selection-foreground = config.theme.colors.base00;
+      };
+
+    };
+
+  };
+}

platforms/home-manager/modules/nmasur/presets/programs/git-work.nix

@@ -27,10 +27,12 @@ in
       name = lib.mkOption {
         type = lib.types.str;
         description = "Name to use for personal git commits";
+        default = config.nmasur.presets.programs.git.name;
       };
       email = lib.mkOption {
         type = lib.types.str;
         description = "Email to use for personal git commits";
+        default = config.nmasur.presets.programs.git.email;
       };
     };
   };
@@ -42,7 +44,7 @@ in
       userEmail = lib.mkForce cfg.work.email;
       includes = [
         {
-          path = "${config.xdg.configHome}/${config.xdg.configFile."git/personal".target}";
+          path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}";
           condition = "gitdir:~/dev/personal/";
         }
       ];
@@ -50,7 +52,7 @@ in
     };
 
     # Personal git config
-    xdg.configFile."git/personal".text = pkgs.formats.gitIni {
+    xdg.configFile."git/personal".text = lib.generators.toGitINI {
       user = {
         name = cfg.personal.name;
         email = cfg.personal.email;

platforms/home-manager/modules/nmasur/presets/programs/git/default.nix

@@ -32,7 +32,7 @@ in
       userName = cfg.name;
       userEmail = cfg.email;
       extraConfig = {
-        core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
+        core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less --no-init";
         interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
         pager = {
           branch = "false";

platforms/home-manager/modules/nmasur/presets/programs/helix.nix

@@ -0,0 +1,425 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.helix;
+in
+
+{
+
+  options.nmasur.presets.programs.helix.enable = lib.mkEnableOption "Helix text editor";
+
+  config = lib.mkIf cfg.enable {
+
+    # Use Neovim as the editor for git commit messages
+    programs.git.extraConfig.core.editor = lib.mkForce "${lib.getExe pkgs.helix}";
+    programs.jujutsu.settings.ui.editor = lib.mkForce "${lib.getExe pkgs.helix}";
+
+    # Set Neovim as the default app for text editing and manual pages
+    home.sessionVariables = {
+      EDITOR = lib.mkForce "${lib.getExe pkgs.helix}";
+      MANPAGER = lib.mkForce "sh -c 'col -bx | ${lib.getExe pkgs.helix}'";
+      MANWIDTH = 87;
+      MANROFFOPT = "-c";
+    };
+
+    # Create quick aliases for launching Helix
+    programs.fish = {
+      shellAbbrs = {
+        h = lib.mkForce "hx";
+      };
+    };
+
+    programs.helix = {
+
+      enable = true;
+
+      package = pkgs.helix; # pkgs.evil-helix
+
+      languages = {
+
+        language-server.nixd = {
+          command = "${pkgs.nixd}/bin/nixd";
+        };
+
+        language-server.fish-lsp = {
+          command = "${pkgs.fish-lsp}/bin/fish-lsp";
+        };
+
+        language-server.yaml-language-server = {
+          command = lib.getExe pkgs.yaml-language-server;
+        };
+
+        language-server.marksman = {
+          command = lib.getExe pkgs.marksman;
+        };
+
+        language-server.terraform-ls = {
+          command = "${lib.getExe pkgs.terraform-ls} serve";
+        };
+
+        language-server.bash-language-server = {
+          command = lib.getExe (
+            pkgs.bash-language-server.overrideAttrs {
+              buildInputs = [
+                pkgs.shellcheck
+                pkgs.shfmt
+              ];
+            }
+          );
+        };
+
+        language = [
+          {
+            name = "nix";
+            auto-format = true;
+            language-servers = [ "nixd" ];
+          }
+          {
+            name = "markdown";
+            auto-format = false;
+            language-servers = [ "marksman" ];
+            formatter = {
+              command = lib.getExe pkgs.mdformat;
+              args = [ "-" ];
+            };
+            # Allows return key to continue the token on the next line
+            comment-tokens = [
+              "-"
+              "+"
+              "*"
+              "- [ ]"
+              ">"
+            ];
+          }
+          {
+            name = "tfvars";
+            auto-format = true;
+            language-servers = [ "terraform-ls" ];
+            formatter = {
+              command = lib.getExe pkgs.terraform;
+              args = [
+                "fmt"
+                "-"
+              ];
+            };
+          }
+          {
+            name = "hcl";
+            auto-format = true;
+            language-servers = [ "terraform-ls" ];
+            formatter = {
+              command = lib.getExe pkgs.terraform;
+              args = [
+                "fmt"
+                "-"
+              ];
+            };
+          }
+          {
+            name = "bash";
+            auto-format = true;
+          }
+        ];
+
+      };
+
+      ignores = [
+        "content/.obsidian/**"
+      ];
+
+      settings = {
+        theme = "base16";
+
+        keys.normal = {
+
+          # Use the enter key to save the file
+          ret = ":write";
+
+          # Get out of multiple cursors and selection
+          esc = [
+            "collapse_selection"
+            "keep_primary_selection"
+          ];
+
+          # Enable and disable inlay hints
+          space.H = ":toggle lsp.display-inlay-hints";
+
+          # Toggle floating pane
+          space.t = ":sh zellij action toggle-floating-panes";
+
+          # Today's note
+          space.n = ":vsplit %sh{fish -c 'generate-today'}";
+
+          # Open lazygit
+          # Unfortunately, this breaks mouse input and the terminal after quitting Helix
+          space.l = [
+            ":write-all"
+            ":new"
+            ":insert-output ${lib.getExe pkgs.lazygit}"
+            ":buffer-close!"
+            ":redraw"
+            ":reload-all"
+            ":set mouse false"
+            ":set mouse true"
+          ];
+
+          # Open yazi
+          # https://github.com/sxyazi/yazi/pull/2461
+          # Won't work until next Helix release
+          C-y = [
+            ":sh rm -f /tmp/unique-file"
+            ":insert-output ${lib.getExe pkgs.yazi} %{buffer_name} --chooser-file=/tmp/unique-file"
+            ":insert-output echo \\x1b[?1049h\\x1b[?2004h > /dev/tty"
+            ":open %sh{cat /tmp/unique-file}"
+            ":redraw"
+          ];
+
+          # Extend selection above
+          X = "select_line_above";
+
+          # Move lines up or down
+          A-j = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "paste_after"
+          ];
+          A-k = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "move_line_up"
+            "paste_before"
+          ];
+
+        };
+
+        editor = {
+
+          # Change cursors depending on the mode
+          cursor-shape = {
+            insert = "bar";
+            normal = "block";
+            select = "underline";
+          };
+
+          # Text width
+          soft-wrap = {
+            enable = true;
+          };
+
+          # View line numbers relative to the current cursors
+          line-number = "relative";
+
+          # Show hidden files
+          file-picker = {
+            hidden = false;
+            git-ignore = true;
+            git-global = true;
+            git-exclude = true;
+          };
+
+          # Show whitespace visible to the user
+          # Waiting for trailing whitespace option ideally
+          whitespace = {
+            render = {
+              # space = "all";
+              tab = "all";
+            };
+            characters = {
+              # space = "·";
+              tab = "→";
+            };
+          };
+        };
+
+      };
+
+      themes."${config.programs.helix.settings.theme}" = {
+        "attributes" = config.theme.colors.base09;
+        "comment" = {
+          fg = config.theme.colors.base03;
+          modifiers = [ "italic" ];
+        };
+        "constant" = config.theme.colors.base09;
+        "constant.character.escape" = config.theme.colors.base0C;
+        "constant.numeric" = config.theme.colors.base09;
+        "constructor" = config.theme.colors.base0D;
+        "debug" = config.theme.colors.base03;
+        "diagnostic" = {
+          modifiers = [ "underlined" ];
+        };
+        "diff.delta" = config.theme.colors.base09;
+        "diff.minus" = config.theme.colors.base08;
+        "diff.plus" = config.theme.colors.base0B;
+        "error" = config.theme.colors.base08;
+        "function" = config.theme.colors.base0D;
+        "hint" = config.theme.colors.base03;
+        "info" = config.theme.colors.base0D;
+        "keyword" = config.theme.colors.base0E;
+        "label" = config.theme.colors.base0E;
+        "namespace" = config.theme.colors.base0E;
+        "operator" = config.theme.colors.base05;
+        "special" = config.theme.colors.base0D;
+        "string" = config.theme.colors.base0B;
+        "type" = config.theme.colors.base0A;
+        "variable" = config.theme.colors.base08;
+        "variable.other.member" = config.theme.colors.base05;
+        "warning" = config.theme.colors.base09;
+        "markup.bold" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "bold" ];
+        };
+        "markup.heading" = config.theme.colors.base0D;
+        "markup.italic" = {
+          fg = config.theme.colors.base0E;
+          modifiers = [ "italic" ];
+        };
+        "markup.link.text" = config.theme.colors.base08;
+        "markup.link.url" = {
+          fg = config.theme.colors.base09;
+          modifiers = [ "underlined" ];
+        };
+        "markup.list" = config.theme.colors.base08;
+        "markup.quote" = config.theme.colors.base0C;
+        "markup.raw" = config.theme.colors.base0B;
+        "markup.strikethrough" = {
+          modifiers = [ "crossed_out" ];
+        };
+        "diagnostic.hint" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "diagnostic.info" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "diagnostic.warning" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "diagnostic.error" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "ui.background" = {
+          bg = config.theme.colors.base00;
+        };
+        "ui.bufferline.active" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base03;
+          modifiers = [ "bold" ];
+        };
+        "ui.bufferline" = {
+          fg = config.theme.colors.base04;
+          bg = config.theme.colors.base00;
+        };
+        "ui.cursor" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.cursor.insert" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.cursorline.primary" = {
+          fg = config.theme.colors.base05;
+          bg = config.theme.colors.base01;
+        };
+        "ui.cursor.match" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.cursor.select" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.gutter" = {
+          bg = config.theme.colors.base00;
+        };
+        "ui.help" = {
+          fg = config.theme.colors.base06;
+          bg = config.theme.colors.base01;
+        };
+        "ui.linenr" = {
+          fg = config.theme.colors.base03;
+          bg = config.theme.colors.base00;
+        };
+        "ui.linenr.selected" = {
+          fg = config.theme.colors.base04;
+          bg = config.theme.colors.base01;
+          modifiers = [ "bold" ];
+        };
+        "ui.menu" = {
+          fg = config.theme.colors.base05;
+          bg = config.theme.colors.base01;
+        };
+        "ui.menu.scroll" = {
+          fg = config.theme.colors.base03;
+          bg = config.theme.colors.base01;
+        };
+        "ui.menu.selected" = {
+          fg = config.theme.colors.base01;
+          bg = config.theme.colors.base04;
+        };
+        "ui.popup" = {
+          bg = config.theme.colors.base01;
+        };
+        "ui.selection" = {
+          bg = config.theme.colors.base01;
+        };
+        "ui.selection.primary" = {
+          bg = config.theme.colors.base02;
+        };
+        "ui.statusline" = {
+          fg = config.theme.colors.base04;
+          bg = config.theme.colors.base01;
+        };
+        "ui.statusline.inactive" = {
+          bg = config.theme.colors.base01;
+          fg = config.theme.colors.base03;
+        };
+        "ui.statusline.insert" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base0B;
+        };
+        "ui.statusline.normal" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base03;
+        };
+        "ui.statusline.select" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base0F;
+        };
+        "ui.text" = config.theme.colors.base05;
+        "ui.text.focus" = config.theme.colors.base05;
+        "ui.virtual.indent-guide" = {
+          fg = config.theme.colors.base03;
+        };
+        "ui.virtual.inlay-hint" = {
+          fg = config.theme.colors.base03;
+        };
+        "ui.virtual.ruler" = {
+          bg = config.theme.colors.base01;
+        };
+        "ui.virtual.jump-label" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "bold" ];
+        };
+        "ui.window" = {
+          bg = config.theme.colors.base01;
+        };
+      };
+
+    };
+
+  };
+
+}

platforms/home-manager/modules/nmasur/presets/programs/lazygit.nix

@@ -0,0 +1,96 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.lazygit;
+in
+
+{
+  options.nmasur.presets.programs.lazygit.enable = lib.mkEnableOption "Lazygit git TUI";
+
+  config = lib.mkIf cfg.enable {
+    programs.lazygit = {
+      enable = true;
+      settings = {
+        git.paging = {
+          # useConfig = true;
+          pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
+        };
+        os = {
+          edit = "${config.home.sessionVariables.EDITOR} {{filename}}";
+          editAtLine = "${config.home.sessionVariables.EDITOR} {{filename}}:{{line}}";
+          editAtLineAndWait = "${config.home.sessionVariables.EDITOR} {{filename}}:{{line}}";
+          openDirInEditor = "${config.home.sessionVariables.EDITOR}";
+          open = "${config.home.sessionVariables.EDITOR} {{filename}}";
+        };
+        customCommands = [
+          {
+            key = "N";
+            context = "files";
+            command = "git add -N {{.SelectedFile.Name}}";
+          }
+          {
+            key = "<a-enter>";
+            context = "global";
+            command =
+              let
+                openGitUrl = pkgs.writeShellScriptBin "open-git-url" ''
+                  # Try to get the remote URL using two common methods; suppress stderr for individual commands.
+                  # "git remote get-url origin" is generally preferred.
+                  # "git config --get remote.origin.url" is a fallback.
+                  URL=$(git remote get-url origin 2>/dev/null || git config --get remote.origin.url 2>/dev/null);
+
+                  # Check if a URL was actually found.
+                  if [ -z "$URL" ]; then
+                    # Send error message to stderr so it might appear in lazygit logs or notifications.
+                    echo "Lazygit: Could not determine remote URL for 'origin'." >&2;
+                    # Exit with an error code.
+                    exit 1;
+                  fi;
+
+                  # Check if the URL is a GitHub SSH URL and convert it to HTTPS.
+                  # This uses echo and grep to check for "@github.com" and then sed for transformation.
+                  if echo "$URL" | grep -q "@github.com:"; then
+                    # Transform git@github.com:user/repo.git to https://github.com/user/repo
+                    # The first sed handles the main transformation.
+                    # The second sed removes a trailing .git if present, for a cleaner URL.
+                    URL=$(echo "$URL" | sed "s|git@github.com:|https://github.com/|" | sed "s|\.git$||");
+                    # Optional: Log the transformation for debugging.
+                    # echo "Lazygit: Transformed GitHub SSH URL to '$URL'" >&2;
+                  fi;
+
+                  # Determine the operating system.
+                  OS="$(uname -s)";
+
+                  # Optional: Echo for debugging. This might appear in lazygit logs or as a brief message.
+                  # Remove " >&2" if you want to see it as a potential success message in lazygit UI (if it shows stdout).
+                  # echo "Lazygit: Opening URL '$URL' on '$OS'" >&2;
+
+                  # Execute the appropriate command to open the URL based on the OS.
+                  case "$OS" in
+                    Darwin*) # macOS
+                      open "$URL";;
+                    Linux*)  # Linux
+                      xdg-open "$URL";;
+                    *)       # Unsupported OS
+                      echo "Lazygit: Unsupported OS ('$OS'). Could not open URL." >&2;
+                      exit 1;;
+                  esac
+                '';
+              in
+              lib.getExe openGitUrl;
+          }
+        ];
+      };
+    };
+
+    programs.fish.shellAbbrs = {
+      lg = "lazygit";
+    };
+
+  };
+}

platforms/home-manager/modules/nmasur/presets/programs/mpv.nix

@@ -31,5 +31,9 @@ in
         pkgs.mpvScripts.mpv-delete-file
       ];
     };
+
+    programs.fish.shellAbbrs = {
+      mpvs = "mpv --shuffle=yes";
+    };
   };
 }

platforms/home-manager/modules/nmasur/presets/programs/neovim.nix

@@ -28,13 +28,14 @@ in
 
     home.packages = [ cfg.package ];
 
-    #nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
+    nmasur.presets.programs.neovim.package = lib.mkDefault (
-    #  colors = cfg.colors;
+      pkgs.nmasur.neovim.override {
-    #  github = cfg.github.enable;
+        colors = cfg.colors;
-    #  terraform = cfg.terraform.enable;
+        github = cfg.github.enable;
-    #  kubernetes = cfg.kubernetes.enable;
+        terraform = cfg.terraform.enable;
-    #};
+        kubernetes = cfg.kubernetes.enable;
-    nmasur.presets.programs.neovim.package = pkgs.nmasur.neovim;
+      }
+    );
 
     # Use Neovim as the editor for git commit messages
     programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}";
@@ -61,14 +62,16 @@ in
 
     # Create a desktop option for launching Neovim from a file manager
     # (Requires launching the terminal and then executing Neovim)
-    xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable) {
+    xdg.desktopEntries.nvim =
-      name = "Neovim wrapper";
+      lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable)
-      exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
+        {
-      mimeType = [
+          name = "Neovim wrapper";
-        "text/plain"
+          exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
-        "text/markdown"
+          mimeType = [
-      ];
+            "text/plain"
-    };
+            "text/markdown"
+          ];
+        };
     xdg.mimeApps.defaultApplications = {
       "text/plain" = [ "nvim.desktop" ];
       "text/markdown" = [ "nvim.desktop" ];