clean up i3 sxhkd

.github/workflows/arrow.yml

@@ -1,164 +0,0 @@
-name: Arrow
-
-run-name: Arrow - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
-
-env:
-  TERRAFORM_DIRECTORY: hosts/arrow
-  DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
-  ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
-  CLOUDFLARE_R2_ENDPOINT: "${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
-  AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_SECRET_KEY }}
-  AWS_DEFAULT_REGION: auto
-  AWS_ENDPOINT_URL_S3: "https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
-  TF_VAR_vultr_api_key: ${{ secrets.VULTR_API_KEY }}
-  ZONE_NAME: masu.rs
-  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-  CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-
-on:
-  workflow_dispatch:
-    inputs:
-      rebuild:
-        type: boolean
-        default: false
-      action:
-        type: choice
-        required: true
-        default: create
-        options:
-          - create
-          - destroy
-          - nothing
-      plan:
-        type: choice
-        required: false
-        options:
-          - vc2-1c-1gb # 25 GB / $5
-          - vc2-1c-2gb # 55 GB / $10 (default)
-          - vc2-2c-2gb # 65 GB / $15
-          - vc2-2c-4gb # 80 GB / $20
-          - vc2-4c-8gb # 160 GB / $40
-          - vc2-6c-16gb # 320 GB / $80
-
-jobs:
-  build-deploy:
-    name: Build and Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo Code
-        uses: actions/checkout@v4
-
-      # Enable access to KVM, required to build an image
-      - name: Enable KVM group perms
-        if: inputs.rebuild && inputs.action != 'destroy'
-        run: |
-            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-            sudo udevadm control --reload-rules
-            sudo udevadm trigger --name-match=kvm
-
-      # Install Nix
-      - name: Install Nix
-        if: inputs.rebuild && inputs.action != 'destroy'
-        uses: cachix/install-nix-action@v17
-
-      # Build the image
-      - name: Build Image
-        if: inputs.rebuild && inputs.action != 'destroy'
-        run: nix build .#image.arrow
-
-      - name: Upload Image to S3
-        if: inputs.rebuild && inputs.action != 'destroy'
-        run: |
-          aws s3 cp \
-            result/iso/nixos.iso \
-            s3://noahmasur-arrow-images/arrow.iso \
-            --endpoint-url "https://${{ env.CLOUDFLARE_R2_ENDPOINT }}"
-
-      # # Copy the image to S3
-      # - name: Upload Image to Cache
-      #   env:
-      #     NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
-      #   run: |
-      #     echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
-      #     nix store sign --key-file cache.key $(readlink result)
-      #     nix copy --to s3://t2-aws-nixos-test $(readlink result)
-      #     rm cache.key
-
-      # Installs the Terraform binary and some other accessory functions.
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
-
-      # Checks whether Terraform is formatted properly. If this fails, you
-      # should install the pre-commit hook.
-      - name: Check Formatting
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform fmt -no-color -check -diff -recursive
-
-      # Connects to remote state backend and download providers.
-      - name: Terraform Init
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform init
-
-      # Deploys infrastructure or changes to infrastructure.
-      - name: Terraform Apply
-        if: inputs.action == 'create'
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        env:
-          TF_VAR_vultr_plan: ${{ inputs.plan }}
-        run: |
-          terraform apply \
-            -auto-approve \
-            -input=false
-
-      # Removes infrastructure.
-      - name: Terraform Destroy
-        if: inputs.action == 'destroy'
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: |
-          terraform destroy \
-            -auto-approve \
-            -input=false
-
-      - name: Get Host IP
-        if: inputs.action == 'create'
-        id: host
-        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform output -raw host_ip
-
-      - name: Wait on SSH
-        if: inputs.action == 'create'
-        run: |
-          for i in $(seq 1 15); do
-            if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
-              exit 0
-            fi
-            sleep 10
-          done
-
-      - name: Write Identity Keys to Files
-        if: inputs.action == 'create'
-        run: |
-          echo "${{ env.DEPLOY_IDENTITY_BASE64 }}" | base64 -d > deploy_ed25519
-          chmod 0600 deploy_ed25519
-          echo "${{ env.ARROW_IDENTITY_BASE64 }}" | base64 -d > arrow_ed25519
-          chmod 0600 arrow_ed25519
-
-      - name: Copy Identity File to Host
-        if: inputs.action == 'create'
-        run: |
-          ssh -i deploy_ed25519 -o StrictHostKeyChecking=accept-new noah@${{ steps.host.outputs.stdout }} 'mkdir -pv .ssh'
-          scp -i deploy_ed25519 arrow_ed25519 noah@${{ steps.host.outputs.stdout }}:~/.ssh/id_ed25519
-
-      - name: Wipe Records
-        if: ${{ inputs.action == 'destroy' }}
-        run: |
-          RECORD_ID=$(curl --request GET \
-             --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records \
-             --header 'Content-Type: application/json' \
-             --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "transmission.${{ env.ZONE_NAME }}") | .id')
-          curl --request DELETE \
-             --url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records/${RECORD_ID} \
-             --header 'Content-Type: application/json' \
-             --header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}"

.github/workflows/update.yml

@@ -8,7 +8,6 @@ on:
 permissions:
   contents: write
   pull-requests: write
-  checks: write
 
 jobs:
   lockfile:
@@ -31,39 +30,9 @@ jobs:
           pr-labels: |                  # Labels to be set on the PR
             dependencies
             automated
-          pr-body: |
-            Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action.
-
-            ```
-            {{ env.GIT_COMMIT_MESSAGE }}
-            ```
       - name: Check the Flake
-        id: check
         run: nix flake check
-      - name: Update Check Status
-        uses: LouisBrunner/checks-action@v1.6.1
-        if: always()
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          name: Update Flake
-          conclusion: ${{ job.status }}
-          output: |
-            {"summary":"${{ steps.check.outputs.stdout }}"}
       - name: Enable Pull Request Automerge
-        if: success()
+        run: gh pr merge --rebase --auto ${{ steps.update.outputs.pull-request-number }}
-        run: |
-          gh pr merge \
-            --rebase \
-            --auto \
-            ${{ steps.update.outputs.pull-request-number }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-      - name: Close Pull Request If Failed
-        if: failure()
-        run: |
-          gh pr close \
-            --comment "Auto-closing pull request" \
-            --delete-branch \
-            ${{ steps.update.outputs.pull-request-number }}
         env:
           GH_TOKEN: ${{ github.token }}

.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 *.bak
 *.db
-*.qcow2
 **/.direnv/**
 result
 private/**

README.md

@@ -25,7 +25,7 @@ configuration may be difficult to translate to a non-Nix system.
 | Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
 | Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
 | Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
-| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starship.nix)         |
+| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starhip.nix)         |
 | Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)          |
 | Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)                |
 | Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
@@ -41,26 +41,6 @@ configuration may be difficult to translate to a non-Nix system.
 | ---      | ---                                         | ---                                  |
 | Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
 
-# Diagram
-
-![Diagram](https://github.com/nmasur/dotfiles/assets/7386960/4cc22285-cea1-4831-b387-a82241184381)
-
----
-
-# Unique Configurations
-
-This repo contains a few more elaborate elements of configuration.
-
-- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
-and source-controlled plugins, differing based on installed LSPs, for example.
-- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based
-dynamically on enabled services rendered with Nix.
-- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix.
-- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
-agenix.
-- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
-including Firefox userChrome.
-
 ---
 
 # Installation

apps/loadkey.nix

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

disks/root.nix

@@ -1,38 +1,41 @@
-{ disk, ... }:
+{ disk, ... }: {
-{
   disk = {
     boot = {
       type = "disk";
       device = disk;
       content = {
-        type = "gpt";
+        type = "table";
-        partitions = {
+        format = "gpt";
+        partitions = [
           # Boot partition
-          ESP = rec {
+          {
-            size = "512MiB";
+            name = "ESP";
-            type = "EF00";
+            start = "0";
-            label = "boot";
+            end = "512MiB";
-            device = "/dev/disk/by-label/${label}";
+            fs-type = "fat32";
+            bootable = true;
             content = {
               type = "filesystem";
               format = "vfat";
               mountpoint = "/boot";
-              extraArgs = [ "-n ${label}" ];
+              extraArgs = [ "-n boot" ];
             };
-          };
+          }
           # Root partition ext4
-          root = rec {
+          {
-            size = "100%";
+            name = "root";
-            label = "nixos";
+            start = "512MiB";
-            device = "/dev/disk/by-label/${label}";
+            end = "100%";
+            part-type = "primary";
+            bootable = true;
             content = {
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
-              extraArgs = [ "-L ${label}" ];
+              extraArgs = [ "-L nixos" ];
             };
-          };
+          }
-        };
+        ];
       };
     };
   };

disks/zfs.nix

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

docs/installation.md

@@ -49,25 +49,19 @@ move the `windows/alacritty.yml` file to
 To get started on a bare macOS installation, first install Nix:
 
 ```bash
-curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+sh -c "$(curl -L https://nixos.org/nix/install)"
 ```
 
-Launch a new shell. Then use Nix to switch to the macOS configuration:
+Then use Nix to build nix-darwin:
 
 ```bash
-sudo rm /etc/bashrc
+nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
-sudo rm /etc/nix/nix.conf
+./result/bin/darwin-installer
-export NIX_SSL_CERT_FILE="$HOME/Documents/t2-ca-bundle.pem"
-nix \
-    --extra-experimental-features flakes \
-    --extra-experimental-features nix-command \
-    run nix-darwin -- switch \
-    --flake github:nmasur/dotfiles#lookingglass
 ```
 
-Once installed, you can continue to update the macOS configuration:
+Then switch to the macOS configuration:
 
 ```bash
-darwin-rebuild switch --flake ~/dev/personal/dotfiles
+darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
 ```
 

docs/repair-nextcloud.md

@@ -63,20 +63,3 @@ Use this mysqldump command:
 sudo -u nextcloud mysqldump -S /run/mysqld/mysqld.sock --default-character-set=utf8mb4 nextcloud > backup.sql
 ```
 
-## Converting to Postgres
-
-Same as MySQL, but run this command instead:
-
-```
-sudo -u nextcloud nextcloud-occ db:convert-type pgsql nextcloud /run/postgresql/ nextcloud
-```
-
-Then set the `dbtype` to `pgsql`.
-
-## Backing Up Postgres Database
-
-Use this pg_dump command:
-
-```
-sudo -u nextcloud pg_dump nextcloud > backup.sql
-```

flake.lock

@@ -1,87 +1,6 @@
 {
   "nodes": {
-    "baleia-nvim-src": {
+    "Comment-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704551058,
-        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
-        "owner": "m00qek",
-        "repo": "baleia.nvim",
-        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m00qek",
-        "repo": "baleia.nvim",
-        "type": "github"
-      }
-    },
-    "base16-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708139024,
-        "narHash": "sha256-l0BO2boIy6mwK8ISWS3D68f8egqHYwsGSAnzjbB5aOE=",
-        "owner": "RRethy",
-        "repo": "base16-nvim",
-        "rev": "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RRethy",
-        "repo": "base16-nvim",
-        "type": "github"
-      }
-    },
-    "bufferline-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1706180994,
-        "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=",
-        "owner": "akinsho",
-        "repo": "bufferline.nvim",
-        "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748",
-        "type": "github"
-      },
-      "original": {
-        "owner": "akinsho",
-        "ref": "v4.5.0",
-        "repo": "bufferline.nvim",
-        "type": "github"
-      }
-    },
-    "bypass-paywalls-clean": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713012522,
-        "narHash": "sha256-35KuPa3k6j8//gKXD3JY3Y318DRBxXNo/JuzatFXG5M=",
-        "ref": "refs/heads/master",
-        "rev": "724d4fcff64a433e988d9e54f7a08573523f2ca5",
-        "revCount": 1,
-        "type": "git",
-        "url": "https://git.masu.rs/noah/bpc-uploads"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.masu.rs/noah/bpc-uploads"
-      }
-    },
-    "cmp-nvim-lsp-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1702205473,
-        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "type": "github"
-      }
-    },
-    "comment-nvim-src": {
       "flake": false,
       "locked": {
         "lastModified": 1681214440,
@@ -98,6 +17,55 @@
         "type": "github"
       }
     },
+    "baleia-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681806450,
+        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
+        "owner": "m00qek",
+        "repo": "baleia.nvim",
+        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
+        "type": "github"
+      },
+      "original": {
+        "owner": "m00qek",
+        "repo": "baleia.nvim",
+        "type": "github"
+      }
+    },
+    "bufferline-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687763763,
+        "narHash": "sha256-wbOeylzjjScQXkrDbBU2HtrOZrp2YUK+wQ2aOkgxmRQ=",
+        "owner": "akinsho",
+        "repo": "bufferline.nvim",
+        "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
+        "type": "github"
+      },
+      "original": {
+        "owner": "akinsho",
+        "ref": "v4.2.0",
+        "repo": "bufferline.nvim",
+        "type": "github"
+      }
+    },
+    "cmp-nvim-lsp-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687494203,
+        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
+        "owner": "hrsh7th",
+        "repo": "cmp-nvim-lsp",
+        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hrsh7th",
+        "repo": "cmp-nvim-lsp",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -105,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711763326,
+        "lastModified": 1691275315,
-        "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
+        "narHash": "sha256-9WN0IA0vNZSNxKHpy/bYvPnCw4VH/nr5iBv7c+7KUts=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
+        "rev": "829041cf10c4f6751a53c0a11ca2fd22ff0918d6",
         "type": "github"
       },
       "original": {
@@ -126,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712612224,
+        "lastModified": 1690739034,
-        "narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=",
+        "narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5",
+        "rev": "4015740375676402a2ee6adebc3c30ea625b9a94",
         "type": "github"
       },
       "original": {
@@ -139,23 +107,6 @@
         "type": "github"
       }
     },
-    "fidget-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704696337,
-        "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=",
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db",
-        "type": "github"
-      },
-      "original": {
-        "owner": "j-hui",
-        "ref": "v1.2.0",
-        "repo": "fidget.nvim",
-        "type": "github"
-      }
-    },
     "firefox-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -163,11 +114,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712623312,
+        "lastModified": 1691196340,
-        "narHash": "sha256-6NlzHMtxCdlF+Zq1Y10YnVr5M/AgMcVhEMZlxlQyeNo=",
+        "narHash": "sha256-b1haFWCbFJkiUkeTQCkNjr8hFq/8JlMPaQwNpGlcvxI=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "49b3ee7dbb9fdbb6388bd5d47895a9a9992b771e",
+        "rev": "6081c33185dba05da784d9f2a392861af025bf1a",
         "type": "github"
       },
       "original": {
@@ -179,11 +130,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1673956053,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -193,15 +144,12 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1678901627,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -211,15 +159,33 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
       "inputs": {
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1689068808,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -231,11 +197,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1710430870,
+        "lastModified": 1691223193,
-        "narHash": "sha256-bsOQX56ciQ8ni7Zh4ZNtTvptvy/YaDPG318AsEaZRpE=",
+        "narHash": "sha256-Zsl4s3e4upWiU2mXKqiQcUGxslPzzebKKXfzaHiNq48=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "473d74cf54da8f51aaa9993ec3e6bfae278eb47b",
+        "rev": "1d40963804925754672940d07ddb250d19efec2e",
         "type": "github"
       },
       "original": {
@@ -251,11 +217,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712688495,
+        "lastModified": 1691225770,
-        "narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
+        "narHash": "sha256-O5slH8nW8msTAqVAS5rkvdHSkjmrO+JauuSDzZCmv2M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
+        "rev": "0a014a729cdd54d9919ff36b714d047909d7a4c8",
         "type": "github"
       },
       "original": {
@@ -265,87 +231,78 @@
         "type": "github"
       }
     },
-    "kitty-scrollback-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1712336907,
-        "narHash": "sha256-wDNYvNa9UEHg6lRKaonN+6vg4XJ4umUaVriziEJejKE=",
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "rev": "2d4c6970e9b6155b857755a5499cdce313d923b3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "type": "github"
-      }
-    },
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "lastModified": 1702545935,
+        "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
-        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
       }
     },
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1699624334,
+        "narHash": "sha256-gY1nxqK/pHfoxW/9mE7DFtNawgdEV7a4OXpscWY14yk=",
-        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "lastModified": 1703426420,
+        "narHash": "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=",
-        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"
       }
     },
-    "nextcloud-snappymail": {
+    "nil": {
-      "flake": false,
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
       "locked": {
-        "lastModified": 1712695892,
+        "lastModified": 1680544266,
-        "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
+        "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
-        "type": "tarball",
+        "owner": "oxalica",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
+        "repo": "nil",
+        "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "oxalica",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
+        "ref": "2023-04-03",
+        "repo": "nil",
+        "type": "github"
       }
     },
     "nix2vim": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1707832982,
+        "lastModified": 1685980282,
-        "narHash": "sha256-Jsrj8HJyo+PmjrHIDhq4gjZCE0eYCVmmTrx24cG8eOQ=",
+        "narHash": "sha256-uQyVaoqkiocA8bXKMfrgizuKmz0hUzHye5owFoUd2AQ=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "2fb1328cf058fc967b02f9a5330a99253b4c247e",
+        "rev": "3836a348503ae27340c7f83f0bc7bcb907f3781d",
         "type": "github"
       },
       "original": {
@@ -356,11 +313,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1712450863,
+        "lastModified": 1689469483,
-        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
+        "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
+        "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
         "type": "github"
       },
       "original": {
@@ -377,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712537332,
+        "lastModified": 1690133435,
-        "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=",
+        "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933",
+        "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586",
         "type": "github"
       },
       "original": {
@@ -392,11 +349,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712791164,
+        "lastModified": 1691186842,
-        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+        "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+        "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42",
         "type": "github"
       },
       "original": {
@@ -406,50 +363,66 @@
         "type": "github"
       }
     },
-    "nur": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1712692796,
+        "lastModified": 1690470004,
-        "narHash": "sha256-q3Tx4kS+nH4IDcEsZSv8o2IuCn475mGhCYBXxfxZ2gY=",
+        "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=",
-        "owner": "nix-community",
+        "owner": "NixOS",
-        "repo": "nur",
+        "repo": "nixpkgs",
-        "rev": "ee4ce451f46a08778d1a9f9837eff0750714b08b",
+        "rev": "9462344318b376e157c94fa60c20a25b913b2381",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "NixOS",
-        "repo": "nur",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nvim-lint-src": {
+    "null-ls-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1712680602,
+        "lastModified": 1688652536,
-        "narHash": "sha256-FgHWOiF+oMXVISP/k2rt7epEEjFS/sYLnEpe85B5Ox0=",
+        "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=",
-        "owner": "mfussenegger",
+        "owner": "jose-elias-alvarez",
-        "repo": "nvim-lint",
+        "repo": "null-ls.nvim",
-        "rev": "4055dc856d5ac8f6b85748006fd8fa6457e086e8",
+        "rev": "db09b6c691def0038c456551e4e2772186449f35",
         "type": "github"
       },
       "original": {
-        "owner": "mfussenegger",
+        "owner": "jose-elias-alvarez",
-        "repo": "nvim-lint",
+        "repo": "null-ls.nvim",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "locked": {
+        "lastModified": 1691289987,
+        "narHash": "sha256-sbbDlVzxlP+bBTdhyyzJ6C0APUNU/sChuLmNU9ehkmg=",
+        "owner": "nix-community",
+        "repo": "nur",
+        "rev": "cf2f5d8ad452795e5aca290c95eedc829d3da7ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nur",
         "type": "github"
       }
     },
     "nvim-lspconfig-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701687137,
+        "lastModified": 1675639052,
-        "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=",
+        "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "cf3dd4a290084a868fac0e2e876039321d57111c",
+        "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
         "type": "github"
       },
       "original": {
         "owner": "neovim",
-        "ref": "v0.1.7",
+        "ref": "v0.1.6",
         "repo": "nvim-lspconfig",
         "type": "github"
       }
@@ -457,11 +430,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1712366921,
+        "lastModified": 1691292370,
-        "narHash": "sha256-6pbOeklf+otsJIjt9IUyUfuTAedShnwERYq1IfhyrJs=",
+        "narHash": "sha256-YQRirmp8QerxwF9qdrSrUKJZiVrBb6ZWpUTfM8H7fl4=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "81eb8d519233c105f30dc0a278607e62b20502fd",
+        "rev": "904f95cd9db31d1800998fa428e78e418a50181d",
         "type": "github"
       },
       "original": {
@@ -473,110 +446,82 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1712690702,
+        "lastModified": 1681121236,
-        "narHash": "sha256-iWP5nIswAs+7oNBhJpPzBqJ5BLXEt8+kHPi22RtAK3Q=",
+        "narHash": "sha256-iPsPDLhVKJ14iP1/2cCgcY9SCKK/DQz9Y0mQB1DqNiM=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "c16f66cca0c38b4e21371d8330b7f2ad6404f6dc",
+        "rev": "cc360a9beb1b30d172438f640e2c3450358c4086",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
-        "ref": "master",
+        "ref": "v0.9.0",
         "repo": "nvim-treesitter",
         "type": "github"
       }
     },
-    "proton-ge": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710987994,
-        "narHash": "sha256-NqBzKonCYH+hNpVZzDhrVf+r2i6EwLG/IFBXjE2mC7s=",
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"
-      }
-    },
-    "ren": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704996573,
-        "narHash": "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=",
-        "owner": "robenkleene",
-        "repo": "ren-find",
-        "rev": "50c40172e354caffee48932266edd7c7a76a20fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "robenkleene",
-        "repo": "ren-find",
-        "type": "github"
-      }
-    },
-    "rep": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1707216692,
-        "narHash": "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=",
-        "owner": "robenkleene",
-        "repo": "rep-grep",
-        "rev": "10510d47e392cb9d30a861c69f702fd194b3fa88",
-        "type": "github"
-      },
-      "original": {
-        "owner": "robenkleene",
-        "repo": "rep-grep",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
+        "Comment-nvim-src": "Comment-nvim-src",
         "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",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
-        "nextcloud-snappymail": "nextcloud-snappymail",
+        "nil": "nil",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
+        "null-ls-nvim-src": "null-ls-nvim-src",
         "nur": "nur",
-        "nvim-lint-src": "nvim-lint-src",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
-        "proton-ge": "proton-ge",
-        "ren": "ren",
-        "rep": "rep",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
         "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",
+        "vscode-terraform-snippets": "vscode-terraform-snippets",
         "wallpapers": "wallpapers",
         "wsl": "wsl",
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "nil",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nil",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1680488274,
+        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -610,16 +555,16 @@
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701167040,
+        "lastModified": 1686302912,
-        "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=",
+        "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "d90956833d7c27e73c621a61f20b29fdb7122709",
+        "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
-        "ref": "0.1.5",
+        "ref": "0.1.2",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -627,11 +572,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701464478,
+        "lastModified": 1682606566,
-        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
+        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
+        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
         "type": "github"
       },
       "original": {
@@ -643,16 +588,16 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701858874,
+        "lastModified": 1685434104,
-        "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=",
+        "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008",
+        "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.9.0",
+        "ref": "v2.7.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
@@ -660,28 +605,28 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1710290046,
+        "lastModified": 1688032601,
-        "narHash": "sha256-6Rfxh8Y6dg2wyQ9jYnbOaXm1SVfQDQ1B1tNqgpz6sY4=",
+        "narHash": "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "f3f26f47a126797c011c311cec9d449d855c3eab",
+        "rev": "493646764e7ad61ce63ce3b8c59ebeb37f71b841",
         "type": "github"
       },
       "original": {
         "owner": "tree-sitter",
-        "ref": "master",
         "repo": "tree-sitter-bash",
+        "rev": "493646764e7ad61ce63ce3b8c59ebeb37f71b841",
         "type": "github"
       }
     },
     "tree-sitter-ini": {
       "flake": false,
       "locked": {
-        "lastModified": 1699877527,
+        "lastModified": 1690815608,
-        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
+        "narHash": "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M=",
         "owner": "justinmk",
         "repo": "tree-sitter-ini",
-        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
+        "rev": "7f11a02fb8891482068e0fe419965d7bade81a68",
         "type": "github"
       },
       "original": {
@@ -690,31 +635,14 @@
         "type": "github"
       }
     },
-    "tree-sitter-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710150044,
-        "narHash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=",
-        "owner": "MunifTanjim",
-        "repo": "tree-sitter-lua",
-        "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "ref": "main",
-        "repo": "tree-sitter-lua",
-        "type": "github"
-      }
-    },
     "tree-sitter-puppet": {
       "flake": false,
       "locked": {
-        "lastModified": 1709480423,
+        "lastModified": 1690231696,
-        "narHash": "sha256-Lwfiby7amjTIOz8QRoC4RdZyFPfFikmQ2sqta4akyH8=",
+        "narHash": "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw=",
         "owner": "amaanq",
         "repo": "tree-sitter-puppet",
-        "rev": "5849f9694197a6e822872945b415429c285fdd54",
+        "rev": "9ce9a5f7d64528572aaa8d59459ba869e634086b",
         "type": "github"
       },
       "original": {
@@ -726,28 +654,28 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1712321561,
+        "lastModified": 1690493803,
-        "narHash": "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88=",
+        "narHash": "sha256-2btd/NRE6NuGNlx4cq535OrwtWXihiP3VMCJjPCiDOk=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a",
+        "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5",
         "type": "github"
       },
       "original": {
         "owner": "tree-sitter",
-        "ref": "master",
         "repo": "tree-sitter-python",
+        "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5",
         "type": "github"
       }
     },
     "tree-sitter-rasi": {
       "flake": false,
       "locked": {
-        "lastModified": 1707776004,
+        "lastModified": 1678701563,
-        "narHash": "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c=",
+        "narHash": "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA=",
         "owner": "Fymyte",
         "repo": "tree-sitter-rasi",
-        "rev": "43196d934a9a6ab3c7093a8683efd0111bb03db1",
+        "rev": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d",
         "type": "github"
       },
       "original": {
@@ -756,19 +684,19 @@
         "type": "github"
       }
     },
-    "tree-sitter-vimdoc": {
+    "vscode-terraform-snippets": {
       "flake": false,
       "locked": {
-        "lastModified": 1711210668,
+        "lastModified": 1614849738,
-        "narHash": "sha256-spj8h1ZDY+6sWi+FCALapBsG+ig9H1u3bjkI2+UP0ds=",
+        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
-        "owner": "neovim",
+        "owner": "run-at-scale",
-        "repo": "tree-sitter-vimdoc",
+        "repo": "vscode-terraform-doc-snippets",
-        "rev": "a75a932449675bbd260213a95f4cd8b3193286f0",
+        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
         "type": "github"
       },
       "original": {
-        "owner": "neovim",
+        "owner": "run-at-scale",
-        "repo": "tree-sitter-vimdoc",
+        "repo": "vscode-terraform-doc-snippets",
         "type": "github"
       }
     },
@@ -791,17 +719,15 @@
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1710519878,
+        "lastModified": 1690553050,
-        "narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=",
+        "narHash": "sha256-pK3kF30OykL3v6P8UP6ipihlS34KoGq9SryCj3tHrFw=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592",
+        "rev": "f7a95a37306c46b42e9ce751977c44c752fd5eca",
         "type": "github"
       },
       "original": {
@@ -813,11 +739,11 @@
     "zenyd-mpv-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1707704915,
+        "lastModified": 1650625438,
-        "narHash": "sha256-9P/8q/OZXfaJMS08acQP4h3/zUA5mKRQee0JmkXcz1w=",
+        "narHash": "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=",
         "owner": "zenyd",
         "repo": "mpv-scripts",
-        "rev": "9bdce0050144cb24f92475f7bdd77180e0e4c26b",
+        "rev": "19ea069abcb794d1bf8fac2f59b50d71ab992130",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,15 +9,12 @@
 
     # Used for MacOS system config
     darwin = {
-      url = "github:lnl7/nix-darwin/master";
+      url = "github:/lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Used for Windows Subsystem for Linux compatibility
-    wsl = {
+    wsl.url = "github:nix-community/NixOS-WSL";
-      url = "github:nix-community/NixOS-WSL";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # Used for user packages and dotfiles
     home-manager = {
@@ -59,38 +56,39 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Neovim plugins
+    # Nix language server
-    base16-nvim-src = {
+    nil = {
-      url = "github:RRethy/base16-nvim";
+      url = "github:oxalica/nil/2023-04-03";
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Neovim plugins
     nvim-lspconfig-src = {
-      # https://github.com/neovim/nvim-lspconfig/tags
+      url = "github:neovim/nvim-lspconfig/v0.1.6";
-      url = "github:neovim/nvim-lspconfig/v0.1.7";
       flake = false;
     };
     cmp-nvim-lsp-src = {
       url = "github:hrsh7th/cmp-nvim-lsp";
       flake = false;
     };
+    null-ls-nvim-src = {
+      url = "github:jose-elias-alvarez/null-ls.nvim";
+      flake = false;
+    };
     baleia-nvim-src = {
-      # https://github.com/m00qek/baleia.nvim/tags
       url = "github:m00qek/baleia.nvim";
       flake = false;
     };
-    comment-nvim-src = {
+    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/v0.9.0";
-      url = "github:nvim-treesitter/nvim-treesitter/master";
       flake = false;
     };
     telescope-nvim-src = {
-      # https://github.com/nvim-telescope/telescope.nvim/releases
+      url = "github:nvim-telescope/telescope.nvim/0.1.2";
-      url = "github:nvim-telescope/telescope.nvim/0.1.5";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -98,48 +96,39 @@
       flake = false;
     };
     toggleterm-nvim-src = {
-      # https://github.com/akinsho/toggleterm.nvim/tags
+      url = "github:akinsho/toggleterm.nvim/v2.7.0";
-      url = "github:akinsho/toggleterm.nvim/v2.9.0";
       flake = false;
     };
     bufferline-nvim-src = {
-      # https://github.com/akinsho/bufferline.nvim/releases
+      url = "github:akinsho/bufferline.nvim/v4.2.0";
-      url = "github:akinsho/bufferline.nvim/v4.5.0";
       flake = false;
     };
     nvim-tree-lua-src = {
       url = "github:kyazdani42/nvim-tree.lua";
       flake = false;
     };
+    vscode-terraform-snippets = {
+      url = "github:run-at-scale/vscode-terraform-doc-snippets";
+      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.2.0";
-      flake = false;
-    };
-    kitty-scrollback-nvim-src = {
-      url = "github:mikesmithgh/kitty-scrollback.nvim";
-      flake = false;
-    };
-    nvim-lint-src = {
-      url = "github:mfussenegger/nvim-lint";
-      flake = false;
-    };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
-      url = "github:tree-sitter/tree-sitter-bash/master";
+      # Fix: bash highlighting doesn't work as of this commit:
+      # https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
+      url =
+        "github:tree-sitter/tree-sitter-bash/493646764e7ad61ce63ce3b8c59ebeb37f71b841";
       flake = false;
     };
     tree-sitter-python = {
-      url = "github:tree-sitter/tree-sitter-python/master";
+      # Fix: invalid node in position. Broken as of this commit (replaced with newer):
-      flake = false;
+      # https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5
-    };
+      url =
-    tree-sitter-lua = {
+        "github:tree-sitter/tree-sitter-python/5af00f64af6bbf822f208243cce5cf75396fb6f5";
-      url = "github:MunifTanjim/tree-sitter-lua/main";
       flake = false;
     };
     tree-sitter-ini = {
@@ -154,10 +143,6 @@
       url = "github:Fymyte/tree-sitter-rasi";
       flake = false;
     };
-    tree-sitter-vimdoc = {
-      url = "github:neovim/tree-sitter-vimdoc";
-      flake = false;
-    };
 
     # MPV Scripts
     zenyd-mpv-scripts = {
@@ -165,56 +150,20 @@
       flake = false;
     };
 
-    # Ren and rep - CLI find and replace
-    rep = {
-      url = "github:robenkleene/rep-grep";
-      flake = false;
-    };
-    ren = {
-      url = "github:robenkleene/ren-find";
-      flake = false;
-    };
-
-    # GE version of Proton for game compatibility
-    # Alternatively, could consider using https://github.com/fufexan/nix-gaming
-    proton-ge = {
-      # https://github.com/GloriousEggroll/proton-ge-custom/releases
-      url =
-        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz";
-      flake = false;
-    };
-
-    # Firefox addon from outside the extension store
-    bypass-paywalls-clean = {
-      # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
-      url =
-        "git+https://git.masu.rs/noah/bpc-uploads"; # temporary, shouldn't rely on myself
-      flake = false;
-    };
-
     # Nextcloud Apps
     nextcloud-news = {
-      # https://github.com/nextcloud/news/releases
       url =
-        "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
+        "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz";
       flake = false;
     };
     nextcloud-external = {
-      # https://github.com/nextcloud-releases/external/releases
       url =
-        "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
+        "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz";
       flake = false;
     };
     nextcloud-cookbook = {
-      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
       url =
-        "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
+        "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz";
-      flake = false;
-    };
-    nextcloud-snappymail = {
-      # https://github.com/the-djmaze/snappymail/releases
-      url =
-        "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz";
       flake = false;
     };
 
@@ -237,18 +186,13 @@
         dotfilesRepo = "https://github.com/nmasur/dotfiles";
         hostnames = {
           git = "git.${baseName}";
-          influxdb = "influxdb.${baseName}";
-          irc = "irc.${baseName}";
           metrics = "metrics.${baseName}";
-          minecraft = "minecraft.${baseName}";
           prometheus = "prom.${baseName}";
-          paperless = "paper.${baseName}";
           secrets = "vault.${baseName}";
           stream = "stream.${baseName}";
           content = "cloud.${baseName}";
           books = "books.${baseName}";
           download = "download.${baseName}";
-          transmission = "transmission.${baseName}";
         };
       };
 
@@ -264,10 +208,6 @@
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/proton-ge.nix inputs)
-        (import ./overlays/gh-collaborators.nix)
-        (import ./overlays/bypass-paywalls-clean.nix inputs)
-        (import ./overlays/ren-rep.nix inputs)
       ];
 
       # System types to support.
@@ -282,7 +222,6 @@
       # Contains my full system builds, including home-manager
       # nixos-rebuild switch --flake .#tempest
       nixosConfigurations = {
-        arrow = import ./hosts/arrow { inherit inputs globals overlays; };
         tempest = import ./hosts/tempest { inherit inputs globals overlays; };
         hydra = import ./hosts/hydra { inherit inputs globals overlays; };
         flame = import ./hosts/flame { inherit inputs globals overlays; };
@@ -309,8 +248,6 @@
       diskoConfigurations = { root = import ./disks/root.nix; };
 
       packages = let
-        arrow = system:
-          import ./hosts/arrow { inherit inputs globals overlays system; };
         aws = system:
           import ./hosts/aws { inherit inputs globals overlays system; };
         staff = system:
@@ -322,18 +259,8 @@
             colors = (import ./colorscheme/gruvbox-dark).dark;
           };
       in {
-        x86_64-linux.arrow = arrow "x86_64-linux";
         x86_64-linux.aws = aws "x86_64-linux";
         x86_64-linux.staff = staff "x86_64-linux";
-        x86_64-linux.image = {
-          arrow = inputs.nixos-generators.nixosGenerate {
-            system = "x86_64-linux";
-            format = "iso";
-            modules = import ./hosts/arrow/modules.nix {
-              inherit inputs globals overlays;
-            };
-          };
-        };
 
         # Package Neovim config into standalone package
         x86_64-linux.neovim = neovim "x86_64-linux";
@@ -354,46 +281,28 @@
 
           # Used to run commands and edit files in this repo
           default = pkgs.mkShell {
-            buildInputs = with pkgs; [
+            buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
-              git
-              stylua
-              nixfmt-rfc-style
-              shfmt
-              shellcheck
-            ];
           };
-        }
-      );
 
-      checks = forAllSystems (
+        });
-        system:
-        let
-          pkgs = import nixpkgs { inherit system overlays; };
-        in
-        {
-          neovim =
-            pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
-              ''
-                mkdir -p $out
-                export HOME=$TMPDIR
-                nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
 
-                # Check for errors inside the health log
+      checks = forAllSystems (system:
-                if $(grep "ERROR" $out/health.log); then
+        let pkgs = import nixpkgs { inherit system overlays; };
-                  cat $out/health.log
+        in {
-                  exit 1
+          neovim = pkgs.runCommand "neovim-check-health" {
-                fi
+            buildInputs = [ inputs.self.packages.${system}.neovim ];
-              '';
+          } ''
-        }
+            mkdir -p $out
-      );
+            export HOME=$TMPDIR
+            nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
 
-      formatter = forAllSystems (
+            # Check for errors inside the health log
-        system:
+            if $(grep "ERROR" $out/health.log); then
-        let
+              cat $out/health.log
-          pkgs = import nixpkgs { inherit system overlays; };
+              exit 1
-        in
+            fi
-        pkgs.nixfmt-rfc-style
+          '';
-      );
+        });
 
       # Templates for starting other projects quickly
       templates = rec {
@@ -414,10 +323,6 @@
           path = ./templates/haskell;
           description = "Haskell template";
         };
-        rust = {
-          path = ./templates/rust;
-          description = "Rust template";
-        };
       };
 
     };

hosts/README.md

@@ -12,15 +12,3 @@ These are the individual machines managed by this flake.
 | [swan](./swan/default.nix)                 | Home server         |
 | [tempest](./tempest/default.nix)           | Linux desktop       |
 
-## NixOS Workflow
-
-Each hosts file is imported into [nixosConfigurations](../flake.nix) and passed
-the arguments from the flake (inputs, globals, overlays). The `nixosSystem`
-function in that hosts file will be called by the NixOS module system during a
-nixos-rebuild.
-
-Each module in the each host's `modules` list is either a function or an
-attrset. The attrsets will simply apply values to options that have been
-declared in the config by other modules. Meanwhile, the functions will be
-passed various arguments, several of which you will see listed at the top of
-each of their files.

hosts/arrow/default.nix

@@ -1,26 +0,0 @@
-{
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
-
-inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
-  specialArgs = { };
-  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";
-      };
-    }
-  ];
-}

hosts/arrow/main.tf

@@ -1,99 +0,0 @@
-terraform {
-  backend "s3" {
-    bucket                      = "noahmasur-terraform"
-    key                         = "arrow.tfstate"
-    region                      = "auto"
-    skip_credentials_validation = true
-    skip_metadata_api_check     = true
-    skip_region_validation      = true
-    skip_requesting_account_id  = true
-    skip_s3_checksum            = true
-    use_path_style              = true
-    /*
-      ENVIRONMENT VARIABLES
-      ---------------------
-      AWS_ACCESS_KEY_ID     - R2 token
-      AWS_SECRET_ACCESS_KEY - R2 secret
-      AWS_ENDPOINT_URL_S3   - R2 location: https://ACCOUNT_ID.r2.cloudflarestorage.com
-    */
-  }
-  required_version = ">= 1.0.0"
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "5.42.0"
-    }
-    vultr = {
-      source  = "vultr/vultr"
-      version = "2.19.0"
-    }
-  }
-}
-
-# locals {
-#   image_file = one(fileset(path.root, "result/iso/nixos.iso"))
-# }
-
-# variable "cloudflare_r2_endpoint" {
-#   type        = string
-#   description = "Domain for the Cloudflare R2 endpoint"
-# }
-
-variable "vultr_api_key" {
-  type        = string
-  description = "API key for Vultr management"
-  sensitive   = true
-}
-
-# https://api.vultr.com/v2/plans
-variable "vultr_plan" {
-  type        = string
-  description = "Size of instance to launch"
-  default     = "vc2-1c-2gb" # 55 GB SSD ($10/mo)
-}
-
-provider "aws" {
-  region                      = "auto"
-  skip_credentials_validation = true
-  skip_metadata_api_check     = true
-  skip_region_validation      = true
-  skip_requesting_account_id  = true
-}
-
-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"
-}
-
-resource "vultr_instance" "arrow" {
-  plan                = var.vultr_plan
-  region              = "ewr"
-  iso_id              = vultr_iso_private.image.id
-  label               = "arrow"
-  tags                = ["arrow"]
-  enable_ipv6         = false
-  disable_public_ipv4 = false
-  backups             = "disabled"
-  ddos_protection     = false
-  activation_email    = false
-}
-
-output "host_ip" {
-  value = vultr_instance.arrow.main_ip
-}

hosts/arrow/modules.nix

@@ -1,42 +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.transmission.enable = true;
-
-    # nix-index seems to each 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/aws/default.nix

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

hosts/aws/main.tf

@@ -26,7 +26,7 @@ data "aws_iam_policy_document" "vmimport" {
     actions = [
       "s3:GetBucketLocation",
       "s3:GetObject",
-        "s3:ListBucket",
+      "s3:ListBucket",
     ]
     resources = [
       "arn:aws:s3:::${aws_s3_object.image.bucket}",

hosts/flame/default.nix

@@ -1,18 +1,11 @@
 # The Flame
 # System configuration for an Oracle free server
 
-# See [readme](../README.md) to explain how this file works.
-
 # 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.
 
-{
+{ inputs, globals, overlays, ... }:
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
 
 inputs.nixpkgs.lib.nixosSystem {
   system = "aarch64-linux";
@@ -31,11 +24,7 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # Not sure what's necessary but too afraid to remove anything
       imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
-      boot.initrd.availableKernelModules = [
+      boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
-        "xhci_pci"
-        "virtio_pci"
-        "usbhid"
-      ];
 
       # File systems must be declared in order to boot
 
@@ -58,22 +47,17 @@ inputs.nixpkgs.lib.nixosSystem {
       gui.enable = false;
 
       # Still require colors for programs like Neovim, K9S
-      theme = {
+      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
-        colors = (import ../../colorscheme/gruvbox).dark;
-      };
 
       # Programs and services
-      atuin.enable = true;
       cloudflare.enable = true; # Proxy traffic with Cloudflare
       dotfiles.enable = true; # Clone dotfiles
       neovim.enable = true;
       giteaRunner.enable = true;
       services.caddy.enable = true;
       services.grafana.enable = true;
-      services.thelounge.enable = true;
       services.openssh.enable = true;
       services.victoriametrics.enable = true;
-      services.influxdb2.enable = true;
       services.gitea.enable = true;
       services.vaultwarden.enable = true;
       services.minecraft-server.enable = true; # Setup Minecraft server
@@ -83,7 +67,8 @@ inputs.nixpkgs.lib.nixosSystem {
         enable = true;
         id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
         credentialsFile = ../../private/cloudflared-flame.age;
-        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
+        ca =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
       };
 
       # Nextcloud backup config
@@ -94,9 +79,8 @@ inputs.nixpkgs.lib.nixosSystem {
       };
 
       # Disable passwords, only use SSH key
-      publicKeys = [
+      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
-      ];
 
       # # Wireguard config for Transmission
       # wireguard.enable = true;
@@ -126,6 +110,7 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # # VPN port forwarding
       # services.transmission.settings.peer-port = 57599;
+
     }
   ];
 }

hosts/hydra/default.nix

@@ -1,14 +1,7 @@
 # The Hydra
 # System configuration for WSL
 
-# See [readme](../README.md) to explain how this file works.
+{ inputs, globals, overlays, ... }:
-
-{
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
 
 inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
@@ -37,7 +30,8 @@ inputs.nixpkgs.lib.nixosSystem {
         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
+        interop.includePath =
+          false; # Including Windows PATH will slow down Neovim command mode
       };
 
       neovim.enable = true;

hosts/lookingglass/default.nix

@@ -1,27 +1,19 @@
 # The Looking Glass
 # System configuration for my work Macbook
 
-{
+{ inputs, globals, overlays, ... }:
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
 
 inputs.darwin.lib.darwinSystem {
-  system = "aarch64-darwin";
+  system = "x86_64-darwin";
   specialArgs = { };
   modules = [
     ../../modules/common
     ../../modules/darwin
-    (
+    (globals // rec {
-      globals
+      user = "Noah.Masur";
-      // rec {
+      gitName = "Noah-Masur_1701";
-        user = "Noah.Masur";
+      gitEmail = "${user}@take2games.com";
-        gitName = "Noah-Masur_1701";
+    })
-        gitEmail = "${user}@take2games.com";
-      }
-    )
     inputs.home-manager.darwinModules.home-manager
     {
       nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
@@ -33,7 +25,6 @@ inputs.darwin.lib.darwinSystem {
         dark = true;
       };
       mail.user = globals.user;
-      atuin.enable = true;
       charm.enable = true;
       neovim.enable = true;
       mail.enable = true;
@@ -46,9 +37,7 @@ inputs.darwin.lib.darwinSystem {
       nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
-      rust.enable = true;
       lua.enable = true;
-      obsidian.enable = true;
       kubernetes.enable = true;
       _1password.enable = true;
       slack.enable = true;

hosts/staff/default.nix

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

hosts/swan/default.nix

@@ -1,14 +1,7 @@
 # The Swan
 # System configuration for my home NAS server
 
-# See [readme](../README.md) to explain how this file works.
+{ inputs, globals, overlays, ... }:
-
-{
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
 
 inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
@@ -28,13 +21,8 @@ inputs.nixpkgs.lib.nixosSystem {
       networking.hostName = "swan";
 
       # Not sure what's necessary but too afraid to remove anything
-      boot.initrd.availableKernelModules = [
+      boot.initrd.availableKernelModules =
-        "xhci_pci"
+        [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
-        "ahci"
-        "nvme"
-        "usb_storage"
-        "sd_mod"
-      ];
 
       # Required for transcoding
       boot.initrd.kernelModules = [ "amdgpu" ];
@@ -66,19 +54,8 @@ inputs.nixpkgs.lib.nixosSystem {
         devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
       };
 
-      boot.zfs = {
+      # Automatically load the ZFS pool on boot
-        # Automatically load the ZFS pool on boot
+      boot.zfs.extraPools = [ "tank" ];
-        extraPools = [ "tank" ];
-        # Only try to decrypt datasets with keyfiles
-        requestEncryptionCredentials = [
-          "tank/archive"
-          "tank/generic"
-          "tank/nextcloud"
-          "tank/generic/git"
-        ];
-        # If password is requested and fails, continue to boot eventually
-        passwordTimeout = 300;
-      };
 
       # Theming
 
@@ -86,12 +63,9 @@ inputs.nixpkgs.lib.nixosSystem {
       gui.enable = false;
 
       # Still require colors for programs like Neovim, K9S
-      theme = {
+      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
-        colors = (import ../../colorscheme/gruvbox-dark).dark;
-      };
 
       # Programs and services
-      atuin.enable = true;
       neovim.enable = true;
       cloudflare.enable = true;
       dotfiles.enable = true;
@@ -105,15 +79,14 @@ inputs.nixpkgs.lib.nixosSystem {
       services.prometheus.enable = false;
       services.vmagent.enable = true;
       services.samba.enable = true;
-      services.paperless.enable = true;
-      services.postgresql.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
         enable = true;
         id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
         credentialsFile = ../../private/cloudflared-swan.age;
-        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
+        ca =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
       };
 
       # Send regular backups and litestream for DBs to an S3-like bucket
@@ -124,9 +97,8 @@ inputs.nixpkgs.lib.nixosSystem {
       };
 
       # Disable passwords, only use SSH key
-      publicKeys = [
+      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
-      ];
     }
   ];
 }

hosts/tempest/default.nix

@@ -1,14 +1,7 @@
 # The Tempest
 # System configuration for my desktop
 
-# See [readme](../README.md) to explain how this file works.
+{ inputs, globals, overlays, ... }:
-
-{
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
 
 inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
@@ -25,14 +18,8 @@ inputs.nixpkgs.lib.nixosSystem {
       networking.hostName = "tempest";
 
       # Not sure what's necessary but too afraid to remove anything
-      boot.initrd.availableKernelModules = [
+      boot.initrd.availableKernelModules =
-        "nvme"
+        [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-        "xhci_pci"
-        "ahci"
-        "usb_storage"
-        "usbhid"
-        "sd_mod"
-      ];
 
       # Graphics and VMs
       boot.initrd.kernelModules = [ "amdgpu" ];
@@ -96,7 +83,6 @@ inputs.nixpkgs.lib.nixosSystem {
       gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
 
       # Programs and services
-      atuin.enable = true;
       charm.enable = true;
       neovim.enable = true;
       media.enable = true;
@@ -113,8 +99,6 @@ inputs.nixpkgs.lib.nixosSystem {
       keybase.enable = true;
       mullvad.enable = false;
       nixlang.enable = true;
-      rust.enable = true;
-      terraform.enable = true;
       yt-dlp.enable = true;
       gaming = {
         dwarf-fortress.enable = true;
@@ -122,23 +106,27 @@ inputs.nixpkgs.lib.nixosSystem {
         steam.enable = true;
         legendary.enable = true;
         lutris.enable = true;
+        leagueoflegends.enable = true;
         ryujinx.enable = true;
       };
       services.vmagent.enable = true; # Enables Prometheus metrics
-      services.openssh.enable = true; # Required for Cloudflare tunnel and identity file
+      services.openssh.enable =
+        true; # Required for Cloudflare tunnel and identity file
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
         enable = true;
         id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
         credentialsFile = ../../private/cloudflared-tempest.age;
-        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
+        ca =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
       };
 
       # Allows requests to force machine to wake up
       # This network interface might change, needs to be set specifically for each machine.
       # Or set usePredictableInterfaceNames = false
       networking.interfaces.enp5s0.wakeOnLan.enable = true;
+
     }
   ];
 }

misc/public-keys

@@ -4,4 +4,3 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVknmPi7sG6ES0G0jcsvebzKGWWaMfJTYgvOue6EULI flame
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9mwXlZnIALt9SnH3FOZvdgHLM5ZqwYUERXBbM7Rwh6 swan
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3yHivgEXr2ecwe58h9bkhwTYivf3GwL8xenQKMeiUb tempest
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICmGHIWBZzRx35/yFgnPJSHN2+35WJ30G9c5tDhPsCrl arrow

modules/common/applications/1password.nix

@@ -9,22 +9,12 @@
     };
   };
 
-  config = lib.mkIf (config.gui.enable && config._1password.enable) {
+  config = lib.mkIf
-    unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
+    (config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
-    home-manager.users.${config.user} = {
+      unfreePackages = [ "1password" "_1password-gui" ];
-      home.packages = with pkgs; [ _1password-gui _1password ];
+      home-manager.users.${config.user} = {
+        home.packages = with pkgs; [ _1password-gui ];
+      };
     };
 
-    # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
-    # On Mac, does not apply: https://1password.community/discussion/142794/app-and-browser-integration
-    # However, the button doesn't work either:
-    # https://1password.community/discussion/140735/extending-support-for-trusted-web-browsers
-    environment.etc."1password/custom_allowed_browsers".text = ''
-      ${
-        config.home-manager.users.${config.user}.programs.firefox.package
-      }/Applications/Firefox.app/Contents/MacOS/firefox
-      firefox
-    '';
-  };
-
 }

modules/common/applications/discord.nix

@@ -11,8 +11,8 @@
 
   config = lib.mkIf (config.gui.enable && config.discord.enable) {
     unfreePackages = [ "discord" ];
-    environment.systemPackages = [ pkgs.discord ];
     home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ discord ];
       xdg.configFile."discord/settings.json".text = ''
         {
           "BACKGROUND_COLOR": "#202225",

modules/common/applications/firefox.nix

@@ -28,22 +28,22 @@
           id = 0;
           name = "default";
           isDefault = true;
-          # https://nur.nix-community.org/repos/rycee/
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            (lib.mkIf config._1password.enable onepassword-password-manager)
+            ublock-origin
-            pkgs.bypass-paywalls-clean
+            vimium
-            darkreader
-            don-t-fuck-with-paste
-            facebook-container
-            markdownload
             multi-account-containers
+            facebook-container
+            (lib.mkIf config._1password.enable onepassword-password-manager)
             okta-browser-plugin
+            sponsorblock
             reddit-enhancement-suite
             return-youtube-dislikes
-            sponsorblock
+            markdownload
-            ublock-origin
+            darkreader
-            ublacklist
+            snowflake
-            vimium
+            don-t-fuck-with-paste
+            i-dont-care-about-cookies
+            wappalyzer
           ];
           settings = {
             "app.update.auto" = false;
@@ -73,8 +73,6 @@
             "media.ffmpeg.vaapi.enabled" =
               true; # Enable hardware video acceleration
             "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "devtools.command-button-screenshot.enabled" =
-              true; # Scrolling screenshot of entire page
             "svg.context-properties.content.enabled" = true; # Sidebery styling
           };
           userChrome = ''
@@ -116,7 +114,7 @@
               background-color: ${config.theme.colors.base00};
               color: ${config.theme.colors.base06} !important;
             }
-            .tab-content[selected] {
+            .tab-content[selected=true] {
               border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
               background-color: ${config.theme.colors.base01} !important;
               color: ${config.theme.colors.base07} !important;
@@ -163,11 +161,6 @@
 
       };
 
-      xdg.mimeApps = {
-        associations.added = { "text.html" = [ "firefox.desktop" ]; };
-        defaultApplications = { "text.html" = [ "firefox.desktop" ]; };
-      };
-
       xsession.windowManager.i3.config.keybindings =
         lib.mkIf pkgs.stdenv.isLinux {
           "${

modules/common/applications/kitty.nix

@@ -11,23 +11,10 @@
 
   config = lib.mkIf (config.gui.enable && config.kitty.enable) {
 
-    # Set the Rofi-Systemd terminal for viewing logs
+    terminal = "${pkgs.kitty}/bin/kitty";
-    # Using optionalAttrs because only available in NixOS
-    environment = { } // lib.attrsets.optionalAttrs
-      (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
-      };
 
     home-manager.users.${config.user} = {
 
-      # Set the i3 terminal
-      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";
-
       # Display images in the terminal
       programs.fish.shellAliases = {
         icat = "kitty +kitten icat";
@@ -45,20 +32,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;
@@ -103,8 +79,8 @@
           color21 = config.theme.colors.base06;
 
           # Scrollback
-          scrollback_lines = 10000;
+          scrolling_lines = 10000;
-          scrollback_pager_history_size = 300; # MB
+          scrollback_pager_history_size = 10; # MB
 
           # Window
           window_padding_width = 6;

modules/common/applications/media.nix

@@ -40,7 +40,6 @@
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
-          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
@@ -49,7 +48,6 @@
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
-          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
       };

modules/common/applications/obsidian.nix

@@ -15,9 +15,8 @@
       home.packages = with pkgs; [ obsidian ];
     };
 
-    # Broken on 2023-12-11
+    # Broken on 2023-04-16
-    # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
+    nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ];
-    nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
 
   };
 

modules/common/default.nix

@@ -75,22 +75,10 @@
         type = lib.types.str;
         description = "Hostname for metrics server.";
       };
-      minecraft = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for Minecraft server.";
-      };
-      paperless = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for document server (paperless-ngx).";
-      };
       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).";
@@ -111,20 +99,44 @@
         type = lib.types.str;
         description = "Hostname for download services.";
       };
-      irc = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for IRC services.";
-      };
-      transmission = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for peer2peer downloads (Transmission).";
-      };
     };
   };
 
   config = let stateVersion = "23.05";
   in {
 
+    nix = {
+
+      # Enable features in Nix commands
+      extraOptions = ''
+        experimental-features = nix-command flakes
+        warn-dirty = false
+      '';
+
+      gc = {
+        automatic = true;
+        options = "--delete-older-than 7d";
+      };
+
+      settings = {
+
+        # Add community Cachix to binary cache
+        # Don't use with macOS because blocked by corporate firewall
+        builders-use-substitutes = true;
+        substituters = lib.mkIf (!pkgs.stdenv.isDarwin)
+          [ "https://nix-community.cachix.org" ];
+        trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
+          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        ];
+
+        # Scans and hard links identical files in the store
+        # Not working with macOS: https://github.com/NixOS/nix/issues/7273
+        auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
+
+      };
+
+    };
+
     # Basic common system packages for all devices
     environment.systemPackages = with pkgs; [ git vim wget curl ];
 

modules/common/mail/aerc.nix

@@ -68,7 +68,7 @@
             "!" = ":term<space>";
             "|" = ":pipe<space>";
 
-            "/" = ":search<space>-a<space>";
+            "/" = ":search<space>";
             "\\" = ":filter <space>";
             n = ":next-result<Enter>";
             N = ":prev-result<Enter>";
@@ -176,7 +176,6 @@
         extraAccounts = {
           check-mail = "5m";
           check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
-          check-mail-timeout = "15s";
         };
       };
 

modules/common/mail/himalaya.nix

@@ -9,6 +9,8 @@
       programs.himalaya = { enable = true; };
       accounts.email.accounts.home.himalaya = {
         enable = true;
+        backend = "imap";
+        sender = "smtp";
         settings = {
           downloads-dir = config.userDirs.download;
           smtp-insecure = true;

modules/common/neovim/config/colors.nix

@@ -8,7 +8,7 @@
   };
 
   config = {
-    plugins = [ pkgs.vimPlugins.base16-nvim ];
+    plugins = [ pkgs.vimPlugins.nvim-base16 ];
     setup.base16-colorscheme = config.colors;
 
     # Telescope isn't working, shut off for now

modules/common/neovim/config/completion.nix

@@ -9,6 +9,7 @@
     pkgs.vimPlugins.luasnip
     pkgs.vimPlugins.cmp_luasnip
     pkgs.vimPlugins.cmp-rg
+    pkgs.vimPlugins.friendly-snippets
   ];
 
   use.cmp.setup = dsl.callWith {
@@ -23,6 +24,13 @@
       end
     '';
 
+    # Enable Luasnip snippet completion
+    snippet.expand = dsl.rawLua ''
+      function(args)
+          require("luasnip").lsp_expand(args.body)
+      end
+    '';
+
     # Basic completion keybinds
     mapping = {
       "['<C-n>']" = dsl.rawLua
@@ -62,6 +70,7 @@
     sources = [
       { name = "nvim_lua"; } # Fills in common Neovim lua functions
       { name = "nvim_lsp"; } # LSP results
+      { name = "luasnip"; } # Snippets
       { name = "path"; } # Shell completion from current PATH
       {
         name = "buffer"; # Grep for text from the current text buffer
@@ -110,6 +119,7 @@
             }
             vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
             vim_item.menu = ({
+                luasnip = "[Snippet]",
                 buffer = "[Buffer]",
                 path = "[Path]",
                 rg = "[Grep]",
@@ -129,6 +139,13 @@
   };
 
   lua = ''
+    -- Load snippets
+    -- Check status: :lua require("luasnip").log.open()
+    require("luasnip.loaders.from_vscode").lazy_load()
+    require("luasnip.loaders.from_vscode").lazy_load({ paths = { "${
+      builtins.toString pkgs.vscode-terraform-snippets
+    }" } })
+
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
         sources = {

modules/common/neovim/config/github.lua

@@ -1,14 +0,0 @@
--- Keymap to open file in GitHub web
-vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
-
--- Pop a terminal to watch the current run
-local gitwatch =
-    require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
-
--- Set a toggle for this terminal
-function GITWATCH_TOGGLE()
-    gitwatch:toggle()
-end
-
--- Keymap to toggle the run
-vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)

modules/common/neovim/config/kubernetes.lua

@@ -1,6 +0,0 @@
-local k9s = require("toggleterm.terminal").Terminal:new({ cmd = "k9s" })
-function K9S_TOGGLE()
-    k9s:toggle()
-end
-
-vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)

modules/common/neovim/config/lsp.nix

@@ -1,112 +1,76 @@
-{ pkgs, lib, config, dsl, ... }: {
+{ pkgs, dsl, ... }: {
 
-  # Terraform optional because non-free
+  plugins = [
-  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
+    pkgs.vimPlugins.nvim-lspconfig
-  options.github = lib.mkEnableOption "Whether to enable GitHub features";
+    pkgs.vimPlugins.lsp-colors-nvim
-  options.kubernetes =
+    pkgs.vimPlugins.null-ls-nvim
-    lib.mkEnableOption "Whether to enable Kubernetes features";
+  ];
-
-  config = {
-    plugins = [
-      pkgs.vimPlugins.nvim-lspconfig
-      pkgs.vimPlugins.conform-nvim
-      pkgs.vimPlugins.fidget-nvim
-      pkgs.vimPlugins.nvim-lint
-    ];
-
-    setup.fidget = { };
-
-    use.lspconfig.lua_ls.setup = dsl.callWith {
-      settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-      capabilities =
-        dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-      cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
-    };
-
-    use.lspconfig.nil_ls.setup = dsl.callWith {
-      cmd = [ "${pkgs.nil}/bin/nil" ];
-      capabilities =
-        dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-    };
-
-    use.lspconfig.pyright.setup = dsl.callWith {
-      cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
-    };
-
-    use.lspconfig.terraformls.setup = dsl.callWith {
-      cmd = if config.terraform then [
-        "${pkgs.terraform-ls}/bin/terraform-ls"
-        "serve"
-      ] else
-        [ "echo" ];
-    };
-
-    use.lspconfig.rust_analyzer.setup = dsl.callWith {
-      cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
-      settings = {
-        "['rust-analyzer']" = {
-          check = { command = "clippy"; };
-          files = { excludeDirs = [ ".direnv" ]; };
-        };
-      };
-    };
-
-    setup.conform = {
-      format_on_save = {
-        # These options will be passed to conform.format()
-        timeout_ms = 1500;
-        lsp_fallback = true;
-      };
-      formatters_by_ft = {
-        lua = [ "stylua" ];
-        python = [ "black" ];
-        fish = [ "fish_indent" ];
-        nix = [ "nixfmt" ];
-        rust = [ "rustfmt" ];
-        sh = [ "shfmt" ];
-        terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
-        hcl = if config.terraform then [ "terraform_fmt" ] else [ ];
-      };
-      formatters = {
-        lua.command = "${pkgs.stylua}/bin/stylua";
-        black.command = "${pkgs.black}/bin/black";
-        fish_indent.command = "${pkgs.fish}/bin/fish_indent";
-        nixfmt.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
-        rustfmt = {
-          command = "${pkgs.rustfmt}/bin/rustfmt";
-          prepend_args = [ "--edition" "2021" ];
-        };
-        shfmt = {
-          command = "${pkgs.shfmt}/bin/shfmt";
-          prepend_args = [ "-i" "4" "-ci" ];
-        };
-        terraform_fmt.command =
-          if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
-      };
-    };
-
-    use.lint = {
-      linters_by_ft = dsl.toTable {
-        python = [ "ruff" ];
-        sh = [ "shellcheck" ];
-      };
-    };
-
-    vim.api.nvim_create_autocmd = dsl.callWith [
-      (dsl.toTable [ "BufEnter" "BufWritePost" ])
-      (dsl.rawLua "{ callback = function() require('lint').try_lint() end }")
-    ];
-
-    lua = ''
-      ${builtins.readFile ./lsp.lua}
-
-      local ruff = require('lint').linters.ruff; ruff.cmd = "${pkgs.ruff}/bin/ruff"
-      local shellcheck = require('lint').linters.shellcheck; shellcheck.cmd = "${pkgs.shellcheck}/bin/shellcheck"
-
-      -- Prevent infinite log size (change this when debugging)
-      vim.lsp.set_log_level("off")
-    '';
 
+  use.lspconfig.lua_ls.setup = dsl.callWith {
+    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
   };
 
+  use.lspconfig.nil_ls.setup = dsl.callWith {
+    cmd = [ "${pkgs.nil}/bin/nil" ];
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+  };
+
+  use.lspconfig.pyright.setup = dsl.callWith {
+    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+  };
+
+  use.lspconfig.terraformls.setup =
+    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
+
+  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+
+  lua = ''
+    ${builtins.readFile ./lsp.lua}
+
+    -- Prevent infinite log size (change this when debugging)
+    vim.lsp.set_log_level("off")
+
+    require("null-ls").setup({
+        sources = {
+            require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
+            require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+            require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+            require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
+            require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
+            require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
+            require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
+            require("null-ls").builtins.formatting.shfmt.with({
+                command = "${pkgs.shfmt}/bin/shfmt",
+                extra_args = { "-i", "4", "-ci" },
+            }),
+            require("null-ls").builtins.formatting.terraform_fmt.with({
+                command = "${pkgs.terraform}/bin/terraform",
+                extra_filetypes = { "hcl" },
+            }),
+        },
+
+        on_attach = function(client, bufnr)
+            if client.supports_method("textDocument/formatting") then
+                -- Auto-format on save
+                vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+                vim.api.nvim_create_autocmd("BufWritePre", {
+                    group = augroup,
+                    buffer = bufnr,
+                    callback = function()
+                        vim.lsp.buf.format({ bufnr = bufnr })
+                    end,
+                })
+                -- Use internal formatting for bindings like gq.
+                vim.api.nvim_create_autocmd("LspAttach", {
+                    callback = function(args)
+                        vim.bo[args.buf].formatexpr = nil
+                    end,
+                })
+            end
+        end,
+    })
+  '';
+
 }

modules/common/neovim/config/misc.nix

@@ -8,15 +8,13 @@
     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; }; };
+  setup.colorizer = { };
   setup.glow = { };
   setup.which-key = { };
-  setup.kitty-scrollback = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -71,6 +69,10 @@
     " Remember last position when reopening file
     au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
 
+    " LaTeX options
+    au FileType tex inoremap ;bf \textbf{}<Esc>i
+    au BufWritePost *.tex silent! execute "!pdflatex -output-directory=%:p:h % >/dev/null 2>&1" | redraw!
+
     " Flash highlight when yanking
     au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
   '';

modules/common/neovim/config/syntax.nix

@@ -4,7 +4,6 @@
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
       with pkgs.tree-sitter-grammars; [
         tree-sitter-bash
-        tree-sitter-c
         tree-sitter-fish
         tree-sitter-hcl
         tree-sitter-ini
@@ -17,16 +16,15 @@
         tree-sitter-python
         tree-sitter-rasi
         tree-sitter-toml
-        tree-sitter-vimdoc
         tree-sitter-yaml
       ]))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
     pkgs.vimPlugins.vim-helm
-    pkgs.vimPlugins.baleia-nvim # Clean ANSI from kitty scrollback
+    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
-    # pkgs.vimPlugins.hmts-nvim # Tree-sitter injections for home-manager
+    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPlugin {
+    (pkgs.vimUtils.buildVimPluginFrom2Nix {
       pname = "nmasur";
       version = "0.1";
       src = ../plugin;

modules/common/neovim/config/toggleterm.lua

@@ -26,5 +26,17 @@ function NIXPKGS_TOGGLE()
     nixpkgs:toggle()
 end
 
+local gitwatch = terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+function GITWATCH_TOGGLE()
+    gitwatch:toggle()
+end
+
+local k9s = terminal:new({ cmd = "k9s" })
+function K9S_TOGGLE()
+    k9s:toggle()
+end
+
 vim.keymap.set("n", "<Leader>t", TERM_TOGGLE)
 vim.keymap.set("n", "<Leader>P", NIXPKGS_TOGGLE)
+vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
+vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)

modules/common/neovim/config/toggleterm.nix

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

modules/common/neovim/config/tree.nix

@@ -63,6 +63,7 @@
     '';
     view = { # Set look and feel
       width = 30;
+      hide_root_folder = false;
       side = "left";
       number = false;
       relativenumber = false;

modules/common/neovim/default.nix

@@ -5,9 +5,6 @@ let
   neovim = import ./package {
     inherit pkgs;
     colors = config.theme.colors;
-    terraform = config.terraform.enable;
-    github = true;
-    kubernetes = config.kubernetes.enable;
   };
 
 in {
@@ -45,8 +42,8 @@ in {
         # 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 =
+        programs.kitty.settings.scrollback_pager = ''
-          "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
+          $SHELL -c 'sed -r "s/[[:cntrl:]]\]133;[AC]..//g" | ${neovim}/bin/nvim -c "setlocal nonumber norelativenumber nolist laststatus=0" -c "lua baleia = require(\"baleia\").setup({}); baleia.once(0)" -c "map <silent> q :qa!<CR>" -c "autocmd VimEnter * normal G"' '';
 
         # Create a desktop option for launching Neovim from a file manager
         # (Requires launching the terminal and then executing Neovim)

modules/common/neovim/lua/keybinds.lua

@@ -39,6 +39,7 @@ key("n", "<Leader>fs", ":write<CR>")
 key("n", "<Leader>fd", ":lcd %:p:h<CR>", { silent = true })
 key("n", "<Leader>fu", ":lcd ..<CR>", { silent = true })
 key("n", "<Leader><Tab>", ":b#<CR>", { silent = true })
+key("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
 key("n", "<Leader>tt", [[<Cmd>exe 'edit $NOTES_PATH/journal/'.strftime("%Y-%m-%d_%a").'.md'<CR>]])
 key("n", "<Leader>jj", ":!journal<CR>:e<CR>")
 
@@ -64,12 +65,6 @@ key("n", "<C-Down>", ":resize -2<CR>", { silent = true })
 key("n", "<C-Left>", ":vertical resize -2<CR>", { silent = true })
 key("n", "<C-Right>", ":vertical resize +2<CR>", { silent = true })
 
--- Quickfix
-key("n", "]q", ":cnext<CR>")
-key("n", "[q", ":cprevious<CR>")
-key("n", "co", ":copen<CR>")
-key("n", "cq", ":cclose<CR>")
-
 -- Other
 key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
 key("n", "Y", "y$")                                         --- Copy to end of line

modules/common/neovim/package/default.nix

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

modules/common/programming/default.nix

@@ -6,7 +6,6 @@
     ./lua.nix
     ./nix.nix
     ./python.nix
-    ./rust.nix
     ./terraform.nix
   ];
 

modules/common/programming/kubernetes.nix

@@ -24,125 +24,113 @@
       # Terminal Kubernetes UI
       programs.k9s = {
         enable = true;
-        settings = {
+        # settings = { k9s = { headless = true; }; };
+        skin = {
           k9s = {
-            ui = {
+            body = {
-              enableMouse = true;
+              fgColor = config.theme.colors.base06;
-              headless = true;
+              bgColor = config.theme.colors.base00;
-              logoless = true;
+              logoColor = config.theme.colors.base02; # *blue ?
-              crumbsless = false;
-              skin = "main";
             };
-          };
+            # Search bar
-        };
+            prompt = {
-        skins = {
+              fgColor = config.theme.colors.base06;
-          main = {
+              bgColor = config.theme.colors.base00;
-            k9s = {
+              suggestColor = config.theme.colors.base03;
-              body = {
+            };
+            # Header left side
+            info = {
+              fgColor = config.theme.colors.base04;
+              sectionColor = config.theme.colors.base05;
+            };
+            dialog = {
+              fgColor = config.theme.colors.base06;
+              bgColor = config.theme.colors.base00;
+              buttonFgColor = config.theme.colors.base06;
+              buttonBgColor = config.theme.colors.base0E;
+              buttonFocusFgColor = config.theme.colors.base07;
+              buttonFocusBgColor = config.theme.colors.base02; # *cyan
+              labelFgColor = config.theme.colors.base09;
+              fieldFgColor = config.theme.colors.base06;
+            };
+            frame = {
+              border = {
+                fgColor = config.theme.colors.base01;
+                focusColor = config.theme.colors.base06;
+              };
+              menu = {
                 fgColor = config.theme.colors.base06;
-                bgColor = "default";
+                keyColor = config.theme.colors.base0E; # *magenta
-                logoColor = config.theme.colors.base02; # *blue ?
+                numKeyColor = config.theme.colors.base0E; # *magenta
               };
-              # Search bar
+              crumbs = {
-              prompt = {
                 fgColor = config.theme.colors.base06;
-                bgColor = "default";
+                bgColor = config.theme.colors.base01;
-                suggestColor = config.theme.colors.base03;
+                activeColor = config.theme.colors.base03;
               };
-              # Header left side
+              status = {
-              info = {
+                newColor = config.theme.colors.base04; # *cyan
-                fgColor = config.theme.colors.base04;
+                modifyColor = config.theme.colors.base0D; # *blue
-                sectionColor = config.theme.colors.base05;
+                addColor = config.theme.colors.base0B; # *green
+                errorColor = config.theme.colors.base08; # *red
+                highlightColor = config.theme.colors.base09; # *orange
+                killColor = config.theme.colors.base03; # *comment
+                completedColor = config.theme.colors.base03; # *comment
               };
-              dialog = {
+              title = {
                 fgColor = config.theme.colors.base06;
-                bgColor = "default";
+                bgColor = config.theme.colors.base00;
-                buttonFgColor = config.theme.colors.base06;
+                highlightColor = config.theme.colors.base09; # *orange
-                buttonBgColor = config.theme.colors.base0E;
+                counterColor = config.theme.colors.base0D; # *blue
-                buttonFocusFgColor = config.theme.colors.base07;
+                filterColor = config.theme.colors.base0E; # *magenta
-                buttonFocusBgColor = config.theme.colors.base02; # *cyan
-                labelFgColor = config.theme.colors.base09;
-                fieldFgColor = config.theme.colors.base06;
               };
-              frame = {
+            };
-                border = {
+            views = {
-                  fgColor = config.theme.colors.base01;
+              charts = {
-                  focusColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
-                };
+                defaultDialColors =
-                menu = {
+                  [ config.theme.colors.base0D config.theme.colors.base08 ];
-                  fgColor = config.theme.colors.base06;
+                # - *blue
-                  keyColor = config.theme.colors.base0E; # *magenta
+                # - *red
-                  numKeyColor = config.theme.colors.base0E; # *magenta
+                defaultChartColors =
-                };
+                  [ config.theme.colors.base0D config.theme.colors.base08 ];
-                crumbs = {
+                # - *blue
-                  fgColor = config.theme.colors.base06;
+                # - *red
-                  bgColor = config.theme.colors.base01;
-                  activeColor = config.theme.colors.base03;
-                };
-                status = {
-                  newColor = config.theme.colors.base04; # *cyan
-                  modifyColor = config.theme.colors.base0D; # *blue
-                  addColor = config.theme.colors.base0B; # *green
-                  errorColor = config.theme.colors.base08; # *red
-                  highlightColor = config.theme.colors.base09; # *orange
-                  killColor = config.theme.colors.base03; # *comment
-                  completedColor = config.theme.colors.base03; # *comment
-                };
-                title = {
-                  fgColor = config.theme.colors.base06;
-                  bgColor = "default";
-                  highlightColor = config.theme.colors.base09; # *orange
-                  counterColor = config.theme.colors.base0D; # *blue
-                  filterColor = config.theme.colors.base0E; # *magenta
-                };
               };
-              views = {
+              table = {
-                charts = {
+                # List of resources
-                  bgColor = "default";
+                fgColor = config.theme.colors.base06;
-                  defaultDialColors =
+                bgColor = config.theme.colors.base00;
-                    [ config.theme.colors.base0D config.theme.colors.base08 ];
-                  # - *blue
-                  # - *red
-                  defaultChartColors =
-                    [ config.theme.colors.base0D config.theme.colors.base08 ];
-                  # - *blue
-                  # - *red
-                };
-                table = {
-                  # List of resources
-                  fgColor = config.theme.colors.base06;
-                  bgColor = "default";
 
-                  # Row selection
+                # Row selection
-                  cursorFgColor = config.theme.colors.base07;
+                cursorFgColor = config.theme.colors.base07;
-                  cursorBgColor = config.theme.colors.base01;
+                cursorBgColor = config.theme.colors.base01;
 
-                  # Header row
+                # Header row
-                  header = {
+                header = {
-                    fgColor = config.theme.colors.base0D;
+                  fgColor = config.theme.colors.base0D;
-                    bgColor = "default";
+                  bgColor = config.theme.colors.base00;
-                    sorterColor = config.theme.colors.base0A; # *selection
+                  sorterColor = config.theme.colors.base0A; # *selection
-                  };
                 };
-                xray = {
+              };
+              xray = {
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
+                cursorColor = config.theme.colors.base06;
+                graphicColor = config.theme.colors.base0D;
+                showIcons = false;
+              };
+              yaml = {
+                keyColor = config.theme.colors.base0D;
+                colonColor = config.theme.colors.base04;
+                fgColor = config.theme.colors.base03;
+              };
+              logs = {
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
+                indicator = {
                   fgColor = config.theme.colors.base06;
-                  bgColor = "default";
+                  bgColor = config.theme.colors.base00;
-                  cursorColor = config.theme.colors.base06;
-                  graphicColor = config.theme.colors.base0D;
-                  showIcons = false;
-                };
-                yaml = {
-                  keyColor = config.theme.colors.base0D;
-                  colonColor = config.theme.colors.base04;
-                  fgColor = config.theme.colors.base03;
-                };
-                logs = {
-                  fgColor = config.theme.colors.base06;
-                  bgColor = "default";
-                  indicator = {
-                    fgColor = config.theme.colors.base06;
-                    bgColor = "default";
-                  };
                 };
               };
             };

modules/common/programming/nix.nix

@@ -7,9 +7,12 @@
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [
-        nixfmt-rfc-style # Nix file formatter
+        nixfmt # Nix file formatter
         nil # Nix language server
       ];
+
     };
+
   };
+
 }

modules/common/programming/rust.nix

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

modules/common/programming/terraform.nix

@@ -3,7 +3,6 @@
   options.terraform.enable = lib.mkEnableOption "Terraform tools.";
 
   config = lib.mkIf config.terraform.enable {
-    unfreePackages = [ "terraform" ];
 
     home-manager.users.${config.user} = {
       programs.fish.shellAbbrs = {

modules/common/repositories/notes.nix

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

modules/common/shell/atuin.nix

@@ -1,39 +0,0 @@
-{ config, lib, ... }: {
-
-  # Shell history sync
-
-  options.atuin.enable = lib.mkEnableOption "Atuin";
-
-  config = {
-
-    home-manager.users.${config.user} = lib.mkIf config.atuin.enable {
-
-      programs.atuin = {
-        enable = true;
-        flags = [ "--disable-up-arrow" "--disable-ctrl-r" ];
-        settings = {
-          auto_sync = true;
-          update_check = false;
-          sync_address = "https://api.atuin.sh";
-          search_mode = "fuzzy";
-          filter_mode = "host"; # global, host, session, directory
-          search_mode_shell_up_key_binding = "fuzzy";
-          filter_mode_shell_up_key_binding = "session";
-          style = "compact"; # or auto,full
-          show_help = true;
-          history_filter = [ ];
-          secrets_filter = true;
-          enter_accept = false;
-          keymap_mode = "vim-normal";
-        };
-      };
-
-    };
-
-    # Give root user the same setup
-    home-manager.users.root.programs.atuin =
-      config.home-manager.users.${config.user}.programs.atuin;
-
-  };
-
-}

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

@@ -31,10 +31,6 @@ STATUS=$?
 # because tesseract adds .txt to the given file path anyways. So if we were to
 # 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."
-    exit 1
-}
 tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}"
 
 # Check if the text was detected by checking number

modules/common/shell/charm.nix

@@ -10,7 +10,6 @@
       glow # Markdown previews
       skate # Key-value store
       charm # Manage account and filesystem
-      pop # Send emails from a TUI
     ];
 
   };

modules/common/shell/default.nix

@@ -1,6 +1,5 @@
 { ... }: {
   imports = [
-    ./atuin.nix
     ./bash
     ./charm.nix
     ./direnv.nix
@@ -12,6 +11,5 @@
     ./nixpkgs.nix
     ./starship.nix
     ./utilities.nix
-    ./work.nix
   ];
 }

modules/common/shell/direnv.nix

@@ -7,22 +7,6 @@
     config = { whitelist = { prefix = [ config.dotfilesPath ]; }; };
   };
 
-  # programs.direnv.direnvrcExtra = ''
-  #   layout_postgres() {
-  #       export PGDATA="$(direnv_layout_dir)/postgres"
-  #       export PGHOST="$PGDATA"
-  #
-  #       if [[ ! -d "PGDATA" ]]; then
-  #           initdb
-  #           cat >> "$PGDATA/postgres.conf" <<- EOF
-  #                   listen_addresses = '''
-  #                   unix_socket_directories = '$PGHOST'
-  #           EOF
-  #           echo "CREATE DATABASE $USER;" | postgres --single -E postgres
-  #       fi
-  #   }
-  # '';
-
   # Prevent garbage collection
   nix.extraOptions = ''
     keep-outputs = true

modules/common/shell/fish/default.nix

@@ -6,7 +6,7 @@
   home-manager.users.${config.user} = {
 
     # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl ];
+    home.packages = with pkgs; [ curl exa ];
 
     programs.fish = {
       enable = true;
@@ -15,8 +15,8 @@
         # Version of bash which works much better on the terminal
         bash = "${pkgs.bashInteractive}/bin/bash";
 
-        # Use eza (exa) instead of ls for fancier output
+        # Use exa instead of ls for fancier output
-        ls = "${pkgs.eza}/bin/eza --group";
+        ls = "exa --group";
 
         # Move files to XDG trash on the commandline
         trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
@@ -123,6 +123,9 @@
         dr = "docker run --rm -it";
         db = "docker build . -t";
 
+        # Rust
+        ca = "cargo";
+
       };
       shellInit = "";
     };

modules/common/shell/fish/functions/fish_user_key_bindings.fish

@@ -18,5 +18,3 @@ bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
-bind -M insert \ch '_atuin_search --filter-mode global'
-bind -M default \ch '_atuin_search --filter-mode global'

modules/common/shell/fzf.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, ... }: {
 
   # FZF is a fuzzy-finder for the terminal
 
@@ -16,9 +16,10 @@
                     --search-path $HOME/dev \
                     --type directory \
                     --exact-depth 2 \
-                | ${pkgs.proximity-sort}/bin/proximity-sort $PWD \
                 | sed 's/\\/$//' \
-                | fzf --tiebreak=index \
+                | fzf \
+                    --delimiter '/' \
+                    --with-nth 6.. \
             )
             and cd $projdir
             and commandline -f execute

modules/common/shell/git.nix

@@ -28,47 +28,15 @@ in {
         userName = config.gitName;
         userEmail = config.gitEmail;
         extraConfig = {
-          core.pager =
-            "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
-          interactive.difffilter =
-            "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
           pager = { branch = "false"; };
           safe = { directory = config.dotfilesPath; };
           pull = { ff = "only"; };
           push = { autoSetupRemote = "true"; };
           init = { defaultBranch = "master"; };
-          rebase = { autosquash = "true"; };
-          gpg = {
-            format = "ssh";
-            ssh.allowedSignersFile = "~/.config/git/allowed-signers";
-          };
-          # commit.gpgsign = true;
-          # tag.gpgsign = true;
         };
         ignores = [ ".direnv/**" "result" ];
-        includes = [{
-          path = "~/.config/git/personal";
-          condition = "gitdir:~/dev/personal/";
-        }];
       };
 
-      # Personal git config
-      # TODO: fix with variables
-      xdg.configFile."git/personal".text = ''
-        [user]
-            name = "${config.fullName}"
-            email = "7386960+nmasur@users.noreply.github.com"
-            signingkey = ~/.ssh/id_ed25519
-        [commit]
-            gpgsign = true
-        [tag]
-            gpgsign = true
-      '';
-
-      xdg.configFile."git/allowed-signers".text = ''
-        7386960+nmasur@users.noreply.github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
-      '';
-
       programs.fish.shellAbbrs = {
         g = "git";
         gs = "git status";
@@ -90,7 +58,6 @@ in {
           git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
         gcob = "git switch -c";
         gb = "git branch";
-        gpd = "git push origin -d";
         gbd = "git branch -d";
         gbD = "git branch -D";
         gr = "git reset";

modules/common/shell/github.nix

@@ -7,7 +7,6 @@
         enable = true;
         gitCredentialHelper.enable = true;
         settings.git_protocol = "https";
-        extensions = [ pkgs.gh-collaborators ];
       };
 
     programs.fish =
@@ -15,7 +14,7 @@
         shellAbbrs = {
           ghr = "gh repo view -w";
           gha =
-            "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
+            "gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view";
           grw = "gh run watch";
           grf = "gh run view --log-failed";
           grl = "gh run view --log";
@@ -48,7 +47,7 @@
         esac
 
         selected=$(gh repo list "$organization" \
-            --limit 100 \
+            --limit 50 \
             --no-archived \
             --json=name,description,isPrivate,updatedAt,primaryLanguage \
             | jq -r '.[] | .name + "," + if .description == "" then "-" else .description |= gsub(","; " ") | .description end + "," + .updatedAt + "," + .primaryLanguage.name' \
@@ -57,7 +56,6 @@
             | fzf \
                 --header-lines=1 \
                 --layout=reverse \
-                --height=100% \
                 --bind "ctrl-o:execute:gh repo view -w ''${organization}/{1}" \
                 --bind "shift-up:preview-half-page-up" \
                 --bind "shift-down:preview-half-page-down" \

modules/common/shell/jujutsu.nix

@@ -4,6 +4,7 @@
 
     home-manager.users.${config.user}.programs.jujutsu = {
       enable = true;
+      enableFishIntegration = true;
 
       # https://github.com/martinvonz/jj/blob/main/docs/config.md
       settings = {

modules/common/shell/nixpkgs.nix

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

modules/common/shell/starship.nix

@@ -13,7 +13,7 @@
         "$cmd_duration"
         "$character"
       ];
-      right_format = "$nix_shell";
+      # right_format = "$nix_shell";
       character = {
         success_symbol = "[❯](bold green)";
         error_symbol = "[❯](bold red)";

modules/common/shell/utilities.nix

@@ -20,21 +20,15 @@ in {
       home.packages = with pkgs; [
         age # Encryption
         bc # Calculator
-        delta # Fancy diffs
-        difftastic # Other fancy diffs
         dig # DNS lookup
         fd # find
         htop # Show system processes
         killall # Force quit
         inetutils # Includes telnet, whois
-        jless # JSON viewer
-        jo # JSON output
         jq # JSON manipulation
         lf # File viewer
         qrencode # Generate qr codes
         rsync # Copy folders
-        ren # Rename files
-        # rep # Replace text in files
         ripgrep # grep
         sd # sed
         tealdeer # Cheatsheets
@@ -50,11 +44,10 @@ in {
 
       home.file = {
         ".rgignore".text = ignorePatterns;
+        ".fdignore".text = ignorePatterns;
         ".digrc".text = "+noall +answer"; # Cleaner dig commands
       };
 
-      xdg.configFile."fd/ignore".text = ignorePatterns;
-
       programs.bat = {
         enable = true; # cat replacement
         config = {

modules/common/shell/work.nix

@@ -1,46 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-
-  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
-
-    home.packages = let
-      ldap_scheme = "ldaps";
-      magic_number = "2";
-      magic_end_seq = "corp";
-      magic_prefix = "take";
-      ldap_host =
-        "${magic_prefix}${magic_number}.t${magic_number}.${magic_end_seq}";
-      ldap_port = 636;
-      ldap_dc_1 = "${magic_prefix}${magic_number}";
-      ldap_dc_2 = "t${magic_number}";
-      ldap_dc_3 = magic_end_seq;
-      ldap_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 \
-            -H "${ldap_scheme}://${ldap_host}:${builtins.toString ldap_port}" \
-            -D "${pkgs.lib.toUpper magic_prefix}${magic_number}\\${
-              pkgs.lib.toLower config.user
-            }" \
-            -w "$(${pkgs._1password}/bin/op item get T${magic_number} --fields label=password)" \
-            -b "DC=${ldap_dc_1},DC=${ldap_dc_2},DC=${ldap_dc_3}" \
-            -s "sub" -x "(cn=$SEARCH_FILTER)" \
-            | jq --slurp \
-                --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
-      '';
-      ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
-        ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
-      '';
-      ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
-        ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
-      '';
-    in [ ldap_script ldapm_script ldapg_script ];
-
-  };
-
-}

modules/darwin/hammerspoon.nix

@@ -16,7 +16,6 @@
           firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
           discord = "${pkgs.discord}/Applications/Discord.app";
           kitty = "${pkgs.kitty}/Applications/kitty.app";
-          obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
           slack = "${pkgs.slack}/Applications/Slack.app";
         };
       xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source =
@@ -25,9 +24,9 @@
       home.activation.reloadHammerspoon =
         config.home-manager.users.${config.user}.lib.dag.entryAfter
         [ "writeBoundary" ] ''
-          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
+          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.reload()"
           $DRY_RUN_CMD sleep 1
-          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
+          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.console.clearConsole()"
         '';
 
     };

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

@@ -8,8 +8,24 @@ obj.name = "Launcher"
 obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
-local screen = hs.screen.primaryScreen()
+local width = hs.screen.mainScreen():fullFrame().w
 local switcherWidth = 500
+obj.canvas = hs.canvas.new({
+    x = width / 2 - switcherWidth / 2,
+    y = 1,
+    h = 3,
+    w = switcherWidth,
+})
+-- Draw switcher
+obj.canvas[#obj.canvas + 1] = {
+    action = "build",
+    type = "rectangle",
+}
+obj.canvas[#obj.canvas + 1] = {
+    type = "rectangle",
+    fillColor = { alpha = 1, red = 0.8, green = 0.6, blue = 0.3 },
+    action = "fill",
+}
 
 function obj:init()
     -- Begin launcher mode
@@ -23,29 +39,13 @@ function obj:init()
     -- Behaviors on enter
     function self.launcher:entered()
         -- hs.alert("Entered mode")
-        obj.canvas = hs.canvas.new({
-            x = (screen:fullFrame().x + screen:fullFrame().w) / 2 - switcherWidth / 2,
-            y = 1,
-            h = 3,
-            w = switcherWidth,
-        })
-        -- Draw switcher
-        obj.canvas[#obj.canvas + 1] = {
-            action = "build",
-            type = "rectangle",
-        }
-        obj.canvas[#obj.canvas + 1] = {
-            type = "rectangle",
-            fillColor = { alpha = 1, red = 0.8, green = 0.6, blue = 0.3 },
-            action = "fill",
-        }
         obj.canvas:show()
     end
 
     -- Behaviors on exit
     function self.launcher:exited()
         -- hs.alert("Exited mode")
-        obj.canvas:delete(0.2)
+        obj.canvas:hide()
     end
 
     -- Use escape to exit launcher mode
@@ -54,19 +54,14 @@ function obj:init()
     end)
 
     -- Launcher shortcuts
-    self.launcher:bind("ctrl", "space", function() end)
+    self.launcher:bind("ctrl", "space", function()
+    end)
     self.launcher:bind("", "return", function()
         self:switch("@kitty@")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")
     end)
-    self.launcher:bind("shift", "D", function()
-        hs.execute("launchctl remove com.paloaltonetworks.gp.pangps")
-        hs.execute("launchctl remove com.paloaltonetworks.gp.pangpa")
-        hs.alert.show("Disconnected from GlobalProtect", nil, nil, 4)
-        self.launcher:exit()
-    end)
     self.launcher:bind("", "E", function()
         self:switch("Mail.app")
     end)
@@ -80,17 +75,11 @@ function obj:init()
         self:switch("Messages.app")
     end)
     self.launcher:bind("", "O", function()
-        self:switch("@obsidian@")
+        self:switch("Obsidian.app")
     end)
     self.launcher:bind("", "P", function()
         self:switch("System Preferences.app")
     end)
-    self.launcher:bind("shift", "P", function()
-        hs.execute("launchctl load /Library/LaunchAgents/com.paloaltonetworks.gp.pangps.plist")
-        hs.execute("launchctl load /Library/LaunchAgents/com.paloaltonetworks.gp.pangpa.plist")
-        hs.alert.show("Reconnecting to GlobalProtect", nil, nil, 4)
-        self.launcher:exit()
-    end)
     self.launcher:bind("", "R", function()
         hs.console.clearConsole()
         hs.reload()

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

@@ -9,7 +9,7 @@ obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
 function obj:init()
-    hs.window.animationDuration = 0.1
+    hs.window.animationDuration = 0
     dofile(hs.spoons.resourcePath("worklayout.lua"))()
     -- bind hotkey
     hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "n", function()
@@ -56,7 +56,7 @@ function obj:init()
         local frame = win:frame()
         -- maximize if possible
         local max = win:screen():fullFrame()
-        frame.x = (max.x * 2 + max.w) / 2
+        frame.x = max.w / 2
         frame.y = max.y
         frame.w = max.w / 2
         frame.h = max.h

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

@@ -51,20 +51,10 @@ local function worklayout()
         local laptop = {
             { "Firefox",  nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
             { "Obsidian", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
-            { "Calendar", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
         }
         local layout = concat(left, right, laptop)
         hs.layout.apply(layout)
     end)
-
-    -- Reload Hammerspoon whenever layout changes
-    hs.screen.watcher.new(function()
-        -- Pause for 5 seconds to give time for layout to change
-        hs.timer.doAfter(5, function()
-            -- Perform the actual reload
-            hs.reload()
-        end)
-    end)
 end
 
 return worklayout

modules/darwin/hammerspoon/init.lua

@@ -1,5 +1,5 @@
-hs.ipc.cliInstall()                   -- Install Hammerspoon CLI program
 hs.loadSpoon("ControlEscape"):start() -- Load Hammerspoon bits from https://github.com/jasonrudolph/ControlEscape.spoon
 hs.loadSpoon("Launcher"):init()
 hs.loadSpoon("DismissAlerts"):init()
 hs.loadSpoon("MoveWindow"):init()
+hs.ipc.cliInstall() -- Install Hammerspoon CLI program

modules/darwin/homebrew.nix

@@ -8,15 +8,11 @@
       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
+      if ! /usr/local/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/" ];
-
     homebrew = {
       enable = true;
       onActivation = {
@@ -28,19 +24,24 @@
         brewfile = true; # Run brew bundle from anywhere
         lockfiles = false; # Don't save lockfile (since running from anywhere)
       };
+      taps = [
+        "homebrew/cask" # Required for casks
+        "homebrew/cask-drivers" # Used for Logitech G-Hub
+      ];
       brews = [
         "trash" # Delete files and folders to trash instead of rm
+        "openjdk" # Required by Apache Directory Studio
       ];
       casks = [
-        "1password" # 1Password will not launch from Nix on macOS
+        "1password" # 1Password packaging on Nix is broken for macOS
-        # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
+        "apache-directory-studio" # Packaging on Nix is not available for macOS
+        "gitify" # Git notifications in menu bar
         "keybase" # GUI on Nix not available for macOS
-        # "logitech-g-hub" # Mouse and keyboard management
+        "logitech-g-hub" # Mouse and keyboard management
-        "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
+        "obsidian" # Obsidian packaging on Nix is not available for macOS
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
-        # "steam" # Not packaged for Nix
+        "steam" # Not packaged for Nix
-        # "epic-games" # Not packaged for Nix
       ];
     };
 

modules/darwin/kitty.nix

@@ -3,6 +3,7 @@
   # MacOS-specific settings for Kitty
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
     programs.kitty = {
+      darwinLaunchOptions = [ "--start-as=fullscreen" ];
       font.size = lib.mkForce 20;
       settings = {
         shell = "/run/current-system/sw/bin/fish";

modules/darwin/networking.nix

@@ -2,7 +2,7 @@
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
     networking = {
-      computerName = config.networking.hostName;
+      computerName = "${config.fullName}'\\''s Mac";
       # Adjust if necessary
       # hostName = "";
     };

modules/darwin/system.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ pkgs, lib, ... }: {
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -34,8 +34,8 @@
           # Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
           AppleKeyboardUIMode = 3;
 
-          # Only hide menu bar in fullscreen
+          # Automatically show and hide the menu bar
-          _HIHideMenuBar = false;
+          _HIHideMenuBar = true;
 
           # Expand save panel by default
           NSNavPanelExpandedStateForSaveMode = true;
@@ -88,21 +88,6 @@
           orientation = "bottom";
           show-recents = false;
           tilesize = 44;
-
-          persistent-apps = [
-            "/Applications/1Password.app"
-            "${pkgs.slack}/Applications/Slack.app"
-            "/System/Applications/Calendar.app"
-            "${pkgs.firefox-bin}/Applications/Firefox.app"
-            "/System/Applications/Messages.app"
-            "/System/Applications/Mail.app"
-            "/Applications/zoom.us.app"
-            "${pkgs.discord}/Applications/Discord.app"
-            "${pkgs.obsidian}/Applications/Obsidian.app"
-            "${pkgs.kitty}/Applications/kitty.app"
-            "/System/Applications/System Settings.app"
-          ];
-
         };
 
         finder = {
@@ -127,67 +112,41 @@
         # Disable trackpad tap to click
         trackpad.Clicking = false;
 
+        # universalaccess = {
+
+        #   # Zoom in with Control + Scroll Wheel
+        #   closeViewScrollWheelToggle = true;
+        #   closeViewZoomFollowsFocus = true;
+        # };
+
         # Where to save screenshots
         screencapture.location = "~/Downloads";
 
-        CustomUserPreferences = {
-          # Disable disk image verification
-          "com.apple.frameworks.diskimages" = {
-            skip-verify = true;
-            skip-verify-locked = true;
-            skip-verify-remote = true;
-          };
-          # Avoid creating .DS_Store files on network or USB volumes
-          "com.apple.desktopservices" = {
-            DSDontWriteNetworkStores = true;
-            DSDontWriteUSBStores = true;
-          };
-          "com.apple.dock" = {
-            magnification = true;
-            largesize = 48;
-          };
-          # Require password immediately after screen saver begins
-          "com.apple.screensaver" = {
-            askForPassword = 1;
-            askForPasswordDelay = 0;
-          };
-          "com.apple.finder" = {
-            # Disable the warning before emptying the Trash
-            WarnOnEmptyTrash = false;
-
-            # Finder search in current folder by default
-            FXDefaultSearchScope = "SCcf";
-
-            # Default Finder window set to column view
-            FXPreferredViewStyle = "clmv";
-          };
-          "leits.MeetingBar" = {
-            eventTimeFormat = ''"show"'';
-            eventTitleFormat = ''"none"'';
-            eventTitleIconFormat = ''"iconCalendar"'';
-            slackBrowser =
-              ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
-            zoomBrowser =
-              ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
-            KeyboardShortcuts_joinEventShortcut =
-              ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
-            timeFormat = ''"12-hour"'';
-          };
-        };
-
-        CustomSystemPreferences = {
-
-        };
-
       };
 
       # Settings that don't have an option in nix-darwin
       activationScripts.postActivation.text = ''
+        echo "Disable disk image verification"
+        defaults write com.apple.frameworks.diskimages skip-verify -bool true
+        defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
+        defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
+
+        echo "Avoid creating .DS_Store files on network volumes"
+        defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
+
+        echo "Disable the warning before emptying the Trash"
+        defaults write com.apple.finder WarnOnEmptyTrash -bool false
+
+        echo "Require password immediately after sleep or screen saver begins"
+        defaults write com.apple.screensaver askForPassword -int 1
+        defaults write com.apple.screensaver askForPasswordDelay -int 0
+
         echo "Allow apps from anywhere"
         SPCTL=$(spctl --status)
         if ! [ "$SPCTL" = "assessments disabled" ]; then
             sudo spctl --master-disable
         fi
+
       '';
 
       # User-level settings
@@ -195,9 +154,35 @@
         echo "Show the ~/Library folder"
         chflags nohidden ~/Library
 
-        echo "Reduce Menu Bar padding"
+        echo "Enable dock magnification"
-        defaults write -globalDomain NSStatusItemSelectionPadding -int 6
+        defaults write com.apple.dock magnification -bool true
-        defaults write -globalDomain NSStatusItemSpacing -int 6
+
+        echo "Set dock magnification size"
+        defaults write com.apple.dock largesize -int 48
+
+        echo "Define dock icon function"
+        __dock_item() {
+            printf "%s%s%s%s%s" \
+                   "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
+                   "<key>_CFURLString</key><string>" \
+                   "$1" \
+                   "</string><key>_CFURLStringType</key><integer>0</integer>" \
+                   "</dict></dict></dict>"
+        }
+
+        echo "Choose and order dock icons"
+        defaults write com.apple.dock persistent-apps -array \
+            "$(__dock_item /Applications/1Password.app)" \
+            "$(__dock_item ${pkgs.slack}/Applications/Slack.app)" \
+            "$(__dock_item /System/Applications/Calendar.app)" \
+            "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
+            "$(__dock_item /System/Applications/Messages.app)" \
+            "$(__dock_item /System/Applications/Mail.app)" \
+            "$(__dock_item /Applications/zoom.us.app)" \
+            "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
+            "$(__dock_item /Applications/Obsidian.app)" \
+            "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
+            "$(__dock_item /System/Applications/System\ Settings.app)"
       '';
 
     };

modules/darwin/user.nix

@@ -9,19 +9,13 @@
 
     };
 
+    # Used for aerc
     home-manager.users.${config.user} = {
-
+      home.sessionVariables = {
-      # Default shell setting doesn't work
+        XDG_CONFIG_HOME = "${config.homePath}/.config";
-      home.sessionVariables = { SHELL = "${pkgs.fish}/bin/fish"; };
+      };
-
-      # Used for aerc
-      xdg.enable = true;
-
     };
 
-    # Fix for: 'Error: HOME is set to "/var/root" but we expect "/var/empty"'
-    home-manager.users.root.home.homeDirectory = lib.mkForce "/var/root";
-
   };
 
 }

modules/darwin/utilities.nix

@@ -2,24 +2,20 @@
 
 {
 
-  unfreePackages = [ "consul" "vault-bin" ];
-
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     home.packages = with pkgs; [
-      visidata # CSV inspector
+      # visidata # CSV inspector
       dos2unix # Convert Windows text files
       inetutils # Includes telnet
       youtube-dl # Convert web videos
       pandoc # Convert text documents
       mpd # TUI slideshows
-      mpv # Video player
-      gnupg # Encryption
       awscli2
-      ssm-session-manager-plugin
       awslogs
       google-cloud-sdk
-      vault-bin
+      ansible
+      vault
       consul
       noti # Create notifications programmatically
       ipcalc # Make IP network calculations

modules/nixos/applications/nautilus.nix

@@ -36,12 +36,23 @@
       # Set Nautilus as default for opening directories
       xdg.mimeApps = {
         associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
+        # associations.removed = {
+        #   "inode/directory" = [ "kitty-open.desktop" ];
+        # };
         defaultApplications."inode/directory" =
           lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
       };
 
     };
 
+    # # Set default for opening directories
+    # xdg.mime = {
+    #   addedAssociations."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
+    #   removedAssociations = { "inode/directory" = [ "kitty-open.desktop" ]; };
+    #   defaultApplications."inode/directory" =
+    #     lib.mkForce [ "org.gnome.Nautilus.desktop" ];
+    # };
+
     # Delete Trash files older than 1 week
     systemd.user.services.empty-trash = {
       description = "Empty Trash on a regular basis";

modules/nixos/gaming/default.nix

@@ -3,6 +3,7 @@
   imports = [
     ./chiaki.nix
     ./dwarf-fortress.nix
+    ./leagueoflegends.nix
     ./legendary.nix
     ./lutris.nix
     ./minecraft-server.nix

modules/nixos/gaming/leagueoflegends.nix

@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }: {
+
+  options.gaming.leagueoflegends.enable =
+    lib.mkEnableOption "League of Legends";
+
+  config =
+    lib.mkIf (config.gaming.leagueoflegends.enable && pkgs.stdenv.isLinux) {
+
+      # League of Legends anti-cheat requirement
+      boot.kernel.sysctl = { "abi.vsyscall32" = 0; };
+
+      environment.systemPackages = with pkgs; [
+
+        # Lutris requirement to install the game
+        lutris
+        amdvlk
+        wineWowPackages.stable
+        # vulkan-tools
+
+        # Required according to https://lutris.net/games/league-of-legends/
+        openssl
+        gnome.zenity
+
+        # Don't remember if this is required
+        dconf
+
+      ];
+
+      environment.sessionVariables = { QT_X11_NO_MITSHM = "1"; };
+
+    };
+}

modules/nixos/gaming/minecraft-server.nix

@@ -44,8 +44,6 @@ in {
 
     networking.firewall.allowedTCPPorts = [ publicPort ];
 
-    cloudflare.noProxyDomains = [ config.hostnames.minecraft ];
-
     ## Automatically start and stop Minecraft server based on player connections
 
     # Adapted shamelessly from:

modules/nixos/gaming/steam.nix

@@ -9,14 +9,6 @@
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true;
-      package = pkgs.steam.override {
-        # Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix
-        # Based on: https://github.com/NixOS/nixpkgs/issues/73323
-        extraEnv = {
-          STEAM_EXTRA_COMPAT_TOOLS_PATHS =
-            lib.makeBinPath [ pkgs.proton-ge-custom ];
-        };
-      };
     };
 
     environment.systemPackages = with pkgs; [

modules/nixos/graphical/default.nix

@@ -5,6 +5,7 @@
     ./fonts.nix
     ./gtk.nix
     ./i3.nix
+    ./keybinds.nix
     ./picom.nix
     ./polybar.nix
     ./rofi.nix
@@ -13,14 +14,6 @@
 
   options = {
 
-    launcherCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for launching";
-    };
-    systemdSearch = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for interacting with systemd";
-    };
     altTabCommand = lib.mkOption {
       type = lib.types.str;
       description = "Command to use for choosing windows";
@@ -37,14 +30,30 @@
       type = lib.types.str;
       description = "Command to use for quick calculations";
     };
-    toggleBarCommand = lib.mkOption {
+    launcherCommand = lib.mkOption {
       type = lib.types.str;
-      description = "Command to hide and show the status bar.";
+      description = "Command to use for launching";
+    };
+    lockScreenCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use to lock the screen";
     };
     powerCommand = lib.mkOption {
       type = lib.types.str;
       description = "Command to use for power options menu";
     };
+    systemdSearch = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for interacting with systemd";
+    };
+    terminal = lib.mkOption {
+      type = lib.types.str;
+      description = "Package to use for graphical terminal";
+    };
+    toggleBarCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to hide and show the status bar.";
+    };
     wallpaper = lib.mkOption {
       type = lib.types.path;
       description = "Wallpaper background image file";

modules/nixos/graphical/i3.nix

@@ -2,11 +2,22 @@
 
 let
 
-  lockCmd =
-    "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
   lockUpdate =
     "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
 
+  workspaces = {
+    "1" = "1:I";
+    "2" = "2:II";
+    "3" = "3:III";
+    "4" = "4:IV";
+    "5" = "5:V";
+    "6" = "6:VI";
+    "7" = "7:VII";
+    "8" = "8:VIII";
+    "9" = "9:IX";
+    "10" = "10:X";
+  };
+
 in {
 
   config = lib.mkIf pkgs.stdenv.isLinux {
@@ -23,29 +34,18 @@ in {
     home-manager.users.${config.user} = {
       xsession.windowManager.i3 = {
         enable = config.services.xserver.enable;
-        config = let
+        config = let modifier = "Mod4"; # Super key
-          modifier = "Mod4"; # Super key
-          ws1 = "1:I";
-          ws2 = "2:II";
-          ws3 = "3:III";
-          ws4 = "4:IV";
-          ws5 = "5:V";
-          ws6 = "6:VI";
-          ws7 = "7:VII";
-          ws8 = "8:VIII";
-          ws9 = "9:IX";
-          ws10 = "10:X";
         in {
           modifier = modifier;
           assigns = {
-            "${ws1}" = [{ class = "Firefox"; }];
+            "${workspaces."1"}" = [{ class = "Firefox"; }];
-            "${ws2}" = [
+            "${workspaces."2"}" = [
               { class = "kitty"; }
               { class = "aerc"; }
               { class = "obsidian"; }
             ];
-            "${ws3}" = [{ class = "discord"; }];
+            "${workspaces."3"}" = [{ class = "discord"; }];
-            "${ws4}" = [ { class = "steam"; } { class = "Steam"; } ];
+            "${workspaces."4"}" = [{ class = "Steam"; }];
           };
           bars = [{ command = "echo"; }]; # Disable i3bar
           colors = let
@@ -91,131 +91,7 @@ in {
             newWindow = "urgent";
             followMouse = false;
           };
-          keybindings = {
+          keybindings = { };
-
-            # Adjust screen brightness
-            "Shift+F12" =
-              # Disable dynamic sleep
-              # https://github.com/rockowitz/ddcutil/issues/323
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-            "Shift+F11" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-            "XF86MonBrightnessUp" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-            "XF86MonBrightnessDown" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-
-            # Media player controls
-            "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
-            "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
-            "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
-            "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-
-            # Launchers
-            "${modifier}+Return" =
-              "exec --no-startup-id kitty; 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}";
-            "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
-            "${modifier}+Shift+period" =
-              "exec --no-startup-id ${config.powerCommand}";
-            "${modifier}+Shift+m" =
-              "exec --no-startup-id ${config.brightnessCommand}";
-            "${modifier}+c" =
-              "exec --no-startup-id ${config.calculatorCommand}";
-            "${modifier}+Shift+c" = "reload";
-            "${modifier}+Shift+r" = "restart";
-            "${modifier}+Shift+q" = ''
-              exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
-            "${modifier}+Shift+x" = "exec ${lockCmd}";
-            "${modifier}+Mod1+h" =
-              "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-            "${modifier}+Mod1+r" =
-              "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-
-            # Window options
-            "${modifier}+q" = "kill";
-            "${modifier}+b" = "exec ${config.toggleBarCommand}";
-            "${modifier}+f" = "fullscreen toggle";
-            "${modifier}+h" = "focus left";
-            "${modifier}+j" = "focus down";
-            "${modifier}+k" = "focus up";
-            "${modifier}+l" = "focus right";
-            "${modifier}+Left" = "focus left";
-            "${modifier}+Down" = "focus down";
-            "${modifier}+Up" = "focus up";
-            "${modifier}+Right" = "focus right";
-            "${modifier}+Shift+h" = "move left";
-            "${modifier}+Shift+j" = "move down";
-            "${modifier}+Shift+k" = "move up";
-            "${modifier}+Shift+l" = "move right";
-            "${modifier}+Shift+Left" = "move left";
-            "${modifier}+Shift+Down" = "move down";
-            "${modifier}+Shift+Up" = "move up";
-            "${modifier}+Shift+Right" = "move right";
-
-            # Tiling
-            "${modifier}+i" = "split h";
-            "${modifier}+v" = "split v";
-            "${modifier}+s" = "layout stacking";
-            "${modifier}+t" = "layout tabbed";
-            "${modifier}+e" = "layout toggle split";
-            "${modifier}+Shift+space" = "floating toggle";
-            "${modifier}+Control+space" = "focus mode_toggle";
-            "${modifier}+a" = "focus parent";
-
-            # Workspaces
-            "${modifier}+1" = "workspace ${ws1}";
-            "${modifier}+2" = "workspace ${ws2}";
-            "${modifier}+3" = "workspace ${ws3}";
-            "${modifier}+4" = "workspace ${ws4}";
-            "${modifier}+5" = "workspace ${ws5}";
-            "${modifier}+6" = "workspace ${ws6}";
-            "${modifier}+7" = "workspace ${ws7}";
-            "${modifier}+8" = "workspace ${ws8}";
-            "${modifier}+9" = "workspace ${ws9}";
-            "${modifier}+0" = "workspace ${ws10}";
-
-            # Move windows
-            "${modifier}+Shift+1" =
-              "move container to workspace ${ws1}; workspace ${ws1}";
-            "${modifier}+Shift+2" =
-              "move container to workspace ${ws2}; workspace ${ws2}";
-            "${modifier}+Shift+3" =
-              "move container to workspace ${ws3}; workspace ${ws3}";
-            "${modifier}+Shift+4" =
-              "move container to workspace ${ws4}; workspace ${ws4}";
-            "${modifier}+Shift+5" =
-              "move container to workspace ${ws5}; workspace ${ws5}";
-            "${modifier}+Shift+6" =
-              "move container to workspace ${ws6}; workspace ${ws6}";
-            "${modifier}+Shift+7" =
-              "move container to workspace ${ws7}; workspace ${ws7}";
-            "${modifier}+Shift+8" =
-              "move container to workspace ${ws8}; workspace ${ws8}";
-            "${modifier}+Shift+9" =
-              "move container to workspace ${ws9}; workspace ${ws9}";
-            "${modifier}+Shift+0" =
-              "move container to workspace ${ws10}; workspace ${ws10}";
-
-            # Move screens
-            "${modifier}+Control+l" = "move workspace to output right";
-            "${modifier}+Control+h" = "move workspace to output left";
-
-            # Resizing
-            "${modifier}+r" = ''mode "resize"'';
-            "${modifier}+Control+Shift+h" =
-              "resize shrink width 10 px or 10 ppt";
-            "${modifier}+Control+Shift+j" =
-              "resize grow height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+k" =
-              "resize shrink height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
-          };
           modes = { };
           startup = [
             {
@@ -224,16 +100,15 @@ in {
               notification = false;
             }
             {
-              command =
+              command = "i3-msg focus right, workspace ${workspaces."2"}";
-                "i3-msg workspace ${ws2}, move workspace to output right";
               notification = false;
             }
             {
-              command =
+              command = "i3-msg focus left, workspace ${workspaces."1"}";
-                "i3-msg workspace ${ws1}, move workspace to output left";
               notification = false;
             }
           ];
+          terminal = config.terminal;
           window = {
             border = 0;
             hideEdgeBorders = "smart";
@@ -241,22 +116,74 @@ in {
           };
           workspaceAutoBackAndForth = false;
           workspaceOutputAssign = [ ];
-          # gaps = {
-          # bottom = 8;
-          # top = 8;
-          # left = 8;
-          # right = 8;
-          # horizontal = 15;
-          # vertical = 15;
-          # inner = 15;
-          # outer = 0;
-          # smartBorders = "off";
-          # smartGaps = false;
-          # };
         };
         extraConfig = "";
       };
 
+      services.sxhkd.keybindings = let
+
+        # Shortcuts
+        i3-msg = "${pkgs.i3}/bin/i3-msg";
+
+      in {
+
+        # Window navigation
+        "super + {_,shift +}{h,j,k,l}" =
+          ''${i3-msg} "{focus,move} {left,down,up,right}"'';
+        "super + {_,shift +}{Left,Down,Up,Right}" =
+          ''${i3-msg} "{focus,move} {left,down,up,right}"'';
+        "super + q" = ''${i3-msg} "kill"'';
+        "super + f" = ''${i3-msg} "fullscreen toggle"'';
+
+        # Screen management
+        "super + control + l" = ''${i3-msg} "move workspace to output right"'';
+        "super + control + h" = ''${i3-msg} "move workspace to output left"'';
+
+        # Window layouts and tiling
+        "super + {i,v}" = ''${i3-msg} "split {h,v}"'';
+        "super + {s,t,e}" =
+          ''${i3-msg} "layout {stacking,tabbed,toggle split}"'';
+        "super + shift + space" = ''${i3-msg} "floating toggle"'';
+        "super + control + space" = ''${i3-msg} "focus mode_toggle"'';
+        "super + a" = ''${i3-msg} "focus parent"'';
+
+        # Launch terminal
+        "super + Return" = ''
+          ${i3-msg} "exec --no-startup-id ${config.terminal}; workspace ${
+            workspaces."2"
+          }; layout tabbed"'';
+
+        # Restart and reload
+        "super + shift + {c,r}" = ''${i3-msg} "{reload,restart}"'';
+        "super + shift + q" = ''
+          ${pkgs.i3}/bin/i3-nagbar -t warning -m "Exit i3?" -B "Yes, exit i3" "${i3-msg} exit"'';
+
+        # Resize
+        "super + r : {h,j,k,l}" =
+          ''${i3-msg} "resize {shrink,grow} width 10px or 10 ppt"'';
+        "super + r : {j,k}" =
+          ''${i3-msg} "resize {shrink,grow} height 10px or 10 ppt"'';
+
+      } // (
+
+        # Bind navigation by number
+        let
+          bindWorkspace = num: workspace:
+            lib.attrsets.nameValuePair ("super + ${num}")
+            (''${i3-msg} "workspace ${workspace}"'');
+        in lib.mapAttrs' bindWorkspace workspaces
+
+      ) // (
+
+        # Bind move container to workspace by number
+        let
+          bindWorkspace = num: workspace:
+            lib.attrsets.nameValuePair ("super + shift +${num}") (''
+              ${i3-msg} "move container to workspace ${workspace}; workspace ${workspace}"'');
+        in lib.mapAttrs' bindWorkspace workspaces
+
+      );
+
       programs.fish.functions = {
         update-lock-screen = lib.mkIf config.services.xserver.enable {
           description = "Update lockscreen with wallpaper";
@@ -277,17 +204,20 @@ in {
 
     };
 
+    lockScreenCommand =
+      "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
+
     # Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service
     systemd.services.lock = {
       enable = config.services.xserver.enable;
-      description = "Lock the screen on resume from suspend";
+      description = "Lock the screen before suspend";
       before = [ "sleep.target" "suspend.target" ];
       serviceConfig = {
         User = config.user;
         Type = "simple";
         Environment = "DISPLAY=:0";
         TimeoutSec = "infinity";
-        ExecStart = lockCmd;
+        ExecStart = config.lockScreenCommand;
         ExecStartPost = "${pkgs.coreutils-full}/bin/sleep 1";
       };
       wantedBy = [ "sleep.target" "suspend.target" ];

modules/nixos/graphical/keybinds.nix

@@ -0,0 +1,51 @@
+{ config, pkgs, ... }: {
+
+  home-manager.users.${config.user} = {
+    services.sxhkd = {
+      enable = true;
+      keybindings = {
+
+        # Adjust screen brightness (TODO: replace with pkgs.light?)
+        "shift + {F11,F12}" = ''
+          ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 {- 30,+ 30} && sleep 1; \\
+          ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 {- 30,+ 30}
+        '';
+        "XF86MonBrightness{Down,Up}" = ''
+          ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 {- 30,+ 30} && sleep 1; \\
+          ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 {- 30,+ 30}
+        '';
+
+        # Media controls
+        "XF86Audio{Play,Stop,Next,Prev}" =
+          "${pkgs.playerctl}/bin/playerctl {play-pause,stop,next,previous}";
+
+        # Toggle bar
+        "super + b" = config.toggleBarCommand;
+
+        # Launchers
+        "super + space" = config.launcherCommand;
+        "super + shift + s" = config.systemdSearch;
+        "super + shift + a" = config.audioSwitchCommand;
+        "alt + Tab" = config.altTabCommand;
+        "super + shift + period" = config.powerCommand;
+        "super + shift + m" = config.brightnessCommand;
+        "super + c" = config.calculatorCommand;
+        "super + shift + x" = config.lockScreenCommand;
+        "super + alt + h" =
+          "${config.terminal} sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+        "super + alt + r" =
+          "${config.terminal} sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+
+      };
+    };
+
+    xsession.windowManager.i3.config.startup = [{
+
+      command = "pkill sxhkd; sxhkd";
+      always = true;
+      notification = false;
+    }];
+
+  };
+
+}

modules/nixos/graphical/picom.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
+  config = lib.mkIf config.services.xserver.enable {
     home-manager.users.${config.user} = {
 
       services.picom = {

modules/nixos/graphical/polybar.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
+  config = lib.mkIf config.services.xserver.enable {
 
     toggleBarCommand = "polybar-msg cmd toggle";
 
@@ -36,7 +36,7 @@
             module-margin = 1;
             modules-left = "i3";
             modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date keyboard power";
+            modules-right = "mailcount network pulseaudio date power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -141,7 +141,7 @@
             format-volume = "<ramp-volume> <label-volume>";
             # format-volume-background = colors.background;
             # label-volume-background = colors.background;
-            format-volume-foreground = config.theme.colors.base04;
+            format-volume-foreground = config.theme.colors.base0B;
             label-volume = "%percentage%%";
             label-muted = "󰝟 ---";
             label-muted-foreground = config.theme.colors.base03;
@@ -197,20 +197,13 @@
             date = "%d %b %l:%M %p";
             date-alt = "%Y-%m-%d %H:%M:%S";
             label = "%date%";
-            label-foreground = config.theme.colors.base06;
+            label-foreground = config.theme.colors.base0A;
             # format-background = colors.background;
           };
-          "module/keyboard" = {
-            type = "custom/text";
-            content = "󰌌";
-            click-left = "doas systemctl restart keyd";
-            content-foreground = config.theme.colors.base04;
-          };
           "module/power" = {
             type = "custom/text";
             content = "  ";
             click-left = config.powerCommand;
-            click-right = "polybar-msg cmd restart";
             content-foreground = config.theme.colors.base04;
           };
           "settings" = {

modules/nixos/graphical/rofi.nix

@@ -8,11 +8,10 @@ in {
 
   imports = [ ./rofi/power.nix ./rofi/brightness.nix ];
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
+  config = lib.mkIf config.services.xserver.enable {
 
     # Set the Rofi-Systemd terminal for viewing logs
-    environment.sessionVariables.ROFI_SYSTEMD_TERM =
+    environment.sessionVariables.ROFI_SYSTEMD_TERM = config.terminal;
-      lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
 
     home-manager.users.${config.user} = {
 
@@ -24,6 +23,13 @@ in {
       programs.rofi = {
         enable = true;
         cycle = true;
+        extraConfig = {
+          show-icons = true;
+          kb-cancel = "Escape,Super+space";
+          modi = "window,run,ssh,emoji,calc,systemd";
+          sort = true;
+          # levenshtein-sort = true;
+        };
         location = "center";
         pass = { };
         plugins = [ pkgs.rofi-calc pkgs.rofi-emoji pkgs.rofi-systemd ];
@@ -59,7 +65,7 @@ in {
             border = mkLiteral "0px";
             border-radius = mkLiteral "0px";
             border-color = mkLiteral config.theme.colors.base04;
-            children = map mkLiteral [ "inputbar" "message" "listview" ];
+            children = map mkLiteral [ "inputbar" "listview" ];
             spacing = mkLiteral "10px";
             padding = mkLiteral "10px";
           };
@@ -143,15 +149,9 @@ in {
           };
 
         };
+        terminal = config.terminal;
         xoffset = 0;
         yoffset = -20;
-        extraConfig = {
-          show-icons = true;
-          kb-cancel = "Escape,Super+space";
-          modi = "window,run,ssh,emoji,calc,systemd";
-          sort = true;
-          # levenshtein-sort = true;
-        };
       };
 
       home.file.".local/share/rofi/themes" = {

modules/nixos/graphical/rofi/brightness.nix

@@ -28,18 +28,17 @@ in {
               -sep ';' \
               -selected-row 1)
 
-
       case "$chosen" in
           "$dimmer")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 25
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 25
               ;;
 
           "$medium")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 75
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 75
               ;;
 
           "$brighter")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 100
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 100
               ;;
 
           *) exit 1 ;;

modules/nixos/graphical/rofi/power.nix

@@ -31,17 +31,15 @@ in {
             -sep ';' \
             -selected-row 2)
 
-    confirm () {
-        ${builtins.readFile ./rofi-prompt.sh}
-    }
-
     case "$chosen" in
         "$power_off")
-            confirm 'Shutdown?' && doas shutdown now
+            ${
+              builtins.toString ./rofi-prompt.sh
+            } 'Shutdown?' && doas shutdown now
             ;;
 
         "$reboot")
-            confirm 'Reboot?' && doas reboot
+            ${builtins.toString ./rofi-prompt.sh} 'Reboot?' && doas reboot
             ;;
 
         "$lock")
@@ -53,7 +51,7 @@ in {
             ;;
 
         "$log_out")
-            confirm 'Logout?' && i3-msg exit
+            ${builtins.toString ./rofi-prompt.sh} 'Logout?' && i3-msg exit
             ;;
 
         *) exit 1 ;;

modules/nixos/graphical/rofi/rofi-prompt.sh

@@ -42,6 +42,6 @@ chosen=$(printf '%s;%s\n' "$yes" "$no" |
         -selected-row 1)
 
 case "$chosen" in
-    "$yes") return 0 ;;
+    "$yes") exit 0 ;;
-    *) return 1 ;;
+    *) exit 1 ;;
 esac

modules/nixos/graphical/sway.nix

@@ -0,0 +1,25 @@
+{ config, lib, ... }: {
+
+  config = lib.mkIf config.gui.enable {
+
+    programs.sway = {
+      enable = true;
+      package = null; # Use home-manager Sway instead
+    };
+
+  };
+
+  home-manager.users.${config.user} = {
+
+    wayland.windowManager.sway = {
+      enable = true;
+      config =
+        config.home-manager.users.${config.user}.xsession.windowManager.i3.config;
+    };
+
+  };
+
+  # TODO: swaybg
+  # TODO: swaylock
+
+}

modules/nixos/hardware/boot.nix

@@ -27,7 +27,7 @@
         if keystatus --shift ; then
             set timeout=-1
         else
-            set timeout=3
+            set timeout=0
         fi
       '';
     };

modules/nixos/hardware/iso.nix

@@ -1,19 +0,0 @@
-{ config, lib, modulesPath, ... }:
-{
-
-  # options.iso.enable = lib.mkEnableOption "Enable creating as an ISO.";
-  #
-  # imports = [ "${toString modulesPath}/installer/cd-dvd/iso-image.nix" ];
-
-  # config = lib.mkIf config.iso.enable {
-  #
-  #   # EFI booting
-  #   isoImage.makeEfiBootable = true;
-  #
-  #   # USB booting
-  #   isoImage.makeUsbBootable = true;
-  #
-  # };
-
-}
-

modules/nixos/hardware/keyboard.nix

@@ -1,10 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{ config, ... }: {
 
-  config = lib.mkIf config.physical {
+  config = {
 
     services.xserver = {
 
-      xkb.layout = "us";
+      layout = "us";
 
       # Keyboard responsiveness
       autoRepeatDelay = 250;
@@ -23,10 +23,6 @@
       };
     };
 
-    # For some reason, keyd doesn't restart properly when updating
-    system.activationScripts.keyd.text =
-      "${pkgs.systemd}/bin/systemctl restart keyd.service";
-
     # Enable num lock on login
     home-manager.users.${config.user}.xsession.numlock.enable = true;
 

modules/nixos/hardware/networking.nix

@@ -12,7 +12,7 @@
       domainName = "local";
       ipv6 = false; # Should work either way
       # Resolve local hostnames using Avahi DNS
-      nssmdns4 = true;
+      nssmdns = true;
       publish = {
         enable = true;
         addresses = true;

modules/nixos/services/arr.nix

@@ -2,7 +2,6 @@
 
 let
 
-  # This config specifies ports for Prometheus to scrape information
   arrConfig = {
     radarr = {
       exportarrPort = "9707";
@@ -42,8 +41,6 @@ in {
       sabnzbd = {
         enable = true;
         group = "media";
-        # The config file must be editable within the application
-        # It contains server configs and credentials
         configFile = "/data/downloads/sabnzbd/sabnzbd.ini";
       };
       sonarr = {
@@ -56,23 +53,16 @@ in {
       };
     };
 
-    # Create a media group to be shared between services
     users.groups.media = { };
-
-    # Give the human user access to the media group
     users.users.${config.user}.extraGroups = [ "media" ];
-
-    # Allows media group to read/write the sabnzbd directory
     users.users.sabnzbd.homeMode = "0770";
 
-    unfreePackages = [ "unrar" ]; # Required as a dependency for sabnzbd
+    unfreePackages = [ "unrar" ]; # Required for sabnzbd
 
     # Requires updating the base_url config value in each service
     # If you try to rewrite the URL, the service won't redirect properly
     caddy.routes = [
       {
-        # Group means that routes with the same name are mutually exclusive,
-        # so they are split between the appropriate services.
         group = "download";
         match = [{
           host = [ config.hostnames.download ];
@@ -80,7 +70,6 @@ in {
         }];
         handle = [{
           handler = "reverse_proxy";
-          # We're able to reference the url and port of the service dynamically 
           upstreams = [{ dial = arrConfig.sonarr.url; }];
         }];
       }
@@ -103,7 +92,6 @@ in {
         }];
         handle = [{
           handler = "reverse_proxy";
-          # Prowlarr doesn't offer a dynamic config, so we have to hardcode it
           upstreams = [{ dial = "localhost:9696"; }];
         }];
       }
@@ -116,7 +104,6 @@ in {
         handle = [{
           handler = "reverse_proxy";
           upstreams = [{
-            # Bazarr only dynamically sets the port, not the host
             dial = "localhost:${
                 builtins.toString config.services.bazarr.listenPort
               }";
@@ -147,9 +134,6 @@ in {
       }
     ];
 
-    # Configure Cloudflare DNS to point to this machine
-    services.cloudflare-dyndns.domains = [ config.hostnames.download ];
-
     # Enable Prometheus exporters
     systemd.services = lib.mapAttrs' (name: attrs: {
       name = "prometheus-${name}-exporter";
@@ -161,12 +145,10 @@ in {
           Type = "simple";
           DynamicUser = true;
           ExecStart = let
-            # Sabnzbd doesn't accept the URI path, unlike the others
             url = if name != "sabnzbd" then
               "http://${attrs.url}/${name}"
             else
               "http://${attrs.url}";
-            # Exportarr is trained to pull from the arr services
           in ''
             ${pkgs.exportarr}/bin/exportarr ${name} \
                         --url ${url} \
@@ -215,7 +197,7 @@ in {
       prefix = "API_KEY=";
     };
 
-    # Prometheus scrape targets (expose Exportarr to Prometheus)
+    # Prometheus scrape targets
     prometheus.scrapeTargets = map (key:
       "127.0.0.1:${
         lib.attrsets.getAttrFromPath [ key "exportarrPort" ] arrConfig

modules/nixos/services/backups.nix

@@ -1,6 +1,3 @@
-# This is my setup for backing up SQlite databases and other systems to S3 or
-# S3-equivalent services (like Backblaze B2).
-
 { config, lib, ... }: {
 
   options = {

modules/nixos/services/bind.nix

@@ -1,16 +1,4 @@
-# Bind is a DNS service. This allows me to resolve public domains locally so
+{ config, pkgs, lib, ... }:
-# when I'm at home, I don't have to travel over the Internet to reach my
-# server.
-
-# To set this on all home machines, I point my router's DNS resolver to the
-# local IP address of the machine running this service (swan).
-
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 let
 
@@ -23,33 +11,17 @@ let
   ];
   mkRecord = service: "${service}       A       ${localIp}";
   localRecords = lib.concatLines (map mkRecord localServices);
-in
+
-{
+in {
 
   config = lib.mkIf config.services.bind.enable {
 
-    # Normally I block all requests not coming from Cloudflare, so I have to also
-    # allow my local network.
     caddy.cidrAllowlist = [ "192.168.0.0/16" ];
 
     services.bind = {
-
+      cacheNetworks = [ "127.0.0.0/24" "192.168.0.0/16" ];
-      # Allow requests coming from these IPs. This way I don't somehow get
+      forwarders = [ "1.1.1.1" "1.0.0.1" ];
-      # spammed with DNS requests coming from the Internet.
+      ipv4Only = true;
-      cacheNetworks = [
-        "127.0.0.0/24"
-        "192.168.0.0/16"
-        "::1/128" # Required because IPv6 loopback now added to resolv.conf
-        # (see: https://github.com/NixOS/nixpkgs/pull/302228)
-      ];
-
-      # When making normal DNS requests, forward them to Cloudflare to resolve.
-      forwarders = [
-        "1.1.1.1"
-        "1.0.0.1"
-      ];
-
-      ipv4Only = false;
 
       # Use rpz zone as an override
       extraOptions = ''response-policy { zone "rpz"; };'';
@@ -72,16 +44,12 @@ in
           '';
         };
       };
+
     };
 
-    # We must allow DNS traffic to hit our machine as well
     networking.firewall.allowedTCPPorts = [ 53 ];
     networking.firewall.allowedUDPPorts = [ 53 ];
 
-    # Set our own nameservers to ourselves
-    networking.nameservers = [
-      "127.0.0.1"
-      "::1"
-    ];
   };
+
 }