inline rofi power prompt

hope to fix issue where confirmation doesn't run when linked to another file

.github/workflows/check.yml

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

.github/workflows/update.yml

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

.gitignore

@@ -3,7 +3,6 @@
 *.db
 **/.direnv/**
 result
-.luarc.json
 private/**
+templates/**/flake.lock
 !private/**.age
-!private/**.sha512

README.md

@@ -6,21 +6,72 @@ 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.
 
-However, some of the configurations are easier to lift directly:
+## System Features
 
-- [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)
+| 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)    |
 
-Try out my Neovim config (requires [nix](https://nixos.org/download.html)):
+## 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) |
+
+---
+
+# Unique Configurations
+
+This repo contains a few atypical choices for configuration.
+
+- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
+and source-controlled plugins, differing from host to host.
+- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based on
+dynamic service metadata.
+- [Grafana config](./modules/nixos/services/grafana.nix) based on dynamic
+service metadata.
+- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
+agenix.
+- Base16 [colorschemes](./colorscheme/) applied to multiple applications.
+
+---
+
+# Installation
+
+Click [here](./docs/installation.md) for detailed installation instructions.
+
+# Neovim
+
+Try out my Neovim config with nix:
 
 ```bash
 nix run github:nmasur/dotfiles#neovim
 ```
 
-Or build it as a package (requires [nix](https://nixos.org/download.html)):
+Or build it as a package:
 
 ```bash
 nix build github:nmasur/dotfiles#neovim
@@ -30,73 +81,6 @@ 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

apps/README.md

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

apps/encrypt-secret.nix

@@ -11,7 +11,7 @@
     tmpfile=$(mktemp)
     echo "''${secret}" > ''${tmpfile}
     ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-      builtins.toString ../public-keys
+      builtins.toString ../misc/public-keys
     } $tmpfile
     rm $tmpfile
   '');

apps/installer.nix

@@ -17,8 +17,8 @@
             --foreground "#fb4934" \
             "Missing required parameter." \
             "Usage: installer -- <disk> <host>" \
-            "Example: installer -- nvme0n1 desktop" \
-            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 desktop"
+            "Example: installer -- nvme0n1 tempest" \
+            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
         echo "(exiting)"
         exit 1
     fi

apps/neovim.nix

@@ -5,8 +5,7 @@
   program = "${
       (import ../modules/common/neovim/package {
         inherit pkgs;
-        colors =
-          import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
+        colors = (import ../colorscheme/nord).dark;
       })
     }/bin/nvim";
 

apps/rebuild.nix

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

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 ../public-keys
+        builtins.toString ../misc/public-keys
       } $tmpfile > $encryptedfile
       rm $tmpfile
     done

colorscheme/README.md

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

colorscheme/everforest/default.nix

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

colorscheme/gruvbox-dark/default.nix

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

colorscheme/gruvbox/default.nix

@@ -19,7 +19,6 @@
     base0D = "#83a598"; # blue
     base0E = "#d3869b"; # purple
     base0F = "#d65d0e"; # brown
-    neovimConfig = ./neovim-gruvbox.nix;
     batTheme = "gruvbox-dark";
   };
   light = {
@@ -39,7 +38,6 @@
     base0D = "#076678"; # blue
     base0E = "#8f3f71"; # purple
     base0F = "#d65d0e"; # brown
-    neovimConfig = ./neovim-gruvbox.nix;
     batTheme = "gruvbox-light";
   };
 }

colorscheme/gruvbox/neovim-gruvbox.nix

@@ -1,12 +0,0 @@
-{ 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
-  '';
-
-}

colorscheme/nord/default.nix

@@ -1,21 +1,23 @@
 {
   name = "nord";
   author = "arcticicestudio";
-  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;
+  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";
+  };
 }

colorscheme/nord/neovim.lua

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

disks/README.md

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

disks/root.nix

@@ -9,7 +9,6 @@
         partitions = [
           # Boot partition
           {
-            type = "partition";
             name = "ESP";
             start = "0";
             end = "512MiB";
@@ -24,7 +23,6 @@
           }
           # Root partition ext4
           {
-            type = "partition";
             name = "root";
             start = "512MiB";
             end = "100%";

docs/README.md

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

docs/installation.md

@@ -0,0 +1,67 @@
+[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
+```
+

docs/repair-nextcloud.md

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

docs/restore-nextcloud.md

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

docs/zfs.md

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

flake.lock

@@ -3,43 +3,94 @@
     "Comment-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1674040818,
-        "narHash": "sha256-7UtZAE9tPlnpeHS2LLol/LGVOxptDXNKWXHNHvFBNk4=",
+        "lastModified": 1681214440,
+        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "eab2c83a0207369900e92783f56990808082eac2",
+        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
         "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": 1676130961,
-        "narHash": "sha256-3LT45i0eSMfUV9EBrtdtzHxFKRATIhRy/faDd3lI3mA=",
+        "lastModified": 1695205521,
+        "narHash": "sha256-MQMpXMgUpZA0E9TunzjXeOQxDWSCTogXbvi9VJnv4Kw=",
         "owner": "akinsho",
         "repo": "bufferline.nvim",
-        "rev": "84b0822b2af478d0b4f7b0f9249ca218855331db",
+        "rev": "6ecd37e0fa8b156099daedd2191130e083fb1490",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
+        "ref": "v4.4.0",
         "repo": "bufferline.nvim",
         "type": "github"
       }
     },
+    "bypass-paywalls-clean": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704296449,
+        "narHash": "sha256-UkEaTOBEfPTxcNo9Iv2xUEW6jYWMJeaGKA38KF6Yuf0=",
+        "owner": "magnolia1234",
+        "repo": "bpc-uploads",
+        "rev": "dcd11128c6b7c6246fc6d199ce10d5ec796d4716",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "magnolia1234",
+        "repo": "bpc-uploads",
+        "type": "gitlab"
+      }
+    },
     "cmp-nvim-lsp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1675708067,
-        "narHash": "sha256-DxpcPTBlvVP88PDoTheLV2fC76EXDqS2UpM5mAfj/D4=",
+        "lastModified": 1702205473,
+        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "0e6b2ed705ddcff9738ec4ea838141654f12eeef",
+        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
         "type": "github"
       },
       "original": {
@@ -55,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "lastModified": 1704277720,
+        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
         "type": "github"
       },
       "original": {
@@ -76,11 +127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677116397,
-        "narHash": "sha256-2OHwhv4k1SDEuNxhq+zluvrd5pbW8d4TP9NKW4B8iO8=",
+        "lastModified": 1704318910,
+        "narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "8fddb2fd721365fa77ff68b709539639d4dc65d7",
+        "rev": "aef9a509db64a081186af2dc185654d78dc8e344",
         "type": "github"
       },
       "original": {
@@ -89,16 +140,35 @@
         "type": "github"
       }
     },
+    "fidget-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702031048,
+        "narHash": "sha256-wbjQuOFd/2339TIrUA97PYsV8N3PZsS+xbyMsyZmki8=",
+        "owner": "j-hui",
+        "repo": "fidget.nvim",
+        "rev": "300018af4abd00610a345e382ca1f4b7ba420f77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "j-hui",
+        "ref": "v1.1.0",
+        "repo": "fidget.nvim",
+        "type": "github"
+      }
+    },
     "firefox-darwin": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1676854489,
-        "narHash": "sha256-hWmx3JFLNPGMtflyjgEn5GZydbLW3msjXvarS1NsBDM=",
+        "lastModified": 1704415391,
+        "narHash": "sha256-DOK05XW4cSdE+lw+OfrzYTywIHSVazm5TJsODSDrNKY=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "6a5cca0ea8dfab4718e1e43e243c80ba110c2364",
+        "rev": "ca04361b1c2e6cbe5cbf7e118a28fe67ddf51f4c",
         "type": "github"
       },
       "original": {
@@ -110,11 +180,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -124,12 +194,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1687709756,
+        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
         "type": "github"
       },
       "original": {
@@ -139,12 +212,15 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -154,12 +230,15 @@
       }
     },
     "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -168,19 +247,34 @@
         "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": 1678271387,
-        "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=",
+        "lastModified": 1704383912,
+        "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2",
+        "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7",
         "type": "github"
       },
       "original": {
@@ -190,22 +284,64 @@
         "type": "github"
       }
     },
+    "nextcloud-cookbook": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702545935,
+        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
+        "type": "tarball",
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+      }
+    },
+    "nextcloud-external": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1699624334,
+        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
+        "type": "tarball",
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+      }
+    },
+    "nextcloud-news": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1703426420,
+        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
+        "type": "tarball",
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+      }
+    },
     "nil": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1676110678,
-        "narHash": "sha256-hemg8rMKS2me2Wua9ZG/0aQ8fEOfytjyKB+WYcXfEKE=",
+        "lastModified": 1691372739,
+        "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "ce2e0b5d60fe497134050796f7d12ffb6b50eb28",
+        "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
+        "ref": "2023-08-09",
         "repo": "nil",
         "type": "github"
       }
@@ -218,11 +354,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673891598,
-        "narHash": "sha256-EevceKxQtA+I0XVA8tBGKmYV1V1KbWc3gsswysMzeDk=",
+        "lastModified": 1685980282,
+        "narHash": "sha256-uQyVaoqkiocA8bXKMfrgizuKmz0hUzHye5owFoUd2AQ=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "5b31eb81e2c6c74f9e8a4911660f3bf585d55158",
+        "rev": "3836a348503ae27340c7f83f0bc7bcb907f3781d",
         "type": "github"
       },
       "original": {
@@ -233,11 +369,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1636849918,
-        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+        "lastModified": 1693701915,
+        "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+        "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
         "type": "github"
       },
       "original": {
@@ -254,11 +390,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1674666581,
-        "narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
+        "lastModified": 1701689616,
+        "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
+        "rev": "246219bc21b943c6f6812bb7744218ba0df08600",
         "type": "github"
       },
       "original": {
@@ -269,43 +405,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "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=",
+        "lastModified": 1704194953,
+        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "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",
+        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
         "type": "github"
       },
       "original": {
@@ -315,18 +419,18 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1674868155,
-        "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
+        "lastModified": 1703900474,
+        "narHash": "sha256-Zu+chYVYG2cQ4FCbhyo6rc5Lu0ktZCjRbSPE0fDgukI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
+        "rev": "9dd7699928e26c3c00d5d46811f1358524081062",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -334,11 +438,11 @@
     "null-ls-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1676246878,
-        "narHash": "sha256-hAUEa2zNsYXQ+TsHYHBzcW67lCxhiD7x+uPbdOZwY8o=",
+        "lastModified": 1691810493,
+        "narHash": "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "d4594231a06cecce73a78a256b0d7c7ab51f7dd5",
+        "rev": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7",
         "type": "github"
       },
       "original": {
@@ -349,11 +453,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1676251563,
-        "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
+        "lastModified": 1704483764,
+        "narHash": "sha256-SuMEUsYHFbYYVZr3wWC64/tc1K/iI2/CJGdDixk6J5c=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
+        "rev": "9c4f6b66f05fc6f6285df25e89f825b441ec9705",
         "type": "github"
       },
       "original": {
@@ -365,15 +469,16 @@
     "nvim-lspconfig-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1676175675,
-        "narHash": "sha256-Wg3NatT4DRBMF6hCxK4C2DC+geFMpfFUFogPbqeMt6E=",
+        "lastModified": 1675639052,
+        "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "1712672e4da3003a0dd9f771d30389600b360f42",
+        "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
         "type": "github"
       },
       "original": {
         "owner": "neovim",
+        "ref": "v0.1.6",
         "repo": "nvim-lspconfig",
         "type": "github"
       }
@@ -381,11 +486,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1676244722,
-        "narHash": "sha256-xoSekdZhWr59qTOM0/ihYiuKiwHiKYb42Ep5JHn65UM=",
+        "lastModified": 1704073600,
+        "narHash": "sha256-D+wCJQuRj9mvgLd0DaiYgqghDYDwfux9zlEb/vIvaqA=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "ba1778e061f25814bc5940be886a7f41d7d7736e",
+        "rev": "f1b3e6a7eb92da492bd693257367d9256839ed3d",
         "type": "github"
       },
       "original": {
@@ -397,42 +502,73 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1676240774,
-        "narHash": "sha256-eRSU/9ysSvTyYxBrp9Whg0eXgAOsCdmIHMlYZK7bjRg=",
+        "lastModified": 1704470326,
+        "narHash": "sha256-/kyRtwWuW68zTETOmVpJWzC1iqzl+U0q0gvRVvmnEfI=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "7eb5f1a2e3949496f26c4084b521b30f2d08137a",
+        "rev": "49f1b9a7efc794be143f7ddcd60ce18e8164a7f8",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
+        "ref": "master",
         "repo": "nvim-treesitter",
         "type": "github"
       }
     },
+    "proton-ge": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1700610476,
+        "narHash": "sha256-IoClZ6hl2lsz9OGfFgnz7vEAGlSY2+1K2lDEEsJQOfU=",
+        "type": "tarball",
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
+      }
+    },
     "root": {
       "inputs": {
         "Comment-nvim-src": "Comment-nvim-src",
+        "age": "age",
+        "baleia-nvim-src": "baleia-nvim-src",
         "bufferline-nvim-src": "bufferline-nvim-src",
+        "bypass-paywalls-clean": "bypass-paywalls-clean",
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
         "darwin": "darwin",
         "disko": "disko",
+        "fidget-nvim-src": "fidget-nvim-src",
         "firefox-darwin": "firefox-darwin",
+        "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
+        "nextcloud-cookbook": "nextcloud-cookbook",
+        "nextcloud-external": "nextcloud-external",
+        "nextcloud-news": "nextcloud-news",
         "nil": "nil",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "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"
+        "wsl": "wsl",
+        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
     "rust-overlay": {
@@ -447,11 +583,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1675391458,
-        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
+        "lastModified": 1688783586,
+        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
+        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
         "type": "github"
       },
       "original": {
@@ -460,18 +596,64 @@
         "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": 1675149856,
-        "narHash": "sha256-L4Kw94CUy6N7zcyy9INuR/O0fxQ7sp0IvGd/u7fHxMA=",
+        "lastModified": 1697004956,
+        "narHash": "sha256-7SqYFnfCjotOBhuX6Wx1IOhgMKoxaoI1a4SKz1d5RVM=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "203bf5609137600d73e8ed82703d6b0e320a5f36",
+        "rev": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
+        "ref": "0.1.4",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -479,11 +661,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1671805267,
-        "narHash": "sha256-S4SOHzQ17ux5pcwwYFpVVLzjLeC4/EJ0IFPbrfzUJC8=",
+        "lastModified": 1701464478,
+        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972",
+        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
         "type": "github"
       },
       "original": {
@@ -495,31 +677,132 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1675358836,
-        "narHash": "sha256-9O7p/7tRStg51OFhMc88M5ewYquiYC9x9CV4s5veVP8=",
+        "lastModified": 1695636777,
+        "narHash": "sha256-o8xzoo7OuYrPnKlfrupQ24Ja9hZy1qQVnvwO0FO+4zM=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "19aad0f41f47affbba1274f05e3c067e6d718e1e",
+        "rev": "faee9d60428afc7857e0927fdc18daa6c409fa64",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
+        "ref": "v2.8.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
     },
-    "utils": {
+    "tree-sitter-bash": {
+      "flake": false,
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "lastModified": 1696959291,
+        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
+        "owner": "tree-sitter",
+        "repo": "tree-sitter-bash",
+        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "tree-sitter",
+        "ref": "master",
+        "repo": "tree-sitter-bash",
+        "type": "github"
+      }
+    },
+    "tree-sitter-ini": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1699877527,
+        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
+        "owner": "justinmk",
+        "repo": "tree-sitter-ini",
+        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
+        "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": 1700218345,
+        "narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
+        "owner": "tree-sitter",
+        "repo": "tree-sitter-python",
+        "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
+        "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",
         "type": "github"
       }
     },
@@ -543,14 +826,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1676126384,
-        "narHash": "sha256-3aAnN891Cb1pizewAgaHIo3W1WbAjXtoWuX8n3j8YoI=",
+        "lastModified": 1704321386,
+        "narHash": "sha256-d2ZIWHHsVviiqLDUuezuNO6w+V87EW6M+DwtNLN/Hmk=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a1c7e8bebac32cfac7aa8498bdfc60cbff13eb50",
+        "rev": "c81bc3f9baa0571d03d1297faddf3a08737fe49e",
         "type": "github"
       },
       "original": {
@@ -558,6 +841,22 @@
         "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",

flake.nix

@@ -9,25 +9,28 @@
 
     # Used for MacOS system config
     darwin = {
-      url = "github:/lnl7/nix-darwin/master";
+      url = "github:lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Used for Windows Subsystem for Linux compatibility
     wsl.url = "github:nix-community/NixOS-WSL";
 
-    # Used for user packages
+    # Used for user packages and dotfiles
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows =
-        "nixpkgs"; # Use system packages list where available
+        "nixpkgs"; # Use system packages list for their inputs
     };
 
     # 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";
+    firefox-darwin = {
+      url = "github:bandithedoge/nixpkgs-firefox-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Manage disk format and partitioning
     disko = {
@@ -54,11 +57,15 @@
     };
 
     # Nix language server
-    nil.url = "github:oxalica/nil";
+    nil = {
+      url = "github:oxalica/nil/2023-08-09";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Neovim plugins
     nvim-lspconfig-src = {
-      url = "github:neovim/nvim-lspconfig";
+      # https://github.com/neovim/nvim-lspconfig/tags
+      url = "github:neovim/nvim-lspconfig/v0.1.6";
       flake = false;
     };
     cmp-nvim-lsp-src = {
@@ -69,16 +76,22 @@
       url = "github:jose-elias-alvarez/null-ls.nvim";
       flake = false;
     };
+    baleia-nvim-src = {
+      # https://github.com/m00qek/baleia.nvim/tags
+      url = "github:m00qek/baleia.nvim";
+      flake = false;
+    };
     Comment-nvim-src = {
-      url = "github:numToStr/Comment.nvim";
+      url = "github:numToStr/Comment.nvim/v0.8.0";
       flake = false;
     };
     nvim-treesitter-src = {
-      url = "github:nvim-treesitter/nvim-treesitter";
+      # https://github.com/nvim-treesitter/nvim-treesitter/tags
+      url = "github:nvim-treesitter/nvim-treesitter/master";
       flake = false;
     };
     telescope-nvim-src = {
-      url = "github:nvim-telescope/telescope.nvim";
+      url = "github:nvim-telescope/telescope.nvim/0.1.4";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -86,17 +99,104 @@
       flake = false;
     };
     toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim";
+      url = "github:akinsho/toggleterm.nvim/v2.8.0";
       flake = false;
     };
     bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim";
+      url = "github:akinsho/bufferline.nvim/v4.4.0";
       flake = false;
     };
     nvim-tree-lua-src = {
       url = "github:kyazdani42/nvim-tree.lua";
       flake = false;
     };
+    vscode-terraform-snippets = {
+      url = "github:run-at-scale/vscode-terraform-doc-snippets";
+      flake = false;
+    };
+    hmts-nvim-src = {
+      url = "github:calops/hmts.nvim";
+      flake = false;
+    };
+    fidget-nvim-src = {
+      # https://github.com/j-hui/fidget.nvim/tags
+      url = "github:j-hui/fidget.nvim/v1.1.0";
+      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-25/GE-Proton8-25.tar.gz";
+      flake = false;
+    };
+
+    # Firefox addon from outside the extension store
+    bypass-paywalls-clean = {
+      # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
+      url = "gitlab:magnolia1234/bpc-uploads";
+      flake = false;
+    };
+
+    # Nextcloud Apps
+    nextcloud-news = {
+      # https://github.com/nextcloud/news/releases
+      url =
+        "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
+      flake = false;
+    };
+    nextcloud-external = {
+      # https://github.com/nextcloud-releases/external/releases
+      url =
+        "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
+      flake = false;
+    };
+    nextcloud-cookbook = {
+      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
+      url =
+        "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
+      flake = false;
+    };
 
   };
 
@@ -105,13 +205,28 @@
     let
 
       # Global configuration for my systems
-      globals = rec {
+      globals = let baseName = "masu.rs";
+      in rec {
         user = "noah";
         fullName = "Noah Masur";
         gitName = fullName;
         gitEmail = "7386960+nmasur@users.noreply.github.com";
         mail.server = "noahmasur.com";
-        dotfilesRepo = "git@github.com:nmasur/dotfiles";
+        mail.imapHost = "imap.purelymail.com";
+        mail.smtpHost = "smtp.purelymail.com";
+        dotfilesRepo = "https://github.com/nmasur/dotfiles";
+        hostnames = {
+          git = "git.${baseName}";
+          influxdb = "influxdb.${baseName}";
+          metrics = "metrics.${baseName}";
+          prometheus = "prom.${baseName}";
+          paperless = "paper.${baseName}";
+          secrets = "vault.${baseName}";
+          stream = "stream.${baseName}";
+          content = "cloud.${baseName}";
+          books = "books.${baseName}";
+          download = "download.${baseName}";
+        };
       };
 
       # Common overlays to always use
@@ -120,6 +235,17 @@
         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/gh-collaborators.nix)
+        (import ./overlays/bypass-paywalls-clean.nix inputs)
+        (import ./overlays/terraform.nix)
       ];
 
       # System types to support.
@@ -131,6 +257,8 @@
 
     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; };
@@ -138,12 +266,14 @@
         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 local settings with:
+      # For quickly applying home-manager settings with:
       # home-manager switch --flake .#tempest
       homeConfigurations = {
         tempest =
@@ -152,44 +282,37 @@
           darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
       };
 
-      # Disk formatting
+      # Disk formatting, only used once
       diskoConfigurations = { root = import ./disks/root.nix; };
 
-      # 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;
+      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;
           };
-        };
+      in {
+        x86_64-linux.aws = aws "x86_64-linux";
+        x86_64-linux.staff = staff "x86_64-linux";
 
-        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; };
-        };
-
-      });
+        # 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";
+      };
 
+      # Programs that can be run by calling this flake
       apps = forAllSystems (system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = overlays ++ [
-              (final: prev: {
-                disko-packaged = inputs.disko.packages.${system}.disko;
-              })
-            ];
-          };
+        let pkgs = import nixpkgs { inherit system overlays; };
         in import ./apps { inherit pkgs; });
 
+      # Development environments
       devShells = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system overlays; };
         in {
@@ -199,23 +322,24 @@
             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

hosts/README.md

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

hosts/aws/default.nix

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

hosts/aws/main.tf

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

hosts/aws/workflow.yml

@@ -1,7 +1,6 @@
 name: 'Terraform'
 env:
 
-
   AWS_ACCOUNT_NUMBER: ''
   AWS_PLAN_ROLE_NAME: github_actions_plan
   AWS_APPLY_ROLE_NAME: github_actions_admin
@@ -82,15 +81,14 @@ jobs:
 
       # Downloads the current repo code to the runner.
       - name: Checkout Repo Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      # Install Nix
-      - name: Install Nix
-        uses: cachix/install-nix-action@v17
-
-      # Build the image
-      - name: Build Image
-        run: nix build .#aws
+      # 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
 
       # Login to AWS
       - name: AWS Assume Role
@@ -99,6 +97,28 @@ 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.

hosts/flame/default.nix

@@ -3,42 +3,74 @@
 
 # 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, ... }:
 
-with inputs;
-
-nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem {
   system = "aarch64-linux";
   specialArgs = { };
   modules = [
-    ./hardware-configuration.nix
+    globals
+    inputs.home-manager.nixosModules.home-manager
     ../../modules/common
     ../../modules/nixos
-    (removeAttrs globals [ "mail.server" ])
-    wsl.nixosModules.wsl
-    home-manager.nixosModules.home-manager
     {
-      server = true;
-      gui.enable = false;
-      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
       nixpkgs.overlays = overlays;
-      wsl.enable = false;
-      caddy.enable = true;
 
-      # FQDNs for various services
+      # Hardware
+      server = true;
       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";
 
-      # Disable passwords, only use SSH key
-      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
+      # 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; };
+
+      # 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.influxdb2.enable = true;
+      services.gitea.enable = true;
+      services.vaultwarden.enable = true;
+      services.minecraft-server.enable = true; # Setup Minecraft server
+
+      # 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";
+      };
 
       # Nextcloud backup config
       backup.s3 = {
@@ -47,51 +79,38 @@ nixpkgs.lib.nixosSystem {
         accessKeyId = "0026b0e73b2e2c80000000005";
       };
 
-      # Grant access to Jellyfin directories from Nextcloud
-      users.users.nextcloud.extraGroups = [ "jellyfin" ];
+      # Disable passwords, only use SSH key
+      publicKey =
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
 
-      # Wireguard config for Transmission
-      wireguard.enable = true;
-      networking.wireguard.interfaces.wg0 = {
+      # # 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;
+      #
+      #   }];
+      #
+      # };
 
-        # 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;
+      # # VPN port forwarding
+      # services.transmission.settings.peer-port = 57599;
 
     }
   ];

hosts/flame/hardware-configuration.nix

@@ -1,34 +0,0 @@
-# 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";
-}

hosts/hydra/default.nix

@@ -3,29 +3,26 @@
 
 { inputs, globals, overlays, ... }:
 
-with inputs;
-
-nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
     ../../modules/common
     ../../modules/nixos
+    ../../modules/wsl
     globals
-    wsl.nixosModules.wsl
-    home-manager.nixosModules.home-manager
+    inputs.wsl.nixosModules.wsl
+    inputs.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 = nixpkgs.lib.fileContents ../../password.sha512;
+      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
       wsl = {
         enable = true;
         wslConf.automount.root = "/mnt";

hosts/lookingglass/default.nix

@@ -3,37 +3,33 @@
 
 { inputs, globals, overlays, ... }:
 
-with inputs;
-
-darwin.lib.darwinSystem {
+inputs.darwin.lib.darwinSystem {
   system = "x86_64-darwin";
   specialArgs = { };
   modules = [
     ../../modules/common
     ../../modules/darwin
-    (globals // {
+    (globals // rec {
       user = "Noah.Masur";
       gitName = "Noah-Masur_1701";
-      gitEmail = "Noah.Masur@take2games.com";
+      gitEmail = "${user}@take2games.com";
     })
-    home-manager.darwinModules.home-manager
+    inputs.home-manager.darwinModules.home-manager
     {
-      networking.hostName = "noah-masur-mac";
+      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
+      networking.hostName = "lookingglass";
       identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
       gui.enable = true;
       theme = {
-        colors = (import ../../colorscheme/gruvbox).dark;
+        colors = (import ../../colorscheme/gruvbox-dark).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 = true;
+      mail.himalaya.enable = false;
       kitty.enable = true;
       discord.enable = true;
       firefox.enable = true;
@@ -41,6 +37,7 @@ darwin.lib.darwinSystem {
       nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
+      rust.enable = true;
       lua.enable = true;
       kubernetes.enable = true;
       _1password.enable = true;

hosts/staff/default.nix

@@ -3,9 +3,7 @@
 
 { inputs, system, overlays, ... }:
 
-with inputs;
-
-nixos-generators.nixosGenerate {
+inputs.nixos-generators.nixosGenerate {
   inherit system;
   format = "install-iso";
   modules = [{
@@ -34,9 +32,7 @@ nixos-generators.nixosGenerate {
         curl
         (import ../../modules/common/neovim/package {
           inherit pkgs;
-          # colors = import ../../colorscheme/gruvbox.dark.neovimConfig {
-          #   inherit pkgs;
-          # };
+          colors = (import ../../colorscheme/gruvbox).dark;
         })
       ];
     nix.extraOptions = ''

hosts/swan/default.nix

@@ -3,47 +3,94 @@
 
 { inputs, globals, overlays, ... }:
 
-with inputs;
-
-nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
-    ./hardware-configuration.nix
+    globals
+    inputs.home-manager.nixosModules.home-manager
+    inputs.disko.nixosModules.disko
     ../../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";
 
-      # head -c 8 /etc/machine-id
+      # 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
       networking.hostId = "600279f4"; # Random ID required for ZFS
 
-      zfs.enable = true;
+      # Sets root ext4 filesystem instead of declaring it manually
       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" ];
 
-      gui.enable = false;
-      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
-      nixpkgs.overlays = overlays;
-      neovim.enable = true;
-      caddy.enable = true;
-      streamServer = "stream.masu.rs";
-      nextcloudServer = "cloud.masu.rs";
-      bookServer = "books.masu.rs";
-      samba.enable = true;
+      # 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
+      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;
+      services.paperless.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";
@@ -53,12 +100,6 @@ 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;
-
     }
   ];
 }

hosts/swan/hardware-configuration.nix

@@ -1,39 +0,0 @@
-# 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;
-}

hosts/tempest/default.nix

@@ -3,39 +3,90 @@
 
 { inputs, globals, overlays, ... }:
 
-with inputs;
-
-nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
-  specialArgs = { };
   modules = [
-    ./hardware-configuration.nix
+    globals
+    inputs.home-manager.nixosModules.home-manager
     ../../modules/common
     ../../modules/nixos
-    globals
-    wsl.nixosModules.wsl
-    home-manager.nixosModules.home-manager
     {
+      nixpkgs.overlays = overlays;
+
+      # Hardware
       physical = true;
       networking.hostName = "tempest";
-      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";
+
+      # 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
       gui.enable = true;
+
+      # Set the system-wide theme, also used for non-graphical programs
       theme = {
-        colors = (import ../../colorscheme/gruvbox).dark;
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
         dark = true;
       };
-      wallpaper = "${wallpapers}/gruvbox/road.jpg";
-      gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";
-      passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
-      wsl.enable = false;
-      publicKey = null;
+      wallpaper = "${inputs.wallpapers}/gruvbox/road.jpg";
+      gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
 
+      # Programs and services
       charm.enable = true;
       neovim.enable = true;
       media.enable = true;
+      dotfiles.enable = true;
       firefox.enable = true;
       kitty.enable = true;
       _1password.enable = true;
@@ -46,18 +97,36 @@ nixpkgs.lib.nixosSystem {
       mail.aerc.enable = true;
       mail.himalaya.enable = true;
       keybase.enable = true;
-      # mullvad.enable = true;
+      mullvad.enable = false;
       nixlang.enable = true;
-      dotfiles.enable = true;
+      rust.enable = true;
       yt-dlp.enable = true;
-
       gaming = {
+        dwarf-fortress.enable = true;
         enable = true;
         steam.enable = true;
-        legendary.enable = true;
+        legendary.enable = false; # Electron marked as insecure
         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;
 
     }
   ];

hosts/tempest/hardware-configuration.nix

@@ -1,40 +0,0 @@
-# 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;
-}

misc/README.md

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

misc/libratbag-profile

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

misc/public-keys

@@ -1,5 +1,6 @@
 # Scan hosts: ssh-keyscan -t ed25519 <hostnames>
 
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s tempest
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVknmPi7sG6ES0G0jcsvebzKGWWaMfJTYgvOue6EULI flame
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9mwXlZnIALt9SnH3FOZvdgHLM5ZqwYUERXBbM7Rwh6 swan
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3yHivgEXr2ecwe58h9bkhwTYivf3GwL8xenQKMeiUb tempest

modules/README.md

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

modules/common/applications/default.nix

@@ -7,7 +7,6 @@
     ./firefox.nix
     ./kitty.nix
     ./media.nix
-    ./nautilus.nix
     ./obsidian.nix
     ./qbittorrent.nix
     ./slack.nix

modules/common/applications/firefox.nix

@@ -16,6 +16,7 @@
     unfreePackages = [
       (lib.mkIf config._1password.enable "onepassword-password-manager")
       "okta-browser-plugin"
+      "wappalyzer"
     ];
 
     home-manager.users.${config.user} = {
@@ -29,21 +30,21 @@
           name = "default";
           isDefault = true;
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            ublock-origin
-            vimium
-            multi-account-containers
-            facebook-container
-            temporary-containers
             (lib.mkIf config._1password.enable onepassword-password-manager)
+            pkgs.bypass-paywalls-clean
+            darkreader
+            don-t-fuck-with-paste
+            facebook-container
+            markdownload
+            multi-account-containers
             okta-browser-plugin
-            sponsorblock
             reddit-enhancement-suite
             return-youtube-dislikes
-            markdownload
-            darkreader
             snowflake
-            don-t-fuck-with-paste
-            i-dont-care-about-cookies
+            sponsorblock
+            ublock-origin
+            ublacklist
+            vimium
             wappalyzer
           ];
           settings = {
@@ -71,6 +72,12 @@
             "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
+            "devtools.command-button-screenshot.enabled" =
+              true; # Scrolling screenshot of entire page
+            "svg.context-properties.content.enabled" = true; # Sidebery styling
           };
           userChrome = ''
             :root {
@@ -111,7 +118,7 @@
               background-color: ${config.theme.colors.base00};
               color: ${config.theme.colors.base06} !important;
             }
-            .tab-content[selected=true] {
+            .tab-content[selected] {
               border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
               background-color: ${config.theme.colors.base01} !important;
               color: ${config.theme.colors.base07} !important;
@@ -157,6 +164,24 @@
         };
 
       };
+
+      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"
+              '')
+            }";
+        };
+
     };
 
   };

modules/common/applications/kitty.nix

@@ -10,16 +10,40 @@
   };
 
   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} = {
-      # xsession.windowManager.i3.config.terminal = "kitty";
-      # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
+
+      # 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";
+      };
+
       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 = {
@@ -70,8 +94,6 @@
           # 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;
@@ -79,7 +101,7 @@
           tab_bar_edge = "top";
           tab_bar_style = "slant";
 
-          # Audio
+          # Disable audio
           enable_audio_bell = false;
         };
       };

modules/common/applications/media.nix

@@ -12,22 +12,43 @@
   config = lib.mkIf (config.gui.enable && config.media.enable) {
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [
-        mpv # Video viewer
-        sxiv # Image viewer
+        nsxiv # Image viewer
         mupdf # PDF viewer
         zathura # PDF viewer
       ];
 
-      # Set default for opening PDFs
+      # 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
       xdg.mimeApps = {
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/*" = [ "sxiv.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+        associations.removed = {
+          "application/pdf" = [ "mupdf.desktop" "wine-extension-pdf.desktop" ];
         };
-        associations.removed = { "application/pdf" = [ "mupdf.desktop" ]; };
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/*" = [ "sxiv.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
         };
       };
 

modules/common/applications/nautilus.nix

@@ -1,34 +0,0 @@
-{ 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";
-        };
-      };
-    };
-
-  };
-
-}

modules/common/applications/obsidian.nix

@@ -14,6 +14,11 @@
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ obsidian ];
     };
+
+    # Broken on 2023-12-11
+    # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
+    nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
+
   };
 
 }

modules/common/default.nix

@@ -44,11 +44,6 @@
         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.";
@@ -57,7 +52,6 @@
       else
         "/home/${config.user}");
     };
-
     dotfilesPath = lib.mkOption {
       type = lib.types.path;
       description = "Path of dotfiles repository.";
@@ -65,13 +59,55 @@
     };
     dotfilesRepo = lib.mkOption {
       type = lib.types.str;
-      description = "Link to dotfiles repository.";
+      description = "Link to dotfiles repository HTTPS URL.";
     };
     unfreePackages = lib.mkOption {
       type = lib.types.listOf lib.types.str;
       description = "List of unfree packages to allow.";
       default = [ ];
     };
+    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.";
+      };
+      paperless = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for document server (paperless-ngx).";
+      };
+      prometheus = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Prometheus server.";
+      };
+      influxdb = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for InfluxDB2 server.";
+      };
+      secrets = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for passwords and secrets (Vaultwarden).";
+      };
+      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";
@@ -85,9 +121,16 @@
         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) [
@@ -95,7 +138,8 @@
         ];
 
         # Scans and hard links identical files in the store
-        auto-optimise-store = true;
+        # Not working with macOS: https://github.com/NixOS/nix/issues/7273
+        auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
 
       };
 

modules/common/mail/aerc.nix

@@ -154,22 +154,20 @@
           general.unsafe-accounts-conf = true;
           viewer = { pager = "${pkgs.less}/bin/less -R"; };
           filters = {
-            "text/plain" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+            "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "text/calendar" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
             "text/html" =
-              "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
-            # "text/html" =
-            #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
+              "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
             # "text/*" =
             #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
             "message/delivery-status" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
-            "message/rfc822" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+              "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "message/rfc822" = "${pkgs.aerc}/libexec/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 -";
           };
         };
       };
@@ -181,6 +179,27 @@
         };
       };
 
+      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"; };
 
     };

modules/common/mail/default.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  imports = [ ./himalaya.nix ./aerc.nix ];
+  imports = [ ./himalaya.nix ./aerc.nix ./system.nix ];
 
   options = {
     mail.enable = lib.mkEnableOption "Mail service.";
@@ -10,21 +10,49 @@
       default = config.user;
     };
     mail.server = lib.mkOption {
-      type = lib.types.str;
+      type = lib.types.nullOr 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 {
@@ -37,40 +65,53 @@
               "hey"
               "admin"
             ];
+
+            # Options for contact completion
             alot = { };
-            flavor = "plain";
-            folders = { };
-            getmail = { };
+
             imap = {
-              host = "imap.purelymail.com";
+              host = config.mail.imapHost;
               port = 993;
               tls.enable = true;
             };
+
+            # Watch for mail and run notifications or sync
             imapnotify = {
-              enable = false;
-              boxes = [ ];
-              onNotify = "";
-              onNotifyPost = "";
+              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'";
             };
+
+            # Name of the directory in maildir for this account
             maildir = { path = "main"; };
+
+            # Bi-directional syncing options for local files
             mbsync = {
               enable = true;
-              create = "maildir";
-              expunge = "none";
-              remove = "none";
+              create = "both";
+              expunge = "both";
+              remove = "both";
               patterns = [ "*" ];
               extraConfig.channel = {
                 CopyArrivalDate = "yes"; # Sync time of original message
               };
             };
-            mu.enable = false;
-            notmuch.enable = false;
+
+            # Enable indexing
+            notmuch.enable = true;
+
+            # Used to login and send and receive emails
             passwordCommand =
-              "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
-                builtins.toString ../../../private/mailpass.age
+              "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${
+                pkgs.writeText "mailpass.age"
+                (builtins.readFile ../../../private/mailpass.age)
               }";
+
             smtp = {
-              host = "smtp.purelymail.com";
+              host = config.mail.smtpHost;
               port = 465;
               tls.enable = true;
             };

modules/common/mail/system.nix

@@ -0,0 +1,34 @@
+{ 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;
+          };
+        };
+
+    };
+
+  };
+
+}

modules/common/neovim/config/align.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }: {
+
+  # Plugin for aligning text programmatically
+
   plugins = [ pkgs.vimPlugins.tabular ];
   lua = ''
     -- Align

modules/common/neovim/config/bufferline.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }: {
+
+  # Shows buffers in a VSCode-style tab layout
+
   plugins = [
     pkgs.vimPlugins.bufferline-nvim
     pkgs.vimPlugins.vim-bbye # Better closing of buffers

modules/common/neovim/config/colors.nix

@@ -0,0 +1,22 @@
+{ 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,
+      }
+    '';
+  };
+
+}

modules/common/neovim/config/completion.nix

@@ -24,12 +24,14 @@
       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 })";
@@ -64,24 +66,26 @@
       '';
     };
 
+    # These are where the completion engine gets its suggestions
     sources = [
-      { name = "nvim_lua"; }
-      { name = "nvim_lsp"; }
-      { name = "luasnip"; }
-      { name = "path"; }
+      { name = "nvim_lua"; } # Fills in common Neovim lua functions
+      { name = "nvim_lsp"; } # LSP results
+      { name = "luasnip"; } # Snippets
+      { name = "path"; } # Shell completion from current PATH
       {
-        name = "buffer";
+        name = "buffer"; # Grep for text from the current text buffer
         keyword_length = 3;
         max_item_count = 10;
       }
       {
-        name = "rg";
+        name = "rg"; # Grep for text from the current directory
         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 ''
@@ -135,6 +139,13 @@
   };
 
   lua = ''
+    -- Load snippets
+    -- Check status: :lua require("luasnip").log.open()
+    require("luasnip.loaders.from_vscode").lazy_load()
+    require("luasnip.loaders.from_vscode").lazy_load({ paths = { "${
+      builtins.toString pkgs.vscode-terraform-snippets
+    }" } })
+
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
         sources = {

modules/common/neovim/config/github.lua

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

modules/common/neovim/config/kubernetes.lua

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

modules/common/neovim/config/lsp.nix

@@ -1,66 +1,110 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, lib, config, dsl, ... }: {
 
-  plugins = [
-    pkgs.vimPlugins.nvim-lspconfig
-    pkgs.vimPlugins.lsp-colors-nvim
-    pkgs.vimPlugins.null-ls-nvim
-  ];
+  # Terraform optional because non-free
+  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
+  options.github = lib.mkEnableOption "Whether to enable GitHub features";
+  options.kubernetes =
+    lib.mkEnableOption "Whether to enable Kubernetes features";
 
-  use.lspconfig.lua_ls.setup = dsl.callWith {
-    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
-  };
+  config =
 
-  use.lspconfig.nil_ls.setup = dsl.callWith {
-    cmd = [ "${pkgs.nil}/bin/nil" ];
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-  };
+    let
 
-  use.lspconfig.pyright.setup = dsl.callWith {
-    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
-  };
+      terraformFormat = if config.terraform then ''
+        require("null-ls").builtins.formatting.terraform_fmt.with({
+            command = "${pkgs.terraform}/bin/terraform",
+            extra_filetypes = { "hcl" },
+        }),
+      '' else
+        "";
 
-  use.lspconfig.terraformls.setup =
-    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
+    in {
+      plugins = [
+        pkgs.vimPlugins.nvim-lspconfig
+        pkgs.vimPlugins.null-ls-nvim
+        pkgs.vimPlugins.fidget-nvim
+      ];
 
-  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+      setup.fidget = { };
 
-  lua = ''
-    ${builtins.readFile ./lsp.lua}
+      use.lspconfig.lua_ls.setup = dsl.callWith {
+        settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+        cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
+      };
 
-    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.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" }),
-            require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
-            require("null-ls").builtins.formatting.shfmt.with({
-                command = "${pkgs.shfmt}/bin/shfmt",
-                extra_args = { "-i", "4", "-ci" },
-            }),
-            require("null-ls").builtins.formatting.terraform_fmt.with({
-                command = "${pkgs.terraform}/bin/terraform",
-                extra_filetypes = { "hcl" },
-            }),
-        },
+      use.lspconfig.nil_ls.setup = dsl.callWith {
+        cmd = [ "${pkgs.nil}/bin/nil" ];
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      };
 
-        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,
-    })
-  '';
+      use.lspconfig.pyright.setup = dsl.callWith {
+        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+      };
+
+      use.lspconfig.terraformls.setup = dsl.callWith {
+        cmd = if config.terraform then [
+          "${pkgs.terraform-ls}/bin/terraform-ls"
+          "serve"
+        ] else
+          [ "echo" ];
+      };
+
+      use.lspconfig.rust_analyzer.setup = dsl.callWith {
+        cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
+        settings = {
+          "['rust-analyzer']" = { check = { command = "clippy"; }; };
+        };
+      };
+
+      vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+
+      lua = ''
+        ${builtins.readFile ./lsp.lua}
+
+        -- Prevent infinite log size (change this when debugging)
+        vim.lsp.set_log_level("off")
+
+        require("null-ls").setup({
+            sources = {
+                require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
+                require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+                require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+                require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
+                require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
+                require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
+                require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
+                require("null-ls").builtins.formatting.shfmt.with({
+                    command = "${pkgs.shfmt}/bin/shfmt",
+                    extra_args = { "-i", "4", "-ci" },
+                }),
+                ${terraformFormat}
+            },
+
+            on_attach = function(client, bufnr)
+                if client.supports_method("textDocument/formatting") then
+                    -- Auto-format on save
+                    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+                    vim.api.nvim_create_autocmd("BufWritePre", {
+                        group = augroup,
+                        buffer = bufnr,
+                        callback = function()
+                            vim.lsp.buf.format({ bufnr = bufnr })
+                        end,
+                    })
+                    -- Use internal formatting for bindings like gq.
+                    vim.api.nvim_create_autocmd("LspAttach", {
+                        callback = function(args)
+                            vim.bo[args.buf].formatexpr = nil
+                        end,
+                    })
+                end
+            end,
+        })
+      '';
+
+    };
 
 }

modules/common/neovim/config/misc.nix

@@ -5,13 +5,16 @@
     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.colorizer = { user_default_options = { names = false; }; };
+  setup.glow = { };
+  setup.which-key = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -41,17 +44,23 @@
     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.stdpath("cache") .. "/backup"'';
+  vim.o.backupdir =
+    dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
+  vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
 
   # Required for nvim-cmp completion
   vim.opt.completeopt = [ "menu" "menuone" "noselect" ];
 
   lua = lib.mkBefore ''
-    require("impatient")
+    vim.loader.enable()
     ${builtins.readFile ../lua/keybinds.lua};
     ${builtins.readFile ../lua/settings.lua};
   '';
@@ -60,10 +69,6 @@
     " Remember last position when reopening file
     au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
 
-    " LaTeX options
-    au FileType tex inoremap ;bf \textbf{}<Esc>i
-    au BufWritePost *.tex silent! execute "!pdflatex -output-directory=%:p:h % >/dev/null 2>&1" | redraw!
-
     " Flash highlight when yanking
     au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
   '';

modules/common/neovim/config/statusline.nix

@@ -2,7 +2,7 @@
   plugins = [ pkgs.vimPlugins.lualine-nvim ];
   setup.lualine = {
     options = {
-      theme = "gruvbox";
+      theme = "base16";
       icons_enabled = true;
     };
   };

modules/common/neovim/config/syntax.nix

@@ -1,26 +1,41 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
 
   plugins = [
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
       with pkgs.tree-sitter-grammars; [
-        tree-sitter-hcl
-        tree-sitter-python
-        tree-sitter-lua
-        tree-sitter-nix
+        tree-sitter-bash
+        # tree-sitter-c
         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-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.vimPlugins.vim-puppet
+    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
+    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
+    (pkgs.vimUtils.buildVimPlugin {
+      pname = "nmasur";
+      version = "0.1";
+      src = ../plugin;
+    })
   ];
 
   setup."nvim-treesitter.configs" = {
     highlight = { enable = true; };
     indent = { enable = true; };
+    matchup = { enable = true; }; # Uses vim-matchup
 
     textobjects = {
       select = {
@@ -49,4 +64,10 @@
     };
   };
 
+  # Use mkAfter to ensure tree-sitter is already loaded
+  lua = lib.mkAfter ''
+    -- Use HCL parser with .tf files
+    vim.treesitter.language.register('hcl', 'terraform')
+  '';
+
 }

modules/common/neovim/config/telescope.lua

@@ -13,6 +13,7 @@ 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 = {
@@ -45,7 +46,7 @@ end)
 vim.keymap.set("n", "<Leader>fz", require("telescope").extensions.zoxide.list)
 
 -- Project
-require("telescope").load_extension("project")
+require("telescope").load_extension("projects")
 vim.keymap.set("n", "<C-p>", function()
     local opts = require("telescope.themes").get_ivy({
         layout_config = {
@@ -54,7 +55,7 @@ vim.keymap.set("n", "<C-p>", function()
             },
         },
     })
-    require("telescope").extensions.project.project(opts)
+    require("telescope").extensions.projects.projects(opts)
 end)
 
 -- File browser

modules/common/neovim/config/telescope.nix

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

modules/common/neovim/config/toggleterm.lua

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

modules/common/neovim/config/toggleterm.nix

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

modules/common/neovim/config/tree.nix

@@ -1,5 +1,7 @@
 { 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
@@ -10,14 +12,16 @@
   };
 
   setup.nvim-tree = {
-    disable_netrw = true;
-    hijack_netrw = true;
-    update_focused_file = {
+    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
       enable = true;
-      update_cwd = true;
+      update_root = true;
       ignore_list = { };
     };
-    diagnostics = {
+    diagnostics = { # Enable LSP and linter integration
       enable = true;
       icons = {
         hint = "";
@@ -26,7 +30,7 @@
         error = "";
       };
     };
-    renderer = {
+    renderer = { # Show files with changes vs. current commit
       icons = {
         glyphs = {
           git = {
@@ -41,35 +45,31 @@
         };
       };
     };
-    view = {
+    # 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
       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 })
   '';

modules/common/neovim/default.nix

@@ -4,7 +4,10 @@ let
 
   neovim = import ./package {
     inherit pkgs;
-    colors = import config.theme.colors.neovimConfig { inherit pkgs; };
+    colors = config.theme.colors;
+    terraform = config.terraform.enable;
+    github = true;
+    kubernetes = config.kubernetes.enable;
   };
 
 in {
@@ -18,11 +21,17 @@ 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 = {
@@ -31,22 +40,28 @@ 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 = lib.mkIf pkgs.stdenv.isLinux {
-          defaultApplications."text/markdown" = [ "nvim.desktop" ];
+        xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
+          "text/plain" = [ "nvim.desktop" ];
+          "text/markdown" = [ "nvim.desktop" ];
         };
 
       };
 
-    # # Used for icons in Vim
-    # fonts.fonts = with pkgs; [ nerdfonts ];
-
   };
 
 }

modules/common/neovim/init.lua

@@ -1,4 +0,0 @@
-require("packer_init")
-require("settings")
-require("keybinds")
-require("background")

modules/common/neovim/lua/keybinds.lua

@@ -39,7 +39,6 @@ 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 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,11 +47,6 @@ 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")
@@ -70,9 +64,15 @@ 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

modules/common/neovim/lua/packer/completion.lua

@@ -1,164 +0,0 @@
--- =======================================================================
--- 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

modules/common/neovim/lua/packer/lsp.lua

@@ -1,153 +0,0 @@
--- =======================================================================
--- 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

modules/common/neovim/lua/packer/misc.lua

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

modules/common/neovim/lua/packer/speed.lua

@@ -1,13 +0,0 @@
-local M = {}
-
-M.packer = function(use)
-    -- Startup speed hacks
-    use({
-        "lewis6991/impatient.nvim",
-        config = function()
-            require("impatient")
-        end,
-    })
-end
-
-return M

modules/common/neovim/lua/packer/syntax.lua

@@ -1,72 +0,0 @@
--- =======================================================================
--- 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

modules/common/neovim/lua/packer/telescope.lua

@@ -1,139 +0,0 @@
--- =======================================================================
--- 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

modules/common/neovim/lua/packer/toggleterm.lua

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

modules/common/neovim/lua/packer/visuals.lua

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

modules/common/neovim/lua/packer_init.lua

@@ -1,34 +0,0 @@
--- 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)

modules/common/neovim/lua/settings.lua

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

modules/common/neovim/package/default.nix

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

modules/common/neovim/plugin/after/queries/nix/injections.scm

@@ -0,0 +1,8 @@
+expression: (apply_expression
+  function: (apply_expression
+    function: (select_expression
+      attrpath: (attrpath) @writeshell (#match? @writeshell "^writeShell.*$")
+      )
+    )
+  (indented_string_expression) @bash
+)

modules/common/programming/default.nix

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

modules/common/programming/rust.nix

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

modules/common/programming/terraform.nix

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

modules/common/repositories/dotfiles.nix

@@ -1,5 +1,7 @@
 { 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 {
@@ -14,13 +16,8 @@
           [ "writeBoundary" ] ''
             if [ ! -d "${config.dotfilesPath}" ]; then
                 $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${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}"
+                $DRY_RUN_CMD ${pkgs.git}/bin/git \
+                    clone ${config.dotfilesRepo} "${config.dotfilesPath}"
             fi
           '';
 

modules/common/repositories/notes.nix

@@ -1,5 +1,8 @@
 { 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 = {

modules/common/shell/bash/default.nix

@@ -0,0 +1,20 @@
+{ 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;
+
+    };
+  };
+}

modules/common/shell/bash/scripts/docker-cleanup.sh

@@ -0,0 +1,26 @@
+#!/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."

modules/common/shell/charm.nix

@@ -1,5 +1,7 @@
 { 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 {
@@ -8,6 +10,7 @@
       glow # Markdown previews
       skate # Key-value store
       charm # Manage account and filesystem
+      pop # Send emails from a TUI
     ];
 
   };

modules/common/shell/default.nix

@@ -1,11 +1,13 @@
 { ... }: {
   imports = [
+    ./bash
     ./charm.nix
     ./direnv.nix
     ./fish
     ./fzf.nix
     ./git.nix
     ./github.nix
+    ./jujutsu.nix
     ./nixpkgs.nix
     ./starship.nix
     ./utilities.nix

modules/common/shell/direnv.nix

@@ -1,11 +1,28 @@
 { config, ... }: {
 
+  # Enables quickly entering Nix shells when changing directories
   home-manager.users.${config.user}.programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
     config = { whitelist = { prefix = [ config.dotfilesPath ]; }; };
   };
 
+  # programs.direnv.direnvrcExtra = ''
+  #   layout_postgres() {
+  #       export PGDATA="$(direnv_layout_dir)/postgres"
+  #       export PGHOST="$PGDATA"
+  #
+  #       if [[ ! -d "PGDATA" ]]; then
+  #           initdb
+  #           cat >> "$PGDATA/postgres.conf" <<- EOF
+  #                   listen_addresses = '''
+  #                   unix_socket_directories = '$PGHOST'
+  #           EOF
+  #           echo "CREATE DATABASE $USER;" | postgres --single -E postgres
+  #       fi
+  #   }
+  # '';
+
   # Prevent garbage collection
   nix.extraOptions = ''
     keep-outputs = true

modules/common/shell/fish/default.nix

@@ -1,18 +1,24 @@
 { config, pkgs, lib, ... }: {
 
   users.users.${config.user}.shell = pkgs.fish;
-  programs.fish.enable =
-    true; # Needed for LightDM to remember username (TODO: fix)
+  programs.fish.enable = true; # Needed for LightDM to remember username
 
   home-manager.users.${config.user} = {
 
     # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl exa ];
+    home.packages = with pkgs; [ curl ];
 
     programs.fish = {
       enable = true;
       shellAliases = {
-        ls = "exa";
+
+        # 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
         trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
       };
       functions = {
@@ -76,7 +82,6 @@
         set -g fish_cursor_replace_one underscore
       '';
       loginShellInit = "";
-      shellAliases = { };
       shellAbbrs = {
 
         # Directory aliases
@@ -118,9 +123,6 @@
         dr = "docker run --rm -it";
         db = "docker build . -t";
 
-        # Rust
-        ca = "cargo";
-
       };
       shellInit = "";
     };

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 run nixpkgs#"'
-bind -M default \cn 'commandline -r "nix run nixpkgs#"'
+bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
+bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf

modules/common/shell/fish/functions/git-push-upstream.fish

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

modules/common/shell/fzf.nix

@@ -1,5 +1,7 @@
 { config, ... }: {
 
+  # FZF is a fuzzy-finder for the terminal
+
   home-manager.users.${config.user} = {
 
     programs.fzf.enable = true;
@@ -13,9 +15,8 @@
                 fd \
                     --search-path $HOME/dev \
                     --type directory \
-                    --hidden \
-                    "^.git\$" \
-                | xargs dirname \
+                    --exact-depth 2 \
+                | sed 's/\\/$//' \
                 | fzf \
                     --delimiter '/' \
                     --with-nth 6.. \

modules/common/shell/git.nix

@@ -31,6 +31,7 @@ in {
           pager = { branch = "false"; };
           safe = { directory = config.dotfilesPath; };
           pull = { ff = "only"; };
+          push = { autoSetupRemote = "true"; };
           init = { defaultBranch = "master"; };
         };
         ignores = [ ".direnv/**" "result" ];
@@ -50,7 +51,6 @@ 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";
@@ -58,6 +58,7 @@ in {
           git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
         gcob = "git switch -c";
         gb = "git branch";
+        gpd = "git push origin -d";
         gbd = "git branch -d";
         gbD = "git branch -D";
         gr = "git reset";
@@ -113,10 +114,6 @@ 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;

modules/common/shell/github.nix

@@ -5,8 +5,9 @@
     programs.gh =
       lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
         enable = true;
-        enableGitCredentialHelper = true;
+        gitCredentialHelper.enable = true;
         settings.git_protocol = "https";
+        extensions = [ pkgs.gh-collaborators ];
       };
 
     programs.fish =
@@ -14,11 +15,14 @@
         shellAbbrs = {
           ghr = "gh repo view -w";
           gha =
-            "gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view";
+            "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
           grw = "gh run watch";
           grf = "gh run view --log-failed";
           grl = "gh run view --log";
           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 = {