attempt to use pkgs for unfree predicate

still not working
2025-07-06 20:10:14 +00:00 · 2023-03-10 21:22:07 -05:00
215 changed files with 2735 additions and 6673 deletions
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -1,20 +0,0 @@
-name: Check Build
-
-on:
-  workflow_dispatch: # allows manual triggering
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-      - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check the Flake
-        run: nix flake check
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -1,52 +0,0 @@
-name: Update Flake
-
-on:
-  workflow_dispatch: # allows manual triggering
-  schedule:
-    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  lockfile:
-    name: Lockfile
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-      - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v19
-        id: update
-        with:
-          pr-title: "Update flake.lock" # Title of PR to be created
-          pr-labels: |                  # Labels to be set on the PR
-            dependencies
-            automated
-      - name: Check the Flake
-        run: nix flake check
-      - name: Enable Pull Request Automerge
-        if: success()
-        run: |
-          gh pr merge \
-            --rebase \
-            --auto \
-            ${{ steps.update.outputs.pull-request-number }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-      - name: Close Pull Request If Failed
-        if: failure()
-        run: |
-          gh pr close \
-            --comment "Auto-closing pull request" \
-            --delete-branch \
-            ${{ steps.update.outputs.pull-request-number }}
-        env:
-          GH_TOKEN: ${{ github.token }}
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@
 *.db
 **/.direnv/**
 result
+.luarc.json
 private/**
-templates/**/flake.lock
 !private/**.age
+!private/**.sha512
--- a/README.md
+++ b/README.md
@ -6,56 +6,21 @@ hosts.
 They are organized and managed by [Nix](https://nixos.org), so some of the
 configuration may be difficult to translate to a non-Nix system.

-## System Features
+However, some of the configurations are easier to lift directly:

-| Feature        | Program                                             | Configuration                                 |
-| ---            | ---                                                 | ---                                           |
-| OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
-| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
-| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
-| Window Manager | [i3](https://i3wm.org/)                             | [Link](./modules/nixos/graphical/i3.nix)      |
-| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./modules/nixos/graphical/polybar.nix) |
-| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix)   |
-| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./modules/nixos/graphical/rofi.nix)    |
+- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/common/neovim/config)
+- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/common/shell/fish/functions)
+- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/fish/default.nix)
+- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/git.nix)
+- [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon)

-## User Features
-
-| Feature      | Program                                                                          | Configuration                                      |
-| ---          | ---                                                                              | ---                                                |
-| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
-| Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
-| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
-| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/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)             |
-| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
-| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |
-| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./modules/common/applications/nautilus.nix) |
-| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./modules/common/applications/media.nix)    |
-| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./modules/common/applications/media.nix)    |
-
-## macOS Features
-
-| Feature  | Program                                     | Configuration                        |
-| ---      | ---                                         | ---                                  |
-| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
-
---
-
-# Installation
-
-Click [here](./docs/installation.md) for detailed installation instructions.
-
-# Neovim
-
-Try out my Neovim config with nix:
+Try out my Neovim config (requires [nix](https://nixos.org/download.html)):

 ```bash
 nix run github:nmasur/dotfiles#neovim
 ```

-Or build it as a package:
+Or build it as a package (requires [nix](https://nixos.org/download.html)):

 ```bash
 nix build github:nmasur/dotfiles#neovim
@ -65,6 +30,73 @@ If you already have a Neovim configuration, you may need to move it out of
 `~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise both
 configs might conflict with each other.

+---
+
+# Full Installation
+
+## NixOS - From Live Disk
+
+Format drives and build system from any NixOS host, including the live
+installer disk:
+
+**This will erase your drives; use at your own risk!**
+
+```bash
+lsblk # Choose the disk you want to wipe
+nix-shell -p nixVersions.stable
+nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
+```
+
+## NixOS - From Existing System
+
+If you're already running NixOS, you can switch to this configuration with the
+following command:
+
+```bash
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
+```
+
+## Windows - From NixOS WSL
+
+After [installing NixOS on
+WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
+the WSL configuration:
+
+```
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
+```
+
+You should also download the
+[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
+font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
+move the `windows/alacritty.yml` file to
+`C:\Users\<user>\AppData\Roaming\alacritty`.
+
+## macOS
+
+To get started on a bare macOS installation, first install Nix:
+
+```bash
+sh -c "$(curl -L https://nixos.org/nix/install)"
+```
+
+Then use Nix to build nix-darwin:
+
+```bash
+nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
+./result/bin/darwin-installer
+```
+
+Then switch to the macOS configuration:
+
+```bash
+darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+```
+
+---
+
 # Flake Templates

 You can also use the [templates](./templates/) as flakes for starting new
--- a/apps/README.md
+++ b/apps/README.md
@ -1,9 +0,0 @@
-# Apps
-
-These are all my miscellaneous utilies and scripts to accompany this project.
-
-They can be run with:
-
-```
-nix run github:nmasur/dotfiles#appname
-```
--- a/apps/encrypt-secret.nix
+++ b/apps/encrypt-secret.nix
@ -11,7 +11,7 @@
    tmpfile=$(mktemp)
    echo "''${secret}" > ''${tmpfile}
    ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-      builtins.toString ../misc/public-keys
+      builtins.toString ../public-keys
    } $tmpfile
    rm $tmpfile
  '');
--- a/apps/installer.nix
+++ b/apps/installer.nix
@ -17,8 +17,8 @@
            --foreground "#fb4934" \
            "Missing required parameter." \
            "Usage: installer -- <disk> <host>" \
-            "Example: installer -- nvme0n1 tempest" \
-            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
+            "Example: installer -- nvme0n1 desktop" \
+            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 desktop"
        echo "(exiting)"
        exit 1
    fi
--- a/apps/neovim.nix
+++ b/apps/neovim.nix
@ -5,7 +5,8 @@
  program = "${
      (import ../modules/common/neovim/package {
        inherit pkgs;
-        colors = (import ../colorscheme/nord).dark;
+        colors =
+          import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
      })
    }/bin/nvim";

--- a/apps/rebuild.nix
+++ b/apps/rebuild.nix
@ -6,9 +6,9 @@
    echo ${pkgs.system}
    SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
    if [ "$SYSTEM" == "darwin" ]; then
-        sudo darwin-rebuild switch --flake ${builtins.toString ../.}
+        darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
    else
-        doas nixos-rebuild switch --flake ${builtins.toString ../.}
+        nixos-rebuild switch --flake github:nmasur/dotfiles
    fi
  '');

--- a/apps/reencrypt-secrets.nix
+++ b/apps/reencrypt-secrets.nix
@ -17,7 +17,7 @@
        --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
      echo "Encrypting ''${encryptedfile}..."
      ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-        builtins.toString ../misc/public-keys
+        builtins.toString ../public-keys
      } $tmpfile > $encryptedfile
      rm $tmpfile
    done
--- a/colorscheme/README.md
+++ b/colorscheme/README.md
@ -1,5 +0,0 @@
-# Colorschemes
-
-Color information for different themes is found here. The colors are sourced
-and used with [base16](https://github.com/chriskempson/base16) format
-consistently across the system.
--- a/colorscheme/everforest/default.nix
+++ b/colorscheme/everforest/default.nix
@ -1,24 +1,20 @@
 {
  name = "everforest"; # dark, hard
  author = "Sainnhe Park";
-  dark = {
-    base00 = "#2b3339"; # Default Background
-    base01 = "#323c41"; # Lighter Background
-    base02 = "#503946"; # Selection Background
-    base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
-    base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
-    base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
-    base06 = "#e9e8d2"; # Light Foreground (Not often used)
-    base07 = "#fff9e8"; # Light Background (Not often used)
-    base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
-    base09 = "#d699b6"; # Integers, Boolean, Constants, ...
-    base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
-    base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-    base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
-    base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-    base0E =
-      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-    base0F =
-      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
-  };
+  base00 = "#2b3339"; # Default Background
+  base01 = "#323c41"; # Lighter Background
+  base02 = "#503946"; # Selection Background
+  base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
+  base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
+  base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
+  base06 = "#e9e8d2"; # Light Foreground (Not often used)
+  base07 = "#fff9e8"; # Light Background (Not often used)
+  base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
+  base09 = "#d699b6"; # Integers, Boolean, Constants, ...
+  base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
+  base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
+  base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
+  base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
+  base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+  base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
 }
--- a/colorscheme/gruvbox-dark/default.nix
+++ b/colorscheme/gruvbox-dark/default.nix
@ -1,45 +0,0 @@
-# Gruvbox with a darker background for greater contrast
-
-{
-  name = "gruvbox-dark"; # Dark, Medium
-  author =
-    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
-  dark = {
-    base00 = "#1D2122"; # ---- This is the change from normal gruvbox
-    base01 = "#3c3836"; # ---
-    base02 = "#504945"; # --
-    base03 = "#665c54"; # -
-    base04 = "#bdae93"; # +
-    base05 = "#d5c4a1"; # ++
-    base06 = "#ebdbb2"; # +++
-    base07 = "#fbf1c7"; # ++++
-    base08 = "#fb4934"; # red
-    base09 = "#fe8019"; # orange
-    base0A = "#fabd2f"; # yellow
-    base0B = "#b8bb26"; # green
-    base0C = "#8ec07c"; # aqua/cyan
-    base0D = "#83a598"; # blue
-    base0E = "#d3869b"; # purple
-    base0F = "#d65d0e"; # brown
-    batTheme = "gruvbox-dark";
-  };
-  light = {
-    base00 = "#fbf1c7"; # ----
-    base01 = "#ebdbb2"; # ---
-    base02 = "#d5c4a1"; # --
-    base03 = "#bdae93"; # -
-    base04 = "#665c54"; # +
-    base05 = "#504945"; # ++
-    base06 = "#3c3836"; # +++
-    base07 = "#1D2122"; # ++++ Adjusted darker here
-    base08 = "#9d0006"; # red
-    base09 = "#af3a03"; # orange
-    base0A = "#b57614"; # yellow
-    base0B = "#79740e"; # green
-    base0C = "#427b58"; # aqua/cyan
-    base0D = "#076678"; # blue
-    base0E = "#8f3f71"; # purple
-    base0F = "#d65d0e"; # brown
-    batTheme = "gruvbox-light";
-  };
-}
--- a/colorscheme/gruvbox/default.nix
+++ b/colorscheme/gruvbox/default.nix
@ -19,6 +19,7 @@
    base0D = "#83a598"; # blue
    base0E = "#d3869b"; # purple
    base0F = "#d65d0e"; # brown
+    neovimConfig = ./neovim-gruvbox.nix;
    batTheme = "gruvbox-dark";
  };
  light = {
@ -38,6 +39,7 @@
    base0D = "#076678"; # blue
    base0E = "#8f3f71"; # purple
    base0F = "#d65d0e"; # brown
+    neovimConfig = ./neovim-gruvbox.nix;
    batTheme = "gruvbox-light";
  };
 }
--- a/colorscheme/gruvbox/neovim-gruvbox.nix
+++ b/colorscheme/gruvbox/neovim-gruvbox.nix
@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+
+  plugins = [ pkgs.vimPlugins.vim-gruvbox8 ];
+
+  vim.g.gruvbox_italicize_strings = 0;
+  vim.o.background = "dark";
+  vimscript = ''
+    let g:gruvbox_italicize_strings = 0
+    colorscheme gruvbox8
+  '';
+
+}
--- a/colorscheme/nord/default.nix
+++ b/colorscheme/nord/default.nix
@ -1,23 +1,21 @@
 {
  name = "nord";
  author = "arcticicestudio";
-  dark = {
-    base00 = "#2E3440";
-    base01 = "#3B4252";
-    base02 = "#434C5E";
-    base03 = "#4C566A";
-    base04 = "#D8DEE9";
-    base05 = "#E5E9F0";
-    base06 = "#ECEFF4";
-    base07 = "#8FBCBB";
-    base08 = "#88C0D0";
-    base09 = "#81A1C1";
-    base0A = "#5E81AC";
-    base0B = "#BF616A";
-    base0C = "#D08770";
-    base0D = "#EBCB8B";
-    base0E = "#A3BE8C";
-    base0F = "#B48EAD";
-    batTheme = "nord";
-  };
+  base00 = "#2E3440";
+  base01 = "#3B4252";
+  base02 = "#434C5E";
+  base03 = "#4C566A";
+  base04 = "#D8DEE9";
+  base05 = "#E5E9F0";
+  base06 = "#ECEFF4";
+  base07 = "#8FBCBB";
+  base08 = "#88C0D0";
+  base09 = "#81A1C1";
+  base0A = "#5E81AC";
+  base0B = "#BF616A";
+  base0C = "#D08770";
+  base0D = "#EBCB8B";
+  base0E = "#A3BE8C";
+  base0F = "#B48EAD";
+  neovimConfig = ./neovim.lua;
 }
--- a/colorscheme/nord/neovim.lua
+++ b/colorscheme/nord/neovim.lua
@ -0,0 +1,13 @@
+local M = {}
+
+M.packer = function(use)
+    use({
+        "shaunsingh/nord.nvim",
+        config = function()
+            vim.g.nord_italic = true
+            vim.cmd("colorscheme nord")
+        end,
+    })
+end
+
+return M
--- a/disks/README.md
+++ b/disks/README.md
@ -1,5 +0,0 @@
-# Disks
-
-These are my [disko](https://github.com/nix-community/disko) configurations,
-which allow me to save desired disk formatting layouts as a declarative file so
-I don't have to remember how to format my disks later on.
--- a/disks/root.nix
+++ b/disks/root.nix
@ -9,6 +9,7 @@
        partitions = [
          # Boot partition
          {
+            type = "partition";
            name = "ESP";
            start = "0";
            end = "512MiB";
@ -23,6 +24,7 @@
          }
          # Root partition ext4
          {
+            type = "partition";
            name = "root";
            start = "512MiB";
            end = "100%";
--- a/docs/README.md
+++ b/docs/README.md
@ -1,4 +0,0 @@
-# Documentation
-
-Reference documents for some of the more complicated services and maintenance
-tasks.
--- a/docs/installation.md
+++ b/docs/installation.md
@ -1,67 +0,0 @@
-[Back to README](../README.md)
-
---
-
-# Installation
-
-## NixOS - From Live Disk
-
-Format drives and build system from any NixOS host, including the live
-installer disk:
-
-**This will erase your drives; use at your own risk!**
-
-```bash
-lsblk # Choose the disk you want to wipe
-nix-shell -p nixVersions.stable
-nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
-```
-
-## NixOS - From Existing System
-
-If you're already running NixOS, you can switch to this configuration with the
-following command:
-
-```bash
-nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
-```
-
-## Windows - From NixOS WSL
-
-After [installing NixOS on
-WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
-the WSL configuration:
-
-```
-nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
-```
-
-You should also download the
-[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
-font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
-move the `windows/alacritty.yml` file to
-`C:\Users\<user>\AppData\Roaming\alacritty`.
-
-## macOS
-
-To get started on a bare macOS installation, first install Nix:
-
-```bash
-sh -c "$(curl -L https://nixos.org/nix/install)"
-```
-
-Then use Nix to build nix-darwin:
-
-```bash
-nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
-./result/bin/darwin-installer
-```
-
-Then switch to the macOS configuration:
-
-```bash
-darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
-```
-
--- a/docs/repair-nextcloud.md
+++ b/docs/repair-nextcloud.md
@ -1,65 +0,0 @@
-# Repairing Nextcloud
-
-You can run the maintenance commands like this:
-
-```
-sudo -u nextcloud nextcloud-occ maintenance:mode --on
-sudo -u nextcloud nextcloud-occ maintenance:repair
-sudo -u nextcloud nextcloud-occ maintenance:mode --off
-```
-
-## Rescan Files
-
-```
-sudo -u nextcloud nextcloud-occ files:scan --all
-```
-
-## Converting from SQLite to MySQL (mariadb)
-
-First: keep Nextcloud set to SQLite as its dbtype, and separately launch MySQL
-as a service by copying the configuration found
-[here](https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/web-apps/nextcloud.nix).
-
-No password is necessary, since the user-based auth works with UNIX sockets.
-
-You can connect to the MySQL instance like this:
-
-```
-sudo -u nextcloud mysql -S /run/mysqld/mysqld.sock
-```
-
-Create a blank database for Nextcloud:
-
-```sql
-create database nextcloud;
-```
-
-Now setup the [conversion](https://docs.nextcloud.com/server/17/admin_manual/configuration_database/db_conversion.html):
-
-```
-sudo -u nextcloud nextcloud-occ db:convert-type mysql nextcloud localhost nextcloud
-```
-
-Ignore the password prompt. Proceed with the conversion.
-
-Now `config.php` will be updated but the override config from NixOS will not
-be. Now update your NixOS configuration:
-
- Remove the `mysql` service you created.
- Set `dbtype` to `mysql`.
- Set `database.createLocally` to `true`.
-
-Rebuild your configuration.
-
-Now, make sure to enable [4-byte
-support](https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/mysql_4byte_support.html)
-in the database.
-
-## Backing Up MySQL Database
-
-Use this mysqldump command:
-
-```
-sudo -u nextcloud mysqldump -S /run/mysqld/mysqld.sock --default-character-set=utf8mb4 nextcloud > backup.sql
-```
-
--- a/docs/restore-nextcloud.md
+++ b/docs/restore-nextcloud.md
@ -0,0 +1,43 @@
+# Restoring Nextcloud From Backup
+
+Install the `litestream` package.
+
+```
+nix-shell --run fish -p litestream
+```
+
+Set the S3 credentials:
+
+```
+set -x AWS_ACCESS_KEY_ID (read)
+set -x AWS_SECRET_ACCESS_KEY (read)
+```
+
+Restore from S3:
+
+```
+litestream restore -o nextcloud.db s3://noahmasur-backup.s3.us-west-002.backblazeb2.com/nextcloud
+```
+
+Install Nextcloud. Then copy DB:
+
+```
+sudo rm /data/nextcloud/data/nextcloud.db*
+sudo mv nextcloud.db /data/nextcloud/data/
+sudo chown nextcloud:nextcloud /data/nextcloud/data/nextcloud.db
+sudo chmod 770 /data/nextcloud/data/nextcloud.db
+```
+
+Restart Nextcloud:
+
+```
+sudo systemctl restart phpfpm-nextcloud.service
+```
+
+Adjust Permissions and Directories:
+
+```
+sudo mkdir /data/nextcloud/data/noah/files
+sudo chown nextcloud:nextcloud /data/nextcloud/data/noah/files
+```
+
--- a/docs/zfs.md
+++ b/docs/zfs.md
@ -1,45 +0,0 @@
-# ZFS
-
-Swan runs its root on ext4. The ZFS drives are managed imperatively (this
-[disko configuration](../disks/zfs.nix) is an unused work-in-progress).
-
-The basic ZFS settings are managed [here](../modules/nixos/hardware/zfs.nix).
-
-## Creating a New Dataset
-
-```
-sudo zfs create tank/mydataset
-sudo zfs set compression=zstd tank/myzstddataset
-sudo zfs set mountpoint=/data/mydataset tank/mydataset
-```
-
-## Maintenance
-
-### Get Status
-
-```
-sudo zpool status
-```
-
-### Replace Disk
-
-```
-sudo zdb
-sudo zpool status -g # Show by GUID
-sudo zpool offline tank <GUID>
-sudo zpool status
-# Remove old disk, insert new disk
-sudo zdb
-sudo zpool replace tank <OLD GUID> /dev/disk/by-id/<NEW PATH>
-sudo zpool status
-```
-
-## Initial Setup
-
-```
-sudo zpool create tank raidz1 sda sdb sdc
-sudo zpool set ashift=12 tank
-sudo zpool set autoexpand=on tank
-sudo zpool set compression=on tank
-```
-
--- a/flake.lock
+++ b/flake.lock
@ -3,66 +3,31 @@
    "Comment-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1681214440,
-        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
+        "lastModified": 1674040818,
+        "narHash": "sha256-7UtZAE9tPlnpeHS2LLol/LGVOxptDXNKWXHNHvFBNk4=",
        "owner": "numToStr",
        "repo": "Comment.nvim",
-        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
+        "rev": "eab2c83a0207369900e92783f56990808082eac2",
        "type": "github"
      },
      "original": {
        "owner": "numToStr",
-        "ref": "v0.8.0",
        "repo": "Comment.nvim",
        "type": "github"
      }
    },
-    "age": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1672087018,
-        "narHash": "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw=",
-        "owner": "FiloSottile",
-        "repo": "age",
-        "rev": "c6dcfa1efcaa27879762a934d5bea0d1b83a894c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "FiloSottile",
-        "ref": "v1.1.1",
-        "repo": "age",
-        "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=",
+        "lastModified": 1676130961,
+        "narHash": "sha256-3LT45i0eSMfUV9EBrtdtzHxFKRATIhRy/faDd3lI3mA=",
        "owner": "akinsho",
        "repo": "bufferline.nvim",
-        "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
+        "rev": "84b0822b2af478d0b4f7b0f9249ca218855331db",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v4.2.0",
        "repo": "bufferline.nvim",
        "type": "github"
      }
@ -70,11 +35,11 @@
    "cmp-nvim-lsp-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1687494203,
-        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
+        "lastModified": 1675708067,
+        "narHash": "sha256-DxpcPTBlvVP88PDoTheLV2fC76EXDqS2UpM5mAfj/D4=",
        "owner": "hrsh7th",
        "repo": "cmp-nvim-lsp",
-        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
+        "rev": "0e6b2ed705ddcff9738ec4ea838141654f12eeef",
        "type": "github"
      },
      "original": {
@ -90,11 +55,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696043447,
-        "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
        "type": "github"
      },
      "original": {
@ -111,11 +76,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1695864092,
-        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
+        "lastModified": 1677116397,
+        "narHash": "sha256-2OHwhv4k1SDEuNxhq+zluvrd5pbW8d4TP9NKW4B8iO8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
+        "rev": "8fddb2fd721365fa77ff68b709539639d4dc65d7",
        "type": "github"
      },
      "original": {
@ -126,16 +91,14 @@
    },
    "firefox-darwin": {
      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1696034364,
-        "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=",
+        "lastModified": 1676854489,
+        "narHash": "sha256-hWmx3JFLNPGMtflyjgEn5GZydbLW3msjXvarS1NsBDM=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df",
+        "rev": "6a5cca0ea8dfab4718e1e43e243c80ba110c2364",
        "type": "github"
      },
      "original": {
@ -161,15 +124,12 @@
      }
    },
    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
      "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
@ -179,15 +139,12 @@
      }
    },
    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
@ -197,15 +154,12 @@
      }
    },
    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
@ -214,34 +168,19 @@
        "type": "github"
      }
    },
-    "hmts-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693226725,
-        "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
-        "owner": "calops",
-        "repo": "hmts.nvim",
-        "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "calops",
-        "repo": "hmts.nvim",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
-        ]
+        ],
+        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1696063111,
-        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
+        "lastModified": 1678271387,
+        "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
+        "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2",
        "type": "github"
      },
      "original": {
@ -251,61 +190,22 @@
        "type": "github"
      }
    },
-    "nextcloud-cookbook": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
-      }
-    },
-    "nextcloud-external": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"
-      }
-    },
-    "nextcloud-news": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=",
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"
-      }
-    },
    "nil": {
      "inputs": {
        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1691372739,
-        "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=",
+        "lastModified": 1676110678,
+        "narHash": "sha256-hemg8rMKS2me2Wua9ZG/0aQ8fEOfytjyKB+WYcXfEKE=",
        "owner": "oxalica",
        "repo": "nil",
-        "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b",
+        "rev": "ce2e0b5d60fe497134050796f7d12ffb6b50eb28",
        "type": "github"
      },
      "original": {
        "owner": "oxalica",
-        "ref": "2023-08-09",
        "repo": "nil",
        "type": "github"
      }
@ -318,11 +218,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685980282,
-        "narHash": "sha256-uQyVaoqkiocA8bXKMfrgizuKmz0hUzHye5owFoUd2AQ=",
+        "lastModified": 1673891598,
+        "narHash": "sha256-EevceKxQtA+I0XVA8tBGKmYV1V1KbWc3gsswysMzeDk=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "3836a348503ae27340c7f83f0bc7bcb907f3781d",
+        "rev": "5b31eb81e2c6c74f9e8a4911660f3bf585d55158",
        "type": "github"
      },
      "original": {
@ -333,11 +233,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1693701915,
-        "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
+        "lastModified": 1636849918,
+        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
+        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
        "type": "github"
      },
      "original": {
@ -354,11 +254,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696058303,
-        "narHash": "sha256-eNqKWpF5zG0SrgbbtljFOrRgFgRzCc4++TMFADBMLnc=",
+        "lastModified": 1674666581,
+        "narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "150f38bd1e09e20987feacb1b0d5991357532fb5",
+        "rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
        "type": "github"
      },
      "original": {
@ -369,11 +269,43 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1695830400,
-        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+        "lastModified": 1639237670,
+        "narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1675309347,
+        "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
+        "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1676885936,
+        "narHash": "sha256-ZRKb6zBfTvdCOXI7nGC1L9UWSU5ay2ltxg+f5UIzBOU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b69883faca9542d135fa6bab7928ff1b233c167f",
        "type": "github"
      },
      "original": {
@ -383,34 +315,18 @@
        "type": "github"
      }
    },
-    "nixpkgs-keyd": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1690363189,
-        "narHash": "sha256-Zs0VkngOtQz7nIEO7Wi8AwGB4TBSex2KZAw784aOm2M=",
-        "owner": "JohnAZoidberg",
-        "repo": "nixpkgs",
-        "rev": "6591d332f93422e388ef6337f6b362b4ff8d0724",
-        "type": "github"
-      },
-      "original": {
-        "owner": "JohnAZoidberg",
-        "ref": "keyd-2.4.3",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1674868155,
+        "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-22.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -418,11 +334,11 @@
    "null-ls-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1691810493,
-        "narHash": "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=",
+        "lastModified": 1676246878,
+        "narHash": "sha256-hAUEa2zNsYXQ+TsHYHBzcW67lCxhiD7x+uPbdOZwY8o=",
        "owner": "jose-elias-alvarez",
        "repo": "null-ls.nvim",
-        "rev": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7",
+        "rev": "d4594231a06cecce73a78a256b0d7c7ab51f7dd5",
        "type": "github"
      },
      "original": {
@ -433,11 +349,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1696080597,
-        "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=",
+        "lastModified": 1676251563,
+        "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6",
+        "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
        "type": "github"
      },
      "original": {
@ -449,16 +365,15 @@
    "nvim-lspconfig-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1675639052,
-        "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
+        "lastModified": 1676175675,
+        "narHash": "sha256-Wg3NatT4DRBMF6hCxK4C2DC+geFMpfFUFogPbqeMt6E=",
        "owner": "neovim",
        "repo": "nvim-lspconfig",
-        "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
+        "rev": "1712672e4da3003a0dd9f771d30389600b360f42",
        "type": "github"
      },
      "original": {
        "owner": "neovim",
-        "ref": "v0.1.6",
        "repo": "nvim-lspconfig",
        "type": "github"
      }
@ -466,11 +381,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1695716495,
-        "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=",
+        "lastModified": 1676244722,
+        "narHash": "sha256-xoSekdZhWr59qTOM0/ihYiuKiwHiKYb42Ep5JHn65UM=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "934469b9b6df369e198fb3016969e56393b0dc07",
+        "rev": "ba1778e061f25814bc5940be886a7f41d7d7736e",
        "type": "github"
      },
      "original": {
@ -482,71 +397,42 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1696061053,
-        "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=",
+        "lastModified": 1676240774,
+        "narHash": "sha256-eRSU/9ysSvTyYxBrp9Whg0eXgAOsCdmIHMlYZK7bjRg=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32",
+        "rev": "7eb5f1a2e3949496f26c4084b521b30f2d08137a",
        "type": "github"
      },
      "original": {
        "owner": "nvim-treesitter",
-        "ref": "master",
        "repo": "nvim-treesitter",
        "type": "github"
      }
    },
-    "proton-ge": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-75A0VCVdYkiMQ1duE9r2+DLBJzV02vUozoVLeo/TIWQ=",
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
-      }
-    },
    "root": {
      "inputs": {
        "Comment-nvim-src": "Comment-nvim-src",
-        "age": "age",
-        "baleia-nvim-src": "baleia-nvim-src",
        "bufferline-nvim-src": "bufferline-nvim-src",
        "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
        "darwin": "darwin",
        "disko": "disko",
        "firefox-darwin": "firefox-darwin",
-        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
-        "nextcloud-cookbook": "nextcloud-cookbook",
-        "nextcloud-external": "nextcloud-external",
-        "nextcloud-news": "nextcloud-news",
        "nil": "nil",
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-keyd": "nixpkgs-keyd",
+        "nixpkgs": "nixpkgs_3",
        "null-ls-nvim-src": "null-ls-nvim-src",
        "nur": "nur",
        "nvim-lspconfig-src": "nvim-lspconfig-src",
        "nvim-tree-lua-src": "nvim-tree-lua-src",
        "nvim-treesitter-src": "nvim-treesitter-src",
-        "proton-ge": "proton-ge",
        "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",
-        "vscode-terraform-snippets": "vscode-terraform-snippets",
        "wallpapers": "wallpapers",
-        "wsl": "wsl",
-        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
+        "wsl": "wsl"
      }
    },
    "rust-overlay": {
@ -561,11 +447,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1688783586,
-        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
+        "lastModified": 1675391458,
+        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
+        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
        "type": "github"
      },
      "original": {
@ -574,64 +460,18 @@
        "type": "github"
      }
    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "telescope-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1686302912,
-        "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
+        "lastModified": 1675149856,
+        "narHash": "sha256-L4Kw94CUy6N7zcyy9INuR/O0fxQ7sp0IvGd/u7fHxMA=",
        "owner": "nvim-telescope",
        "repo": "telescope.nvim",
-        "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
+        "rev": "203bf5609137600d73e8ed82703d6b0e320a5f36",
        "type": "github"
      },
      "original": {
        "owner": "nvim-telescope",
-        "ref": "0.1.2",
        "repo": "telescope.nvim",
        "type": "github"
      }
@ -639,11 +479,11 @@
    "telescope-project-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1682606566,
-        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
+        "lastModified": 1671805267,
+        "narHash": "sha256-S4SOHzQ17ux5pcwwYFpVVLzjLeC4/EJ0IFPbrfzUJC8=",
        "owner": "nvim-telescope",
        "repo": "telescope-project.nvim",
-        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
+        "rev": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972",
        "type": "github"
      },
      "original": {
@ -655,132 +495,31 @@
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1685434104,
-        "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
+        "lastModified": 1675358836,
+        "narHash": "sha256-9O7p/7tRStg51OFhMc88M5ewYquiYC9x9CV4s5veVP8=",
        "owner": "akinsho",
        "repo": "toggleterm.nvim",
-        "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
+        "rev": "19aad0f41f47affbba1274f05e3c067e6d718e1e",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v2.7.0",
        "repo": "toggleterm.nvim",
        "type": "github"
      }
    },
-    "tree-sitter-bash": {
-      "flake": false,
+    "utils": {
      "locked": {
-        "lastModified": 1695263734,
-        "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=",
-        "owner": "tree-sitter",
-        "repo": "tree-sitter-bash",
-        "rev": "fd4e40dab883d6456da4d847de8321aee9c80805",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
        "type": "github"
      },
      "original": {
-        "owner": "tree-sitter",
-        "ref": "master",
-        "repo": "tree-sitter-bash",
-        "type": "github"
-      }
-    },
-    "tree-sitter-ini": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1690815608,
-        "narHash": "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M=",
-        "owner": "justinmk",
-        "repo": "tree-sitter-ini",
-        "rev": "7f11a02fb8891482068e0fe419965d7bade81a68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "justinmk",
-        "repo": "tree-sitter-ini",
-        "type": "github"
-      }
-    },
-    "tree-sitter-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1694072484,
-        "narHash": "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=",
-        "owner": "MunifTanjim",
-        "repo": "tree-sitter-lua",
-        "rev": "9668709211b2e683f27f414454a8b51bf0a6bda1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "ref": "main",
-        "repo": "tree-sitter-lua",
-        "type": "github"
-      }
-    },
-    "tree-sitter-puppet": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1690231696,
-        "narHash": "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw=",
-        "owner": "amaanq",
-        "repo": "tree-sitter-puppet",
-        "rev": "9ce9a5f7d64528572aaa8d59459ba869e634086b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "amaanq",
-        "repo": "tree-sitter-puppet",
-        "type": "github"
-      }
-    },
-    "tree-sitter-python": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695282953,
-        "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=",
-        "owner": "tree-sitter",
-        "repo": "tree-sitter-python",
-        "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tree-sitter",
-        "ref": "master",
-        "repo": "tree-sitter-python",
-        "type": "github"
-      }
-    },
-    "tree-sitter-rasi": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1678701563,
-        "narHash": "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA=",
-        "owner": "Fymyte",
-        "repo": "tree-sitter-rasi",
-        "rev": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Fymyte",
-        "repo": "tree-sitter-rasi",
-        "type": "github"
-      }
-    },
-    "vscode-terraform-snippets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1614849738,
-        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
-        "owner": "run-at-scale",
-        "repo": "vscode-terraform-doc-snippets",
-        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "run-at-scale",
-        "repo": "vscode-terraform-doc-snippets",
+        "owner": "numtide",
+        "repo": "flake-utils",
        "type": "github"
      }
    },
@ -804,14 +543,14 @@
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1696053802,
-        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
+        "lastModified": 1676126384,
+        "narHash": "sha256-3aAnN891Cb1pizewAgaHIo3W1WbAjXtoWuX8n3j8YoI=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
+        "rev": "a1c7e8bebac32cfac7aa8498bdfc60cbff13eb50",
        "type": "github"
      },
      "original": {
@ -819,22 +558,6 @@
        "repo": "NixOS-WSL",
        "type": "github"
      }
-    },
-    "zenyd-mpv-scripts": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650625438,
-        "narHash": "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=",
-        "owner": "zenyd",
-        "repo": "mpv-scripts",
-        "rev": "19ea069abcb794d1bf8fac2f59b50d71ab992130",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zenyd",
-        "repo": "mpv-scripts",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -7,10 +7,6 @@
    # Used for system packages
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

-    # Update to keyd 2.4.3 not yet in nixpkgs-unstable
-    # https://github.com/NixOS/nixpkgs/pull/245327
-    nixpkgs-keyd.url = "github:JohnAZoidberg/nixpkgs/keyd-2.4.3";
-
    # Used for MacOS system config
    darwin = {
      url = "github:/lnl7/nix-darwin/master";
@ -20,21 +16,18 @@
    # Used for Windows Subsystem for Linux compatibility
    wsl.url = "github:nix-community/NixOS-WSL";

-    # Used for user packages and dotfiles
+    # Used for user packages
    home-manager = {
      url = "github:nix-community/home-manager/master";
      inputs.nixpkgs.follows =
-        "nixpkgs"; # Use system packages list for their inputs
+        "nixpkgs"; # Use system packages list where available
    };

    # Community packages; used for Firefox extensions
    nur.url = "github:nix-community/nur";

    # Use official Firefox binary for macOS
-    firefox-darwin = {
-      url = "github:bandithedoge/nixpkgs-firefox-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";

    # Manage disk format and partitioning
    disko = {
@ -61,15 +54,11 @@
    };

    # Nix language server
-    nil = {
-      url = "github:oxalica/nil/2023-08-09";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nil.url = "github:oxalica/nil";

    # 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";
      flake = false;
    };
    cmp-nvim-lsp-src = {
@ -80,21 +69,16 @@
      url = "github:jose-elias-alvarez/null-ls.nvim";
      flake = false;
    };
-    baleia-nvim-src = {
-      url = "github:m00qek/baleia.nvim";
-      flake = false;
-    };
    Comment-nvim-src = {
-      url = "github:numToStr/Comment.nvim/v0.8.0";
+      url = "github:numToStr/Comment.nvim";
      flake = false;
    };
    nvim-treesitter-src = {
-      # https://github.com/nvim-treesitter/nvim-treesitter/tags
-      url = "github:nvim-treesitter/nvim-treesitter/master";
+      url = "github:nvim-treesitter/nvim-treesitter";
      flake = false;
    };
    telescope-nvim-src = {
-      url = "github:nvim-telescope/telescope.nvim/0.1.2";
+      url = "github:nvim-telescope/telescope.nvim";
      flake = false;
    };
    telescope-project-nvim-src = {
@ -102,92 +86,17 @@
      flake = false;
    };
    toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim/v2.7.0";
+      url = "github:akinsho/toggleterm.nvim";
      flake = false;
    };
    bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim/v4.2.0";
+      url = "github:akinsho/bufferline.nvim";
      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;
-    };
-
-    # Tree-Sitter Grammars
-    tree-sitter-bash = {
-      url = "github:tree-sitter/tree-sitter-bash/master";
-      flake = false;
-    };
-    tree-sitter-python = {
-      url = "github:tree-sitter/tree-sitter-python/master";
-      flake = false;
-    };
-    tree-sitter-lua = {
-      url = "github:MunifTanjim/tree-sitter-lua/main";
-      flake = false;
-    };
-    tree-sitter-ini = {
-      url = "github:justinmk/tree-sitter-ini";
-      flake = false;
-    };
-    tree-sitter-puppet = {
-      url = "github:amaanq/tree-sitter-puppet";
-      flake = false;
-    };
-    tree-sitter-rasi = {
-      url = "github:Fymyte/tree-sitter-rasi";
-      flake = false;
-    };
-
-    # MPV Scripts
-    zenyd-mpv-scripts = {
-      url = "github:zenyd/mpv-scripts";
-      flake = false;
-    };
-
-    # Age encryption (pin because of failed builds)
-    age = {
-      url = "github:FiloSottile/age/v1.1.1";
-      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-Proton8-16/GE-Proton8-16.tar.gz";
-      flake = false;
-    };
-
-    # Nextcloud Apps
-    nextcloud-news = {
-      # https://github.com/nextcloud/news/releases
-      url =
-        "https://github.com/nextcloud/news/releases/download/24.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.2.1/external-v5.2.1.tar.gz";
-      flake = false;
-    };
-    nextcloud-cookbook = {
-      # https://github.com/nextcloud/cookbook/releases
-      url =
-        "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz";
-      flake = false;
-    };

  };

@ -196,26 +105,13 @@
    let

      # Global configuration for my systems
-      globals = let baseName = "masu.rs";
-      in rec {
+      globals = rec {
        user = "noah";
        fullName = "Noah Masur";
        gitName = fullName;
        gitEmail = "7386960+nmasur@users.noreply.github.com";
        mail.server = "noahmasur.com";
-        mail.imapHost = "imap.purelymail.com";
-        mail.smtpHost = "smtp.purelymail.com";
-        dotfilesRepo = "https://github.com/nmasur/dotfiles";
-        hostnames = {
-          git = "git.${baseName}";
-          metrics = "metrics.${baseName}";
-          prometheus = "prom.${baseName}";
-          secrets = "vault.${baseName}";
-          stream = "stream.${baseName}";
-          content = "cloud.${baseName}";
-          books = "books.${baseName}";
-          download = "download.${baseName}";
-        };
+        dotfilesRepo = "git@github.com:nmasur/dotfiles";
      };

      # Common overlays to always use
@ -224,15 +120,6 @@
        inputs.nix2vim.overlay
        (import ./overlays/neovim-plugins.nix inputs)
        (import ./overlays/calibre-web.nix)
-        (import ./overlays/disko.nix inputs)
-        (import ./overlays/tree-sitter.nix inputs)
-        (import ./overlays/caddy.nix inputs)
-        (import ./overlays/mpv-scripts.nix inputs)
-        (import ./overlays/nextcloud-apps.nix inputs)
-        (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/age.nix inputs)
-        (import ./overlays/proton-ge.nix inputs)
-        (import ./overlays/keyd.nix inputs)
      ];

      # System types to support.
@ -244,8 +131,6 @@

    in rec {

-      # Contains my full system builds, including home-manager
-      # nixos-rebuild switch --flake .#tempest
      nixosConfigurations = {
        tempest = import ./hosts/tempest { inherit inputs globals overlays; };
        hydra = import ./hosts/hydra { inherit inputs globals overlays; };
@ -253,14 +138,12 @@
        swan = import ./hosts/swan { inherit inputs globals overlays; };
      };

-      # Contains my full Mac system builds, including home-manager
-      # darwin-rebuild switch --flake .#lookingglass
      darwinConfigurations = {
        lookingglass =
          import ./hosts/lookingglass { inherit inputs globals overlays; };
      };

-      # For quickly applying home-manager settings with:
+      # For quickly applying local settings with:
      # home-manager switch --flake .#tempest
      homeConfigurations = {
        tempest =
@ -269,37 +152,44 @@
          darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
      };

-      # Disk formatting, only used once
+      # Disk formatting
      diskoConfigurations = { root = import ./disks/root.nix; };

-      packages = let
-        aws = system:
-          import ./hosts/aws { inherit inputs globals overlays system; };
-        staff = system:
-          import ./hosts/staff { inherit inputs globals overlays system; };
-        neovim = system:
-          let pkgs = import nixpkgs { inherit system overlays; };
-          in import ./modules/common/neovim/package {
-            inherit pkgs;
-            colors = (import ./colorscheme/gruvbox-dark).dark;
+      # Package servers into images with a generator
+      packages = forAllSystems (system: {
+
+        aws = {
+          "${system}" =
+            import ./generators/aws { inherit inputs globals system overlays; };
+        };
+
+        staff = {
+          "${system}" = import ./generators/staff {
+            inherit inputs globals system overlays;
          };
-      in {
-        x86_64-linux.aws = aws "x86_64-linux";
-        x86_64-linux.staff = staff "x86_64-linux";
+        };

-        # Package Neovim config into standalone package
-        x86_64-linux.neovim = neovim "x86_64-linux";
-        x86_64-darwin.neovim = neovim "x86_64-darwin";
-        aarch64-linux.neovim = neovim "aarch64-linux";
-        aarch64-darwin.neovim = neovim "aarch64-darwin";
-      };
+        neovim = let pkgs = import nixpkgs { inherit system overlays; };
+        in import ./modules/common/neovim/package {
+          inherit pkgs;
+          colors =
+            import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
+        };
+
+      });

-      # Programs that can be run by calling this flake
      apps = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system overlays; };
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = overlays ++ [
+              (final: prev: {
+                disko-packaged = inputs.disko.packages.${system}.disko;
+              })
+            ];
+          };
        in import ./apps { inherit pkgs; });

-      # Development environments
      devShells = forAllSystems (system:
        let pkgs = import nixpkgs { inherit system overlays; };
        in {
@ -309,24 +199,23 @@
            buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
          };

-        });
+          # Used for cloud and systems development and administration
+          devops = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              git
+              terraform
+              consul
+              vault
+              awscli2
+              google-cloud-sdk
+              ansible
+              kubectl
+              kubernetes-helm
+              kustomize
+              fluxcd
+            ];
+          };

-      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
-            if $(grep "ERROR" $out/health.log); then
-              cat $out/health.log
-              exit 1
-            fi
-          '';
        });

      # Templates for starting other projects quickly
--- a/generators/aws/default.nix
+++ b/generators/aws/default.nix
@ -1,16 +1,21 @@
-{ inputs, system, globals, overlays, ... }:
+{ inputs, globals, ... }:

-inputs.nixos-generators.nixosGenerate {
+with inputs;
+
+nixos-generators.nixosGenerate {
  inherit system;
  format = "amazon";
  modules = [
-    globals
-    inputs.home-manager.nixosModules.home-manager
+    home-manager.nixosModules.home-manager
    {
-      nixpkgs.overlays = overlays;
+      user = globals.user;
+      fullName = globals.fullName;
+      dotfilesRepo = globals.dotfilesRepo;
+      gitName = globals.gitName;
+      gitEmail = globals.gitEmail;
      networking.hostName = "sheep";
      gui.enable = false;
-      theme.colors = (import ../../colorscheme/gruvbox).dark;
+      colorscheme = (import ../colorscheme/gruvbox);
      passwordHash = null;
      publicKey =
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
@ -19,7 +24,7 @@ inputs.nixos-generators.nixosGenerate {
    }
    ../../modules/common
    ../../modules/nixos
-    ../../modules/nixos/services/sshd.nix
+    ../../modules/common/services/sshd.nix
  ] ++ [
    # Required to fix diskSize errors during build
    ({ ... }: { amazonImage.sizeMB = 16 * 1024; })
--- a/generators/aws/main.tf
+++ b/generators/aws/main.tf
--- a/generators/aws/workflow.yml
+++ b/generators/aws/workflow.yml
@ -1,6 +1,7 @@
 name: 'Terraform'
 env:

+
  AWS_ACCOUNT_NUMBER: ''
  AWS_PLAN_ROLE_NAME: github_actions_plan
  AWS_APPLY_ROLE_NAME: github_actions_admin
@ -81,14 +82,15 @@ jobs:

      # Downloads the current repo code to the runner.
      - name: Checkout Repo Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

-      # Enable access to KVM, required to build an image
-      - name: Enable KVM group perms
-        run: |
-            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-            sudo udevadm control --reload-rules
-            sudo udevadm trigger --name-match=kvm
+      # Install Nix
+      - name: Install Nix
+        uses: cachix/install-nix-action@v17
+
+      # Build the image
+      - name: Build Image
+        run: nix build .#aws

      # Login to AWS
      - name: AWS Assume Role
@ -97,28 +99,6 @@ jobs:
          role-to-assume: ${{ env.AWS_ROLE_ARN }}
          aws-region: ${{ env.AWS_REGION }}

-      # Install Nix
-      - name: Install Nix
-        uses: cachix/install-nix-action@v17
-        with:
-          extra_nix_config: |
-            substituters = s3://insert-cache-bucket https://cache.nixos.org/
-            trusted-public-keys = insert-cache-bucket:M6PsZjHXcLvbQyPUBLICKEYGVoNwI84g1FBQzouRU= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-
-      # Build the image
-      - name: Build Image
-        run: nix build .#aws
-
-      # Copy the image to S3
-      - name: Upload Image to Cache
-        env:
-          NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
-        run: |
-          echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
-          nix store sign --key-file cache.key $(readlink result)
-          nix copy --to s3://t2-aws-nixos-test $(readlink result)
-          rm cache.key
-
      # Exports all GitHub Secrets as environment variables prefixed by
      # "TF_VAR_", which exposes them to Terraform. The name of each GitHub
      # Secret must match its Terraform variable name exactly.
--- a/generators/staff/default.nix
+++ b/generators/staff/default.nix
@ -3,7 +3,9 @@

 { inputs, system, overlays, ... }:

-inputs.nixos-generators.nixosGenerate {
+with inputs;
+
+nixos-generators.nixosGenerate {
  inherit system;
  format = "install-iso";
  modules = [{
@ -32,7 +34,9 @@ inputs.nixos-generators.nixosGenerate {
        curl
        (import ../../modules/common/neovim/package {
          inherit pkgs;
-          colors = (import ../../colorscheme/gruvbox).dark;
+          # colors = import ../../colorscheme/gruvbox.dark.neovimConfig {
+          #   inherit pkgs;
+          # };
        })
      ];
    nix.extraOptions = ''
--- a/hosts/README.md
+++ b/hosts/README.md
@ -1,14 +0,0 @@
-# Hosts
-
-These are the individual machines managed by this flake.
-
-| Host                                       | Purpose             |
-| ---                                        | ---                 |
-| [aws](./aws/default.nix)                   | AWS AMI             |
-| [staff](./staff/default.nix)               | Live USB stick      |
-| [flame](./flame/default.nix)               | Oracle cloud server |
-| [hydra](./hydra/default.nix)               | WSL config          |
-| [lookingglass](./lookingglass/default.nix) | Work MacBook        |
-| [swan](./swan/default.nix)                 | Home server         |
-| [tempest](./tempest/default.nix)           | Linux desktop       |
-
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -3,73 +3,42 @@

 # 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.nixpkgs.lib.nixosSystem {
+with inputs;
+
+nixpkgs.lib.nixosSystem {
  system = "aarch64-linux";
  specialArgs = { };
  modules = [
-    globals
-    inputs.home-manager.nixosModules.home-manager
+    ./hardware-configuration.nix
    ../../modules/common
    ../../modules/nixos
+    (removeAttrs globals [ "mail.server" ])
+    wsl.nixosModules.wsl
+    home-manager.nixosModules.home-manager
    {
-      nixpkgs.overlays = overlays;
-
-      # Hardware
      server = true;
-      networking.hostName = "flame";
-
-      # Not sure what's necessary but too afraid to remove anything
-      imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
-      boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
-
-      # File systems must be declared in order to boot
-
-      # This is the root filesystem containing NixOS
-      # I forgot to set a clean label for it
-      fileSystems."/" = {
-        device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
-        fsType = "ext4";
-      };
-
-      # This is the boot filesystem for systemd-boot
-      fileSystems."/boot" = {
-        device = "/dev/disk/by-uuid/D5CA-237A";
-        fsType = "vfat";
-      };
-
-      # Theming
-
-      # Server doesn't require GUI
      gui.enable = false;
-
-      # Still require colors for programs like Neovim, K9S
      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+      nixpkgs.overlays = overlays;
+      wsl.enable = false;
+      caddy.enable = true;

-      # Programs and services
-      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.openssh.enable = true;
-      services.victoriametrics.enable = true;
-      services.gitea.enable = true;
-      services.vaultwarden.enable = true;
-      services.minecraft-server.enable = true; # Setup Minecraft server
+      # FQDNs for various services
+      networking.hostName = "flame";
+      bookServer = "books.masu.rs";
+      # streamServer = "stream.masu.rs";
+      nextcloudServer = "cloud.masu.rs";
+      transmissionServer = "download.masu.rs";
+      metricsServer = "metrics.masu.rs";
+      vaultwardenServer = "vault.masu.rs";
+      giteaServer = "git.masu.rs";

-      # Allows private remote access over the internet
-      cloudflareTunnel = {
-        enable = true;
-        id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
-        credentialsFile = ../../private/cloudflared-flame.age;
-        ca =
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
-      };
+      # Disable passwords, only use SSH key
+      publicKey =
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";

      # Nextcloud backup config
      backup.s3 = {
@ -78,38 +47,51 @@ inputs.nixpkgs.lib.nixosSystem {
        accessKeyId = "0026b0e73b2e2c80000000005";
      };

-      # Disable passwords, only use SSH key
-      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
+      # Grant access to Jellyfin directories from Nextcloud
+      users.users.nextcloud.extraGroups = [ "jellyfin" ];

-      # # Wireguard config for Transmission
-      # wireguard.enable = true;
-      # networking.wireguard.interfaces.wg0 = {
-      #
-      #   # The local IPs for this machine within the Wireguard network
-      #   # Any inbound traffic bound for these IPs should be kept on localhost
-      #   ips = [ "10.66.13.200/32" "fc00:bbbb:bbbb:bb01::3:dc7/128" ];
-      #
-      #   peers = [{
-      #
-      #     # Identity of Wireguard target peer (VPN)
-      #     publicKey = "bOOP5lIjqCdDx5t+mP/kEcSbHS4cZqE0rMlBI178lyY=";
-      #
-      #     # The public internet address of the target peer
-      #     endpoint = "86.106.143.132:51820";
-      #
-      #     # Which outgoing IP ranges should be sent through Wireguard
-      #     allowedIPs = [ "0.0.0.0/0" "::0/0" ];
-      #
-      #     # Send heartbeat signal within the network
-      #     persistentKeepalive = 25;
-      #
-      #   }];
-      #
-      # };
+      # Wireguard config for Transmission
+      wireguard.enable = true;
+      networking.wireguard.interfaces.wg0 = {

-      # # VPN port forwarding
-      # services.transmission.settings.peer-port = 57599;
+        # The local IPs for this machine within the Wireguard network
+        # Any inbound traffic bound for these IPs should be kept on localhost
+        ips = [ "10.66.13.200/32" "fc00:bbbb:bbbb:bb01::3:dc7/128" ];
+
+        peers = [{
+
+          # Identity of Wireguard target peer (VPN)
+          publicKey = "bOOP5lIjqCdDx5t+mP/kEcSbHS4cZqE0rMlBI178lyY=";
+
+          # The public internet address of the target peer
+          endpoint = "86.106.143.132:51820";
+
+          # Which outgoing IP ranges should be sent through Wireguard
+          allowedIPs = [ "0.0.0.0/0" "::0/0" ];
+
+          # Send heartbeat signal within the network
+          persistentKeepalive = 25;
+
+        }];
+
+      };
+
+      # VPN port forwarding
+      services.transmission.settings.peer-port = 57599;
+
+      # Grant access to Transmission directories from Jellyfin
+      users.users.jellyfin.extraGroups = [ "transmission" ];
+
+      # Proxy traffic with Cloudflare
+      cloudflare.enable = true;
+
+      # Setup Minecraft server
+      gaming.minecraft-server.enable = true;
+
+      # Clone dotfiles
+      dotfiles.enable = true;
+
+      neovim.enable = true;

    }
  ];
--- a/hosts/flame/hardware-configuration.nix
+++ b/hosts/flame/hardware-configuration.nix
@ -0,0 +1,34 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ lib, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/D5CA-237A";
+    fsType = "vfat";
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@ -3,26 +3,29 @@

 { inputs, globals, overlays, ... }:

-inputs.nixpkgs.lib.nixosSystem {
+with inputs;
+
+nixpkgs.lib.nixosSystem {
  system = "x86_64-linux";
  specialArgs = { };
  modules = [
    ../../modules/common
    ../../modules/nixos
-    ../../modules/wsl
    globals
-    inputs.wsl.nixosModules.wsl
-    inputs.home-manager.nixosModules.home-manager
+    wsl.nixosModules.wsl
+    home-manager.nixosModules.home-manager
    {
      networking.hostName = "hydra";
      nixpkgs.overlays = overlays;
+      # Set registry to flake packages, used for nix X commands
+      nix.registry.nixpkgs.flake = nixpkgs;
      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
      gui.enable = false;
      theme = {
        colors = (import ../../colorscheme/gruvbox).dark;
        dark = true;
      };
-      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
+      passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
      wsl = {
        enable = true;
        wslConf.automount.root = "/mnt";
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -3,33 +3,37 @@

 { inputs, globals, overlays, ... }:

-inputs.darwin.lib.darwinSystem {
+with inputs;
+
+darwin.lib.darwinSystem {
  system = "x86_64-darwin";
  specialArgs = { };
  modules = [
    ../../modules/common
    ../../modules/darwin
-    (globals // rec {
+    (globals // {
      user = "Noah.Masur";
      gitName = "Noah-Masur_1701";
-      gitEmail = "${user}@take2games.com";
+      gitEmail = "Noah.Masur@take2games.com";
    })
-    inputs.home-manager.darwinModules.home-manager
+    home-manager.darwinModules.home-manager
    {
-      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
-      networking.hostName = "lookingglass";
+      networking.hostName = "noah-masur-mac";
      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
      gui.enable = true;
      theme = {
-        colors = (import ../../colorscheme/gruvbox-dark).dark;
+        colors = (import ../../colorscheme/gruvbox).dark;
        dark = true;
      };
      mail.user = globals.user;
+      nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
+      # Set registry to flake packages, used for nix X commands
+      nix.registry.nixpkgs.flake = nixpkgs;
      charm.enable = true;
      neovim.enable = true;
      mail.enable = true;
      mail.aerc.enable = true;
-      mail.himalaya.enable = false;
+      mail.himalaya.enable = true;
      kitty.enable = true;
      discord.enable = true;
      firefox.enable = true;
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -3,93 +3,47 @@

 { inputs, globals, overlays, ... }:

-inputs.nixpkgs.lib.nixosSystem {
+with inputs;
+
+nixpkgs.lib.nixosSystem {
  system = "x86_64-linux";
  specialArgs = { };
  modules = [
-    globals
-    inputs.home-manager.nixosModules.home-manager
-    inputs.disko.nixosModules.disko
+    ./hardware-configuration.nix
    ../../modules/common
    ../../modules/nixos
+    (removeAttrs globals [ "mail.server" ])
+    wsl.nixosModules.wsl
+    home-manager.nixosModules.home-manager
+    disko.nixosModules.disko
    {
-      nixpkgs.overlays = overlays;
-
-      # Hardware
      server = true;
-      physical = true;
      networking.hostName = "swan";

-      # Not sure what's necessary but too afraid to remove anything
-      boot.initrd.availableKernelModules =
-        [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
-
-      # Required for transcoding
-      boot.initrd.kernelModules = [ "amdgpu" ];
-      boot.kernelParams = [
-        "radeon.si_support=0"
-        "amdgpu.si_support=1"
-        "radeon.cik_support=0"
-        "amdgpu.cik_support=1"
-        "amdgpu.dc=1"
-      ];
-
-      # Required binary blobs to boot on this machine
-      hardware.enableRedistributableFirmware = true;
-
-      # Prioritize efficiency over performance
-      powerManagement.cpuFreqGovernor = "powersave";
-
-      # Allow firmware updates
-      hardware.cpu.intel.updateMicrocode = true;
-
-      # ZFS
-      zfs.enable = true;
-      # Generated with: head -c 8 /etc/machine-id
+      # head -c 8 /etc/machine-id
      networking.hostId = "600279f4"; # Random ID required for ZFS

-      # Sets root ext4 filesystem instead of declaring it manually
+      zfs.enable = true;
      disko = {
        enableConfig = true;
        devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
+        # // (import ../../disks/zfs.nix {
+        #   pool = "tank";
+        #   disks = [ "/dev/sda" "/dev/sdb" "/dev/sdc" ];
+        # });
      };
-
-      # Automatically load the ZFS pool on boot
      boot.zfs.extraPools = [ "tank" ];

-      # Theming
-
-      # Server doesn't require GUI
      gui.enable = false;
-
-      # Still require colors for programs like Neovim, K9S
      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
-
-      # Programs and services
+      nixpkgs.overlays = overlays;
      neovim.enable = true;
-      cloudflare.enable = true;
-      dotfiles.enable = true;
-      arrs.enable = true;
-      services.bind.enable = true;
-      services.caddy.enable = true;
-      services.jellyfin.enable = true;
-      services.nextcloud.enable = true;
-      services.calibre-web.enable = true;
-      services.openssh.enable = true;
-      services.prometheus.enable = false;
-      services.vmagent.enable = true;
-      services.samba.enable = true;
+      caddy.enable = true;
+      streamServer = "stream.masu.rs";
+      nextcloudServer = "cloud.masu.rs";
+      bookServer = "books.masu.rs";
+      samba.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";
-      };
-
-      # Send regular backups and litestream for DBs to an S3-like bucket
      backup.s3 = {
        endpoint = "s3.us-west-002.backblazeb2.com";
        bucket = "noahmasur-backup";
@ -99,6 +53,12 @@ inputs.nixpkgs.lib.nixosSystem {
      # Disable passwords, only use SSH key
      publicKey =
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
+
+      # Clone dotfiles
+      dotfiles.enable = true;
+
+      # services.nfs.server.enable = true;
+
    }
  ];
 }
--- a/hosts/swan/hardware-configuration.nix
+++ b/hosts/swan/hardware-configuration.nix
@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  # fileSystems."/" = {
+  #   device = "/dev/disk/by-label/nixos";
+  #   fsType = "ext4";
+  # };
+  #
+  # fileSystems."/boot" = {
+  #   device = "/dev/disk/by-label/boot";
+  #   fsType = "vfat";
+  # };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -3,90 +3,39 @@

 { inputs, globals, overlays, ... }:

-inputs.nixpkgs.lib.nixosSystem {
+with inputs;
+
+nixpkgs.lib.nixosSystem {
  system = "x86_64-linux";
+  specialArgs = { };
  modules = [
-    globals
-    inputs.home-manager.nixosModules.home-manager
+    ./hardware-configuration.nix
    ../../modules/common
    ../../modules/nixos
+    globals
+    wsl.nixosModules.wsl
+    home-manager.nixosModules.home-manager
    {
-      nixpkgs.overlays = overlays;
-
-      # Hardware
      physical = true;
      networking.hostName = "tempest";
-
-      # Not sure what's necessary but too afraid to remove anything
-      boot.initrd.availableKernelModules =
-        [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-
-      # Graphics and VMs
-      boot.initrd.kernelModules = [ "amdgpu" ];
-      boot.kernelModules = [ "kvm-amd" ];
-      services.xserver.videoDrivers = [ "amdgpu" ];
-
-      # Required binary blobs to boot on this machine
-      hardware.enableRedistributableFirmware = true;
-
-      # Prioritize performance over efficiency
-      powerManagement.cpuFreqGovernor = "performance";
-
-      # Allow firmware updates
-      hardware.cpu.amd.updateMicrocode = true;
-
-      # Helps reduce GPU fan noise under idle loads
-      hardware.fancontrol.enable = true;
-      hardware.fancontrol.config = ''
-        # Configuration file generated by pwmconfig, changes will be lost
-        INTERVAL=10
-        DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
-        DEVNAME=hwmon0=amdgpu
-        FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
-        FCFANS= hwmon0/pwm1=hwmon0/fan1_input
-        MINTEMP=hwmon0/pwm1=50
-        MAXTEMP=hwmon0/pwm1=70
-        MINSTART=hwmon0/pwm1=100
-        MINSTOP=hwmon0/pwm1=10
-        MINPWM=hwmon0/pwm1=10
-        MAXPWM=hwmon0/pwm1=240
-      '';
-
-      # File systems must be declared in order to boot
-
-      # 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";
-      };
-
-      # Secrets must be prepared ahead before deploying
-      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
-
-      # Theming
-
-      # Turn on all features related to desktop and graphical applications
+      nixpkgs.overlays = [ nur.overlay ] ++ overlays;
+      # Set registry to flake packages, used for nix X commands
+      nix.registry.nixpkgs.flake = nixpkgs;
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
      gui.enable = true;
-
-      # Set the system-wide theme, also used for non-graphical programs
      theme = {
-        colors = (import ../../colorscheme/gruvbox-dark).dark;
+        colors = (import ../../colorscheme/gruvbox).dark;
        dark = true;
      };
-      wallpaper = "${inputs.wallpapers}/gruvbox/road.jpg";
-      gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
+      wallpaper = "${wallpapers}/gruvbox/road.jpg";
+      gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";
+      passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
+      wsl.enable = false;
+      publicKey = null;

-      # Programs and services
      charm.enable = true;
      neovim.enable = true;
      media.enable = true;
-      dotfiles.enable = true;
      firefox.enable = true;
      kitty.enable = true;
      _1password.enable = true;
@ -97,35 +46,18 @@ inputs.nixpkgs.lib.nixosSystem {
      mail.aerc.enable = true;
      mail.himalaya.enable = true;
      keybase.enable = true;
-      mullvad.enable = false;
+      # mullvad.enable = true;
      nixlang.enable = true;
+      dotfiles.enable = true;
      yt-dlp.enable = true;
+
      gaming = {
-        dwarf-fortress.enable = true;
        enable = true;
        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
-
-      # 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";
-      };
-
-      # 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;

    }
  ];
--- a/hosts/tempest/hardware-configuration.nix
+++ b/hosts/tempest/hardware-configuration.nix
@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules =
+    [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/misc/README.md
+++ b/misc/README.md
@ -1,21 +0,0 @@
-# Miscellaneous
-
-These files contain important data sourced by the configuration, or simply
-information to store for safekeeping later.
-
---
-
-Creating hashed password for [password.sha512](./password.sha512):
-
-```
-mkpasswd -m sha-512
-```
-
---
-
-Getting key for [public-keys](./public-keys):
-
-```
-ssh-keyscan -t ed25519 <hostname>
-```
-
--- a/misc/libratbag-profile
+++ b/misc/libratbag-profile
@ -1,23 +0,0 @@
-Profile 1: (active)
-Name: n/a
-Report Rate: 1000Hz
-Resolutions:
-  0: 400dpi (active) (default)
-  1: 800dpi
-  2: 1600dpi
-  3: 2400dpi
-  4: 0dpi
-Button: 0 is mapped to 'button 1'
-Button: 1 is mapped to 'button 2'
-Button: 2 is mapped to 'button 3'
-Button: 3 is mapped to 'button 4'
-Button: 4 is mapped to 'button 5'
-Button: 5 is mapped to macro '↕F11'
-Button: 6 is mapped to macro '↕VOLUMEDOWN'
-Button: 7 is mapped to macro '↕VOLUMEUP'
-Button: 8 is mapped to 'unknown'
-Button: 9 is mapped to 'wheel-right'
-Button: 10 is mapped to 'wheel-left'
-LED: 0, depth: monochrome, mode: on, color: 000000
-LED: 1, depth: monochrome, mode: on, color: 000000
-LED: 2, depth: monochrome, mode: on, color: 000000
--- a/modules/README.md
+++ b/modules/README.md
@ -1,9 +0,0 @@
-# Modules
-
-| Module                         | Purpose                                     |
-| ---                            | ---                                         |
-| [common](./common/default.nix) | User programs and OS-agnostic configuration |
-| [darwin](./darwin/default.nix) | macOS-specific configuration                |
-| [nixos](./nixos/default.nix)   | NixOS-specific configuration                |
-| [wsl](./wsl/default.nix)       | WSL-specific configuration                  |
-
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@ -11,7 +11,7 @@

  config = lib.mkIf
    (config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
-      unfreePackages = [ "1password" "_1password-gui" ];
+      unfreePackages = with pkgs; [ _1password _1password-gui ];
      home-manager.users.${config.user} = {
        home.packages = with pkgs; [ _1password-gui ];
      };
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@ -7,6 +7,7 @@
    ./firefox.nix
    ./kitty.nix
    ./media.nix
+    ./nautilus.nix
    ./obsidian.nix
    ./qbittorrent.nix
    ./slack.nix
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@ -10,7 +10,7 @@
  };

  config = lib.mkIf (config.gui.enable && config.discord.enable) {
-    unfreePackages = [ "discord" ];
+    unfreePackages = [ pkgs.discord ];
    home-manager.users.${config.user} = {
      home.packages = with pkgs; [ discord ];
      xdg.configFile."discord/settings.json".text = ''
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -13,10 +13,9 @@

  config = lib.mkIf (config.gui.enable && config.firefox.enable) {

-    unfreePackages = [
-      (lib.mkIf config._1password.enable "onepassword-password-manager")
-      "okta-browser-plugin"
-      "wappalyzer"
+    unfreePackages = with pkgs.nur.repos.rycee.firefox-addons; [
+      (lib.mkIf config._1password.enable onepassword-password-manager)
+      okta-browser-plugin
    ];

    home-manager.users.${config.user} = {
@ -34,6 +33,7 @@
            vimium
            multi-account-containers
            facebook-container
+            temporary-containers
            (lib.mkIf config._1password.enable onepassword-password-manager)
            okta-browser-plugin
            sponsorblock
@ -71,10 +71,6 @@
            "layout.css.color-mix.enabled" = true;
            "ui.systemUsesDarkTheme" =
              if config.theme.dark == true then 1 else 0;
-            "media.ffmpeg.vaapi.enabled" =
-              true; # Enable hardware video acceleration
-            "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "svg.context-properties.content.enabled" = true; # Sidebery styling
          };
          userChrome = ''
            :root {
@ -161,24 +157,6 @@
        };

      };
-
-      xsession.windowManager.i3.config.keybindings =
-        lib.mkIf pkgs.stdenv.isLinux {
-          "${
-            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-          }+Shift+b" = "exec ${
-            # Don't name the script `firefox` or it will affect grep
-              builtins.toString (pkgs.writeShellScript "focus-ff.sh" ''
-                count=$(ps aux | grep -c firefox)
-                if [ "$count" -eq 1 ]; then
-                    i3-msg "exec --no-startup-id firefox"
-                    sleep 0.5
-                fi
-                i3-msg "[class=firefox] focus"
-              '')
-            }";
-        };
-
    };

  };
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -10,40 +10,16 @@
  };

  config = lib.mkIf (config.gui.enable && config.kitty.enable) {
-
-    # Set the Rofi-Systemd terminal for viewing logs
-    # Using optionalAttrs because only available in NixOS
-    environment = { } // lib.attrsets.optionalAttrs
-      (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.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";
-        ssh = "kitty +kitten ssh";
-      };
-
+      # xsession.windowManager.i3.config.terminal = "kitty";
+      # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
      programs.kitty = {
        enable = true;
        environment = { };
        extraConfig = "";
        font.size = 14;
        keybindings = {
-          # Use shift+enter to complete text suggestions in fish
          "shift+enter" = "send_text all \\x1F";
-
-          # Easy fullscreen toggle (for macOS)
          "super+f" = "toggle_fullscreen";
        };
        settings = {
@ -94,6 +70,8 @@
          # Scrollback
          scrolling_lines = 10000;
          scrollback_pager_history_size = 10; # MB
+          scrollback_pager = ''
+            ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';

          # Window
          window_padding_width = 6;
@ -101,7 +79,7 @@
          tab_bar_edge = "top";
          tab_bar_style = "slant";

-          # Disable audio
+          # Audio
          enable_audio_bell = false;
        };
      };
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@ -12,43 +12,22 @@
  config = lib.mkIf (config.gui.enable && config.media.enable) {
    home-manager.users.${config.user} = {
      home.packages = with pkgs; [
-        nsxiv # Image viewer
+        mpv # Video viewer
+        sxiv # Image viewer
        mupdf # PDF viewer
        zathura # PDF viewer
      ];

-      # Video player
-      programs.mpv = {
-        enable = true;
-        bindings = { };
-        config = {
-          image-display-duration = 2; # For cycling through images
-          hwdec = "auto-safe"; # Attempt to use GPU decoding for video
-        };
-        scripts = [
-
-          # Automatically load playlist entries before and after current file
-          pkgs.mpvScripts.autoload
-
-          # Delete current file after quitting
-          pkgs.mpvScripts.mpv-delete-file
-        ];
-      };
-
-      # Set default programs for opening PDFs and other media
+      # Set default for opening PDFs
      xdg.mimeApps = {
        associations.added = {
          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/jpeg" = [ "nsxiv.desktop" ];
-          "image/*" = [ "nsxiv.desktop" ];
-        };
-        associations.removed = {
-          "application/pdf" = [ "mupdf.desktop" "wine-extension-pdf.desktop" ];
+          "image/*" = [ "sxiv.desktop" ];
        };
+        associations.removed = { "application/pdf" = [ "mupdf.desktop" ]; };
        defaultApplications = {
          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/jpeg" = [ "nsxiv.desktop" ];
-          "image/*" = [ "nsxiv.desktop" ];
+          "image/*" = [ "sxiv.desktop" ];
        };
      };

--- a/modules/common/applications/nautilus.nix
+++ b/modules/common/applications/nautilus.nix
@ -0,0 +1,34 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    nautilus = {
+      enable = lib.mkEnableOption {
+        description = "Enable Nautilus file manager.";
+        default = false;
+      };
+    };
+  };
+
+  # Install Nautilus file manager
+  config = lib.mkIf (config.gui.enable && config.nautilus.enable) {
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [
+        gnome.nautilus
+        gnome.sushi # Quick preview with spacebar
+      ];
+
+      # Set default for opening directories
+      xdg.mimeApps.defaultApplications."inode/directory" =
+        [ "nautilus.desktop" ];
+
+      programs.fish.functions = {
+        qr = {
+          body =
+            "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+        };
+      };
+    };
+
+  };
+
+}
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@ -10,14 +10,10 @@
  };

  config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
-    unfreePackages = [ "obsidian" ];
+    unfreePackages = [ pkgs.obsidian ];
    home-manager.users.${config.user} = {
      home.packages = with pkgs; [ obsidian ];
    };
-
-    # Broken on 2023-04-16
-    nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ];
-
  };

 }
--- a/modules/common/applications/slack.nix
+++ b/modules/common/applications/slack.nix
@ -10,7 +10,7 @@
  };

  config = lib.mkIf (config.gui.enable && config.slack.enable) {
-    unfreePackages = [ "slack" ];
+    unfreePackages = [ pkgs.slack ];
    home-manager.users.${config.user} = {
      home.packages = with pkgs; [ slack ];
    };
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -44,6 +44,11 @@
        default = true;
      };
    };
+
+    # colorscheme = lib.mkOption {
+    #   type = types.attrs;
+    #   description = "Base16 color scheme";
+    # };
    homePath = lib.mkOption {
      type = lib.types.path;
      description = "Path of user's home directory.";
@ -52,6 +57,7 @@
      else
        "/home/${config.user}");
    };
+
    dotfilesPath = lib.mkOption {
      type = lib.types.path;
      description = "Path of dotfiles repository.";
@ -59,47 +65,13 @@
    };
    dotfilesRepo = lib.mkOption {
      type = lib.types.str;
-      description = "Link to dotfiles repository HTTPS URL.";
+      description = "Link to dotfiles repository.";
    };
    unfreePackages = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+      type = lib.types.listOf lib.types.package;
      description = "List of unfree packages to allow.";
      default = [ ];
    };
-    hostnames = {
-      git = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for git server (Gitea).";
-      };
-      metrics = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for metrics server.";
-      };
-      prometheus = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for Prometheus server.";
-      };
-      secrets = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for passwords and secrets (Vaultwarden).";
-      };
-      stream = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for video/media library (Jellyfin).";
-      };
-      content = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for personal content system (Nextcloud).";
-      };
-      books = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for books library (Calibre-Web).";
-      };
-      download = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for download services.";
-      };
-    };
  };

  config = let stateVersion = "23.05";
@ -113,16 +85,9 @@
        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) [
@ -130,8 +95,7 @@
        ];

        # 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;
+        auto-optimise-store = true;

      };

@ -149,8 +113,10 @@

    # Allow specified unfree packages (identified elsewhere)
    # Retrieves package object based on string name
+    # Idea: https://discourse.nixos.org/t/how-to-use-packages-directly-in-allowunfreepredicate/22455/6
    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) config.unfreePackages;
+      builtins.elem (pkg.name or (builtins.parseDrvName pkg.pname).name)
+      (map lib.getName config.unfreePackages);

    # Pin a state version to prevent warnings
    home-manager.users.${config.user}.home.stateVersion = stateVersion;
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -154,20 +154,22 @@
          general.unsafe-accounts-conf = true;
          viewer = { pager = "${pkgs.less}/bin/less -R"; };
          filters = {
-            "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "text/plain" =
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
            "text/calendar" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
            "text/html" =
-              "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
+              "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
+            # "text/html" =
+            #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
            # "text/*" =
            #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
            "message/delivery-status" =
-              "${pkgs.aerc}/libexec/aerc/filters/colorize";
-            "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+            "message/rfc822" =
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
            "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
            "application/pdf" = "${pkgs.zathura}/bin/zathura -";
-            "audio/*" = "${pkgs.mpv}/bin/mpv -";
-            "image/*" = "${pkgs.feh}/bin/feh -";
          };
        };
      };
@ -179,27 +181,6 @@
        };
      };

-      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
-        name = "aerc";
-        exec = "kitty aerc %u";
-      };
-      xsession.windowManager.i3.config.keybindings =
-        lib.mkIf pkgs.stdenv.isLinux {
-          "${
-            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-          }+Shift+e" = "exec ${
-            # Don't name the script `aerc` or it will affect grep
-              builtins.toString (pkgs.writeShellScript "focus-mail.sh" ''
-                count=$(ps aux | grep -c aerc)
-                if [ "$count" -eq 1 ]; then
-                    i3-msg "exec --no-startup-id kitty --class aerc aerc"
-                    sleep 0.25
-                fi
-                i3-msg "[class=aerc] focus"
-              '')
-            }";
-        };
-
      programs.fish.shellAbbrs = { ae = "aerc"; };

    };
--- a/modules/common/mail/default.nix
+++ b/modules/common/mail/default.nix
@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {

-  imports = [ ./himalaya.nix ./aerc.nix ./system.nix ];
+  imports = [ ./himalaya.nix ./aerc.nix ];

  options = {
    mail.enable = lib.mkEnableOption "Mail service.";
@ -10,49 +10,21 @@
      default = config.user;
    };
    mail.server = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
+      type = lib.types.str;
      description = "Server name for the email address.";
    };
-    mail.imapHost = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Server host for IMAP (reading mail).";
-    };
-    mail.smtpHost = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Server host for SMTP (sending mail).";
-    };
  };

  config = lib.mkIf config.mail.enable {

    home-manager.users.${config.user} = {
      programs.mbsync = { enable = true; };
-
-      # Automatically check for mail and keep files synced locally
      services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
        enable = true;
        frequency = "*:0/5";
-        postExec = "${pkgs.notmuch}/bin/notmuch new";
      };
-
-      # Used to watch for new mail and trigger sync
-      services.imapnotify.enable = pkgs.stdenv.isLinux;
-
-      # Allows sending email from CLI/sendmail
-      programs.msmtp.enable = true;
-
-      # Better local mail search
-      programs.notmuch = {
-        enable = true;
-        new.ignore =
-          [ ".mbsyncstate.lock" ".mbsyncstate.journal" ".mbsyncstate.new" ];
-      };
-
      accounts.email = {
-
-        # Where email files are stored
        maildirBasePath = "${config.homePath}/mail";
-
        accounts = {
          home = let address = "${config.mail.user}@${config.mail.server}";
          in {
@ -65,53 +37,40 @@
              "hey"
              "admin"
            ];
-
-            # Options for contact completion
            alot = { };
-
+            flavor = "plain";
+            folders = { };
+            getmail = { };
            imap = {
-              host = config.mail.imapHost;
+              host = "imap.purelymail.com";
              port = 993;
              tls.enable = true;
            };
-
-            # Watch for mail and run notifications or sync
            imapnotify = {
-              enable = true;
-              boxes = [ "Inbox" ];
-              onNotify = "${pkgs.isync}/bin/mbsync -a";
-              onNotifyPost = lib.mkIf
-                config.home-manager.users.${config.user}.services.dunst.enable
-                "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
+              enable = false;
+              boxes = [ ];
+              onNotify = "";
+              onNotifyPost = "";
            };
-
-            # Name of the directory in maildir for this account
            maildir = { path = "main"; };
-
-            # Bi-directional syncing options for local files
            mbsync = {
              enable = true;
-              create = "both";
-              expunge = "both";
-              remove = "both";
+              create = "maildir";
+              expunge = "none";
+              remove = "none";
              patterns = [ "*" ];
              extraConfig.channel = {
                CopyArrivalDate = "yes"; # Sync time of original message
              };
            };
-
-            # Enable indexing
-            notmuch.enable = true;
-
-            # Used to login and send and receive emails
+            mu.enable = false;
+            notmuch.enable = false;
            passwordCommand =
-              "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${
-                pkgs.writeText "mailpass.age"
-                (builtins.readFile ../../../private/mailpass.age)
+              "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
+                builtins.toString ../../../private/mailpass.age
              }";
-
            smtp = {
-              host = config.mail.smtpHost;
+              host = "smtp.purelymail.com";
              port = 465;
              tls.enable = true;
            };
--- a/modules/common/mail/system.nix
+++ b/modules/common/mail/system.nix
@ -1,34 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf (config.mail.enable || config.server) {
-
-    home-manager.users.${config.user} = {
-
-      programs.msmtp.enable = true;
-
-      # The system user for sending automatic notifications
-      accounts.email.accounts.system =
-        let address = "system@${config.mail.server}";
-        in {
-          userName = address;
-          realName = "NixOS System";
-          primary = !config.mail.enable; # Only primary if mail not enabled
-          inherit address;
-          passwordCommand =
-            "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
-              pkgs.writeText "mailpass-system.age"
-              (builtins.readFile ../../../private/mailpass-system.age)
-            }";
-          msmtp.enable = true;
-          smtp = {
-            host = config.mail.smtpHost;
-            port = 465;
-            tls.enable = true;
-          };
-        };
-
-    };
-
-  };
-
-}
--- a/modules/common/neovim/config/align.nix
+++ b/modules/common/neovim/config/align.nix
@ -1,7 +1,4 @@
 { pkgs, ... }: {
-
-  # Plugin for aligning text programmatically
-
  plugins = [ pkgs.vimPlugins.tabular ];
  lua = ''
    -- Align
--- a/modules/common/neovim/config/bufferline.nix
+++ b/modules/common/neovim/config/bufferline.nix
@ -1,7 +1,4 @@
 { pkgs, ... }: {
-
-  # Shows buffers in a VSCode-style tab layout
-
  plugins = [
    pkgs.vimPlugins.bufferline-nvim
    pkgs.vimPlugins.vim-bbye # Better closing of buffers
--- a/modules/common/neovim/config/colors.nix
+++ b/modules/common/neovim/config/colors.nix
@ -1,22 +0,0 @@
-{ pkgs, lib, config, ... }: {
-
-  # Sets Neovim colors based on Nix colorscheme
-
-  options.colors = lib.mkOption {
-    type = lib.types.attrsOf lib.types.str;
-    description = "Attrset of base16 colorscheme key value pairs.";
-  };
-
-  config = {
-    plugins = [ pkgs.vimPlugins.nvim-base16 ];
-    setup.base16-colorscheme = config.colors;
-
-    # Telescope isn't working, shut off for now
-    lua = ''
-      require('base16-colorscheme').with_config {
-          telescope = false,
-      }
-    '';
-  };
-
-}
--- a/modules/common/neovim/config/completion.nix
+++ b/modules/common/neovim/config/completion.nix
@ -24,14 +24,12 @@
      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
        "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
@ -66,26 +64,24 @@
      '';
    };

-    # These are where the completion engine gets its suggestions
    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 = "nvim_lua"; }
+      { name = "nvim_lsp"; }
+      { name = "luasnip"; }
+      { name = "path"; }
      {
-        name = "buffer"; # Grep for text from the current text buffer
+        name = "buffer";
        keyword_length = 3;
        max_item_count = 10;
      }
      {
-        name = "rg"; # Grep for text from the current directory
+        name = "rg";
        keyword_length = 6;
        max_item_count = 10;
        option = { additional_arguments = "--ignore-case"; };
      }
    ];

-    # Styling of the completion menu
    formatting = {
      fields = [ "kind" "abbr" "menu" ];
      format = dsl.rawLua ''
@ -139,13 +135,6 @@
  };

  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 = {
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -29,14 +29,11 @@
  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.diagnostics.flake8.with({ command = "${pkgs.python310Packages.flake8}/bin/flake8" }),
            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" }),
@ -53,7 +50,6 @@

        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,
@ -62,12 +58,6 @@
                        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,
    })
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@ -5,16 +5,13 @@
    pkgs.vimPlugins.vim-fugitive # Git commands
    pkgs.vimPlugins.vim-repeat # Better repeat using .
    pkgs.vimPlugins.comment-nvim # Smart comment commands
+    pkgs.vimPlugins.impatient-nvim # Faster load times
    pkgs.vimPlugins.glow-nvim # Markdown preview popup
    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
-    pkgs.vimPlugins.which-key-nvim # Keybind helper
  ];

-  # Initialize some plugins
  setup.Comment = { };
  setup.colorizer = { };
-  setup.glow = { };
-  setup.which-key = { };

  vim.o = {
    termguicolors = true; # Set to truecolor
@ -44,23 +41,17 @@
    relativenumber = true; # Relative numbers instead of absolute
  };

-  # For which-key-nvim
-  vim.o.timeout = true;
-  vim.o.timeoutlen = 300;
-
  # Better backup, swap and undo storage
  vim.o.backup = true; # Easier to recover and more secure
  vim.bo.swapfile = false; # Instead of swaps, create backups
  vim.bo.undofile = true; # Keeps undos after quit
-  vim.o.backupdir =
-    dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
-  vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
+  vim.o.backupdir = dsl.rawLua ''vim.fn.stdpath("cache") .. "/backup"'';

  # Required for nvim-cmp completion
  vim.opt.completeopt = [ "menu" "menuone" "noselect" ];

  lua = lib.mkBefore ''
-    vim.loader.enable()
+    require("impatient")
    ${builtins.readFile ../lua/keybinds.lua};
    ${builtins.readFile ../lua/settings.lua};
  '';
--- a/modules/common/neovim/config/statusline.nix
+++ b/modules/common/neovim/config/statusline.nix
@ -2,7 +2,7 @@
  plugins = [ pkgs.vimPlugins.lualine-nvim ];
  setup.lualine = {
    options = {
-      theme = "base16";
+      theme = "gruvbox";
      icons_enabled = true;
    };
  };
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -1,40 +1,26 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {

  plugins = [
    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
      with pkgs.tree-sitter-grammars; [
-        tree-sitter-bash
-        tree-sitter-fish
        tree-sitter-hcl
-        tree-sitter-ini
-        tree-sitter-json
-        tree-sitter-lua
-        tree-sitter-markdown
-        tree-sitter-markdown-inline
-        tree-sitter-nix
-        tree-sitter-puppet
        tree-sitter-python
-        tree-sitter-rasi
+        tree-sitter-lua
+        tree-sitter-nix
+        tree-sitter-fish
        tree-sitter-toml
        tree-sitter-yaml
+        tree-sitter-json
      ]))
    pkgs.vimPlugins.vim-matchup # Better % jumping in languages
-    pkgs.vimPlugins.playground # Tree-sitter experimenting
    pkgs.vimPlugins.nginx-vim
    pkgs.vimPlugins.vim-helm
-    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
-    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
-      pname = "nmasur";
-      version = "0.1";
-      src = ../plugin;
-    })
+    pkgs.vimPlugins.vim-puppet
  ];

  setup."nvim-treesitter.configs" = {
    highlight = { enable = true; };
    indent = { enable = true; };
-    matchup = { enable = true; }; # Uses vim-matchup

    textobjects = {
      select = {
@ -63,10 +49,4 @@
    };
  };

-  # Use mkAfter to ensure tree-sitter is already loaded
-  lua = lib.mkAfter ''
-    -- Use HCL parser with .tf files
-    vim.treesitter.language.register('hcl', 'terraform')
-  '';
-
 }
--- a/modules/common/neovim/config/telescope.lua
+++ b/modules/common/neovim/config/telescope.lua
@ -13,7 +13,6 @@ vim.keymap.set("n", "<Leader>gf", telescope.git_bcommits)
 vim.keymap.set("n", "<Leader>gb", telescope.git_branches)
 vim.keymap.set("n", "<Leader>gs", telescope.git_status)
 vim.keymap.set("n", "<Leader>s", telescope.current_buffer_fuzzy_find)
-vim.keymap.set("n", "<Leader>rr", telescope.resume)

 vim.keymap.set("n", "<Leader>N", function()
    local opts = {
@ -46,7 +45,7 @@ end)
 vim.keymap.set("n", "<Leader>fz", require("telescope").extensions.zoxide.list)

 -- Project
-require("telescope").load_extension("projects")
+require("telescope").load_extension("project")
 vim.keymap.set("n", "<C-p>", function()
    local opts = require("telescope.themes").get_ivy({
        layout_config = {
@ -55,7 +54,7 @@ vim.keymap.set("n", "<C-p>", function()
            },
        },
    })
-    require("telescope").extensions.projects.projects(opts)
+    require("telescope").extensions.project.project(opts)
 end)

 -- File browser
--- a/modules/common/neovim/config/telescope.nix
+++ b/modules/common/neovim/config/telescope.nix
@ -1,10 +1,8 @@
 { pkgs, dsl, ... }: {

-  # Telescope is a fuzzy finder that can work with different sub-plugins
-
  plugins = [
    pkgs.vimPlugins.telescope-nvim
-    pkgs.vimPlugins.project-nvim
+    pkgs.vimPlugins.telescope-project-nvim
    pkgs.vimPlugins.telescope-fzy-native-nvim
    pkgs.vimPlugins.telescope-file-browser-nvim
    pkgs.vimPlugins.telescope-zoxide
@ -27,11 +25,10 @@
    extensions = {
      fzy_native = { };
      zoxide = { };
+      project = { base_dirs = [ "~/dev" ]; };
    };
  };

-  setup.project_nvim = { };
-
  lua = builtins.readFile ./telescope.lua;

 }
--- a/modules/common/neovim/config/toggleterm.lua
+++ b/modules/common/neovim/config/toggleterm.lua
@ -12,8 +12,6 @@ vim.api.nvim_create_autocmd("TermOpen", {
    end,
 })

-- These are all the different types of terminals we can trigger
-
 local terminal = require("toggleterm.terminal").Terminal

 local basicterminal = terminal:new()
--- a/modules/common/neovim/config/toggleterm.nix
+++ b/modules/common/neovim/config/toggleterm.nix
@ -1,7 +1,5 @@
 { pkgs, dsl, ... }: {

-  # Toggleterm provides a floating terminal inside the editor for quick access
-
  plugins = [ pkgs.vimPlugins.toggleterm-nvim ];

  use.toggleterm.setup = dsl.callWith {
--- a/modules/common/neovim/config/tree.nix
+++ b/modules/common/neovim/config/tree.nix
@ -1,7 +1,5 @@
 { pkgs, dsl, ... }: {

-  # This plugin creates a side drawer for navigating the current project
-
  plugins = [ pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-web-devicons ];

  # Disable netrw eagerly
@ -12,16 +10,14 @@
  };

  setup.nvim-tree = {
-    disable_netrw = true; # Disable the built-in file manager
-    hijack_netrw = true; # Works as the file manager
-    sync_root_with_cwd = true; # Change project whenever currend dir changes
-    respect_buf_cwd = true; # Change to exact location of focused buffer
-    update_focused_file = { # Change project based on the focused buffer
+    disable_netrw = true;
+    hijack_netrw = true;
+    update_focused_file = {
      enable = true;
-      update_root = true;
+      update_cwd = true;
      ignore_list = { };
    };
-    diagnostics = { # Enable LSP and linter integration
+    diagnostics = {
      enable = true;
      icons = {
        hint = "";
@ -30,7 +26,7 @@
        error = "";
      };
    };
-    renderer = { # Show files with changes vs. current commit
+    renderer = {
      icons = {
        glyphs = {
          git = {
@ -45,32 +41,35 @@
        };
      };
    };
-    # Set keybinds and initialize program
-    on_attach = dsl.rawLua ''
-      function (bufnr)
-        local api = require('nvim-tree.api')
-        local function opts(desc)
-          return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
-        end
-        api.config.mappings.default_on_attach(bufnr)
-
-        vim.keymap.set('n', 'l', api.node.open.edit, opts('Open'))
-        vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
-        vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
-        vim.keymap.set('n', 'h', api.node.navigate.parent_close, opts('Close Directory'))
-        vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
-      end
-    '';
-    view = { # Set look and feel
+    view = {
      width = 30;
      hide_root_folder = false;
      side = "left";
+      mappings = {
+        custom_only = false;
+        list = [
+          {
+            key = [ "l" "<CR>" "o" ];
+            cb = dsl.rawLua
+              "require('nvim-tree.config').nvim_tree_callback('edit')";
+          }
+          {
+            key = "h";
+            cb = dsl.rawLua
+              "require('nvim-tree.config').nvim_tree_callback('close_node')";
+          }
+          {
+            key = "v";
+            cb = dsl.rawLua
+              "require('nvim-tree.config').nvim_tree_callback('vsplit')";
+          }
+        ];
+      };
      number = false;
      relativenumber = false;
    };
  };

-  # Toggle the sidebar
  lua = ''
    vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
  '';
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -4,7 +4,7 @@ let

  neovim = import ./package {
    inherit pkgs;
-    colors = config.theme.colors;
+    colors = import config.theme.colors.neovimConfig { inherit pkgs; };
  };

 in {
@ -18,17 +18,11 @@ in {

        home.packages = [ neovim ];

-        # Use Neovim as the editor for git commit messages
        programs.git.extraConfig.core.editor = "nvim";
-        programs.jujutsu.settings.ui.editor = "nvim";
-
-        # Set Neovim as the default app for text editing and manual pages
        home.sessionVariables = {
          EDITOR = "nvim";
          MANPAGER = "nvim +Man!";
        };
-
-        # Create quick aliases for launching Neovim
        programs.fish = {
          shellAliases = { vim = "nvim"; };
          shellAbbrs = {
@ -37,28 +31,22 @@ in {
            vll = "nvim -c 'Telescope oldfiles'";
          };
        };
+        programs.kitty.settings.scrollback_pager = lib.mkForce ''
+          ${neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';

-        # Set Neovim as the kitty terminal "scrollback" (vi mode) option.
-        # Requires removing some of the ANSI escape codes that are sent to the
-        # scrollback using sed and baleia, as well as removing several
-        # unnecessary features.
-        programs.kitty.settings.scrollback_pager = ''
-          $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)
        xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
          name = "Neovim wrapper";
          exec = "kitty nvim %F";
-          mimeType = [ "text/plain" "text/markdown" ];
        };
-        xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
-          "text/plain" = [ "nvim.desktop" ];
-          "text/markdown" = [ "nvim.desktop" ];
+        xdg.mimeApps = lib.mkIf pkgs.stdenv.isLinux {
+          defaultApplications."text/markdown" = [ "nvim.desktop" ];
        };

      };

+    # # Used for icons in Vim
+    # fonts.fonts = with pkgs; [ nerdfonts ];
+
  };

 }
--- a/modules/common/neovim/init.lua
+++ b/modules/common/neovim/init.lua
@ -0,0 +1,4 @@
+require("packer_init")
+require("settings")
+require("keybinds")
+require("background")
--- a/modules/common/neovim/lua/keybinds.lua
+++ b/modules/common/neovim/lua/keybinds.lua
@ -39,7 +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>gr", ":!gh repo view -w<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>")

@ -48,6 +48,11 @@ key("n", "<Leader>wv", ":vsplit<CR>")
 key("n", "<Leader>wh", ":split<CR>")
 key("n", "<Leader>wm", ":only<CR>")

+-- Vimrc editing
+key("n", "<Leader>rr", ":luafile $HOME/.config/nvim/init.lua<CR>")
+key("n", "<Leader>rp", ":luafile $HOME/.config/nvim/init.lua<CR>:PackerInstall<CR>:")
+key("n", "<Leader>rc", ":luafile $HOME/.config/nvim/init.lua<CR>:PackerCompile<CR>")
+
 -- Keep cursor in place
 key("n", "n", "nzz")
 key("n", "N", "Nzz")
@ -65,15 +70,9 @@ 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
+key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
+key("n", "Y", "y$") --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
-key("v", "D", "y'>gp")                                      --- Duplicate selected
-key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
+key("v", "D", "y'>gp") --- Duplicate selected
+key("x", "<Leader>p", '"_dP') --- Paste but keep register
--- a/modules/common/neovim/lua/packer/completion.lua
+++ b/modules/common/neovim/lua/packer/completion.lua
@ -0,0 +1,164 @@
+-- =======================================================================
+-- Completion System
+-- =======================================================================
+
+local M = {}
+
+M.packer = function(use)
+    -- Completion sources
+    use("hrsh7th/cmp-nvim-lsp") --- Language server completion plugin
+    use("hrsh7th/cmp-buffer") --- Generic text completion
+    use("hrsh7th/cmp-path") --- Local file completion
+    use("hrsh7th/cmp-cmdline") --- Command line completion
+    use("hrsh7th/cmp-nvim-lua") --- Nvim lua api completion
+    use("saadparwaiz1/cmp_luasnip") --- Luasnip completion
+    use("lukas-reineke/cmp-rg") --- Ripgrep completion
+    use("rafamadriz/friendly-snippets") -- Lots of pre-generated snippets
+
+    -- Completion engine
+    use({
+        "hrsh7th/nvim-cmp",
+        requires = { "L3MON4D3/LuaSnip" },
+        config = function()
+            local cmp = require("cmp")
+
+            local kind_icons = {
+                Text = "",
+                Method = "m",
+                Function = "",
+                Constructor = "",
+                Field = "",
+                Variable = "",
+                Class = "",
+                Interface = "",
+                Module = "",
+                Property = "",
+                Unit = "",
+                Value = "",
+                Enum = "",
+                Keyword = "",
+                Snippet = "",
+                Color = "",
+                File = "",
+                Reference = "",
+                Folder = "",
+                EnumMember = "",
+                Constant = "",
+                Struct = "",
+                Event = "",
+                Operator = "",
+                TypeParameter = "",
+            }
+
+            cmp.setup({
+
+                -- Only enable on non-prompt buffers
+                -- So don't use in telescope
+                enabled = function()
+                    if vim.bo.buftype == "prompt" then
+                        return false
+                    end
+                    return true
+                end,
+
+                -- Setup snippet completion
+                snippet = {
+                    expand = function(args)
+                        require("luasnip").lsp_expand(args.body)
+                    end,
+                },
+
+                -- Setup completion keybinds
+                mapping = {
+                    ["<C-n>"] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }),
+                    ["<C-p>"] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }),
+                    ["<C-d>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
+                    ["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
+                    ["<C-e>"] = cmp.mapping(cmp.mapping.abort(), { "i", "c" }),
+                    ["<Esc>"] = function(_)
+                        cmp.mapping({
+                            i = cmp.mapping.abort(),
+                            c = cmp.mapping.close(),
+                        })
+                        vim.cmd("stopinsert") --- Abort and leave insert mode
+                    end,
+                    ["<CR>"] = cmp.mapping.confirm({
+                        behavior = cmp.ConfirmBehavior.Insert,
+                        select = true,
+                    }),
+                    ["<C-r>"] = cmp.mapping.confirm({
+                        behavior = cmp.ConfirmBehavior.Replace,
+                        select = true,
+                    }),
+                    ["<C-l>"] = cmp.mapping(function(_)
+                        if require("luasnip").expand_or_jumpable() then
+                            require("luasnip").expand_or_jump()
+                        end
+                    end, { "i", "s" }),
+                },
+
+                -- Setup completion engines
+                sources = {
+                    { name = "nvim_lua" },
+                    { name = "nvim_lsp" },
+                    { name = "luasnip" },
+                    { name = "path" },
+                    { name = "buffer", keyword_length = 3, max_item_count = 10 },
+                    {
+                        name = "rg",
+                        keyword_length = 6,
+                        max_item_count = 10,
+                        option = { additional_arguments = "--ignore-case" },
+                    },
+                },
+
+                -- Visual presentation
+                formatting = {
+                    fields = { "kind", "abbr", "menu" },
+                    format = function(entry, vim_item)
+                        vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
+                        vim_item.menu = ({
+                            luasnip = "[Snippet]",
+                            buffer = "[Buffer]",
+                            path = "[Path]",
+                            rg = "[Grep]",
+                            nvim_lsp = "[LSP]",
+                            nvim_lua = "[Lua]",
+                        })[entry.source.name]
+                        return vim_item
+                    end,
+                },
+
+                -- Docs
+                -- window = {
+                --     completion = cmp.config.window.bordered(),
+                --     documentation = cmp.config.window.bordered(),
+                -- },
+
+                -- Extra features
+                experimental = {
+                    native_menu = false, --- Use cmp menu instead of Vim menu
+                    ghost_text = true, --- Show preview auto-completion
+                },
+            })
+
+            -- Use buffer source for `/`
+            cmp.setup.cmdline("/", {
+                sources = {
+                    { name = "buffer", keyword_length = 5 },
+                },
+            })
+
+            -- Use cmdline & path source for ':'
+            cmp.setup.cmdline(":", {
+                sources = cmp.config.sources({
+                    { name = "path" },
+                }, {
+                    { name = "cmdline" },
+                }),
+            })
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/lsp.lua
+++ b/modules/common/neovim/lua/packer/lsp.lua
@ -0,0 +1,153 @@
+-- =======================================================================
+-- Language Server
+-- =======================================================================
+
+local M = {}
+
+M.packer = function(use)
+    -- Language server engine
+    use({
+        "neovim/nvim-lspconfig",
+        requires = { "hrsh7th/cmp-nvim-lsp" },
+        config = function()
+            local function on_path(program)
+                return vim.fn.executable(program) == 1
+            end
+
+            local capabilities = require("cmp_nvim_lsp").default_capabilities()
+            if on_path("lua-language-server") then
+                require("lspconfig").sumneko_lua.setup({
+                    capabilities = capabilities,
+                    -- Turn off errors for vim global variable
+                    settings = {
+                        Lua = {
+                            diagnostics = {
+                                globals = { "vim", "hs" },
+                            },
+                        },
+                    },
+                })
+            end
+            if on_path("rust-analyzer") then
+                require("lspconfig").rust_analyzer.setup({ capabilities = capabilities })
+            end
+            if on_path("tflint") then
+                require("lspconfig").tflint.setup({ capabilities = capabilities })
+            end
+            if on_path("terraform-ls") then
+                require("lspconfig").terraformls.setup({ capabilities = capabilities })
+            end
+            if on_path("pyright") then
+                require("lspconfig").pyright.setup({
+                    on_attach = function()
+                        -- set keymaps (requires 0.7.0)
+                        -- vim.keymap.set("n", "", "", {buffer=0})
+                    end,
+                    capabilities = capabilities,
+                })
+            end
+            if on_path("nil") then
+                require("lspconfig").nil_ls.setup({ capabilities = capabilities })
+            end
+
+            vim.keymap.set("n", "gd", vim.lsp.buf.definition)
+            vim.keymap.set("n", "gT", vim.lsp.buf.type_definition)
+            vim.keymap.set("n", "gi", vim.lsp.buf.implementation)
+            vim.keymap.set("n", "gh", vim.lsp.buf.hover)
+            -- vim.keymap.set("n", "gr", telescope.lsp_references)
+            vim.keymap.set("n", "<Leader>R", vim.lsp.buf.rename)
+            vim.keymap.set("n", "]e", vim.diagnostic.goto_next)
+            vim.keymap.set("n", "[e", vim.diagnostic.goto_prev)
+            vim.keymap.set("n", "<Leader>de", vim.diagnostic.open_float)
+            vim.keymap.set("n", "<Leader>E", vim.lsp.buf.code_action)
+        end,
+    })
+
+    -- Pretty highlights
+    use("folke/lsp-colors.nvim")
+
+    -- Linting
+    use({
+        "jose-elias-alvarez/null-ls.nvim",
+        branch = "main",
+        requires = {
+            "nvim-lua/plenary.nvim",
+            "neovim/nvim-lspconfig",
+        },
+        config = function()
+            local function on_path(program)
+                return vim.fn.executable(program) == 1
+            end
+
+            local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+            require("null-ls").setup({
+                sources = {
+                    require("null-ls").builtins.formatting.stylua.with({
+                        condition = function()
+                            return on_path("stylua")
+                        end,
+                    }),
+                    require("null-ls").builtins.formatting.black.with({
+                        condition = function()
+                            return on_path("black")
+                        end,
+                    }),
+                    require("null-ls").builtins.diagnostics.flake8.with({
+                        condition = function()
+                            return on_path("flake8")
+                        end,
+                    }),
+                    require("null-ls").builtins.formatting.fish_indent.with({
+                        condition = function()
+                            return on_path("fish_indent")
+                        end,
+                    }),
+                    require("null-ls").builtins.formatting.nixfmt.with({
+                        condition = function()
+                            return on_path("nixfmt")
+                        end,
+                    }),
+                    require("null-ls").builtins.formatting.rustfmt.with({
+                        condition = function()
+                            return on_path("rustfmt")
+                        end,
+                    }),
+                    require("null-ls").builtins.diagnostics.shellcheck.with({
+                        condition = function()
+                            return on_path("shellcheck")
+                        end,
+                    }),
+                    require("null-ls").builtins.formatting.shfmt.with({
+                        extra_args = { "-i", "4", "-ci" },
+                        condition = function()
+                            return on_path("shfmt")
+                        end,
+                    }),
+                    require("null-ls").builtins.formatting.terraform_fmt.with({
+                        condition = function()
+                            return on_path("terraform")
+                        end,
+                    }),
+                    -- require("null-ls").builtins.diagnostics.luacheck,
+                    -- require("null-ls").builtins.diagnostics.markdownlint,
+                    -- require("null-ls").builtins.diagnostics.pylint,
+                },
+                -- Format on save
+                on_attach = function(client, bufnr)
+                    if client.supports_method("textDocument/formatting") then
+                        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,
+                        })
+                    end
+                end,
+            })
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/misc.lua
+++ b/modules/common/neovim/lua/packer/misc.lua
@ -0,0 +1,67 @@
+local M = {}
+
+M.packer = function(use)
+    -- Important tweaks
+    use("tpope/vim-surround") --- Manipulate parentheses
+
+    -- Convenience tweaks
+    use("tpope/vim-eunuch") --- File manipulation in Vim
+    use("tpope/vim-vinegar") --- Fixes netrw file explorer
+    use("tpope/vim-fugitive") --- Git commands and syntax
+    use("tpope/vim-repeat") --- Actually repeat using .
+
+    -- Use gc or gcc to add comments
+    use({
+        "numToStr/Comment.nvim",
+        config = function()
+            require("Comment").setup()
+        end,
+    })
+
+    -- Alignment tool
+    use({
+        "godlygeek/tabular",
+        config = function()
+            vim.keymap.set("", "<Leader>ta", ":Tabularize /")
+            vim.keymap.set("", "<Leader>t#", ":Tabularize /#<CR>")
+            vim.keymap.set("", "<Leader>tl", ":Tabularize /---<CR>")
+        end,
+    })
+
+    -- Markdown renderer / wiki notes
+    -- use("vimwiki/vimwiki")
+    use({
+        "jakewvincent/mkdnflow.nvim",
+        config = function()
+            require("mkdnflow").setup({
+                modules = {
+                    bib = false,
+                    conceal = true,
+                    folds = false,
+                },
+                perspective = {
+                    priority = "current",
+                    fallback = "first",
+                    nvim_wd_heel = false, -- Don't change working dir
+                },
+                links = {
+                    style = "markdown",
+                    conceal = true,
+                },
+                wrap = true,
+                to_do = {
+                    symbols = { " ", "-", "x" },
+                },
+            })
+            vim.api.nvim_create_autocmd("FileType", {
+                pattern = "markdown",
+                callback = function()
+                    vim.o.autowriteall = true -- Save in new buffer
+                    vim.o.wrapmargin = 79 -- Wrap text automatically
+                end,
+            })
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/speed.lua
+++ b/modules/common/neovim/lua/packer/speed.lua
@ -0,0 +1,13 @@
+local M = {}
+
+M.packer = function(use)
+    -- Startup speed hacks
+    use({
+        "lewis6991/impatient.nvim",
+        config = function()
+            require("impatient")
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/syntax.lua
+++ b/modules/common/neovim/lua/packer/syntax.lua
@ -0,0 +1,72 @@
+-- =======================================================================
+-- Syntax
+-- =======================================================================
+
+local M = {}
+
+M.packer = function(use)
+    -- Syntax engine
+    use({
+        "nvim-treesitter/nvim-treesitter",
+        commit = "9ada5f70f98d51e9e3e76018e783b39fd1cd28f7",
+        run = ":TSUpdate",
+        config = function()
+            require("nvim-treesitter.configs").setup({
+                ensure_installed = {
+                    "hcl",
+                    "python",
+                    "lua",
+                    "nix",
+                    "fish",
+                    "toml",
+                    "yaml",
+                    "json",
+                },
+                auto_install = true,
+                highlight = { enable = true },
+                indent = { enable = true },
+            })
+        end,
+    })
+
+    -- Syntax-aware Textobjects
+    use({
+        "nvim-treesitter/nvim-treesitter-textobjects",
+        requires = { "nvim-treesitter/nvim-treesitter" },
+        config = function()
+            require("nvim-treesitter.configs").setup({
+                textobjects = {
+                    select = {
+                        enable = true,
+                        lookahead = true, -- Jump forward automatically
+                        keymaps = {
+                            ["af"] = "@function.outer",
+                            ["if"] = "@function.inner",
+                            ["ac"] = "@class.outer",
+                            ["ic"] = "@class.inner",
+                            ["al"] = "@loop.outer",
+                            ["il"] = "@loop.inner",
+                            ["aa"] = "@call.outer",
+                            ["ia"] = "@call.inner",
+                            ["ar"] = "@parameter.outer",
+                            ["ir"] = "@parameter.inner",
+                            ["aC"] = "@comment.outer",
+                            ["iC"] = "@comment.outer",
+                            ["a/"] = "@comment.outer",
+                            ["i/"] = "@comment.outer",
+                            ["a;"] = "@statement.outer",
+                            ["i;"] = "@statement.outer",
+                        },
+                    },
+                },
+            })
+        end,
+    })
+
+    -- Additional syntax sources
+    use("chr4/nginx.vim") --- Nginx syntax
+    use("towolf/vim-helm") --- Helm syntax
+    use("rodjek/vim-puppet") --- Puppet syntax
+end
+
+return M
--- a/modules/common/neovim/lua/packer/telescope.lua
+++ b/modules/common/neovim/lua/packer/telescope.lua
@ -0,0 +1,139 @@
+-- =======================================================================
+-- Fuzzy Launcher
+-- =======================================================================
+
+local M = {}
+
+M.packer = function(use)
+    use({
+        "nvim-telescope/telescope.nvim",
+        branch = "master",
+        requires = { "nvim-lua/plenary.nvim" },
+        config = function()
+            -- Telescope: quit instantly with escape
+            local actions = require("telescope.actions")
+            require("telescope").setup({
+                defaults = {
+                    mappings = {
+                        i = {
+                            ["<esc>"] = actions.close,
+                            ["<C-h>"] = "which_key",
+                        },
+                    },
+                },
+                pickers = {
+                    find_files = { theme = "ivy" },
+                    oldfiles = { theme = "ivy" },
+                    buffers = { theme = "dropdown" },
+                },
+                extensions = {
+                    fzy_native = {},
+                    zoxide = {},
+                    project = {
+                        base_dirs = { "~/dev" },
+                    },
+                },
+            })
+
+            local telescope = require("telescope.builtin")
+
+            vim.keymap.set("n", "<Leader>k", telescope.keymaps)
+            vim.keymap.set("n", "<Leader>/", telescope.live_grep)
+            vim.keymap.set("n", "<Leader>ff", telescope.find_files)
+            vim.keymap.set("n", "<Leader>fp", telescope.git_files)
+            vim.keymap.set("n", "<Leader>fw", telescope.grep_string)
+            vim.keymap.set("n", "<Leader>b", telescope.buffers)
+            vim.keymap.set("n", "<Leader>hh", telescope.help_tags)
+            vim.keymap.set("n", "<Leader>fr", telescope.oldfiles)
+            vim.keymap.set("n", "<Leader>cc", telescope.commands)
+            vim.keymap.set("n", "<Leader>gc", telescope.git_commits)
+            vim.keymap.set("n", "<Leader>gf", telescope.git_bcommits)
+            vim.keymap.set("n", "<Leader>gb", telescope.git_branches)
+            vim.keymap.set("n", "<Leader>gs", telescope.git_status)
+            vim.keymap.set("n", "<Leader>s", telescope.current_buffer_fuzzy_find)
+
+            vim.keymap.set("n", "<Leader>N", function()
+                local opts = {
+                    prompt_title = "Search Notes",
+                    cwd = "$NOTES_PATH",
+                }
+                telescope.live_grep(opts)
+            end)
+
+            vim.keymap.set("n", "<Leader>fN", function()
+                local opts = {
+                    prompt_title = "Find Notes",
+                    cwd = "$NOTES_PATH",
+                }
+                telescope.find_files(opts)
+            end)
+
+            vim.keymap.set("n", "<Leader>cr", function()
+                local opts = require("telescope.themes").get_ivy({
+                    layout_config = {
+                        bottom_pane = {
+                            height = 15,
+                        },
+                    },
+                })
+                telescope.command_history(opts)
+            end)
+        end,
+    })
+
+    -- Faster sorting
+    use("nvim-telescope/telescope-fzy-native.nvim")
+
+    -- Jump around tmux sessions
+    -- use("camgraff/telescope-tmux.nvim")
+
+    -- Jump directories
+    use({
+        "jvgrootveld/telescope-zoxide",
+        requires = { "nvim-lua/popup.nvim", "nvim-telescope/telescope.nvim" },
+        config = function()
+            vim.keymap.set("n", "<Leader>fz", require("telescope").extensions.zoxide.list)
+        end,
+    })
+
+    -- Jump projects
+    use({
+        "nvim-telescope/telescope-project.nvim",
+        requires = { "nvim-telescope/telescope.nvim" },
+        config = function()
+            require("telescope").load_extension("project")
+
+            vim.keymap.set("n", "<C-p>", function()
+                local opts = require("telescope.themes").get_ivy({
+                    layout_config = {
+                        bottom_pane = {
+                            height = 10,
+                        },
+                    },
+                })
+                require("telescope").extensions.project.project(opts)
+            end)
+        end,
+    })
+
+    -- File browser
+    use({
+        "nvim-telescope/telescope-file-browser.nvim",
+        requires = { "nvim-telescope/telescope.nvim" },
+        config = function()
+            require("telescope").load_extension("file_browser")
+
+            vim.keymap.set("n", "<Leader>fa", require("telescope").extensions.file_browser.file_browser)
+
+            vim.keymap.set("n", "<Leader>fD", function()
+                local opts = {
+                    prompt_title = "Find Downloads",
+                    cwd = "~/downloads",
+                }
+                require("telescope").extensions.file_browser.file_browser(opts)
+            end)
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/toggleterm.lua
+++ b/modules/common/neovim/lua/packer/toggleterm.lua
@ -0,0 +1,79 @@
+local M = {}
+
+M.packer = function(use)
+    use({
+        "akinsho/toggleterm.nvim",
+        tag = "v2.1.0",
+        config = function()
+            require("toggleterm").setup({
+                open_mapping = [[<c-\>]],
+                hide_numbers = true,
+                direction = "float",
+            })
+
+            vim.keymap.set("t", "<A-CR>", "<C-\\><C-n>") --- Exit terminal mode
+
+            -- Only set these keymaps for toggleterm
+            vim.api.nvim_create_autocmd("TermOpen", {
+                pattern = "term://*toggleterm#*",
+                callback = function()
+                    -- vim.keymap.set("t", "<Esc>", "<C-\\><C-n>") --- Exit terminal mode
+                    vim.keymap.set("t", "<C-h>", "<C-\\><C-n><C-w>h")
+                    vim.keymap.set("t", "<C-j>", "<C-\\><C-n><C-w>j")
+                    vim.keymap.set("t", "<C-k>", "<C-\\><C-n><C-w>k")
+                    vim.keymap.set("t", "<C-l>", "<C-\\><C-n><C-w>l")
+                end,
+            })
+
+            local terminal = require("toggleterm.terminal").Terminal
+
+            local basicterminal = terminal:new()
+            function TERM_TOGGLE()
+                basicterminal:toggle()
+            end
+
+            local nixpkgs = terminal:new({ cmd = "nix repl '<nixpkgs>'" })
+            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)
+        end,
+    })
+
+    -- Connect to telescope
+    -- use({
+    --     "https://git.sr.ht/~havi/telescope-toggleterm.nvim",
+    --     event = "TermOpen",
+    --     requires = {
+    --         "akinsho/nvim-toggleterm.lua",
+    --         "nvim-telescope/telescope.nvim",
+    --         "nvim-lua/popup.nvim",
+    --         "nvim-lua/plenary.nvim",
+    --     },
+    --     config = function()
+    --         require("telescope").load_extension("toggleterm")
+    --         require("telescope-toggleterm").setup({
+    --             telescope_mappings = {
+    --                 -- <ctrl-c> : kill the terminal buffer (default) .
+    --                 ["<C-c>"] = require("telescope-toggleterm").actions.exit_terminal,
+    --             },
+    --         })
+    --     end,
+    -- })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/visuals.lua
+++ b/modules/common/neovim/lua/packer/visuals.lua
@ -0,0 +1,164 @@
+local M = {}
+
+M.packer = function(use)
+    -- Git next to line numbers
+    use({
+        "lewis6991/gitsigns.nvim",
+        branch = "main",
+        requires = { "nvim-lua/plenary.nvim" },
+        config = function()
+            local gitsigns = require("gitsigns")
+            gitsigns.setup()
+            vim.keymap.set("n", "<Leader>gB", gitsigns.blame_line)
+            vim.keymap.set("n", "<Leader>gp", gitsigns.preview_hunk)
+            vim.keymap.set("v", "<Leader>gp", gitsigns.preview_hunk)
+            vim.keymap.set("n", "<Leader>gd", gitsigns.diffthis)
+            vim.keymap.set("v", "<Leader>gd", gitsigns.diffthis)
+            vim.keymap.set("n", "<Leader>rgf", gitsigns.reset_buffer)
+            vim.keymap.set("v", "<Leader>hs", gitsigns.stage_hunk)
+            vim.keymap.set("v", "<Leader>hr", gitsigns.reset_hunk)
+            vim.keymap.set("v", "<Leader>hr", gitsigns.reset_hunk)
+
+            -- Navigation
+            vim.keymap.set("n", "]g", function()
+                if vim.wo.diff then
+                    return "]g"
+                end
+                vim.schedule(function()
+                    gitsigns.next_hunk()
+                end)
+                return "<Ignore>"
+            end, { expr = true })
+
+            vim.keymap.set("n", "[g", function()
+                if vim.wo.diff then
+                    return "[g"
+                end
+                vim.schedule(function()
+                    gitsigns.prev_hunk()
+                end)
+                return "<Ignore>"
+            end, { expr = true })
+        end,
+    })
+
+    -- Status bar
+    use({
+        "hoob3rt/lualine.nvim",
+        requires = { "kyazdani42/nvim-web-devicons", opt = true },
+        config = function()
+            require("lualine").setup({
+                options = {
+                    theme = "gruvbox",
+                    icons_enabled = true,
+                },
+            })
+        end,
+    })
+
+    -- Buffer line ("tabs")
+    use({
+        "akinsho/bufferline.nvim",
+        tag = "v2.4.0",
+        requires = { "kyazdani42/nvim-web-devicons", "moll/vim-bbye" },
+        config = function()
+            require("bufferline").setup({
+                options = {
+                    diagnostics = "nvim_lsp",
+                    always_show_bufferline = false,
+                    separator_style = "slant",
+                    offsets = { { filetype = "NvimTree" } },
+                },
+            })
+            -- Move buffers
+            vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
+            vim.keymap.set("n", "H", ":BufferLineCyclePrev<CR>", { silent = true })
+
+            -- Kill buffer
+            vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
+
+            -- Shift buffers
+            -- vim.keymap.set("n", "<C-L>", ":BufferLineMoveNext<CR>")
+            -- vim.keymap.set("i", "<C-L>", "<Esc>:BufferLineMoveNext<CR>i")
+            -- vim.keymap.set("n", "<C-H>", ":BufferLineMovePrev<CR>")
+            -- vim.keymap.set("i", "<C-H>", "<Esc>:BufferLineMovePrev<CR>i")
+        end,
+    })
+
+    -- File explorer
+    use({
+        "kyazdani42/nvim-tree.lua",
+        requires = { "kyazdani42/nvim-web-devicons" },
+        config = function()
+            require("nvim-tree").setup({
+                disable_netrw = true,
+                hijack_netrw = true,
+                update_focused_file = {
+                    enable = true,
+                    update_cwd = true,
+                    ignore_list = {},
+                },
+                diagnostics = {
+                    enable = true,
+                    icons = {
+                        hint = "",
+                        info = "",
+                        warning = "",
+                        error = "",
+                    },
+                },
+                renderer = {
+                    icons = {
+                        glyphs = {
+                            git = {
+                                unstaged = "~",
+                                staged = "+",
+                                unmerged = "",
+                                renamed = "➜",
+                                deleted = "",
+                                untracked = "?",
+                                ignored = "◌",
+                            },
+                        },
+                    },
+                },
+                view = {
+                    width = 30,
+                    hide_root_folder = false,
+                    side = "left",
+                    mappings = {
+                        custom_only = false,
+                        list = {
+                            {
+                                key = { "l", "<CR>", "o" },
+                                cb = require("nvim-tree.config").nvim_tree_callback("edit"),
+                            },
+                            { key = "h", cb = require("nvim-tree.config").nvim_tree_callback("close_node") },
+                            { key = "v", cb = require("nvim-tree.config").nvim_tree_callback("vsplit") },
+                        },
+                    },
+                    number = false,
+                    relativenumber = false,
+                },
+            })
+            vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
+
+            -- https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
+            vim.g.loaded = 1
+            vim.g.loaded_netrwPlugin = 1
+        end,
+    })
+
+    -- Markdown pretty view
+    use("ellisonleao/glow.nvim")
+
+    -- Hex color previews
+    use({
+        "norcalli/nvim-colorizer.lua",
+        config = function()
+            require("colorizer").setup()
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer_init.lua
+++ b/modules/common/neovim/lua/packer_init.lua
@ -0,0 +1,34 @@
+-- Bootstrap the Packer plugin manager
+local fn = vim.fn
+local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
+if fn.empty(fn.glob(install_path)) > 0 then
+    PACKER_BOOTSTRAP = fn.system({
+        "git",
+        "clone",
+        "--depth",
+        "1",
+        "https://github.com/wbthomason/packer.nvim",
+        install_path,
+    })
+end
+
+require("packer").startup(function(use)
+    -- Maintain plugin manager
+    use("wbthomason/packer.nvim")
+
+    -- Include other files initialized by packer
+    require("packer.speed").packer(use)
+    require("packer.misc").packer(use)
+    require("packer.colors").packer(use)
+    require("packer.visuals").packer(use)
+    require("packer.lsp").packer(use)
+    require("packer.completion").packer(use)
+    require("packer.syntax").packer(use)
+    require("packer.telescope").packer(use)
+    require("packer.toggleterm").packer(use)
+
+    -- Auto-install after bootstrapping
+    if PACKER_BOOTSTRAP then
+        require("packer").sync()
+    end
+end)
--- a/modules/common/neovim/lua/settings.lua
+++ b/modules/common/neovim/lua/settings.lua
@ -4,9 +4,8 @@

 vim.filetype.add({
    pattern = {
-        [".*%.tfvars"] = "terraform",
-        [".*%.tf"] = "terraform",
-        [".*%.rasi"] = "rasi",
+        [".*%.tfvars"] = "hcl",
+        [".*%.tf"] = "hcl",
    },
 })

--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@ -26,17 +26,13 @@
 #   ] ++ extraConfig;
 # }

-{ pkgs, colors, ... }:
+{ 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;
  imports = [
    ../config/align.nix
    ../config/bufferline.nix
-    ../config/colors.nix
    ../config/completion.nix
    ../config/gitsigns.nix
    ../config/lsp.nix
@ -46,5 +42,6 @@ pkgs.neovimBuilder {
    ../config/telescope.nix
    ../config/toggleterm.nix
    ../config/tree.nix
+    colors
  ];
 }
--- a/modules/common/neovim/plugin/after/queries/nix/injections.scm
+++ b/modules/common/neovim/plugin/after/queries/nix/injections.scm
@ -1,8 +0,0 @@
-expression: (apply_expression
-  function: (apply_expression
-    function: (select_expression
-      attrpath: (attrpath) @writeshell (#match? @writeshell "^writeShell.*$")
-      )
-    )
-  (indented_string_expression) @bash
-)
--- a/modules/common/repositories/dotfiles.nix
+++ b/modules/common/repositories/dotfiles.nix
@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }: {

-  # Allows me to make sure I can work on my dotfiles locally
-
  options.dotfiles.enable = lib.mkEnableOption "Clone dotfiles.";

  config = lib.mkIf config.dotfiles.enable {
@ -16,8 +14,13 @@
          [ "writeBoundary" ] ''
            if [ ! -d "${config.dotfilesPath}" ]; then
                $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
-                $DRY_RUN_CMD ${pkgs.git}/bin/git \
-                    clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+
+                # Force HTTPS because anonymous SSH doesn't work
+                GIT_CONFIG_COUNT=1 \
+                    GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" \
+                    GIT_CONFIG_VALUE_0="git@github.com:" \
+                    $DRY_RUN_CMD \
+                    ${pkgs.git}/bin/git clone ${config.dotfilesRepo} "${config.dotfilesPath}"
            fi
          '';

--- a/modules/common/repositories/notes.nix
+++ b/modules/common/repositories/notes.nix
@ -1,8 +1,5 @@
 { config, ... }: {

-  # This is just a placeholder as I expect to interact with my notes in a
-  # certain location
-
  home-manager.users.${config.user} = {

    home.sessionVariables = {
--- a/modules/common/shell/bash/default.nix
+++ b/modules/common/shell/bash/default.nix
@ -1,20 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = {
-    home-manager.users.${config.user} = {
-
-      programs.bash = {
-        enable = true;
-        shellAliases =
-          config.home-manager.users.${config.user}.programs.fish.shellAliases;
-        initExtra = "";
-        profileExtra = "";
-      };
-
-      programs.starship.enableBashIntegration = false;
-      programs.zoxide.enableBashIntegration = true;
-      programs.fzf.enableBashIntegration = true;
-
-    };
-  };
-}
--- a/modules/common/shell/bash/scripts/docker-cleanup.sh
+++ b/modules/common/shell/bash/scripts/docker-cleanup.sh
@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Stop all containers
-if [ "$(docker ps -a -q)" ]; then
-    echo "Stopping docker containers..."
-    docker stop "$(docker ps -a -q)"
-else
-    echo "No running docker containers."
-fi
-
-# Remove all stopped containers
-if [ "$(docker ps -a -q)" ]; then
-    echo "Removing docker containers..."
-    docker rm "$(docker ps -a -q)"
-else
-    echo "No stopped docker containers."
-fi
-
-# Remove all untagged images
-if docker images | grep -q "^<none>"; then
-    docker rmi "$(docker images | grep "^<none>" | awk '{print $3}')"
-else
-    echo "No untagged docker images."
-fi
-
-echo "Cleaned up docker."
--- a/modules/common/shell/charm.nix
+++ b/modules/common/shell/charm.nix
@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }: {

-  # Convenience utilities from charm.sh
-
  options.charm.enable = lib.mkEnableOption "Charm utilities.";

  config.home-manager.users.${config.user} = lib.mkIf config.charm.enable {
@ -10,7 +8,6 @@
      glow # Markdown previews
      skate # Key-value store
      charm # Manage account and filesystem
-      pop # Send emails from a TUI
    ];

  };
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@ -1,13 +1,11 @@
 { ... }: {
  imports = [
-    ./bash
    ./charm.nix
    ./direnv.nix
    ./fish
    ./fzf.nix
    ./git.nix
    ./github.nix
-    ./jujutsu.nix
    ./nixpkgs.nix
    ./starship.nix
    ./utilities.nix
--- a/modules/common/shell/direnv.nix
+++ b/modules/common/shell/direnv.nix
@ -1,6 +1,5 @@
 { config, ... }: {

-  # Enables quickly entering Nix shells when changing directories
  home-manager.users.${config.user}.programs.direnv = {
    enable = true;
    nix-direnv.enable = true;
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@ -1,24 +1,18 @@
 { config, pkgs, lib, ... }: {

  users.users.${config.user}.shell = pkgs.fish;
-  programs.fish.enable = true; # Needed for LightDM to remember username
+  programs.fish.enable =
+    true; # Needed for LightDM to remember username (TODO: fix)

  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;
      shellAliases = {
-
-        # Version of bash which works much better on the terminal
-        bash = "${pkgs.bashInteractive}/bin/bash";
-
-        # Use eza (exa) instead of ls for fancier output
-        ls = "${pkgs.eza}/bin/eza --group";
-
-        # Move files to XDG trash on the commandline
+        ls = "exa";
        trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
      };
      functions = {
@ -82,6 +76,7 @@
        set -g fish_cursor_replace_one underscore
      '';
      loginShellInit = "";
+      shellAliases = { };
      shellAbbrs = {

        # Directory aliases
--- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish
+++ b/modules/common/shell/fish/functions/fish_user_key_bindings.fish
@ -14,7 +14,7 @@ bind -M insert \cp projects
 bind -M default \cp projects
 bind -M insert \x1F accept-autosuggestion
 bind -M default \x1F accept-autosuggestion
-bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
-bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
+bind -M insert \cn 'commandline -r "nix run nixpkgs#"'
+bind -M default \cn 'commandline -r "nix run nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
--- a/modules/common/shell/fish/functions/git-push-upstream.fish
+++ b/modules/common/shell/fish/functions/git-push-upstream.fish
@ -0,0 +1,4 @@
+set -l branch (git branch 2>/dev/null | grep '^\*' | colrm 1 2)
+and set -l command "git push --set-upstream origin $branch"
+and commandline -r $command
+and commandline -f execute
--- a/modules/common/shell/fzf.nix
+++ b/modules/common/shell/fzf.nix
@ -1,7 +1,5 @@
 { config, ... }: {

-  # FZF is a fuzzy-finder for the terminal
-
  home-manager.users.${config.user} = {

    programs.fzf.enable = true;
@ -15,8 +13,9 @@
                fd \
                    --search-path $HOME/dev \
                    --type directory \
-                    --exact-depth 2 \
-                | sed 's/\\/$//' \
+                    --hidden \
+                    "^.git\$" \
+                | xargs dirname \
                | fzf \
                    --delimiter '/' \
                    --with-nth 6.. \
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@ -31,7 +31,6 @@ in {
          pager = { branch = "false"; };
          safe = { directory = config.dotfilesPath; };
          pull = { ff = "only"; };
-          push = { autoSetupRemote = "true"; };
          init = { defaultBranch = "master"; };
        };
        ignores = [ ".direnv/**" "result" ];
@ -51,6 +50,7 @@ in {
        gcae = "git commit --amend";
        gu = "git pull";
        gp = "git push";
+        gpp = "git-push-upstream";
        gl = "git log --graph --decorate --oneline -20";
        gll = "git log --graph --decorate --oneline";
        gco = "git checkout";
@ -113,6 +113,10 @@ in {
          git-history = {
            body = builtins.readFile ./fish/functions/git-history.fish;
          };
+          git-push-upstream = {
+            description = "Create upstream branch";
+            body = builtins.readFile ./fish/functions/git-push-upstream.fish;
+          };
          uncommitted = {
            description = "Find uncommitted git repos";
            body = builtins.readFile ./fish/functions/uncommitted.fish;
--- a/modules/common/shell/github.nix
+++ b/modules/common/shell/github.nix
@ -5,7 +5,7 @@
    programs.gh =
      lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
        enable = true;
-        gitCredentialHelper.enable = true;
+        enableGitCredentialHelper = true;
        settings.git_protocol = "https";
      };

@ -19,9 +19,6 @@
          grf = "gh run view --log-failed";
          grl = "gh run view --log";
          ghpr = "gh pr create && sleep 3 && gh run watch";
-
-          # https://github.com/cli/cli/discussions/4067
-          prs = "gh search prs --state=open --review-requested=@me";
        };
        functions = {
          repos = {
--- a/modules/common/shell/jujutsu.nix
+++ b/modules/common/shell/jujutsu.nix
@ -1,21 +0,0 @@
-{ config, ... }: {
-
-  config = {
-
-    home-manager.users.${config.user}.programs.jujutsu = {
-      enable = true;
-      enableFishIntegration = true;
-
-      # https://github.com/martinvonz/jj/blob/main/docs/config.md
-      settings = {
-        user = {
-          name = config.home-manager.users.${config.user}.programs.git.userName;
-          email =
-            config.home-manager.users.${config.user}.programs.git.userEmail;
-        };
-      };
-    };
-
-  };
-
-}
--- a/modules/common/shell/nixpkgs.nix
+++ b/modules/common/shell/nixpkgs.nix
@ -67,15 +67,6 @@
    # Set channel to flake packages, used for nix-shell commands
    nixPath = [ "nixpkgs=${pkgs.path}" ];

-    # Set registry to this flake's packages, used for nix X commands
-    registry.nixpkgs.to = {
-      type = "path";
-      path = builtins.toString pkgs.path;
-    };
-
-    # For security, only allow specific users
-    settings.allowed-users = [ "@wheel" config.user ];
-
  };

 }
--- a/modules/common/shell/starship.nix
+++ b/modules/common/shell/starship.nix
@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ config, lib, ... }: {

  home-manager.users.${config.user}.programs.starship = {
    enable = true;
@ -21,7 +21,7 @@
      };
      cmd_duration = {
        min_time = 5000;
-        show_notifications = if pkgs.stdenv.isLinux then false else true;
+        show_notifications = true;
        min_time_to_notify = 30000;
        format = "[$duration]($style) ";
      };
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -18,26 +18,21 @@ in {
    home-manager.users.${config.user} = {

      home.packages = with pkgs; [
-        age # Encryption
-        bc # Calculator
-        dig # DNS lookup
-        fd # find
-        htop # Show system processes
-        killall # Force quit
-        inetutils # Includes telnet, whois
-        jq # JSON manipulation
-        lf # File viewer
-        qrencode # Generate qr codes
+        unzip # Extract zips
        rsync # Copy folders
        ripgrep # grep
+        fd # find
        sd # sed
+        jq # JSON manipulation
        tealdeer # Cheatsheets
        tree # View directory hierarchy
+        htop # Show system processes
+        qrencode # Generate qr codes
        vimv-rs # Batch rename files
-        unzip # Extract zips
-        dua # File sizes (du)
-        du-dust # Disk usage tree (ncdu)
-        duf # Basic disk information (df)
+        dig # DNS lookup
+        lf # File viewer
+        inetutils # Includes telnet, whois
+        age # Encryption
      ];

      programs.zoxide.enable = true; # Shortcut jump command
@ -50,10 +45,11 @@ in {

      programs.bat = {
        enable = true; # cat replacement
-        config = {
-          theme = config.theme.colors.batTheme;
-          pager = "less -R"; # Don't auto-exit if one screen
-        };
+        config = { theme = config.theme.colors.batTheme; };
+      };
+
+      programs.fish.shellAbbrs = {
+        cat = "bat"; # Swap cat with bat
      };

      programs.fish.functions = {
--- a/Show More
+++ b/Show More