try building mole for eblume

relates to #68

.github/workflows/arrow-aws.yml

@@ -42,6 +42,12 @@ jobs:
       - name: Checkout Repo Code
         uses: actions/checkout@v4
 
+      - name: Free Disk Space (Ubuntu)
+        if: inputs.rebuild && inputs.action != 'destroy'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
       # Enable access to KVM, required to build an image
       - name: Enable KVM group perms
         if: inputs.rebuild && inputs.action != 'destroy'
@@ -60,22 +66,19 @@ jobs:
       # Install Nix
       - name: Install Nix
         if: inputs.rebuild && inputs.action != 'destroy'
-        uses: cachix/install-nix-action@v17
+        uses: cachix/install-nix-action@v20
 
       # Build the image
       - name: Build Image
         if: inputs.rebuild && inputs.action != 'destroy'
         run: nix build .#arrow-aws
 
-      # # Copy the image to S3
+      - name: Upload Image to S3
-      # - name: Upload Image to Cache
+        if: inputs.rebuild && inputs.action != 'destroy'
-      #   env:
+        run: |
-      #     NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
+          aws s3 cp \
-      #   run: |
+            result/nixos-amazon-image-*.vhd \
-      #     echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
+            s3://${{ secrets.IMAGES_BUCKET }}/arrow.vhd \
-      #     nix store sign --key-file cache.key $(readlink result)
-      #     nix copy --to s3://t2-aws-nixos-test $(readlink result)
-      #     rm cache.key
 
       # Installs the Terraform binary and some other accessory functions.
       - name: Setup Terraform
@@ -91,16 +94,18 @@ jobs:
       # Connects to remote state backend and download providers.
       - name: Terraform Init
         working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform init
+        run: |
+          terraform init \
+            -backend-config="bucket=${{ secrets.TERRAFORM_STATE_BUCKET }}" \
+            -backend-config="key=arrow.tfstate"
 
       # Deploys infrastructure or changes to infrastructure.
       - name: Terraform Apply
         if: inputs.action == 'create'
         working-directory: ${{ env.TERRAFORM_DIRECTORY }}
         env:
-          TF_VAR_terraform_state_bucket: ${{ secrets.TERRAFORM_STATE_BUCKET }}
-          TF_VAR_terraform_state_key: arrow.tfstate
           TF_VAR_ec2_size: ${{ inputs.size }}
+          TF_VAR_images_bucket: ${{ secrets.IMAGES_BUCKET }}
         run: |
           terraform apply \
             -auto-approve \
@@ -110,6 +115,9 @@ jobs:
       - name: Terraform Destroy
         if: inputs.action == 'destroy'
         working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_ec2_size: ${{ inputs.size }}
+          TF_VAR_images_bucket: ${{ secrets.IMAGES_BUCKET }}
         run: |
           terraform destroy \
             -auto-approve \
@@ -151,7 +159,7 @@ jobs:
           RECORD_ID=$(curl --request GET \
              --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records \
              --header 'Content-Type: application/json' \
-             --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "transmission.${{ env.ZONE_NAME }}") | .id')
+             --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "n8n2.${{ env.ZONE_NAME }}") | .id')
           curl --request DELETE \
              --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records/${RECORD_ID} \
              --header 'Content-Type: application/json' \

.github/workflows/arrow.yml

@@ -75,16 +75,6 @@ jobs:
             s3://noahmasur-arrow-images/arrow.iso \
             --endpoint-url "https://${{ env.CLOUDFLARE_R2_ENDPOINT }}"
 
-      # # Copy the image to S3
-      # - name: Upload Image to Cache
-      #   env:
-      #     NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
-      #   run: |
-      #     echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
-      #     nix store sign --key-file cache.key $(readlink result)
-      #     nix copy --to s3://t2-aws-nixos-test $(readlink result)
-      #     rm cache.key
-
       # Installs the Terraform binary and some other accessory functions.
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
@@ -157,7 +147,7 @@ jobs:
           RECORD_ID=$(curl --request GET \
              --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records \
              --header 'Content-Type: application/json' \
-             --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "transmission.${{ env.ZONE_NAME }}") | .id')
+             --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "n8n2.${{ env.ZONE_NAME }}") | .id')
           curl --request DELETE \
              --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records/${RECORD_ID} \
              --header 'Content-Type: application/json' \

.github/workflows/check.yml

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

.github/workflows/update.yml

@@ -18,13 +18,13 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
+        uses: DeterminateSystems/nix-installer-action@v11
       - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
+        uses: DeterminateSystems/flake-checker-action@v7
       - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
+        uses: DeterminateSystems/magic-nix-cache-action@v6
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v19
+        uses: DeterminateSystems/update-flake-lock@v21
         id: update
         with:
           pr-title: "Update flake.lock" # Title of PR to be created

README.md

@@ -9,7 +9,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## System Features
 
 | Feature        | Program                                             | Configuration                                 |
-| ---            | ---                                                 | ---                                           |
+|----------------|-----------------------------------------------------|-----------------------------------------------|
 | OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
 | Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
 | Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
@@ -21,7 +21,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## User Features
 
 | Feature      | Program                                                                          | Configuration                                      |
-| ---          | ---                                                                              | ---                                                |
+|--------------|----------------------------------------------------------------------------------|----------------------------------------------------|
 | Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
 | Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
 | Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
@@ -38,7 +38,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## macOS Features
 
 | Feature  | Program                                     | Configuration                        |
-| ---      | ---                                         | ---                                  |
+|----------|---------------------------------------------|--------------------------------------|
 | Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
 
 # Diagram

flake.lock

@@ -3,11 +3,11 @@
     "baleia-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1704551058,
+        "lastModified": 1717182435,
-        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
+        "narHash": "sha256-duI3myrJSvmtjF9n7NVrVOsuSo1O3JEypA5ghBHsULc=",
         "owner": "m00qek",
         "repo": "baleia.nvim",
-        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
+        "rev": "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     "base16-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1713467988,
+        "lastModified": 1716483968,
-        "narHash": "sha256-p3HWYasmi0gVUM5l9jLWL4Iy37Uxnvbj3SO/cMCpDBg=",
+        "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
         "owner": "RRethy",
         "repo": "base16-nvim",
-        "rev": "eec6882101dd189117f79c5d18d389d20cfc0415",
+        "rev": "6ac181b5733518040a33017dde654059cd771b7c",
         "type": "github"
       },
       "original": {
@@ -35,40 +35,43 @@
     "bufferline-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706180994,
+        "lastModified": 1716555412,
-        "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=",
+        "narHash": "sha256-8PCkY1zrlMrPGnQOb7MjqDXNlkeX46jrT4ScIL+MOwM=",
         "owner": "akinsho",
         "repo": "bufferline.nvim",
-        "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748",
+        "rev": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v4.5.0",
+        "ref": "v4.6.1",
         "repo": "bufferline.nvim",
         "type": "github"
       }
     },
-    "bypass-paywalls-clean": {
+    "cl-nix-lite": {
-      "flake": false,
       "locked": {
-        "narHash": "sha256-VZey1VgabUpsiN+mdSNzoMfxICSNKtZIuvISFcMUDw4=",
+        "lastModified": 1717972076,
-        "type": "file",
+        "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
-        "url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-3.6.6.0.xpi"
+        "owner": "hraban",
+        "repo": "cl-nix-lite",
+        "rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
+        "type": "github"
       },
       "original": {
-        "type": "file",
+        "owner": "hraban",
-        "url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-3.6.6.0.xpi"
+        "repo": "cl-nix-lite",
+        "type": "github"
       }
     },
     "cmp-nvim-lsp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702205473,
+        "lastModified": 1715931395,
-        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
+        "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
+        "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d",
         "type": "github"
       },
       "original": {
@@ -77,23 +80,6 @@
         "type": "github"
       }
     },
-    "comment-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1681214440,
-        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numToStr",
-        "ref": "v0.8.0",
-        "repo": "Comment.nvim",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -101,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713946171,
+        "lastModified": 1718662658,
-        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
+        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
+        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
         "type": "github"
       },
       "original": {
@@ -122,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714612856,
+        "lastModified": 1718846788,
-        "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=",
+        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370",
+        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
         "type": "github"
       },
       "original": {
@@ -138,16 +124,16 @@
     "fidget-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1704696337,
+        "lastModified": 1716093309,
-        "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=",
+        "narHash": "sha256-Gpk/G0ByOAIE8uX4Xr94CvAjJBSJMEOwBuvrhmYYGsg=",
         "owner": "j-hui",
         "repo": "fidget.nvim",
-        "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db",
+        "rev": "ef99df04a1c53a453602421bc0f756997edc8289",
         "type": "github"
       },
       "original": {
         "owner": "j-hui",
-        "ref": "v1.2.0",
+        "ref": "v1.4.5",
         "repo": "fidget.nvim",
         "type": "github"
       }
@@ -159,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714869979,
+        "lastModified": 1718930737,
-        "narHash": "sha256-kTAMHZ1DDGauq3f5IzPw+EtVOgWdctLPUMJiqciqOx0=",
+        "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "7e9014891eebabffa68351e3360da3fbc59b8066",
+        "rev": "087919070dffc9798a8cb753e97babe287f06c25",
         "type": "github"
       },
       "original": {
@@ -173,6 +159,23 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1697816753,
+        "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
+        "owner": "hraban",
+        "repo": "flake-compat",
+        "rev": "6025bade1336a36014639bc3f67eacc853dab78f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hraban",
+        "ref": "fixed-output",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -192,6 +195,23 @@
       "inputs": {
         "systems": "systems"
       },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "id": "flake-utils",
+        "type": "indirect"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
         "lastModified": 1705309234,
         "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@@ -206,9 +226,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -227,11 +247,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1710430870,
+        "lastModified": 1715076655,
-        "narHash": "sha256-bsOQX56ciQ8ni7Zh4ZNtTvptvy/YaDPG318AsEaZRpE=",
+        "narHash": "sha256-vDTqJQzLyg0nmlC+CrLnPkYti1rPxmvRW8eQq/9Zg+M=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "473d74cf54da8f51aaa9993ec3e6bfae278eb47b",
+        "rev": "19a91816c123173a4551a6a04f2882338f20db1d",
         "type": "github"
       },
       "original": {
@@ -247,11 +267,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714865296,
+        "lastModified": 1718983978,
-        "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=",
+        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f",
+        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
         "type": "github"
       },
       "original": {
@@ -261,19 +281,26 @@
         "type": "github"
       }
     },
-    "kitty-scrollback-nvim-src": {
+    "mac-app-util": {
-      "flake": false,
+      "inputs": {
+        "cl-nix-lite": "cl-nix-lite",
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1714049193,
+        "lastModified": 1718893255,
-        "narHash": "sha256-LICARktpc04vaHpFuAFDrZsYKy2HJme6LMtoXMi7jJ8=",
+        "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=",
-        "owner": "mikesmithgh",
+        "owner": "hraban",
-        "repo": "kitty-scrollback.nvim",
+        "repo": "mac-app-util",
-        "rev": "22f524f1fa9c7660804a1800ed0fe981c5d392c8",
+        "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc",
         "type": "github"
       },
       "original": {
-        "owner": "mikesmithgh",
+        "owner": "hraban",
-        "repo": "kitty-scrollback.nvim",
+        "repo": "mac-app-util",
         "type": "github"
       }
     },
@@ -293,7 +320,7 @@
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1699624348,
+        "lastModified": 1699624334,
         "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
         "type": "tarball",
         "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
@@ -319,29 +346,28 @@
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1714909152,
+        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
-        "narHash": "sha256-CsAUnbA/9XiVuk96pOK+E++lp8BlJITtfExWcb9rqPk=",
+        "type": "file",
-        "type": "tarball",
         "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
       },
       "original": {
-        "type": "tarball",
+        "type": "file",
         "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
       }
     },
     "nix2vim": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1707832982,
+        "lastModified": 1718621825,
-        "narHash": "sha256-Jsrj8HJyo+PmjrHIDhq4gjZCE0eYCVmmTrx24cG8eOQ=",
+        "narHash": "sha256-bSfjwRgKKpLyjEDPRAF1hlJKc7QDoqopalHwNCB/eAA=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "2fb1328cf058fc967b02f9a5330a99253b4c247e",
+        "rev": "1db11dbf8a4d124e02244fa5c4ff219b672a8e5b",
         "type": "github"
       },
       "original": {
@@ -373,11 +399,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713783234,
+        "lastModified": 1718025593,
-        "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=",
+        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e",
+        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
         "type": "github"
       },
       "original": {
@@ -388,11 +414,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714635257,
+        "lastModified": 1718895438,
-        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
+        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
+        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
         "type": "github"
       },
       "original": {
@@ -420,11 +446,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1714880338,
+        "lastModified": 1719001822,
-        "narHash": "sha256-G/dc755qMdAMvXuZsi1OFCzD49OWszdMSnp12+1eFcM=",
+        "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "49f72c695fb2f46c8aeb1549704246b9558b2011",
+        "rev": "e7edcaeae9db01224266febe88eb7d3411055636",
         "type": "github"
       },
       "original": {
@@ -436,11 +462,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1714489830,
+        "lastModified": 1717789608,
-        "narHash": "sha256-aM4oWSZrZb660wEpLQnFyoBkH+MSi0WgfBIztk98Qtk=",
+        "narHash": "sha256-LNYFxAM9lQNNOIOc+IgKgbSRp2U09B/9HivSCwMyUpQ=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "861a04313501563bb1b11f125ae9b7237a517b9b",
+        "rev": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce",
         "type": "github"
       },
       "original": {
@@ -452,16 +478,16 @@
     "nvim-lspconfig-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701687137,
+        "lastModified": 1716281382,
-        "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=",
+        "narHash": "sha256-foJ7a59N0a3QaBW24PtwbyYDQVlIsFxiatADLO/hQvc=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "cf3dd4a290084a868fac0e2e876039321d57111c",
+        "rev": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98",
         "type": "github"
       },
       "original": {
         "owner": "neovim",
-        "ref": "v0.1.7",
+        "ref": "v0.1.8",
         "repo": "nvim-lspconfig",
         "type": "github"
       }
@@ -469,11 +495,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1714794673,
+        "lastModified": 1717900986,
-        "narHash": "sha256-rY4FbuqBM4zOUkaA3QBc+UrpfTha8uGtp+lIzrYK+cg=",
+        "narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "64f61e4c913047a045ff90bd188dd3b54ee443cf",
+        "rev": "2086e564c4d23fea714e8a6d63b881e551af2f41",
         "type": "github"
       },
       "original": {
@@ -485,11 +511,11 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1714811590,
+        "lastModified": 1718957498,
-        "narHash": "sha256-3Ae3ieCqckVAElTufJxgBRNXdWg81++oI0qesKevcb4=",
+        "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "4e21361e15b1d4147830c5fe571556eb1b14e6f9",
+        "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23",
         "type": "github"
       },
       "original": {
@@ -536,16 +562,14 @@
         "baleia-nvim-src": "baleia-nvim-src",
         "base16-nvim-src": "base16-nvim-src",
         "bufferline-nvim-src": "bufferline-nvim-src",
-        "bypass-paywalls-clean": "bypass-paywalls-clean",
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
-        "comment-nvim-src": "comment-nvim-src",
         "darwin": "darwin",
         "disko": "disko",
         "fidget-nvim-src": "fidget-nvim-src",
         "firefox-darwin": "firefox-darwin",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
-        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
+        "mac-app-util": "mac-app-util",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
@@ -606,19 +630,34 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701167040,
+        "lastModified": 1716532947,
-        "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=",
+        "narHash": "sha256-e1ulhc4IIvUgpjKQrSqPY4WpXuez6wlxL6Min9U0o5Q=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "d90956833d7c27e73c621a61f20b29fdb7122709",
+        "rev": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
-        "ref": "0.1.5",
+        "ref": "0.1.8",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -642,16 +681,16 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701858874,
+        "lastModified": 1713792255,
-        "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=",
+        "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008",
+        "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.9.0",
+        "ref": "v2.11.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
@@ -659,11 +698,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1712878661,
+        "lastModified": 1715005250,
-        "narHash": "sha256-sj1qYb42k0hXXcNCKg1hINYD11wDcVpnoPhZNtlYT6k=",
+        "narHash": "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "f8fb3274f72a30896075585b32b0c54cad65c086",
+        "rev": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed",
         "type": "github"
       },
       "original": {
@@ -676,11 +715,11 @@
     "tree-sitter-ini": {
       "flake": false,
       "locked": {
-        "lastModified": 1699877527,
+        "lastModified": 1716889525,
-        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
+        "narHash": "sha256-IyHrIxcmuzs60zUiJv4E3nSkhSkgbcaLDUdeDx5mlHk=",
         "owner": "justinmk",
         "repo": "tree-sitter-ini",
-        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
+        "rev": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c",
         "type": "github"
       },
       "original": {
@@ -742,11 +781,11 @@
     "tree-sitter-rasi": {
       "flake": false,
       "locked": {
-        "lastModified": 1707776004,
+        "lastModified": 1716296585,
-        "narHash": "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c=",
+        "narHash": "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=",
         "owner": "Fymyte",
         "repo": "tree-sitter-rasi",
-        "rev": "43196d934a9a6ab3c7093a8683efd0111bb03db1",
+        "rev": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa",
         "type": "github"
       },
       "original": {
@@ -758,11 +797,11 @@
     "tree-sitter-vimdoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1713806200,
+        "lastModified": 1717834376,
-        "narHash": "sha256-+QbLL5EC3oNiwd7h7MW/mutHhGPUHhbYTQcu6x6atcI=",
+        "narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
         "owner": "neovim",
         "repo": "tree-sitter-vimdoc",
-        "rev": "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4",
+        "rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
         "type": "github"
       },
       "original": {
@@ -789,18 +828,18 @@
     },
     "wsl": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1714355896,
+        "lastModified": 1718710563,
-        "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=",
+        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c",
+        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
         "type": "github"
       },
       "original": {

flake.nix

@@ -37,6 +37,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Better App install management in macOS
+    mac-app-util = {
+      url = "github:hraban/mac-app-util";
+      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
+    };
+
     # Manage disk format and partitioning
     disko = {
       url = "github:nix-community/disko";
@@ -68,7 +74,7 @@
     };
     nvim-lspconfig-src = {
       # https://github.com/neovim/nvim-lspconfig/tags
-      url = "github:neovim/nvim-lspconfig/v0.1.7";
+      url = "github:neovim/nvim-lspconfig/v0.1.8";
       flake = false;
     };
     cmp-nvim-lsp-src = {
@@ -80,11 +86,6 @@
       url = "github:m00qek/baleia.nvim";
       flake = false;
     };
-    comment-nvim-src = {
-      # https://github.com/numToStr/Comment.nvim/releases
-      url = "github:numToStr/Comment.nvim/v0.8.0";
-      flake = false;
-    };
     nvim-treesitter-src = {
       # https://github.com/nvim-treesitter/nvim-treesitter/tags
       url = "github:nvim-treesitter/nvim-treesitter/master";
@@ -92,7 +93,7 @@
     };
     telescope-nvim-src = {
       # https://github.com/nvim-telescope/telescope.nvim/releases
-      url = "github:nvim-telescope/telescope.nvim/0.1.5";
+      url = "github:nvim-telescope/telescope.nvim/0.1.8";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -101,12 +102,12 @@
     };
     toggleterm-nvim-src = {
       # https://github.com/akinsho/toggleterm.nvim/tags
-      url = "github:akinsho/toggleterm.nvim/v2.9.0";
+      url = "github:akinsho/toggleterm.nvim/v2.11.0";
       flake = false;
     };
     bufferline-nvim-src = {
       # https://github.com/akinsho/bufferline.nvim/releases
-      url = "github:akinsho/bufferline.nvim/v4.5.0";
+      url = "github:akinsho/bufferline.nvim/v4.6.1";
       flake = false;
     };
     nvim-tree-lua-src = {
@@ -119,11 +120,7 @@
     };
     fidget-nvim-src = {
       # https://github.com/j-hui/fidget.nvim/tags
-      url = "github:j-hui/fidget.nvim/v1.2.0";
+      url = "github:j-hui/fidget.nvim/v1.4.5";
-      flake = false;
-    };
-    kitty-scrollback-nvim-src = {
-      url = "github:mikesmithgh/kitty-scrollback.nvim";
       flake = false;
     };
     nvim-lint-src = {
@@ -177,13 +174,6 @@
       flake = false;
     };
 
-    # Firefox addon from outside the extension store
-    bypass-paywalls-clean = {
-      # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
-      url = "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-3.6.6.0.xpi";
-      flake = false;
-    };
-
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
@@ -203,7 +193,7 @@
     nextcloud-snappymail = {
       # https://github.com/the-djmaze/snappymail/releases
       # https://snappymail.eu/repository/nextcloud
-      url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
+      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
       flake = false;
     };
   };
@@ -233,6 +223,7 @@
             irc = "irc.${baseName}";
             metrics = "metrics.${baseName}";
             minecraft = "minecraft.${baseName}";
+            n8n = "n8n2.${baseName}";
             prometheus = "prom.${baseName}";
             paperless = "paper.${baseName}";
             secrets = "vault.${baseName}";
@@ -256,7 +247,6 @@
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
         (import ./overlays/gh-collaborators.nix)
-        (import ./overlays/bypass-paywalls-clean.nix inputs)
         (import ./overlays/ren-rep.nix inputs)
       ];
 
@@ -325,9 +315,12 @@
         in
         {
           x86_64-linux.staff = staff "x86_64-linux";
-          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate {
+          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
             system = "x86_64-linux";
             format = "iso";
+            specialArgs = {
+              pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+            };
             modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
           };
           x86_64-linux.arrow-aws = inputs.nixos-generators.nixosGenerate rec {
@@ -337,9 +330,6 @@
               pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
             };
             modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
-              # import
-              # ./modules/aws
-              # { inherit inputs; }
               (
                 { ... }:
                 {
@@ -348,6 +338,8 @@
                   permitRootLogin = "prohibit-password";
                   boot.loader.systemd-boot.enable = inputs.nixpkgs.lib.mkForce false;
                   boot.loader.efi.canTouchEfiVariables = inputs.nixpkgs.lib.mkForce false;
+                  services.amazon-ssm-agent.enable = true;
+                  users.users.ssm-user.extraGroups = [ "wheel" ];
                 }
               )
             ];

hosts/arrow/aws/ec2.tf

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

hosts/arrow/aws/image.tf

@@ -1,13 +1,23 @@
-locals {
+# locals {
-  image_file = one(fileset(path.root, "result/nixos-amazon-image-*.vhd"))
+#   image_file = one(fileset(path.root, "../../../result/nixos-amazon-image-*.vhd"))
+# }
+#
+# # Upload image to S3
+# resource "aws_s3_object" "image" {
+#   bucket = var.images_bucket
+#   key    = basename(local.image_file)
+#   source = local.image_file
+#   etag   = filemd5(local.image_file)
+# }
+
+# Use existing image in S3
+data "aws_s3_object" "image" {
+  bucket = var.images_bucket
+  key    = "arrow.vhd"
 }
 
-# Upload image to S3
+resource "terraform_data" "image_replacement" {
-resource "aws_s3_object" "image" {
+  input = data.aws_s3_object.image.etag
-  bucket = var.images_bucket
-  key    = basename(local.image_file)
-  source = local.image_file
-  etag   = filemd5(local.image_file)
 }
 
 # Setup IAM access for the VM Importer
@@ -29,8 +39,8 @@ data "aws_iam_policy_document" "vmimport" {
       "s3:ListBucket",
     ]
     resources = [
-      "arn:aws:s3:::${aws_s3_object.image.bucket}",
+      "arn:aws:s3:::${data.aws_s3_object.image.bucket}",
-      "arn:aws:s3:::${aws_s3_object.image.bucket}/*",
+      "arn:aws:s3:::${data.aws_s3_object.image.bucket}/*",
     ]
   }
   statement {
@@ -58,23 +68,28 @@ resource "aws_ebs_snapshot_import" "image" {
   disk_container {
     format = "VHD"
     user_bucket {
-      s3_bucket = aws_s3_object.image.bucket
+      s3_bucket = data.aws_s3_object.image.bucket
-      s3_key    = aws_s3_object.image.key
+      s3_key    = data.aws_s3_object.image.key
     }
   }
 
   role_name = aws_iam_role.vmimport.name
+  lifecycle {
+    replace_triggered_by = [terraform_data.image_replacement]
+  }
 }
 
 # Convert to AMI
 resource "aws_ami" "image" {
   description         = "Created with NixOS."
-  name                = replace(basename(local.image_file), "/\\.vhd$/", "")
+  name                = replace(basename(data.aws_s3_object.image.key), "/\\.vhd$/", "")
   virtualization_type = "hvm"
+  root_device_name    = "/dev/xvda"
+  ena_support         = true
 
   ebs_block_device {
     device_name = "/dev/xvda"
     snapshot_id = aws_ebs_snapshot_import.image.id
-    volume_size = 8
+    volume_size = 17
   }
 }

hosts/arrow/aws/main.tf

@@ -1,7 +1,5 @@
 terraform {
   backend "s3" {
-    bucket         = var.terraform_state_bucket
-    key            = var.terraform_state_key
     region         = "us-east-1"
     dynamodb_table = "terraform-state-lock"
   }

hosts/arrow/aws/outputs.tf

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

hosts/arrow/aws/variables.tf

@@ -8,13 +8,3 @@ variable "images_bucket" {
   description = "Name of the bucket in which to store the NixOS VM images."
   type        = string
 }
-
-variable "terraform_state_bucket" {
-  description = "Name of the bucket in which to store the Terraform state information."
-  type        = string
-}
-
-variable "terraform_state_key" {
-  description = "Path of the file in which to store the Terraform state information."
-  type        = string
-}

hosts/arrow/default.nix

@@ -26,6 +26,16 @@ inputs.nixpkgs.lib.nixosSystem rec {
         device = "/dev/disk/by-label/boot";
         fsType = "vfat";
       };
+
+      virtualisation.vmVariant = {
+        virtualisation.forwardPorts = [
+          {
+            from = "host";
+            host.port = 2222;
+            guest.port = 22;
+          }
+        ];
+      };
     }
   ];
 }

hosts/arrow/modules.nix

@@ -22,19 +22,10 @@
     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;
-
-    virtualisation.vmVariant = {
-      virtualisation.forwardPorts = [
-        {
-          from = "host";
-          host.port = 2222;
-          guest.port = 22;
-        }
-      ];
-    };
   }
   ../../modules/common
   ../../modules/nixos

hosts/arrow/vultr/main.tf

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

hosts/flame/default.nix

@@ -14,9 +14,11 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "aarch64-linux";
-  specialArgs = { };
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
   modules = [
     globals
     inputs.home-manager.nixosModules.home-manager
@@ -77,6 +79,7 @@ inputs.nixpkgs.lib.nixosSystem {
       services.gitea.enable = true;
       services.vaultwarden.enable = true;
       services.minecraft-server.enable = true; # Setup Minecraft server
+      system.autoUpgrade.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {

hosts/lookingglass/default.nix

@@ -23,6 +23,7 @@ inputs.darwin.lib.darwinSystem {
       }
     )
     inputs.home-manager.darwinModules.home-manager
+    inputs.mac-app-util.darwinModules.default
     {
       nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
       networking.hostName = "lookingglass";
@@ -33,6 +34,7 @@ inputs.darwin.lib.darwinSystem {
         dark = true;
       };
       mail.user = globals.user;
+      mole.enable = true;
       atuin.enable = true;
       charm.enable = true;
       neovim.enable = true;
@@ -51,6 +53,7 @@ inputs.darwin.lib.darwinSystem {
       kubernetes.enable = true;
       _1password.enable = true;
       slack.enable = true;
+      wezterm.enable = true;
     }
   ];
 }

hosts/swan/default.nix

@@ -8,9 +8,11 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
-  specialArgs = { };
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
   modules = [
     globals
     inputs.home-manager.nixosModules.home-manager
@@ -105,6 +107,7 @@ inputs.nixpkgs.lib.nixosSystem {
       services.samba.enable = true;
       services.paperless.enable = true;
       services.postgresql.enable = true;
+      system.autoUpgrade.enable = false;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {

hosts/tempest/default.nix

@@ -112,6 +112,7 @@ inputs.nixpkgs.lib.nixosSystem {
       mullvad.enable = false;
       rust.enable = true;
       terraform.enable = true;
+      wezterm.enable = true;
       yt-dlp.enable = true;
       gaming = {
         dwarf-fortress.enable = true;

modules/common/applications/default.nix

@@ -8,9 +8,11 @@
     ./firefox.nix
     ./kitty.nix
     ./media.nix
+    ./mole.nix
     ./obsidian.nix
     ./qbittorrent.nix
     ./slack.nix
+    ./wezterm.nix
     ./yt-dlp.nix
   ];
 }

modules/common/applications/firefox.nix

@@ -35,7 +35,6 @@
           # https://nur.nix-community.org/repos/rycee/
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
             (lib.mkIf config._1password.enable onepassword-password-manager)
-            pkgs.bypass-paywalls-clean
             darkreader
             don-t-fuck-with-paste
             facebook-container
@@ -160,11 +159,15 @@
 
       xdg.mimeApps = {
         associations.added = {
-          "text.html" = [ "firefox.desktop" ];
+          "text/html" = [ "firefox.desktop" ];
         };
         defaultApplications = {
-          "text.html" = [ "firefox.desktop" ];
+          "text/html" = [ "firefox.desktop" ];
         };
+        associations.removed = {
+          "text/html" = [ "wine-extension-htm.desktop" ];
+        };
+
       };
 
       xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {

modules/common/applications/kitty.nix

@@ -22,7 +22,7 @@
     environment =
       { }
       // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
+        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
       };
 
     home-manager.users.${config.user} = {
@@ -31,7 +31,7 @@
       xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
 
       # Set the Rofi terminal for running programs
-      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
 
       # Display images in the terminal
       programs.fish.shellAliases = {
@@ -50,18 +50,9 @@
 
           # Easy fullscreen toggle (for macOS)
           "super+f" = "toggle_fullscreen";
-
-          # Kitty scrollback nvim
-          "kitty_mod+h" = "kitty_scrollback_nvim";
-          "kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
         };
         settings = {
 
-          # Required for kitty-scrollback.nvim
-          allow_remote_control = "socket-only";
-          listen_on = "unix:/tmp/kitty";
-          action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
-
           # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
           background = config.theme.colors.base00;
           foreground = config.theme.colors.base05;

modules/common/applications/mole.nix

@@ -0,0 +1,110 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+
+  # Build kdl-py
+  kdl-py = pkgs.python311.pkgs.buildPythonPackage rec {
+    pname = "kdl-py";
+    version = "1.2.0";
+    pyproject = true;
+    src = pkgs.fetchPypi {
+      inherit pname version;
+      hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM=";
+    };
+    build-system = [ pkgs.python311.pkgs.setuptools ];
+    # has no tests
+    doCheck = false;
+  };
+
+  mole = pkgs.python311.pkgs.buildPythonPackage rec {
+    pname = "mole";
+    version = "0.7.1";
+    pyproject = true;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "eblume";
+      repo = pname;
+      rev = "30bb052a97050b1fa89c287855d834f7952b195a";
+      sha256 = "sha256-DUWsfyICCfFQ2ZQBYSQVoA3eLdKC8djUylKgGdHIyJo=";
+    };
+
+    patches = [
+      (builtins.toString (
+        pkgs.writeText "pyproject.toml.patch" ''
+          diff --git a/pyproject.toml b/pyproject.toml
+          index 12ce0f5..787e978 100644
+          --- a/pyproject.toml
+          +++ b/pyproject.toml
+          @@ -12,11 +12,11 @@ packages = [
+           [tool.poetry.dependencies]
+           python = "^3.11"
+           # Now back to the regular dependencies
+          -typer = {extras = ["all"], version = "^0.9"}
+          +typer = {extras = ["all"], version = "^0.12"}
+           todoist-api-python = "^2.1.3"
+           openai = "^1.2.4"
+           rich = "^13.4.2"
+          -watchdog = "^3.0.0"
+          +watchdog = "^4.0.0"
+           pydub = "^0.25.1"
+           requests = "^2.31.0"
+           pyyaml = "^6.0.1"
+        ''
+      ))
+    ];
+
+    # Used during build time
+    nativeBuildInputs = [ pkgs.python311Packages.poetry-core ];
+
+    # Used during run time
+    buildInputs = [
+      pkgs._1password
+      pkgs.nb-cli
+    ];
+
+    # Both build and run time
+    propagatedBuildInputs = [
+      pkgs.python311Packages.typer
+      pkgs.python311Packages.todoist-api-python
+      pkgs.python311Packages.openai
+      pkgs.python311Packages.rich
+      pkgs.python311Packages.watchdog
+      pkgs.python311Packages.pydub
+      pkgs.python311Packages.requests
+      pkgs.python311Packages.pyyaml
+      pkgs.python311Packages.pydantic
+      pkgs.python311Packages.pendulum
+      kdl-py
+      pkgs.ffmpeg
+    ];
+
+    build-system = [ pkgs.python311.pkgs.setuptools ];
+
+    # has no tests
+    doCheck = false;
+
+  };
+
+in
+{
+
+  options = {
+    mole = {
+      enable = lib.mkEnableOption {
+        description = "Enable Mole.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf config.mole.enable {
+    home-manager.users.${config.user} = {
+      home.packages = [ mole ];
+    };
+  };
+}

modules/common/applications/wezterm.nix

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

modules/common/default.nix

@@ -125,6 +125,10 @@
         type = lib.types.str;
         description = "Hostname for IRC services.";
       };
+      n8n = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for n8n automation.";
+      };
       transmission = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for peer2peer downloads (Transmission).";

modules/common/mail/aerc.nix

@@ -158,7 +158,11 @@
           };
         };
         extraConfig = {
-          general.unsafe-accounts-conf = true;
+          general = {
+            unsafe-accounts-conf = true;
+            # log-file = "~/.cache/aerc.log";
+            # log-level = "debug";
+          };
           viewer = {
             pager = "${pkgs.less}/bin/less -R";
           };

modules/common/neovim/config/completion.nix

@@ -26,15 +26,15 @@
 
     # Basic completion keybinds
     mapping = {
-      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
-      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
       "['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
       "['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
       "['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
-      "['<CR>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<C-y>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
-      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
       "['<Esc>']" = dsl.rawLua ''
         function(_)
             cmp.mapping({
@@ -44,7 +44,7 @@
             vim.cmd("stopinsert") --- Abort and leave insert mode
         end
       '';
-      "['<C-l>']" = dsl.rawLua ''
+      "['<C-k>']" = dsl.rawLua ''
         cmp.mapping(function(_)
             if require("luasnip").expand_or_jumpable() then
                 require("luasnip").expand_or_jump()
@@ -131,13 +131,41 @@
   lua = ''
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
-        sources = {
+        mapping = {
-            { name = "buffer", keyword_length = 5 },
+            ['<C-n>'] = {
+                c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
             },
+            ['<C-p>'] = {
+                c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-y>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
+            },
+            ['<C-r>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
+            },
+        },
+        sources = require('cmp').config.sources({
+            { name = "buffer", keyword_length = 5 },
+        }),
     })
 
     -- Use cmdline & path source for ':'
     require('cmp').setup.cmdline(":", {
+        mapping = {
+            ['<C-n>'] = {
+                c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-p>'] = {
+                c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-y>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
+            },
+            ['<C-r>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
+            },
+        },
         sources = require('cmp').config.sources({
             { name = "path" },
         }, {

modules/common/neovim/config/github.lua

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

modules/common/neovim/config/lsp.nix

@@ -18,6 +18,7 @@
       pkgs.vimPlugins.conform-nvim
       pkgs.vimPlugins.fidget-nvim
       pkgs.vimPlugins.nvim-lint
+      pkgs.vimPlugins.vim-table-mode
     ];
 
     setup.fidget = { };
@@ -88,7 +89,7 @@
         rust = [ "rustfmt" ];
         sh = [ "shfmt" ];
         terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
-        hcl = if config.terraform then [ "terraform_fmt" ] else [ ];
+        hcl = [ "hcl" ];
       };
       formatters = {
         lua.command = "${pkgs.stylua}/bin/stylua";
@@ -105,6 +106,7 @@
           ];
         };
         terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+        hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
       };
     };
 

modules/common/neovim/config/misc.nix

@@ -10,15 +10,12 @@
     pkgs.vimPlugins.vim-eunuch # File manipulation commands
     pkgs.vimPlugins.vim-fugitive # Git commands
     pkgs.vimPlugins.vim-repeat # Better repeat using .
-    pkgs.vimPlugins.comment-nvim # Smart comment commands
     pkgs.vimPlugins.glow-nvim # Markdown preview popup
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper
-    pkgs.vimPlugins.kitty-scrollback-nvim # Scrollback pager for kitty
   ];
 
   # Initialize some plugins
-  setup.Comment = { };
   setup.colorizer = {
     user_default_options = {
       names = false;
@@ -26,7 +23,6 @@
   };
   setup.glow = { };
   setup.which-key = { };
-  setup.kitty-scrollback = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -44,7 +40,6 @@
     scrolloff = 3; # Margin of lines to see while scrolling
     splitright = true; # Vertical splits on the right side
     splitbelow = true; # Horizontal splits on the bottom side
-    pastetoggle = "<F3>"; # Use F3 to enter raw paste mode
     clipboard = "unnamedplus"; # Uses system clipboard for yanking
     updatetime = 300; # Faster diagnostics
     mouse = "nv"; # Mouse interaction / scrolling

modules/common/neovim/config/syntax.nix

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

modules/common/neovim/config/toggleterm.nix

@@ -14,6 +14,11 @@
     open_mapping = dsl.rawLua "[[<c-\\>]]";
     hide_numbers = true;
     direction = "float";
+    float_opts = {
+      width = dsl.rawLua "vim.o.columns - 4";
+      height = dsl.rawLua "vim.o.lines - 4";
+      row = 0;
+    };
   };
 
   lua = ''

modules/common/neovim/default.nix

@@ -48,12 +48,6 @@ in
           };
         };
 
-        # Set Neovim as the kitty terminal "scrollback" (vi mode) option.
-        # Requires removing some of the ANSI escape codes that are sent to the
-        # scrollback using sed and baleia, as well as removing several
-        # unnecessary features.
-        programs.kitty.settings.scrollback_pager = "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
-
         # Create a desktop option for launching Neovim from a file manager
         # (Requires launching the terminal and then executing Neovim)
         xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {

modules/common/neovim/lua/settings.lua

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

modules/common/programming/python.nix

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

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

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

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

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

modules/common/shell/github.nix

@@ -12,7 +12,10 @@
       enable = true;
       gitCredentialHelper.enable = true;
       settings.git_protocol = "https";
-      extensions = [ pkgs.gh-collaborators ];
+      extensions = [
+        pkgs.gh-collaborators
+        pkgs.gh-dash
+      ];
     };
 
     programs.fish = lib.mkIf config.home-manager.users.${config.user}.programs.gh.enable {

modules/darwin/hammerspoon.nix

@@ -18,7 +18,7 @@
         src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
         firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
         discord = "${pkgs.discord}/Applications/Discord.app";
-        kitty = "${pkgs.kitty}/Applications/kitty.app";
+        wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
         obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
         slack = "${pkgs.slack}/Applications/Slack.app";
       };

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

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

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

@@ -41,7 +41,7 @@ local function worklayout()
         local u = hs.geometry.unitrect
         -- set the layout
         local left = {
-            { "kitty", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
+            { "WezTerm", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
         }
         local right = {
             { "Slack", nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1), nil, nil, visible = true },

modules/darwin/homebrew.nix

@@ -44,7 +44,8 @@
         "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
-        # "steam" # Not packaged for Nix
+        "notunes" # Don't launch Apple Music with the play button
+        "steam" # Not packaged for Nixon macOS
         # "epic-games" # Not packaged for Nix
       ];
     };

modules/darwin/system.nix

@@ -105,7 +105,7 @@
             "/Applications/zoom.us.app"
             "${pkgs.discord}/Applications/Discord.app"
             "${pkgs.obsidian}/Applications/Obsidian.app"
-            "${pkgs.kitty}/Applications/kitty.app"
+            "${pkgs.wezterm}/Applications/WezTerm.app"
             "/System/Applications/System Settings.app"
           ];
         };
@@ -171,6 +171,7 @@
             eventTitleIconFormat = ''"iconCalendar"'';
             slackBrowser = ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
             zoomBrowser = ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
+            teamsBrowser = ''{"deletable":true,"arguments":"","name":"Teams","path":""}'';
             KeyboardShortcuts_joinEventShortcut = ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
             timeFormat = ''"12-hour"'';
           };

modules/darwin/user.nix

@@ -11,7 +11,7 @@
     users.users."${config.user}" = {
       # macOS user
       home = config.homePath;
-      shell = pkgs.fish; # Default shell
+      # shell = pkgs.fish; # Default shell
     };
 
     home-manager.users.${config.user} = {

modules/darwin/utilities.nix

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

modules/nixos/gaming/default.nix

@@ -19,10 +19,9 @@
   options.gaming.enable = lib.mkEnableOption "Enable gaming features.";
 
   config = lib.mkIf (config.gaming.enable && pkgs.stdenv.isLinux) {
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
     };
     programs.gamemode.enable = true;
   };

modules/nixos/graphical/i3.nix

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

modules/nixos/graphical/rofi.nix

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

modules/nixos/graphical/xorg.nix

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

modules/nixos/hardware/mouse.nix

@@ -16,7 +16,7 @@
       piper # Mouse adjustments GUI
     ];
 
-    services.xserver.libinput.mouse = {
+    services.libinput.mouse = {
       # Disable mouse acceleration
       accelProfile = "flat";
       accelSpeed = "1.15";

modules/nixos/services/jellyfin.nix

@@ -54,9 +54,8 @@
     ];
 
     # Enable VA-API for hardware transcoding
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
       extraPackages = [ pkgs.libva ];
     };
     environment.systemPackages = [ pkgs.libva-utils ];

modules/nixos/services/n8n.nix

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

modules/nixos/services/nextcloud.nix

@@ -9,7 +9,7 @@
   config = lib.mkIf config.services.nextcloud.enable {
 
     services.nextcloud = {
-      package = pkgs.nextcloud28; # Required to specify
+      package = pkgs.nextcloud29; # Required to specify
       configureRedis = true;
       datadir = "/data/nextcloud";
       database.createLocally = true;
@@ -28,8 +28,9 @@
         maintenance_window_start = 4; # Run jobs at 4am UTC
       };
       extraAppsEnable = true;
-      extraApps = with config.services.nextcloud.package.packages.apps; {
+      extraApps = {
-        inherit calendar contacts;
+        calendar = config.services.nextcloud.package.packages.apps.calendar;
+        contacts = config.services.nextcloud.package.packages.apps.contacts;
         # These apps are defined and pinned by overlay in flake.
         news = pkgs.nextcloudApps.news;
         external = pkgs.nextcloudApps.external;

modules/nixos/services/victoriametrics.nix

@@ -12,7 +12,7 @@ let
 
   username = "prometheus";
 
-  prometheusConfig = (pkgs.formats.yaml { }).generate "prometheus.yml" {
+  prometheusConfig = {
     scrape_configs = [
       {
         job_name = config.networking.hostName;
@@ -38,8 +38,6 @@ in
 
   config = {
 
-    services.victoriametrics.extraOptions = [ "-promscrape.config=${prometheusConfig}" ];
-
     systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
       description = "VictoriaMetrics basic auth proxy";
       after = [ "network.target" ];
@@ -85,21 +83,18 @@ in
 
     # VMAgent
 
-    services.vmagent.prometheusConfig = prometheusConfig; # Overwritten below
+    services.vmagent = {
-    systemd.services.vmagent.serviceConfig = lib.mkIf config.services.vmagent.enable {
+      prometheusConfig = prometheusConfig;
-      ExecStart = lib.mkForce ''
+      remoteWrite = {
-        ${pkgs.victoriametrics}/bin/vmagent \
+        url = "https://${config.hostnames.prometheus}/api/v1/write";
-                -promscrape.config=${prometheusConfig} \
+        basicAuthUsername = username;
-                -remoteWrite.url="https://${config.hostnames.prometheus}/api/v1/write" \
+        basicAuthPasswordFile = config.secrets.vmagent.dest;
-                -remoteWrite.basicAuth.username=${username} \
+      };
-                -remoteWrite.basicAuth.passwordFile=${config.secrets.vmagent.dest}'';
     };
 
     secrets.vmagent = lib.mkIf config.services.vmagent.enable {
       source = ../../../private/prometheus.age;
       dest = "${config.secretsDirectory}/vmagent";
-      owner = "vmagent";
-      group = "vmagent";
     };
     systemd.services.vmagent-secret = lib.mkIf config.services.vmagent.enable {
       requiredBy = [ "vmagent.service" ];

modules/nixos/system/auto-upgrade.nix

@@ -11,7 +11,7 @@
 
   # Update the system daily by pointing it at the flake repository
   system.autoUpgrade = {
-    enable = config.server; # Only auto upgrade servers
+    enable = lib.mkDefault false; # Don't enable by default
     dates = "09:33";
     flake = "git+${config.dotfilesRepo}";
     randomizedDelaySec = "25min";

overlays/gh-collaborators.nix

@@ -2,16 +2,17 @@ _final: prev: {
 
   gh-collaborators = prev.buildGoModule rec {
     pname = "gh-collaborators";
-    version = "2.0.2";
+    version = "v2.0.3";
 
     src = prev.fetchFromGitHub {
-      owner = "katiem0";
+      owner = "nmasur";
       repo = "gh-collaborators";
       rev = version;
-      sha256 = "sha256-sz5LHkwZ28aA2vbMnFMzAlyGiJBDZm7jwDQYxgKBPLU=";
+      sha256 = "sha256-XgAZ/+7QxIRKiAZ4Gp/rLgTABSXkVjFQ8TbXOFj9vpM=";
     };
 
-    vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
+    # vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
+    vendorHash = "sha256-fykxRb2U9DDsXorRTLiVWmhMY89N7RS07sal8ww6gz4=";
 
     ldflags = [
       "-s"

overlays/kitty-scrollback-nvim.patch

@@ -1,13 +0,0 @@
-diff --git a/lua/kitty-scrollback/health.lua b/lua/kitty-scrollback/health.lua
-index 9d87dfa..a231b8d 100644
---- a/lua/kitty-scrollback/health.lua
-+++ b/lua/kitty-scrollback/health.lua
-@@ -234,7 +234,7 @@ local function check_kitty_debug_config()
- end
- 
- local function check_kitty_scrollback_nvim_version()
--  local current_version = nil
-+  local current_version = 'master'
-   local tag_cmd = { 'git', 'describe', '--exact-match', '--tags' }
-   local ksb_dir =
-     vim.fn.fnamemodify(vim.api.nvim_get_runtime_file('lua/kitty-scrollback', false)[1], ':h:h')

overlays/neovim-plugins.nix

@@ -25,7 +25,6 @@ in
 
     nvim-lspconfig = withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig-src;
     cmp-nvim-lsp = withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp-src;
-    comment-nvim = withSrc prev.vimPlugins.comment-nvim inputs.comment-nvim-src;
     nvim-treesitter = withSrc prev.vimPlugins.nvim-treesitter inputs.nvim-treesitter-src;
     telescope-nvim = withSrc prev.vimPlugins.telescope-nvim inputs.telescope-nvim-src;
     telescope-project-nvim = withSrc prev.vimPlugins.telescope-project-nvim inputs.telescope-project-nvim-src;
@@ -39,11 +38,5 @@ in
     base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
     baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
     hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
-    kitty-scrollback-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "kitty-scrollback-nvim";
-      src = inputs.kitty-scrollback-nvim-src;
-      version = "master";
-      patches = [ ./kitty-scrollback-nvim.patch ];
-    };
   };
 }

templates/poetry/flake.nix

@@ -1,29 +1,44 @@
 {
   description = "Python project flake";
-
+  inputs = {
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
+    poetry2nix.url = "github:nix-community/poetry2nix";
-  inputs.poetry2nix.url = "github:nix-community/poetry2nix";
+  };
-
   outputs =
+    { nixpkgs, poetry2nix, ... }:
+    let
+      projectDir = ./.;
+      supportedSystems = [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    in
     {
-      self,
+      packages = forAllSystems (
-      nixpkgs,
-      flake-utils,
-      poetry2nix,
-    }:
-    flake-utils.lib.eachDefaultSystem (
         system:
         let
           pkgs = import nixpkgs {
             inherit system;
-          overlays = [ poetry2nix.overlay ];
+            overlays = [ poetry2nix.overlays.default ];
           };
-        projectDir = ./.;
         in
         {
-        defaultPackage = pkgs.poetry2nix.mkPoetryApplication { inherit projectDir; };
+          default = pkgs.poetry2nix.mkPoetryApplication { inherit projectDir; };
-        devShells.default = pkgs.mkShell {
+        }
+      );
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = [ poetry2nix.overlays.default ];
+          };
+        in
+        {
+          default = pkgs.mkShell {
             buildInputs = [
               (pkgs.poetry2nix.mkPoetryEnv { inherit projectDir; })
               pkgs.poetry
@@ -31,4 +46,5 @@
           };
         }
       );
+    };
 }

windows/autohotkey/RemapCapsCtrlEscapeV2.ahk

@@ -0,0 +1,24 @@
+#Requires AutoHotkey v2.0
+#SingleInstance
+
+ih := InputHook("B L1 T1", "{Esc}")
+
+*Ctrl::
+{
+	ih.Start()
+	reason := ih.Wait()
+	if (reason = "Stopped") {
+		Send "{Esc}"
+	} else if (reason = "Max") {
+		Send "{Blind}{Ctrl down}" ih.Input
+	}
+}
+
+*Ctrl up::
+{
+	if (ih.InProgress) {
+		ih.Stop()
+	} else {
+		Send "{Ctrl up}"
+	}
+}

windows/caps-lock-ctrl.reg

@@ -0,0 +1,8 @@
+Windows Registry Editor Version 5.00
+
+; Changes registry to map Caps Lock key to Ctrl key
+; More info here: https://www.autohotkey.com/boards/viewtopic.php?p=468638#p468638
+; And here: https://superuser.com/a/949533
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout]
+"Scancode Map"=hex:00,00,00,00,00,00,00,00,02,00,00,00,1d,00,3a,00,00,00,00,00