set checks on individual languages

apache directory studio can't figure out how to make it work on m3

.github/workflows/check.yml

@@ -2,7 +2,6 @@ name: Check Build
 
 on:
   workflow_dispatch: # allows manual triggering
-  pull_request:
 
 jobs:
   check:

.github/workflows/update.yml

@@ -6,8 +6,9 @@ on:
     - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
 
 permissions:
-  contents: read
+  contents: write
-  pull-request: write
+  pull-requests: write
+  checks: write
 
 jobs:
   lockfile:
@@ -20,13 +21,49 @@ jobs:
         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@v3
+        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
+          pr-body: |
+            Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action.
+
+            ```
+            {{ env.GIT_COMMIT_MESSAGE }}
+            ```
+      - name: Check the Flake
+        id: check
+        run: nix flake check
+      - name: Update Check Status
+        uses: LouisBrunner/checks-action@v1.6.1
+        if: always()
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: Update Flake
+          conclusion: ${{ job.status }}
+          output: |
+            {"summary":"${{ steps.check.outputs.stdout }}"}
       - name: Enable Pull Request Automerge
-        run: gh pr merge --merge --auto ${{ steps.update.outputs.pull-request-number }}
+        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 }}

README.md

@@ -41,6 +41,30 @@ configuration may be difficult to translate to a non-Nix system.
 | ---      | ---                                         | ---                                  |
 | Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
 
+# Diagram
+
+![Diagram](https://github.com/nmasur/dotfiles/assets/7386960/ed3e7202-09c4-4a9c-9b14-0272c01647f6)
+
+- [flake.nix](./flake.nix)
+- [hosts](./hosts/)
+- [modules](./modules/)
+
+---
+
+# Unique Configurations
+
+This repo contains a few more elaborate elements of configuration.
+
+- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
+and source-controlled plugins, differing based on installed LSPs, for example.
+- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based
+dynamically on enabled services rendered with Nix.
+- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix.
+- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
+agenix.
+- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
+including Firefox userChrome.
+
 ---
 
 # Installation

apps/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" \
+            "Example: installer -- nvme0n1 tempest" \
-            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 desktop"
+            "Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
         echo "(exiting)"
         exit 1
     fi

apps/loadkey.nix

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

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.

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.

docs/README.md

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

docs/installation.md

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

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

@@ -20,11 +20,11 @@
     "baleia-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1681806450,
+        "lastModified": 1704551058,
-        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
+        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
         "owner": "m00qek",
         "repo": "baleia.nvim",
-        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
+        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
         "type": "github"
       },
       "original": {
@@ -36,28 +36,44 @@
     "bufferline-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1687763763,
+        "lastModified": 1706180994,
-        "narHash": "sha256-wbOeylzjjScQXkrDbBU2HtrOZrp2YUK+wQ2aOkgxmRQ=",
+        "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=",
         "owner": "akinsho",
         "repo": "bufferline.nvim",
-        "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
+        "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v4.2.0",
+        "ref": "v4.5.0",
         "repo": "bufferline.nvim",
         "type": "github"
       }
     },
+    "bypass-paywalls-clean": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706880406,
+        "narHash": "sha256-8z2Gc3ITluXXbDij4Ltahpkxs7zdnMITvIAjotab/QU=",
+        "owner": "magnolia1234",
+        "repo": "bpc-uploads",
+        "rev": "c91cfd510390ab5a138f412ad2890b2cb2a2eafd",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "magnolia1234",
+        "repo": "bpc-uploads",
+        "type": "gitlab"
+      }
+    },
     "cmp-nvim-lsp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1687494203,
+        "lastModified": 1702205473,
-        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
+        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
+        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
         "type": "github"
       },
       "original": {
@@ -73,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690247892,
+        "lastModified": 1706833576,
-        "narHash": "sha256-WMGc1yq1cqRd+kzjWgbvHxckJIe8VQfiZ5RfR8tgABw=",
+        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "efd35d99ce412335c478dff9da9a4256bbd39757",
+        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
         "type": "github"
       },
       "original": {
@@ -94,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690148072,
+        "lastModified": 1706491084,
-        "narHash": "sha256-R7bk2ij1b06Wc8S3L/guz6Mape5HtKp/YZUyJaxSFa8=",
+        "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "713eb78002e69bd77f5a69595756fd2e564233f3",
+        "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9",
         "type": "github"
       },
       "original": {
@@ -107,6 +123,23 @@
         "type": "github"
       }
     },
+    "fidget-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704696337,
+        "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=",
+        "owner": "j-hui",
+        "repo": "fidget.nvim",
+        "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db",
+        "type": "github"
+      },
+      "original": {
+        "owner": "j-hui",
+        "ref": "v1.2.0",
+        "repo": "fidget.nvim",
+        "type": "github"
+      }
+    },
     "firefox-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -114,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689987164,
+        "lastModified": 1707007453,
-        "narHash": "sha256-piroYVZtJ6hK1QRBtof4d701FRchO+FgkFK4JwMOWxI=",
+        "narHash": "sha256-vs7uACn2/8GOApZJv52gAVsLfpjQWFgkHN2QJ7aVkl8=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "9f5f2b9396724b807818f889abfa7ccf61e20afa",
+        "rev": "d839feb516758ad28bc1cef43008d55e749c1d6a",
         "type": "github"
       },
       "original": {
@@ -130,11 +163,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1696426674,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -144,12 +177,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1678901627,
+        "lastModified": 1705309234,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -160,14 +196,14 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1685518550,
+        "lastModified": 1705309234,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -176,21 +212,19 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "hmts-nvim-src": {
-      "inputs": {
+      "flake": false,
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1689068808,
+        "lastModified": 1706900289,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
-        "owner": "numtide",
+        "owner": "calops",
-        "repo": "flake-utils",
+        "repo": "hmts.nvim",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "calops",
-        "repo": "flake-utils",
+        "repo": "hmts.nvim",
         "type": "github"
       }
     },
@@ -201,11 +235,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690208251,
+        "lastModified": 1706985585,
-        "narHash": "sha256-eb/KANeuQADVl5j4wVid4jyPCOMTorSI2+gqoXp3LME=",
+        "narHash": "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d309a62ee81faec56dd31a263a0184b0e3227e36",
+        "rev": "1ca210648a6ca9b957efde5da957f3de6b1f0c45",
         "type": "github"
       },
       "original": {
@@ -215,42 +249,87 @@
         "type": "github"
       }
     },
-    "nil": {
+    "kitty-scrollback-nvim-src": {
-      "inputs": {
+      "flake": false,
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
       "locked": {
-        "lastModified": 1680544266,
+        "lastModified": 1706891759,
-        "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
+        "narHash": "sha256-p7RPqLHO6D5CCTDQzUrEqTu9+jg+V7wtYfGbY4qjE9A=",
-        "owner": "oxalica",
+        "owner": "mikesmithgh",
-        "repo": "nil",
+        "repo": "kitty-scrollback.nvim",
-        "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
+        "rev": "12f7687ac049d46a987c39b2b4f657fdf540fa4e",
         "type": "github"
       },
       "original": {
-        "owner": "oxalica",
+        "owner": "mikesmithgh",
-        "ref": "2023-04-03",
+        "repo": "kitty-scrollback.nvim",
-        "repo": "nil",
         "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"
+      }
+    },
+    "nextcloud-snappymail": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1707018069,
+        "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
+      }
+    },
     "nix2vim": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1685980282,
+        "lastModified": 1706886721,
-        "narHash": "sha256-uQyVaoqkiocA8bXKMfrgizuKmz0hUzHye5owFoUd2AQ=",
+        "narHash": "sha256-iDYxsE5xYoK8Ww2TYZDmgRQNIZl+QHJfChOxWh45g0k=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "3836a348503ae27340c7f83f0bc7bcb907f3781d",
+        "rev": "29253dcf0f645a44847006d436b096369ef42fd8",
         "type": "github"
       },
       "original": {
@@ -261,11 +340,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1689469483,
+        "lastModified": 1693701915,
-        "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
+        "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
+        "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
         "type": "github"
       },
       "original": {
@@ -282,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690133435,
+        "lastModified": 1706085261,
-        "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=",
+        "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586",
+        "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132",
         "type": "github"
       },
       "original": {
@@ -297,11 +376,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690179384,
+        "lastModified": 1706732774,
-        "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
+        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
+        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
         "type": "github"
       },
       "original": {
@@ -311,30 +390,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1689605451,
-        "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "53657afe29748b3e462f1f892287b7e254c26d77",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "null-ls-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1688652536,
+        "lastModified": 1691810493,
-        "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=",
+        "narHash": "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "db09b6c691def0038c456551e4e2772186449f35",
+        "rev": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7",
         "type": "github"
       },
       "original": {
@@ -345,11 +408,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1690247650,
+        "lastModified": 1707013032,
-        "narHash": "sha256-xasDfDeXnR9PgUhOEzjn1NrvAcqloEgoNFUcQjv20Wg=",
+        "narHash": "sha256-9kEY/D0Q6sF+p6vJRefVXDK4QQdwK4Q0lSQdsYICad0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "ed0946320360d3a08404d93077c0847c176d4da0",
+        "rev": "ab432acea15134873882610c0e936a882319bc8a",
         "type": "github"
       },
       "original": {
@@ -361,16 +424,16 @@
     "nvim-lspconfig-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1675639052,
+        "lastModified": 1701687137,
-        "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
+        "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
+        "rev": "cf3dd4a290084a868fac0e2e876039321d57111c",
         "type": "github"
       },
       "original": {
         "owner": "neovim",
-        "ref": "v0.1.6",
+        "ref": "v0.1.7",
         "repo": "nvim-lspconfig",
         "type": "github"
       }
@@ -378,11 +441,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1690096369,
+        "lastModified": 1706571452,
-        "narHash": "sha256-aLw0ysDIJWOP2x1XppaHBmmRYfL4IzM5xQ+1WuW0QLM=",
+        "narHash": "sha256-b0LIqLC8cCRX1NyJx4eH5c4v5Fqqw5mMleAnQ2VRctM=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "273c1700eb68c27dce4e518efafc8144fd7ce4ab",
+        "rev": "f39f7b6fcd3865ac2146de4cb4045286308f2935",
         "type": "github"
       },
       "original": {
@@ -394,31 +457,83 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1681121236,
+        "lastModified": 1706952848,
-        "narHash": "sha256-iPsPDLhVKJ14iP1/2cCgcY9SCKK/DQz9Y0mQB1DqNiM=",
+        "narHash": "sha256-pNjEODR+QJPDL58O4NM7SjzZEN8D3bXDHbKLNOS3fL8=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "cc360a9beb1b30d172438f640e2c3450358c4086",
+        "rev": "4fbf150a1621d52f17b099506e1a32f107079210",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
-        "ref": "v0.9.0",
+        "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"
+      }
+    },
+    "ren": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704996573,
+        "narHash": "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=",
+        "owner": "robenkleene",
+        "repo": "ren-find",
+        "rev": "50c40172e354caffee48932266edd7c7a76a20fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "robenkleene",
+        "repo": "ren-find",
+        "type": "github"
+      }
+    },
+    "rep": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1705833236,
+        "narHash": "sha256-hm+v+b97z1HnY/7QHZxc0GygCq9W0mJauyjnz48ddaM=",
+        "owner": "robenkleene",
+        "repo": "rep-grep",
+        "rev": "365acc5d599934e94dc066eb85b7ddd684ba508b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "robenkleene",
+        "repo": "rep-grep",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "Comment-nvim-src": "Comment-nvim-src",
         "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",
-        "nil": "nil",
+        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
+        "nextcloud-cookbook": "nextcloud-cookbook",
+        "nextcloud-external": "nextcloud-external",
+        "nextcloud-news": "nextcloud-news",
+        "nextcloud-snappymail": "nextcloud-snappymail",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
@@ -427,37 +542,22 @@
         "nvim-lspconfig-src": "nvim-lspconfig-src",
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
+        "proton-ge": "proton-ge",
+        "ren": "ren",
+        "rep": "rep",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
-        "vscode-terraform-snippets": "vscode-terraform-snippets",
+        "tree-sitter-bash": "tree-sitter-bash",
+        "tree-sitter-ini": "tree-sitter-ini",
+        "tree-sitter-lua": "tree-sitter-lua",
+        "tree-sitter-puppet": "tree-sitter-puppet",
+        "tree-sitter-python": "tree-sitter-python",
+        "tree-sitter-rasi": "tree-sitter-rasi",
+        "tree-sitter-vimdoc": "tree-sitter-vimdoc",
         "wallpapers": "wallpapers",
-        "wsl": "wsl"
+        "wsl": "wsl",
-      }
+        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
-    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": [
-          "nil",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nil",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1680488274,
-        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
       }
     },
     "systems": {
@@ -493,16 +593,16 @@
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1686302912,
+        "lastModified": 1701167040,
-        "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
+        "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
+        "rev": "d90956833d7c27e73c621a61f20b29fdb7122709",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
-        "ref": "0.1.2",
+        "ref": "0.1.5",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -510,11 +610,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1682606566,
+        "lastModified": 1701464478,
-        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
+        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
+        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
         "type": "github"
       },
       "original": {
@@ -526,33 +626,132 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1685434104,
+        "lastModified": 1701858874,
-        "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
+        "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
+        "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.7.0",
+        "ref": "v2.9.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
     },
-    "vscode-terraform-snippets": {
+    "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1614849738,
+        "lastModified": 1705686017,
-        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
+        "narHash": "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w=",
-        "owner": "run-at-scale",
+        "owner": "tree-sitter",
-        "repo": "vscode-terraform-doc-snippets",
+        "repo": "tree-sitter-bash",
-        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
+        "rev": "f7239f638d3dc16762563a9027faeee518ce1bd9",
         "type": "github"
       },
       "original": {
-        "owner": "run-at-scale",
+        "owner": "tree-sitter",
-        "repo": "vscode-terraform-doc-snippets",
+        "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"
+      }
+    },
+    "tree-sitter-vimdoc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1705491128,
+        "narHash": "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg=",
+        "owner": "neovim",
+        "repo": "tree-sitter-vimdoc",
+        "rev": "ed8695ad8de39c3f073da130156f00b1148e2891",
+        "type": "github"
+      },
+      "original": {
+        "owner": "neovim",
+        "repo": "tree-sitter-vimdoc",
         "type": "github"
       }
     },
@@ -575,15 +774,17 @@
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1690187332,
+        "lastModified": 1706867893,
-        "narHash": "sha256-8iyH0LXszole3kUjPfg4S8uprJ0RGDQbZLyBvKFiQ3s=",
+        "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "01112baf546b5577038e2a422a5215eedd9bc84b",
+        "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b",
         "type": "github"
       },
       "original": {
@@ -591,6 +792,22 @@
         "repo": "NixOS-WSL",
         "type": "github"
       }
+    },
+    "zenyd-mpv-scripts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706283438,
+        "narHash": "sha256-hpLZDtt5q18aZ8d9LHfT852wtBosKUTJ7Bx+cbjBLcg=",
+        "owner": "zenyd",
+        "repo": "mpv-scripts",
+        "rev": "7100d19d18d111ce77fc9e6e8947c0d542a86397",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zenyd",
+        "repo": "mpv-scripts",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -9,12 +9,15 @@
 
     # 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";
+    wsl = {
+      url = "github:nix-community/NixOS-WSL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Used for user packages and dotfiles
     home-manager = {
@@ -56,15 +59,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Nix language server
-    nil = {
-      url = "github:oxalica/nil/2023-04-03";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # Neovim plugins
     nvim-lspconfig-src = {
-      url = "github:neovim/nvim-lspconfig/v0.1.6";
+      # https://github.com/neovim/nvim-lspconfig/tags
+      url = "github:neovim/nvim-lspconfig/v0.1.7";
       flake = false;
     };
     cmp-nvim-lsp-src = {
@@ -76,19 +74,23 @@
       flake = false;
     };
     baleia-nvim-src = {
+      # https://github.com/m00qek/baleia.nvim/tags
       url = "github:m00qek/baleia.nvim";
       flake = false;
     };
     Comment-nvim-src = {
+      # https://github.com/numToStr/Comment.nvim/releases
       url = "github:numToStr/Comment.nvim/v0.8.0";
       flake = false;
     };
     nvim-treesitter-src = {
-      url = "github:nvim-treesitter/nvim-treesitter/v0.9.0";
+      # 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/0.1.2";
+      # https://github.com/nvim-telescope/telescope.nvim/releases
+      url = "github:nvim-telescope/telescope.nvim/0.1.5";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -96,19 +98,118 @@
       flake = false;
     };
     toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim/v2.7.0";
+      # https://github.com/akinsho/toggleterm.nvim/tags
+      url = "github:akinsho/toggleterm.nvim/v2.9.0";
       flake = false;
     };
     bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim/v4.2.0";
+      # https://github.com/akinsho/bufferline.nvim/releases
+      url = "github:akinsho/bufferline.nvim/v4.5.0";
       flake = false;
     };
     nvim-tree-lua-src = {
       url = "github:kyazdani42/nvim-tree.lua";
       flake = false;
     };
-    vscode-terraform-snippets = {
+    hmts-nvim-src = {
-      url = "github:run-at-scale/vscode-terraform-doc-snippets";
+      url = "github:calops/hmts.nvim";
+      flake = false;
+    };
+    fidget-nvim-src = {
+      # https://github.com/j-hui/fidget.nvim/tags
+      url = "github:j-hui/fidget.nvim/v1.2.0";
+      flake = false;
+    };
+    kitty-scrollback-nvim-src = {
+      url = "github:mikesmithgh/kitty-scrollback.nvim";
+      flake = false;
+    };
+
+    # Tree-Sitter Grammars
+    tree-sitter-bash = {
+      url = "github:tree-sitter/tree-sitter-bash/master";
+      flake = false;
+    };
+    tree-sitter-python = {
+      url = "github:tree-sitter/tree-sitter-python/master";
+      flake = false;
+    };
+    tree-sitter-lua = {
+      url = "github:MunifTanjim/tree-sitter-lua/main";
+      flake = false;
+    };
+    tree-sitter-ini = {
+      url = "github:justinmk/tree-sitter-ini";
+      flake = false;
+    };
+    tree-sitter-puppet = {
+      url = "github:amaanq/tree-sitter-puppet";
+      flake = false;
+    };
+    tree-sitter-rasi = {
+      url = "github:Fymyte/tree-sitter-rasi";
+      flake = false;
+    };
+    tree-sitter-vimdoc = {
+      url = "github:neovim/tree-sitter-vimdoc";
+      flake = false;
+    };
+
+    # MPV Scripts
+    zenyd-mpv-scripts = {
+      url = "github:zenyd/mpv-scripts";
+      flake = false;
+    };
+
+    # Ren and rep - CLI find and replace
+    rep = {
+      url = "github:robenkleene/rep-grep";
+      flake = false;
+    };
+    ren = {
+      url = "github:robenkleene/ren-find";
+      flake = false;
+    };
+
+    # GE version of Proton for game compatibility
+    # Alternatively, could consider using https://github.com/fufexan/nix-gaming
+    proton-ge = {
+      # https://github.com/GloriousEggroll/proton-ge-custom/releases
+      url =
+        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-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;
+    };
+    nextcloud-snappymail = {
+      # https://github.com/the-djmaze/snappymail/releases
+      url =
+        "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz";
       flake = false;
     };
 
@@ -131,8 +232,10 @@
         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}";
@@ -149,7 +252,14 @@
         (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/proton-ge.nix inputs)
+        (import ./overlays/gh-collaborators.nix)
+        (import ./overlays/bypass-paywalls-clean.nix inputs)
+        (import ./overlays/ren-rep.nix inputs)
       ];
 
       # System types to support.

hosts/README.md

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

hosts/aws/main.tf

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

hosts/flame/default.nix

@@ -1,8 +1,11 @@
 # The Flame
 # System configuration for an Oracle free server
 
+# See [readme](../README.md) to explain how this file works.
+
 # How to install:
 # https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
+# These days, probably use nixos-anywhere instead.
 
 { inputs, globals, overlays, ... }:
 
@@ -21,40 +24,49 @@ inputs.nixpkgs.lib.nixosSystem {
       server = true;
       networking.hostName = "flame";
 
+      # Not sure what's necessary but too afraid to remove anything
       imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
       boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
 
+      # File systems must be declared in order to boot
+
+      # This is the root filesystem containing NixOS
+      # I forgot to set a clean label for it
       fileSystems."/" = {
         device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
         fsType = "ext4";
       };
 
+      # This is the boot filesystem for systemd-boot
       fileSystems."/boot" = {
         device = "/dev/disk/by-uuid/D5CA-237A";
         fsType = "vfat";
       };
 
       # Theming
+
+      # Server doesn't require GUI
       gui.enable = false;
+
+      # Still require colors for programs like Neovim, K9S
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };
 
-      # Disable passwords, only use SSH key
-      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
-
       # Programs and services
+      atuin.enable = true;
       cloudflare.enable = true; # Proxy traffic with Cloudflare
       dotfiles.enable = true; # Clone dotfiles
       neovim.enable = true;
-
+      giteaRunner.enable = true;
       services.caddy.enable = true;
       services.grafana.enable = true;
       services.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";
@@ -63,8 +75,6 @@ inputs.nixpkgs.lib.nixosSystem {
           "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
       };
 
-      giteaRunner.enable = true;
-
       # Nextcloud backup config
       backup.s3 = {
         endpoint = "s3.us-west-002.backblazeb2.com";
@@ -72,8 +82,9 @@ inputs.nixpkgs.lib.nixosSystem {
         accessKeyId = "0026b0e73b2e2c80000000005";
       };
 
-      # # Grant access to Jellyfin directories from Nextcloud
+      # Disable passwords, only use SSH key
-      # users.users.nextcloud.extraGroups = [ "jellyfin" ];
+      publicKey =
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
 
       # # Wireguard config for Transmission
       # wireguard.enable = true;
@@ -104,9 +115,6 @@ inputs.nixpkgs.lib.nixosSystem {
       # # VPN port forwarding
       # services.transmission.settings.peer-port = 57599;
 
-      # # Grant access to Transmission directories from Jellyfin
-      # users.users.jellyfin.extraGroups = [ "transmission" ];
-
     }
   ];
 }

hosts/hydra/default.nix

@@ -1,6 +1,8 @@
 # The Hydra
 # System configuration for WSL
 
+# See [readme](../README.md) to explain how this file works.
+
 { inputs, globals, overlays, ... }:
 
 inputs.nixpkgs.lib.nixosSystem {
@@ -22,7 +24,7 @@ inputs.nixpkgs.lib.nixosSystem {
         colors = (import ../../colorscheme/gruvbox).dark;
         dark = true;
       };
-      passwordHash = inputs.nixpkgs.lib.fileContents ../../password.sha512;
+      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
       wsl = {
         enable = true;
         wslConf.automount.root = "/mnt";

hosts/lookingglass/default.nix

@@ -4,7 +4,7 @@
 { inputs, globals, overlays, ... }:
 
 inputs.darwin.lib.darwinSystem {
-  system = "x86_64-darwin";
+  system = "aarch64-darwin";
   specialArgs = { };
   modules = [
     ../../modules/common
@@ -25,6 +25,7 @@ inputs.darwin.lib.darwinSystem {
         dark = true;
       };
       mail.user = globals.user;
+      atuin.enable = true;
       charm.enable = true;
       neovim.enable = true;
       mail.enable = true;
@@ -37,7 +38,9 @@ inputs.darwin.lib.darwinSystem {
       nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
+      rust.enable = true;
       lua.enable = true;
+      obsidian.enable = true;
       kubernetes.enable = true;
       _1password.enable = true;
       slack.enable = true;

hosts/swan/default.nix

@@ -1,6 +1,8 @@
 # The Swan
 # System configuration for my home NAS server
 
+# See [readme](../README.md) to explain how this file works.
+
 { inputs, globals, overlays, ... }:
 
 inputs.nixpkgs.lib.nixosSystem {
@@ -13,11 +15,14 @@ inputs.nixpkgs.lib.nixosSystem {
     ../../modules/common
     ../../modules/nixos
     {
+      nixpkgs.overlays = overlays;
+
       # Hardware
       server = true;
       physical = true;
       networking.hostName = "swan";
 
+      # Not sure what's necessary but too afraid to remove anything
       boot.initrd.availableKernelModules =
         [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
 
@@ -30,29 +35,44 @@ inputs.nixpkgs.lib.nixosSystem {
         "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
+
+      # Sets root ext4 filesystem instead of declaring it manually
       disko = {
         enableConfig = true;
         devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
       };
+
+      # Automatically load the ZFS pool on boot
       boot.zfs.extraPools = [ "tank" ];
 
+      # Theming
+
+      # Server doesn't require GUI
       gui.enable = false;
+
+      # Still require colors for programs like Neovim, K9S
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };
-      nixpkgs.overlays = overlays;
+
+      # Programs and services
+      atuin.enable = true;
       neovim.enable = true;
       cloudflare.enable = true;
       dotfiles.enable = true;
       arrs.enable = true;
-
       services.bind.enable = true;
       services.caddy.enable = true;
       services.jellyfin.enable = true;
@@ -62,7 +82,10 @@ inputs.nixpkgs.lib.nixosSystem {
       services.prometheus.enable = false;
       services.vmagent.enable = true;
       services.samba.enable = true;
+      services.paperless.enable = true;
+      services.postgresql.enable = true;
 
+      # Allows private remote access over the internet
       cloudflareTunnel = {
         enable = true;
         id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
@@ -71,6 +94,7 @@ inputs.nixpkgs.lib.nixosSystem {
           "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";

hosts/tempest/default.nix

@@ -1,6 +1,8 @@
 # The Tempest
 # System configuration for my desktop
 
+# See [readme](../README.md) to explain how this file works.
+
 { inputs, globals, overlays, ... }:
 
 inputs.nixpkgs.lib.nixosSystem {
@@ -17,14 +19,25 @@ inputs.nixpkgs.lib.nixosSystem {
       physical = true;
       networking.hostName = "tempest";
 
+      # Not sure what's necessary but too afraid to remove anything
       boot.initrd.availableKernelModules =
         [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+
+      # Graphics and VMs
       boot.initrd.kernelModules = [ "amdgpu" ];
       boot.kernelModules = [ "kvm-amd" ];
       services.xserver.videoDrivers = [ "amdgpu" ];
+
+      # Required binary blobs to boot on this machine
       hardware.enableRedistributableFirmware = true;
+
+      # Prioritize performance over efficiency
       powerManagement.cpuFreqGovernor = "performance";
+
+      # Allow firmware updates
       hardware.cpu.amd.updateMicrocode = true;
+
+      # Helps reduce GPU fan noise under idle loads
       hardware.fancontrol.enable = true;
       hardware.fancontrol.config = ''
         # Configuration file generated by pwmconfig, changes will be lost
@@ -41,22 +54,29 @@ inputs.nixpkgs.lib.nixosSystem {
         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";
       };
 
-      # Must be prepared ahead
+      # Secrets must be prepared ahead before deploying
-      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+      passwordHash = inputs.nixpkgs.lib.fileContents ../../misc/password.sha512;
-      passwordHash = inputs.nixpkgs.lib.fileContents ../../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).dark;
         dark = true;
@@ -65,6 +85,7 @@ inputs.nixpkgs.lib.nixosSystem {
       gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
 
       # Programs and services
+      atuin.enable = true;
       charm.enable = true;
       neovim.enable = true;
       media.enable = true;
@@ -81,6 +102,7 @@ inputs.nixpkgs.lib.nixosSystem {
       keybase.enable = true;
       mullvad.enable = false;
       nixlang.enable = true;
+      rust.enable = true;
       yt-dlp.enable = true;
       gaming = {
         dwarf-fortress.enable = true;
@@ -91,9 +113,11 @@ inputs.nixpkgs.lib.nixosSystem {
         leagueoflegends.enable = true;
         ryujinx.enable = true;
       };
-      services.vmagent.enable = true;
+      services.vmagent.enable = true; # Enables Prometheus metrics
+      services.openssh.enable =
+        true; # Required for Cloudflare tunnel and identity file
 
-      services.openssh.enable = true; # Required for Cloudflare tunnel
+      # Allows private remote access over the internet
       cloudflareTunnel = {
         enable = true;
         id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
@@ -103,6 +127,8 @@ inputs.nixpkgs.lib.nixosSystem {
       };
 
       # Allows requests to force machine to wake up
+      # This network interface might change, needs to be set specifically for each machine.
+      # Or set usePredictableInterfaceNames = false
       networking.interfaces.enp5s0.wakeOnLan.enable = true;
 
     }

misc/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

@@ -5,4 +5,5 @@
 | [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/1password.nix

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

modules/common/applications/discord.nix

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

modules/common/applications/firefox.nix

@@ -16,6 +16,7 @@
     unfreePackages = [
       (lib.mkIf config._1password.enable "onepassword-password-manager")
       "okta-browser-plugin"
+      "wappalyzer"
     ];
 
     home-manager.users.${config.user} = {
@@ -28,21 +29,23 @@
           id = 0;
           name = "default";
           isDefault = true;
+          # https://nur.nix-community.org/repos/rycee/
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            ublock-origin
-            vimium
-            multi-account-containers
-            facebook-container
             (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
+            sponsorblock
-            i-dont-care-about-cookies
+            ublock-origin
+            ublacklist
+            vimium
             wappalyzer
           ];
           settings = {
@@ -73,6 +76,8 @@
             "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 = ''
@@ -114,7 +119,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;

modules/common/applications/kitty.nix

@@ -40,11 +40,25 @@
         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";
+
+          # Kitty scrollback nvim
+          "kitty_mod+h" = "kitty_scrollback_nvim";
+          "kitty_mod+g" =
+            "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
         };
         settings = {
 
+          # Required for kitty-scrollback.nvim
+          allow_remote_control = "socket-only";
+          listen_on = "unix:/tmp/kitty";
+          action_alias =
+            "kitty_scrollback_nvim kitten ${pkgs.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
+
           # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
           background = config.theme.colors.base00;
           foreground = config.theme.colors.base05;
@@ -98,7 +112,7 @@
           tab_bar_edge = "top";
           tab_bar_style = "slant";
 
-          # Audio
+          # Disable audio
           enable_audio_bell = false;
         };
       };

modules/common/applications/media.nix

@@ -22,8 +22,8 @@
         enable = true;
         bindings = { };
         config = {
-          image-display-duration = 2;
+          image-display-duration = 2; # For cycling through images
-          hwdec = "auto-safe";
+          hwdec = "auto-safe"; # Attempt to use GPU decoding for video
         };
         scripts = [
 
@@ -31,29 +31,16 @@
           pkgs.mpvScripts.autoload
 
           # Delete current file after quitting
-          (pkgs.stdenv.mkDerivation rec {
+          pkgs.mpvScripts.mpv-delete-file
-            pname = "mpv-delete-file";
-            version = "0.1"; # made-up
-            src = pkgs.fetchFromGitHub {
-              owner = "zenyd";
-              repo = "mpv-scripts";
-              rev = "19ea069abcb794d1bf8fac2f59b50d71ab992130";
-              sha256 = "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=";
-            } + "/delete_file.lua";
-            dontBuild = true;
-            dontUnpack = true;
-            installPhase =
-              "install -Dm644 ${src} $out/share/mpv/scripts/delete_file.lua";
-            passthru.scriptName = "delete_file.lua";
-          })
         ];
       };
 
-      # Set default for opening PDFs
+      # Set default programs for opening PDFs and other media
       xdg.mimeApps = {
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
@@ -62,6 +49,7 @@
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
       };

modules/common/applications/obsidian.nix

@@ -15,8 +15,9 @@
       home.packages = with pkgs; [ obsidian ];
     };
 
-    # Broken on 2023-04-16
+    # Broken on 2023-12-11
-    nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ];
+    # 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

@@ -75,10 +75,18 @@
         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).";

modules/common/mail/aerc.nix

@@ -68,7 +68,7 @@
             "!" = ":term<space>";
             "|" = ":pipe<space>";
 
-            "/" = ":search<space>";
+            "/" = ":search<space>-a<space>";
             "\\" = ":filter <space>";
             n = ":next-result<Enter>";
             N = ":prev-result<Enter>";

modules/common/mail/default.nix

@@ -27,19 +27,32 @@
 
     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" ];
+        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 {
@@ -52,13 +65,17 @@
               "hey"
               "admin"
             ];
+
+            # Options for contact completion
             alot = { };
-            flavor = "plain";
+
             imap = {
               host = config.mail.imapHost;
               port = 993;
               tls.enable = true;
             };
+
+            # Watch for mail and run notifications or sync
             imapnotify = {
               enable = true;
               boxes = [ "Inbox" ];
@@ -67,7 +84,11 @@
                 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 = "both";
@@ -78,12 +99,17 @@
                 CopyArrivalDate = "yes"; # Sync time of original message
               };
             };
+
+            # Enable indexing
             notmuch.enable = true;
+
+            # Used to login and send and receive emails
             passwordCommand =
-              "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
+              "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${
                 pkgs.writeText "mailpass.age"
                 (builtins.readFile ../../../private/mailpass.age)
               }";
+
             smtp = {
               host = config.mail.smtpHost;
               port = 465;

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

@@ -1,5 +1,7 @@
 { 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.";

modules/common/neovim/config/completion.nix

@@ -9,7 +9,6 @@
     pkgs.vimPlugins.luasnip
     pkgs.vimPlugins.cmp_luasnip
     pkgs.vimPlugins.cmp-rg
-    pkgs.vimPlugins.friendly-snippets
   ];
 
   use.cmp.setup = dsl.callWith {
@@ -24,12 +23,7 @@
       end
     '';
 
-    snippet.expand = dsl.rawLua ''
+    # Basic completion keybinds
-      function(args)
-          require("luasnip").lsp_expand(args.body)
-      end
-    '';
-
     mapping = {
       "['<C-n>']" = dsl.rawLua
         "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
@@ -64,24 +58,25 @@
       '';
     };
 
+    # These are where the completion engine gets its suggestions
     sources = [
-      { name = "nvim_lua"; }
+      { name = "nvim_lua"; } # Fills in common Neovim lua functions
-      { name = "nvim_lsp"; }
+      { name = "nvim_lsp"; } # LSP results
-      { name = "luasnip"; }
+      { name = "path"; } # Shell completion from current PATH
-      { name = "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 ''
@@ -115,7 +110,6 @@
             }
             vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
             vim_item.menu = ({
-                luasnip = "[Snippet]",
                 buffer = "[Buffer]",
                 path = "[Path]",
                 rg = "[Grep]",
@@ -135,13 +129,6 @@
   };
 
   lua = ''
-    -- Load snippets
-    -- Check status: :lua require("luasnip").log.open()
-    require("luasnip.loaders.from_vscode").lazy_load()
-    require("luasnip.loaders.from_vscode").lazy_load({ paths = { "${
-      builtins.toString pkgs.vscode-terraform-snippets
-    }" } })
-
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
         sources = {

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

@@ -8,12 +8,15 @@
     pkgs.vimPlugins.glow-nvim # Markdown preview popup
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper
+    pkgs.kitty-scrollback-nvim # Scrollback pager for kitty
   ];
 
+  # Initialize some plugins
   setup.Comment = { };
-  setup.colorizer = { };
+  setup.colorizer = { user_default_options = { names = false; }; };
   setup.glow = { };
   setup.which-key = { };
+  setup.kitty-scrollback = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -51,7 +54,9 @@
   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" ];
@@ -66,10 +71,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/syntax.nix

@@ -1,11 +1,12 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, config, ... }: {
 
   plugins = [
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
-      with pkgs.tree-sitter-grammars; [
+      with pkgs.tree-sitter-grammars;
+      [
         tree-sitter-bash
+        tree-sitter-c
         tree-sitter-fish
-        tree-sitter-hcl
         tree-sitter-ini
         tree-sitter-json
         tree-sitter-lua
@@ -13,22 +14,23 @@
         tree-sitter-markdown-inline
         tree-sitter-nix
         tree-sitter-puppet
-        tree-sitter-python
         tree-sitter-rasi
         tree-sitter-toml
+        tree-sitter-vimdoc
         tree-sitter-yaml
-      ]))
+      ] ++ (if config.python.enable then [ tree-sitter-python ] else [ ])
+      ++ (if config.terraform.enable then [ tree-sitter-hcl ] else [ ])))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
-    pkgs.vimPlugins.vim-helm
     pkgs.baleia-nvim # Clean ANSI from kitty scrollback
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
+    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
+    (pkgs.vimUtils.buildVimPlugin {
       pname = "nmasur";
       version = "0.1";
       src = ../plugin;
     })
-  ];
+  ] ++ (if config.kubernetes.enable then [ pkgs.vimPlugins.vim-helm ] else [ ]);
 
   setup."nvim-treesitter.configs" = {
     highlight = { enable = true; };

modules/common/neovim/config/telescope.nix

@@ -1,5 +1,7 @@
 { pkgs, dsl, ... }: {
 
+  # Telescope is a fuzzy finder that can work with different sub-plugins
+
   plugins = [
     pkgs.vimPlugins.telescope-nvim
     pkgs.vimPlugins.project-nvim

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,16 +12,16 @@
   };
 
   setup.nvim-tree = {
-    disable_netrw = true;
+    disable_netrw = true; # Disable the built-in file manager
-    hijack_netrw = true;
+    hijack_netrw = true; # Works as the file manager
-    sync_root_with_cwd = true;
+    sync_root_with_cwd = true; # Change project whenever currend dir changes
-    respect_buf_cwd = true;
+    respect_buf_cwd = true; # Change to exact location of focused buffer
-    update_focused_file = {
+    update_focused_file = { # Change project based on the focused buffer
       enable = true;
       update_root = true;
       ignore_list = { };
     };
-    diagnostics = {
+    diagnostics = { # Enable LSP and linter integration
       enable = true;
       icons = {
         hint = "";
@@ -28,7 +30,7 @@
         error = "";
       };
     };
-    renderer = {
+    renderer = { # Show files with changes vs. current commit
       icons = {
         glyphs = {
           git = {
@@ -43,6 +45,7 @@
         };
       };
     };
+    # Set keybinds and initialize program
     on_attach = dsl.rawLua ''
       function (bufnr)
         local api = require('nvim-tree.api')
@@ -58,15 +61,15 @@
         vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
       end
     '';
-    view = {
+    view = { # Set look and feel
       width = 30;
-      hide_root_folder = false;
       side = "left";
       number = false;
       relativenumber = false;
     };
   };
 
+  # Toggle the sidebar
   lua = ''
     vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
   '';

modules/common/neovim/default.nix

@@ -5,6 +5,11 @@ let
   neovim = import ./package {
     inherit pkgs;
     colors = config.theme.colors;
+    c = config.c.enable;
+    github = true;
+    kubernetes = config.kubernetes.enable;
+    python = config.python.enable;
+    terraform = config.terraform.enable;
   };
 
 in {
@@ -18,11 +23,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,12 +42,20 @@ in {
             vll = "nvim -c 'Telescope oldfiles'";
           };
         };
-        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"' '';
 
+        # Set Neovim as the kitty terminal "scrollback" (vi mode) option.
+        # Requires removing some of the ANSI escape codes that are sent to the
+        # scrollback using sed and baleia, as well as removing several
+        # unnecessary features.
+        programs.kitty.settings.scrollback_pager =
+          "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
+
+        # Create a desktop option for launching Neovim from a file manager
+        # (Requires launching the terminal and then executing Neovim)
         xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
           name = "Neovim wrapper";
           exec = "kitty nvim %F";
+          mimeType = [ "text/plain" "text/markdown" ];
         };
         xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
           "text/plain" = [ "nvim.desktop" ];
@@ -45,9 +64,6 @@ in {
 
       };
 
-    # # Used for icons in Vim
-    # fonts.fonts = with pkgs; [ nerdfonts ];
-
   };
 
 }

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

modules/common/neovim/package/default.nix

@@ -26,13 +26,13 @@
 #   ] ++ extraConfig;
 # }
 
-{ pkgs, colors, ... }:
+{ 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;
+  inherit colors terraform github kubernetes;
   imports = [
     ../config/align.nix
     ../config/bufferline.nix

modules/common/programming/c.nix

@@ -0,0 +1 @@
+{ lib, ... }: { options.c.enable = lib.mkEnableOption "C language tools."; }

modules/common/programming/default.nix

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

modules/common/programming/kubernetes.nix

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

modules/common/programming/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 {

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/atuin.nix

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

modules/common/shell/bash/scripts/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,5 +1,6 @@
 { ... }: {
   imports = [
+    ./atuin.nix
     ./bash
     ./charm.nix
     ./direnv.nix
@@ -7,6 +8,7 @@
     ./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,19 +1,24 @@
 { config, pkgs, lib, ... }: {
 
   users.users.${config.user}.shell = pkgs.fish;
-  programs.fish.enable =
+  programs.fish.enable = true; # Needed for LightDM to remember username
-    true; # Needed for LightDM to remember username (TODO: fix)
 
   home-manager.users.${config.user} = {
 
     # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl exa ];
+    home.packages = with pkgs; [ curl ];
 
     programs.fish = {
       enable = true;
       shellAliases = {
+
+        # Version of bash which works much better on the terminal
         bash = "${pkgs.bashInteractive}/bin/bash";
-        ls = "exa";
+
+        # 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 = {
@@ -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

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

modules/common/shell/fzf.nix

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

modules/common/shell/git.nix

@@ -35,8 +35,20 @@ in {
           init = { defaultBranch = "master"; };
         };
         ignores = [ ".direnv/**" "result" ];
+        includes = [{
+          path = "~/.config/git/personal";
+          condition = "gitdir:~/dev/personal/";
+        }];
       };
 
+      # Personal git config
+      # TODO: fix with variables
+      xdg.configFile."git/personal".text = ''
+        [user]
+            name = "Noah Masur"
+            email = "7386960+nmasur@users.noreply.github.com"
+      '';
+
       programs.fish.shellAbbrs = {
         g = "git";
         gs = "git status";
@@ -58,6 +70,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";

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,7 +15,7 @@
         shellAbbrs = {
           ghr = "gh repo view -w";
           gha =
-            "gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view";
+            "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
           grw = "gh run watch";
           grf = "gh run view --log-failed";
           grl = "gh run view --log";
@@ -56,6 +57,7 @@
             | fzf \
                 --header-lines=1 \
                 --layout=reverse \
+                --height=100% \
                 --bind "ctrl-o:execute:gh repo view -w ''${organization}/{1}" \
                 --bind "shift-up:preview-half-page-up" \
                 --bind "shift-down:preview-half-page-down" \

modules/common/shell/jujutsu.nix

@@ -0,0 +1,21 @@
+{ config, ... }: {
+
+  config = {
+
+    home-manager.users.${config.user}.programs.jujutsu = {
+      enable = true;
+      enableFishIntegration = true;
+
+      # https://github.com/martinvonz/jj/blob/main/docs/config.md
+      settings = {
+        user = {
+          name = config.home-manager.users.${config.user}.programs.git.userName;
+          email =
+            config.home-manager.users.${config.user}.programs.git.userEmail;
+        };
+      };
+    };
+
+  };
+
+}

modules/common/shell/nixpkgs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
   home-manager.users.${config.user} = {
 
     programs.fish = {
@@ -60,6 +60,18 @@
       enableFishIntegration = true;
     };
 
+    # Create nix-index if doesn't exist
+    home.activation.createNixIndex =
+      let cacheDir = "${config.homePath}/.cache/nix-index";
+      in lib.mkIf
+      config.home-manager.users.${config.user}.programs.nix-index.enable
+      (config.home-manager.users.${config.user}.lib.dag.entryAfter
+        [ "writeBoundary" ] ''
+          if [ ! -d ${cacheDir} ]; then
+              $DRY_RUN_CMD ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
+          fi
+        '');
+
   };
 
   nix = {

modules/common/shell/utilities.nix

@@ -25,26 +25,34 @@ in {
         htop # Show system processes
         killall # Force quit
         inetutils # Includes telnet, whois
+        jless # JSON viewer
+        jo # JSON output
         jq # JSON manipulation
         lf # File viewer
         qrencode # Generate qr codes
         rsync # Copy folders
+        ren # Rename files
+        # rep # Replace text in files
         ripgrep # grep
         sd # sed
         tealdeer # Cheatsheets
         tree # View directory hierarchy
         vimv-rs # Batch rename files
         unzip # Extract zips
+        dua # File sizes (du)
+        du-dust # Disk usage tree (ncdu)
+        duf # Basic disk information (df)
       ];
 
       programs.zoxide.enable = true; # Shortcut jump command
 
       home.file = {
         ".rgignore".text = ignorePatterns;
-        ".fdignore".text = ignorePatterns;
         ".digrc".text = "+noall +answer"; # Cleaner dig commands
       };
 
+      xdg.configFile."fd/ignore".text = ignorePatterns;
+
       programs.bat = {
         enable = true; # cat replacement
         config = {

modules/darwin/hammerspoon.nix

@@ -24,9 +24,9 @@
       home.activation.reloadHammerspoon =
         config.home-manager.users.${config.user}.lib.dag.entryAfter
         [ "writeBoundary" ] ''
-          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.reload()"
+          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
           $DRY_RUN_CMD sleep 1
-          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.console.clearConsole()"
+          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
         '';
 
     };

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

@@ -54,14 +54,19 @@ function obj:init()
     end)
 
     -- Launcher shortcuts
-    self.launcher:bind("ctrl", "space", function()
+    self.launcher:bind("ctrl", "space", function() end)
-    end)
     self.launcher:bind("", "return", function()
         self:switch("@kitty@")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")
     end)
+    self.launcher:bind("shift", "D", function()
+        hs.execute("launchctl remove com.paloaltonetworks.gp.pangps")
+        hs.execute("launchctl remove com.paloaltonetworks.gp.pangpa")
+        hs.alert.show("Disconnected from GlobalProtect", nil, nil, 4)
+        self.launcher:exit()
+    end)
     self.launcher:bind("", "E", function()
         self:switch("Mail.app")
     end)
@@ -80,6 +85,12 @@ function obj:init()
     self.launcher:bind("", "P", function()
         self:switch("System Preferences.app")
     end)
+    self.launcher:bind("shift", "P", function()
+        hs.execute("launchctl load /Library/LaunchAgents/com.paloaltonetworks.gp.pangps.plist")
+        hs.execute("launchctl load /Library/LaunchAgents/com.paloaltonetworks.gp.pangpa.plist")
+        hs.alert.show("Reconnecting to GlobalProtect", nil, nil, 4)
+        self.launcher:exit()
+    end)
     self.launcher:bind("", "R", function()
         hs.console.clearConsole()
         hs.reload()

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

@@ -9,7 +9,7 @@ obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
 function obj:init()
-    hs.window.animationDuration = 0
+    hs.window.animationDuration = 0.1
     dofile(hs.spoons.resourcePath("worklayout.lua"))()
     -- bind hotkey
     hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "n", function()

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

@@ -55,6 +55,15 @@ local function worklayout()
         local layout = concat(left, right, laptop)
         hs.layout.apply(layout)
     end)
+
+    -- Reload Hammerspoon whenever layout changes
+    hs.screen.watcher.new(function()
+        -- Pause for 5 seconds to give time for layout to change
+        hs.timer.doAfter(5, function()
+            -- Perform the actual reload
+            hs.reload()
+        end)
+    end)
 end
 
 return worklayout

modules/darwin/hammerspoon/init.lua

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

modules/darwin/homebrew.nix

@@ -8,11 +8,15 @@
       if ! xcode-select --version 2>/dev/null; then
         $DRY_RUN_CMD xcode-select --install
       fi
-      if ! /usr/local/bin/brew --version 2>/dev/null; then
+      if ! /opt/homebrew/bin/brew --version 2>/dev/null; then
         $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
       fi
     '';
 
+    # Add homebrew paths to CLI path
+    home-manager.users.${config.user}.home.sessionPath =
+      [ "/opt/homebrew/bin/" ];
+
     homebrew = {
       enable = true;
       onActivation = {
@@ -24,24 +28,19 @@
         brewfile = true; # Run brew bundle from anywhere
         lockfiles = false; # Don't save lockfile (since running from anywhere)
       };
-      taps = [
-        "homebrew/cask" # Required for casks
-        "homebrew/cask-drivers" # Used for Logitech G-Hub
-      ];
       brews = [
         "trash" # Delete files and folders to trash instead of rm
-        "openjdk" # Required by Apache Directory Studio
       ];
       casks = [
-        "1password" # 1Password packaging on Nix is broken for macOS
+        "1password" # 1Password will not launch from Nix on macOS
-        "apache-directory-studio" # Packaging on Nix is not available for macOS
+        # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
-        "gitify" # Git notifications in menu bar
         "keybase" # GUI on Nix not available for macOS
-        "logitech-g-hub" # Mouse and keyboard management
+        # "logitech-g-hub" # Mouse and keyboard management
+        "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
-        "obsidian" # Obsidian packaging on Nix is not available for macOS
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
-        "steam" # Not packaged for Nix
+        # "steam" # Not packaged for Nix
+        # "epic-games" # Not packaged for Nix
       ];
     };
 

modules/darwin/networking.nix

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

modules/darwin/system.nix

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

modules/darwin/user.nix

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

modules/darwin/utilities.nix

@@ -2,6 +2,8 @@
 
 {
 
+  unfreePackages = [ "consul" "vault-bin" ];
+
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     home.packages = with pkgs; [
@@ -11,11 +13,12 @@
       youtube-dl # Convert web videos
       pandoc # Convert text documents
       mpd # TUI slideshows
+      mpv # Video player
+      gnupg # Encryption
       awscli2
       awslogs
       google-cloud-sdk
-      ansible
+      vault-bin
-      vault
       consul
       noti # Create notifications programmatically
       ipcalc # Make IP network calculations

modules/nixos/applications/calibre.nix

@@ -14,6 +14,8 @@
       home.packages = with pkgs; [ calibre ];
       # home.sessionVariables = { CALIBRE_USE_DARK_PALETTE = 1; };
     };
+
+    # Forces Calibre to use dark mode
     environment.sessionVariables = { CALIBRE_USE_DARK_PALETTE = "1"; };
   };
 }

modules/nixos/applications/nautilus.nix

@@ -18,12 +18,14 @@
 
     home-manager.users.${config.user} = {
 
+      # Quick button for launching nautilus
       xsession.windowManager.i3.config.keybindings = {
         "${
           config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
         }+n" = "exec --no-startup-id ${pkgs.gnome.nautilus}/bin/nautilus";
       };
 
+      # Generates a QR code and previews it with sushi
       programs.fish.functions = {
         qr = {
           body =
@@ -31,7 +33,7 @@
         };
       };
 
-      # Set default for opening directories
+      # Set Nautilus as default for opening directories
       xdg.mimeApps = {
         associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
         # associations.removed = {

modules/nixos/gaming/steam.nix

@@ -22,6 +22,15 @@
 
     ];
 
+    # Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix
+    # Based on: https://github.com/NixOS/nixpkgs/issues/73323
+    environment.sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS =
+      lib.makeBinPath [ pkgs.proton-ge-custom ];
+
+    # Seems like NetworkManager can help speed up Steam launch
+    # https://www.reddit.com/r/archlinux/comments/qguhco/steam_startup_time_arch_1451_seconds_fedora_34/hi8opet/
+    networking.networkmanager.enable = true;
+
   };
 
 }

modules/nixos/graphical/default.nix

@@ -3,6 +3,7 @@
   imports = [
     ./dunst.nix
     ./fonts.nix
+    ./gtk.nix
     ./i3.nix
     ./picom.nix
     ./polybar.nix

modules/nixos/graphical/fonts.nix

@@ -6,7 +6,7 @@ in {
 
   config = lib.mkIf (config.gui.enable && pkgs.stdenv.isLinux) {
 
-    fonts.fonts = with pkgs; [
+    fonts.packages = with pkgs; [
       victor-mono # Used for Vim and Terminal
       (nerdfonts.override { fonts = [ "Hack" ]; }) # For Polybar, Rofi
     ];

modules/nixos/graphical/gtk.nix

@@ -0,0 +1,51 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    gtk.theme = {
+      name = lib.mkOption {
+        type = lib.types.str;
+        description = "Theme name for GTK applications";
+      };
+      package = lib.mkOption {
+        type = lib.types.package;
+        description = "Theme package for GTK applications";
+        default = pkgs.gnome-themes-extra;
+      };
+    };
+  };
+
+  config = lib.mkIf config.gui.enable {
+
+    home-manager.users.${config.user} = {
+
+      gtk = let
+        gtkExtraConfig = {
+          gtk-application-prefer-dark-theme = config.theme.dark;
+        };
+      in {
+        enable = true;
+        theme = {
+          name = config.gtk.theme.name;
+          package = config.gtk.theme.package;
+        };
+        gtk3.extraConfig = gtkExtraConfig;
+        gtk4.extraConfig = gtkExtraConfig;
+      };
+
+    };
+
+    # Required for setting GTK theme (for preferred-color-scheme in browser)
+    services.dbus.packages = [ pkgs.dconf ];
+    programs.dconf.enable = true;
+
+    # Make the login screen dark
+    services.xserver.displayManager.lightdm.greeters.gtk.theme = {
+      name = config.gtk.theme.name;
+      package = config.gtk.theme.package;
+    };
+
+    environment.sessionVariables = { GTK_THEME = config.gtk.theme.name; };
+
+  };
+
+}

modules/nixos/graphical/i3.nix

@@ -45,7 +45,7 @@ in {
               { class = "obsidian"; }
             ];
             "${ws3}" = [{ class = "discord"; }];
-            "${ws4}" = [{ class = "Steam"; }];
+            "${ws4}" = [ { class = "steam"; } { class = "Steam"; } ];
           };
           bars = [{ command = "echo"; }]; # Disable i3bar
           colors = let
@@ -95,13 +95,15 @@ in {
 
             # Adjust screen brightness
             "Shift+F12" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
+              # Disable dynamic sleep
+              # https://github.com/rockowitz/ddcutil/issues/323
+              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
             "Shift+F11" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 - 30";
+              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
             "XF86MonBrightnessUp" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
+              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
             "XF86MonBrightnessDown" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 - 30";
+              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
 
             # Media player controls
             "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";

modules/nixos/graphical/polybar.nix

@@ -36,7 +36,7 @@
             module-margin = 1;
             modules-left = "i3";
             modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date power";
+            modules-right = "mailcount network pulseaudio date keyboard power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -200,10 +200,17 @@
             label-foreground = config.theme.colors.base0A;
             # format-background = colors.background;
           };
+          "module/keyboard" = {
+            type = "custom/text";
+            content = "󰌌";
+            click-left = "doas systemctl restart keyd";
+            content-foreground = config.theme.colors.base04;
+          };
           "module/power" = {
             type = "custom/text";
             content = "  ";
             click-left = config.powerCommand;
+            click-right = "polybar-msg cmd restart";
             content-foreground = config.theme.colors.base04;
           };
           "settings" = {

modules/nixos/graphical/rofi.nix

@@ -59,7 +59,7 @@ in {
             border = mkLiteral "0px";
             border-radius = mkLiteral "0px";
             border-color = mkLiteral config.theme.colors.base04;
-            children = map mkLiteral [ "inputbar" "listview" ];
+            children = map mkLiteral [ "inputbar" "message" "listview" ];
             spacing = mkLiteral "10px";
             padding = mkLiteral "10px";
           };

modules/nixos/graphical/rofi/brightness.nix

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

modules/nixos/graphical/rofi/power.nix

@@ -25,21 +25,23 @@ in {
         | ${rofi}/bin/rofi \
             -theme-str '@import "power.rasi"' \
             -hover-select \
-            -me-select-entry ''' \
+            -me-select-entry "" \
             -me-accept-entry MousePrimary \
             -dmenu \
             -sep ';' \
             -selected-row 2)
 
+    confirm () {
+        ${builtins.readFile ./rofi-prompt.sh}
+    }
+
     case "$chosen" in
         "$power_off")
-            ${
+            confirm 'Shutdown?' && doas shutdown now
-              builtins.toString ./rofi-prompt.sh
-            } 'Shutdown?' && doas shutdown now
             ;;
 
         "$reboot")
-            ${builtins.toString ./rofi-prompt.sh} 'Reboot?' && doas reboot
+            confirm 'Reboot?' && doas reboot
             ;;
 
         "$lock")
@@ -51,7 +53,7 @@ in {
             ;;
 
         "$log_out")
-            ${builtins.toString ./rofi-prompt.sh} 'Logout?' && i3-msg exit
+            confirm 'Logout?' && i3-msg exit
             ;;
 
         *) exit 1 ;;

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

@@ -32,7 +32,7 @@ done
 chosen=$(printf '%s;%s\n' "$yes" "$no" |
     rofi -theme-str '@import "prompt.rasi"' \
         -hover-select \
-        -me-select-entry '' \
+        -me-select-entry "" \
         -me-accept-entry MousePrimary \
         -p "$query" \
         -dmenu \
@@ -42,6 +42,6 @@ chosen=$(printf '%s;%s\n' "$yes" "$no" |
         -selected-row 1)
 
 case "$chosen" in
-    "$yes") exit 0 ;;
+    "$yes") return 0 ;;
-    *) exit 1 ;;
+    *) return 1 ;;
 esac

modules/nixos/graphical/rofi/themes/prompt.rasi

@@ -4,14 +4,13 @@
  */
 @import "common.rasi"
 * {
-  font: @text-font;
+  font: @prompt-text-font;
 }
 #window {
   height: @prompt-window-height;
   width: @prompt-window-width;
   children: [ inputbar, horibox ];
   border: @prompt-window-border;
-  border-color: @accent;
 }
 #inputbar {
   enabled: false;
@@ -19,8 +18,6 @@
 #prompt {
   padding: @prompt-prompt-padding;
   margin: @prompt-prompt-margin;
-  background-color: @accent;
-  text-color: @background-light;
 }
 #listview {
   padding: @prompt-listview-padding;
@@ -31,19 +28,3 @@
   font: @prompt-text-font;
   padding: @prompt-element-padding;
 }
-element.alternate.active,
-element.normal.active,
-element.alternate.urgent,
-element.normal.urgent {
-  background-color: @background-light;
-  text-color: @foreground;
-}
-element.selected.urgent {
-  background-color: @off;
-  text-color: @background;
-}
-element.selected.active {
-  background-color: @on;
-  text-color: @background;
-}
-

modules/nixos/graphical/xorg.nix

@@ -1,27 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  options = {
+  config = lib.mkIf config.gui.enable {
-    gtk.theme = {
-      name = lib.mkOption {
-        type = lib.types.str;
-        description = "Theme name for GTK applications";
-      };
-      package = lib.mkOption {
-        type = lib.types.str;
-        description = "Theme package name for GTK applications";
-        default = "gnome-themes-extra";
-      };
-    };
-  };
-
-  config = let
-
-    gtkTheme = {
-      name = config.gtk.theme.name;
-      package = pkgs."${config.gtk.theme.package}";
-    };
-
-  in lib.mkIf config.gui.enable {
 
     # Enable the X11 windowing system.
     services.xserver = {
@@ -36,10 +15,8 @@
           enable = config.services.xserver.enable;
           background = config.wallpaper;
 
-          # Make the login screen dark
-          greeters.gtk.theme = gtkTheme;
-
           # Show default user
+          # Also make sure /var/lib/AccountsService/users/<user> has SystemAccount=false
           extraSeatDefaults = ''
             greeter-hide-users = false
           '';
@@ -54,12 +31,6 @@
         xclip # Clipboard
       ];
 
-    # Required for setting GTK theme (for preferred-color-scheme in browser)
-    services.dbus.packages = [ pkgs.dconf ];
-    programs.dconf.enable = true;
-
-    environment.sessionVariables = { GTK_THEME = config.gtk.theme.name; };
-
     home-manager.users.${config.user} = {
 
       programs.fish.shellAliases = {
@@ -67,17 +38,6 @@
         pbpaste = "xclip -selection clipboard -out";
       };
 
-      gtk = let
-        gtkExtraConfig = {
-          gtk-application-prefer-dark-theme = config.theme.dark;
-        };
-      in {
-        enable = true;
-        theme = gtkTheme;
-        gtk3.extraConfig = gtkExtraConfig;
-        gtk4.extraConfig = gtkExtraConfig;
-      };
-
     };
 
   };

modules/nixos/hardware/keyboard.nix

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

modules/nixos/hardware/networking.nix

@@ -2,7 +2,7 @@
 
   config = lib.mkIf config.physical {
 
-    networking.useDHCP = true;
+    networking.useDHCP = !config.networking.networkmanager.enable;
 
     networking.firewall.allowPing = lib.mkIf config.server true;
 
@@ -12,7 +12,7 @@
       domainName = "local";
       ipv6 = false; # Should work either way
       # Resolve local hostnames using Avahi DNS
-      nssmdns = true;
+      nssmdns4 = true;
       publish = {
         enable = true;
         addresses = true;