set checks on individual languages

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

.github/workflows/update.yml

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

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
 ```
 

flake.lock

@@ -17,31 +17,14 @@
         "type": "github"
       }
     },
-    "age": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1672087018,
-        "narHash": "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw=",
-        "owner": "FiloSottile",
-        "repo": "age",
-        "rev": "c6dcfa1efcaa27879762a934d5bea0d1b83a894c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "FiloSottile",
-        "ref": "v1.1.1",
-        "repo": "age",
-        "type": "github"
-      }
-    },
     "baleia-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1681806450,
+        "lastModified": 1704551058,
-        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
+        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
         "owner": "m00qek",
         "repo": "baleia.nvim",
-        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
+        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
         "type": "github"
       },
       "original": {
@@ -53,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": {
@@ -90,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694810318,
+        "lastModified": 1706833576,
-        "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=",
+        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8",
+        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
         "type": "github"
       },
       "original": {
@@ -111,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694808292,
+        "lastModified": 1706491084,
-        "narHash": "sha256-zSZ8IfZfv6nK0z+wNuM0Tqx6c9b4+Q5Xn9FIpunWBwA=",
+        "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "0faae8adf6d790df2c3d00437ccad7cd5c531c70",
+        "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9",
         "type": "github"
       },
       "original": {
@@ -124,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": [
@@ -131,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694651982,
+        "lastModified": 1707007453,
-        "narHash": "sha256-oI8jrtIvLll+ADzm+qQqy58ybFeA1J1GlNgL3Q5hvGs=",
+        "narHash": "sha256-vs7uACn2/8GOApZJv52gAVsLfpjQWFgkHN2QJ7aVkl8=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "a376e3619b40947054e2c5e93fbcc00aa9e24477",
+        "rev": "d839feb516758ad28bc1cef43008d55e749c1d6a",
         "type": "github"
       },
       "original": {
@@ -147,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": {
@@ -165,11 +181,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1687709756,
+        "lastModified": 1705309234,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -183,29 +199,11 @@
         "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": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
         "type": "github"
       },
       "original": {
@@ -217,11 +215,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1693226725,
+        "lastModified": 1706900289,
-        "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
+        "narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
+        "rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
         "type": "github"
       },
       "original": {
@@ -237,11 +235,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694643239,
+        "lastModified": 1706985585,
-        "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
+        "narHash": "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
+        "rev": "1ca210648a6ca9b957efde5da957f3de6b1f0c45",
         "type": "github"
       },
       "original": {
@@ -251,78 +249,87 @@
         "type": "github"
       }
     },
+    "kitty-scrollback-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706891759,
+        "narHash": "sha256-p7RPqLHO6D5CCTDQzUrEqTu9+jg+V7wtYfGbY4qjE9A=",
+        "owner": "mikesmithgh",
+        "repo": "kitty-scrollback.nvim",
+        "rev": "12f7687ac049d46a987c39b2b4f657fdf540fa4e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mikesmithgh",
+        "repo": "kitty-scrollback.nvim",
+        "type": "github"
+      }
+    },
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
+        "lastModified": 1702545935,
+        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
+        "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/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
       }
     },
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-gY1nxqK/pHfoxW/9mE7DFtNawgdEV7a4OXpscWY14yk=",
+        "lastModified": 1699624334,
+        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz"
+        "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.2.0/external-v5.2.0.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=",
+        "lastModified": 1703426420,
+        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"
+        "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/22.0.0/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
       }
     },
-    "nil": {
+    "nextcloud-snappymail": {
-      "inputs": {
+      "flake": false,
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
       "locked": {
-        "lastModified": 1691372739,
+        "lastModified": 1707018069,
-        "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=",
+        "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
-        "owner": "oxalica",
+        "type": "tarball",
-        "repo": "nil",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
-        "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b",
-        "type": "github"
       },
       "original": {
-        "owner": "oxalica",
+        "type": "tarball",
-        "ref": "2023-08-09",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
-        "repo": "nil",
-        "type": "github"
       }
     },
     "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": {
@@ -354,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693791338,
+        "lastModified": 1706085261,
-        "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=",
+        "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "8ee78470029e641cddbd8721496da1316b47d3b4",
+        "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132",
         "type": "github"
       },
       "original": {
@@ -369,11 +376,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694767346,
+        "lastModified": 1706732774,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
+        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
         "type": "github"
       },
       "original": {
@@ -383,22 +390,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1694048570,
-        "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "null-ls-nvim-src": {
       "flake": false,
       "locked": {
@@ -417,11 +408,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1694814340,
+        "lastModified": 1707013032,
-        "narHash": "sha256-eo9444JGI/G9jZF+X3xmS5TMRuIT4VYPKyZQ11iF65Q=",
+        "narHash": "sha256-9kEY/D0Q6sF+p6vJRefVXDK4QQdwK4Q0lSQdsYICad0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "9b70f21fd41d3b96580e7ca4a3d1c29e87bdab36",
+        "rev": "ab432acea15134873882610c0e936a882319bc8a",
         "type": "github"
       },
       "original": {
@@ -433,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"
       }
@@ -450,11 +441,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1694306329,
+        "lastModified": 1706571452,
-        "narHash": "sha256-Rv3DdlqRppEum09N4cKRlj0xdPbf5QLYHzYDuxb55w8=",
+        "narHash": "sha256-b0LIqLC8cCRX1NyJx4eH5c4v5Fqqw5mMleAnQ2VRctM=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "94c7c810af205c0f00c8f105dcf490c8eb17658a",
+        "rev": "f39f7b6fcd3865ac2146de4cb4045286308f2935",
         "type": "github"
       },
       "original": {
@@ -466,36 +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",
-        "age": "age",
         "baleia-nvim-src": "baleia-nvim-src",
         "bufferline-nvim-src": "bufferline-nvim-src",
+        "bypass-paywalls-clean": "bypass-paywalls-clean",
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
         "darwin": "darwin",
         "disko": "disko",
+        "fidget-nvim-src": "fidget-nvim-src",
         "firefox-darwin": "firefox-darwin",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
+        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
-        "nil": "nil",
+        "nextcloud-snappymail": "nextcloud-snappymail",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
@@ -504,45 +542,24 @@
         "nvim-lspconfig-src": "nvim-lspconfig-src",
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
+        "proton-ge": "proton-ge",
+        "ren": "ren",
+        "rep": "rep",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
         "tree-sitter-bash": "tree-sitter-bash",
         "tree-sitter-ini": "tree-sitter-ini",
+        "tree-sitter-lua": "tree-sitter-lua",
         "tree-sitter-puppet": "tree-sitter-puppet",
         "tree-sitter-python": "tree-sitter-python",
         "tree-sitter-rasi": "tree-sitter-rasi",
-        "vscode-terraform-snippets": "vscode-terraform-snippets",
+        "tree-sitter-vimdoc": "tree-sitter-vimdoc",
         "wallpapers": "wallpapers",
         "wsl": "wsl",
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": [
-          "nil",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nil",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1688783586,
-        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -573,34 +590,19 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1686302912,
+        "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"
       }
@@ -608,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": {
@@ -624,16 +626,16 @@
     "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"
       }
@@ -641,28 +643,28 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1688032601,
+        "lastModified": 1705686017,
-        "narHash": "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=",
+        "narHash": "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "493646764e7ad61ce63ce3b8c59ebeb37f71b841",
+        "rev": "f7239f638d3dc16762563a9027faeee518ce1bd9",
         "type": "github"
       },
       "original": {
         "owner": "tree-sitter",
+        "ref": "master",
         "repo": "tree-sitter-bash",
-        "rev": "493646764e7ad61ce63ce3b8c59ebeb37f71b841",
         "type": "github"
       }
     },
     "tree-sitter-ini": {
       "flake": false,
       "locked": {
-        "lastModified": 1690815608,
+        "lastModified": 1699877527,
-        "narHash": "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M=",
+        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
         "owner": "justinmk",
         "repo": "tree-sitter-ini",
-        "rev": "7f11a02fb8891482068e0fe419965d7bade81a68",
+        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
         "type": "github"
       },
       "original": {
@@ -671,6 +673,23 @@
         "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": {
@@ -690,17 +709,17 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1690493803,
+        "lastModified": 1700218345,
-        "narHash": "sha256-2btd/NRE6NuGNlx4cq535OrwtWXihiP3VMCJjPCiDOk=",
+        "narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5",
+        "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
         "type": "github"
       },
       "original": {
         "owner": "tree-sitter",
+        "ref": "master",
         "repo": "tree-sitter-python",
-        "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5",
         "type": "github"
       }
     },
@@ -720,19 +739,19 @@
         "type": "github"
       }
     },
-    "vscode-terraform-snippets": {
+    "tree-sitter-vimdoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1614849738,
+        "lastModified": 1705491128,
-        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
+        "narHash": "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg=",
-        "owner": "run-at-scale",
+        "owner": "neovim",
-        "repo": "vscode-terraform-doc-snippets",
+        "repo": "tree-sitter-vimdoc",
-        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
+        "rev": "ed8695ad8de39c3f073da130156f00b1148e2891",
         "type": "github"
       },
       "original": {
-        "owner": "run-at-scale",
+        "owner": "neovim",
-        "repo": "vscode-terraform-doc-snippets",
+        "repo": "tree-sitter-vimdoc",
         "type": "github"
       }
     },
@@ -755,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": 1694522206,
+        "lastModified": 1706867893,
-        "narHash": "sha256-mb34WlyHi/whE6gIMEtXKfGRALzvB6/U7CYdUnJKN+c=",
+        "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "e7d93d0f478b6fbb47c00d03449dc3d08b90abb7",
+        "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b",
         "type": "github"
       },
       "original": {
@@ -775,11 +796,11 @@
     "zenyd-mpv-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1650625438,
+        "lastModified": 1706283438,
-        "narHash": "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=",
+        "narHash": "sha256-hpLZDtt5q18aZ8d9LHfT852wtBosKUTJ7Bx+cbjBLcg=",
         "owner": "zenyd",
         "repo": "mpv-scripts",
-        "rev": "19ea069abcb794d1bf8fac2f59b50d71ab992130",
+        "rev": "7100d19d18d111ce77fc9e6e8947c0d542a86397",
         "type": "github"
       },
       "original": {

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-08-09";
-      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,39 +98,44 @@
       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 = {
-      url = "github:run-at-scale/vscode-terraform-doc-snippets";
-      flake = false;
-    };
     hmts-nvim-src = {
       url = "github:calops/hmts.nvim";
       flake = false;
     };
+    fidget-nvim-src = {
+      # https://github.com/j-hui/fidget.nvim/tags
+      url = "github:j-hui/fidget.nvim/v1.2.0";
+      flake = false;
+    };
+    kitty-scrollback-nvim-src = {
+      url = "github:mikesmithgh/kitty-scrollback.nvim";
+      flake = false;
+    };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
-      # Fix: bash highlighting doesn't work as of this commit:
+      url = "github:tree-sitter/tree-sitter-bash/master";
-      # https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
-      url =
-        "github:tree-sitter/tree-sitter-bash/493646764e7ad61ce63ce3b8c59ebeb37f71b841";
       flake = false;
     };
     tree-sitter-python = {
-      # Fix: invalid node in position. Broken as of this commit (replaced with newer):
+      url = "github:tree-sitter/tree-sitter-python/master";
-      # https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5
+      flake = false;
-      url =
+    };
-        "github:tree-sitter/tree-sitter-python/5af00f64af6bbf822f208243cce5cf75396fb6f5";
+    tree-sitter-lua = {
+      url = "github:MunifTanjim/tree-sitter-lua/main";
       flake = false;
     };
     tree-sitter-ini = {
@@ -143,6 +150,10 @@
       url = "github:Fymyte/tree-sitter-rasi";
       flake = false;
     };
+    tree-sitter-vimdoc = {
+      url = "github:neovim/tree-sitter-vimdoc";
+      flake = false;
+    };
 
     # MPV Scripts
     zenyd-mpv-scripts = {
@@ -150,26 +161,55 @@
       flake = false;
     };
 
-    # Age encryption (pin because of failed builds)
+    # Ren and rep - CLI find and replace
-    age = {
+    rep = {
-      url = "github:FiloSottile/age/v1.1.1";
+      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/22.0.0/news.tar.gz";
+        "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.2.0/external-v5.2.0.tar.gz";
+        "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/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz";
+        "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;
     };
 
@@ -192,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}";
@@ -214,7 +256,10 @@
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/age.nix inputs)
+        (import ./overlays/proton-ge.nix inputs)
+        (import ./overlays/gh-collaborators.nix)
+        (import ./overlays/bypass-paywalls-clean.nix inputs)
+        (import ./overlays/ren-rep.nix inputs)
       ];
 
       # System types to support.

hosts/README.md

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

hosts/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,6 +1,8 @@
 # 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.
@@ -50,6 +52,7 @@ inputs.nixpkgs.lib.nixosSystem {
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };
 
       # Programs and services
+      atuin.enable = true;
       cloudflare.enable = true; # Proxy traffic with Cloudflare
       dotfiles.enable = true; # Clone dotfiles
       neovim.enable = true;
@@ -58,6 +61,7 @@ inputs.nixpkgs.lib.nixosSystem {
       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

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 {

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 {
@@ -66,6 +68,7 @@ inputs.nixpkgs.lib.nixosSystem {
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };
 
       # Programs and services
+      atuin.enable = true;
       neovim.enable = true;
       cloudflare.enable = true;
       dotfiles.enable = true;
@@ -79,6 +82,8 @@ 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 = {

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 {
@@ -83,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;
@@ -99,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;

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

@@ -29,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 = {
@@ -74,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 = ''
@@ -115,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

@@ -45,9 +45,20 @@
 
           # 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;

modules/common/applications/media.nix

@@ -40,6 +40,7 @@
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
@@ -48,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/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,13 +23,6 @@
       end
     '';
 
-    # Enable Luasnip snippet completion
-    snippet.expand = dsl.rawLua ''
-      function(args)
-          require("luasnip").lsp_expand(args.body)
-      end
-    '';
-
     # Basic completion keybinds
     mapping = {
       "['<C-n>']" = dsl.rawLua
@@ -70,7 +62,6 @@
     sources = [
       { name = "nvim_lua"; } # Fills in common Neovim lua functions
       { name = "nvim_lsp"; } # LSP results
-      { name = "luasnip"; } # Snippets
       { name = "path"; } # Shell completion from current PATH
       {
         name = "buffer"; # Grep for text from the current text buffer
@@ -119,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]",
@@ -139,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,13 +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
@@ -69,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,23 +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.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
+    (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/toggleterm.lua

@@ -26,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,4 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, config, ... }: {
 
   # Toggleterm provides a floating terminal inside the editor for quick access
 
@@ -10,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

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

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 {
@@ -42,8 +47,8 @@ in {
         # Requires removing some of the ANSI escape codes that are sent to the
         # scrollback using sed and baleia, as well as removing several
         # unnecessary features.
-        programs.kitty.settings.scrollback_pager = ''
+        programs.kitty.settings.scrollback_pager =
-          $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"' '';
+          "${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)

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>")
 

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

@@ -1,5 +1,6 @@
 { ... }: {
   imports = [
+    ./atuin.nix
     ./bash
     ./charm.nix
     ./direnv.nix

modules/common/shell/direnv.nix

@@ -7,6 +7,22 @@
     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

@@ -123,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,4 @@
-{ config, ... }: {
+{ config, pkgs, ... }: {
 
   # FZF is a fuzzy-finder for the terminal
 
@@ -16,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

@@ -7,6 +7,7 @@
         enable = 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/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,10 +25,14 @@ 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
@@ -44,10 +48,11 @@ in {
 
       home.file = {
         ".rgignore".text = ignorePatterns;
-        ".fdignore".text = ignorePatterns;
         ".digrc".text = "+noall +answer"; # Cleaner dig commands
       };
 
+      xdg.configFile."fd/ignore".text = ignorePatterns;
+
       programs.bat = {
         enable = true; # cat replacement
         config = {

modules/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/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,25 +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
+        # "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/gaming/steam.nix

@@ -22,6 +22,11 @@
 
     ];
 
+    # 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/i3.nix

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

@@ -31,15 +31,17 @@ in {
             -sep ';' \
             -selected-row 2)
 
+    confirm () {
+        ${builtins.readFile ./rofi-prompt.sh}
+    }
+
     case "$chosen" in
         "$power_off")
-            ${
+            confirm 'Shutdown?' && doas shutdown now
-              builtins.toString ./rofi-prompt.sh
-            } 'Shutdown?' && doas shutdown now
             ;;
 
         "$reboot")
-            ${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

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

@@ -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;

modules/nixos/services/arr.nix

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

modules/nixos/services/backups.nix

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

modules/nixos/services/bind.nix

@@ -1,3 +1,10 @@
+# Bind is a DNS service. This allows me to resolve public domains locally so
+# when I'm at home, I don't have to travel over the Internet to reach my
+# server.
+
+# To set this on all home machines, I point my router's DNS resolver to the
+# local IP address of the machine running this service (swan).
+
 { config, pkgs, lib, ... }:
 
 let
@@ -16,11 +23,19 @@ in {
 
   config = lib.mkIf config.services.bind.enable {
 
+    # Normally I block all requests not coming from Cloudflare, so I have to also
+    # allow my local network.
     caddy.cidrAllowlist = [ "192.168.0.0/16" ];
 
     services.bind = {
+
+      # Allow requests coming from these IPs. This way I don't somehow get
+      # spammed with DNS requests coming from the Internet.
       cacheNetworks = [ "127.0.0.0/24" "192.168.0.0/16" ];
+
+      # When making normal DNS requests, forward them to Cloudflare to resolve.
       forwarders = [ "1.1.1.1" "1.0.0.1" ];
+
       ipv4Only = true;
 
       # Use rpz zone as an override
@@ -47,6 +62,7 @@ in {
 
     };
 
+    # We must allow DNS traffic to hit our machine as well
     networking.firewall.allowedTCPPorts = [ 53 ];
     networking.firewall.allowedUDPPorts = [ 53 ];
 

modules/nixos/services/caddy.nix

@@ -1,3 +1,14 @@
+# Caddy is a reverse proxy, like Nginx or Traefik. This creates an ingress
+# point from my local network or the public (via Cloudflare). Instead of a
+# Caddyfile, I'm using the more expressive JSON config file format. This means
+# I can source routes from other areas in my config and build the JSON file
+# using the result of the expression.
+
+# Caddy helpfully provides automatic ACME cert generation and management, but
+# it requires a form of validation. We are using a custom build of Caddy
+# (compiled with an overlay) to insert a plugin for managing DNS validation
+# with Cloudflare's DNS API.
+
 { config, pkgs, lib, ... }: {
 
   options = {
@@ -42,12 +53,17 @@
       configFile = pkgs.writeText "Caddyfile" (builtins.toJSON {
         apps.http.servers.main = {
           listen = [ ":443" ];
+
+          # These routes are pulled from the rest of this repo
           routes = config.caddy.routes;
           errors.routes = config.caddy.blocks;
-          logs = { }; # Uncomment to collect access logs
+
+          logs = { }; # Uncommenting collects access logs
         };
         apps.http.servers.metrics = { }; # Enables Prometheus metrics
         apps.tls.automation.policies = config.caddy.tlsPolicies;
+
+        # Setup logging to file
         logging.logs.main = {
           encoder = { format = "console"; };
           writer = {
@@ -58,13 +74,23 @@
           };
           level = "INFO";
         };
+
       });
 
     };
 
+    # Allows Caddy to serve lower ports (443, 80)
+    systemd.services.caddy.serviceConfig.AmbientCapabilities =
+      "CAP_NET_BIND_SERVICE";
+
+    # Required for web traffic to reach this machine
     networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+    # HTTP/3 QUIC uses UDP (not sure if being used)
     networking.firewall.allowedUDPPorts = [ 443 ];
 
+    # Caddy exposes Prometheus metrics with the admin API
+    # https://caddyserver.com/docs/api
     prometheus.scrapeTargets = [ "127.0.0.1:2019" ];
 
   };

modules/nixos/services/calibre.nix

@@ -1,3 +1,9 @@
+# Calibre-web is an E-Book library and management tool.
+
+# - Exposed to the public via Caddy.
+# - Hostname defined with config.hostnames.books
+# - File directory backed up to S3 on a cron schedule.
+
 { config, pkgs, lib, ... }:
 
 let
@@ -26,6 +32,7 @@ in {
       };
     };
 
+    # Allow web traffic to Caddy
     caddy.routes = [{
       match = [{ host = [ config.hostnames.books ]; }];
       handle = [{
@@ -35,6 +42,8 @@ in {
               builtins.toString config.services.calibre-web.listen.port
             }";
         }];
+        # This is required when calibre-web is behind a reverse proxy
+        # https://github.com/janeczku/calibre-web/issues/19
         headers.request.add."X-Script-Name" = [ "/calibre-web" ];
       }];
     }];

modules/nixos/services/cloudflare-tunnel.nix

@@ -1,3 +1,12 @@
+# Cloudflare Tunnel is a service for accessing the network even behind a
+# firewall, through outbound-only requests. It works by installing an agent on
+# our machines that exposes services through Cloudflare Access (Zero Trust),
+# similar to something like Tailscale.
+
+# In this case, we're using Cloudflare Tunnel to enable SSH access over a web
+# browser even when outside of my network. This is probably not the safest
+# choice but I feel comfortable enough with it anyway.
+
 { config, lib, ... }:
 
 # First time setup:
@@ -40,23 +49,28 @@
       tunnels = {
         "${config.cloudflareTunnel.id}" = {
           credentialsFile = config.secrets.cloudflared.dest;
+          # Catch-all if no match (should never happen anyway)
           default = "http_status:404";
+          # Match from ingress of any valid server name to SSH access
           ingress = { "*.masu.rs" = "ssh://localhost:22"; };
         };
       };
     };
 
+    # Grant Cloudflare access to SSH into this server
     environment.etc = {
       "ssh/ca.pub".text = ''
         ${config.cloudflareTunnel.ca}
       '';
 
-      # Must match the username of the email address in Cloudflare Access
+      # Must match the username portion of the email address in Cloudflare
+      # Access
       "ssh/authorized_principals".text = ''
         ${config.user}
       '';
     };
 
+    # Adjust SSH config to allow access from Cloudflare's certificate
     services.openssh.extraConfig = ''
       PubkeyAuthentication yes
       TrustedUserCAKeys /etc/ssh/ca.pub

modules/nixos/services/cloudflare.nix

@@ -1,5 +1,13 @@
 # This module is necessary for hosts that are serving through Cloudflare.
 
+# Cloudflare is a CDN service that is used to serve the domain names and
+# caching for my websites and services. Since Cloudflare acts as our proxy, we
+# must allow access over the Internet from Cloudflare's IP ranges.
+
+# We also want to validate our HTTPS certificates from Caddy. We'll use Caddy's
+# DNS validation plugin to connect to Cloudflare and automatically create
+# validation DNS records for our generated certificates.
+
 { config, pkgs, lib, ... }:
 
 let
@@ -59,10 +67,9 @@ in {
         };
       }];
     }];
+    # Allow Caddy to read Cloudflare API key for DNS validation
     systemd.services.caddy.serviceConfig.EnvironmentFile =
       config.secrets.cloudflareApi.dest;
-    systemd.services.caddy.serviceConfig.AmbientCapabilities =
-      "CAP_NET_BIND_SERVICE";
 
     # API key must have access to modify Cloudflare DNS records
     secrets.cloudflareApi = {
@@ -73,7 +80,7 @@ in {
     };
 
     # Allows Nextcloud to trust Cloudflare IPs
-    services.nextcloud.config.trustedProxies = cloudflareIpRanges;
+    services.nextcloud.extraOptions.trusted_proxies = cloudflareIpRanges;
 
   };
 }

modules/nixos/services/default.nix

@@ -1,3 +1,6 @@
+# This file imports all the other files in this directory for use as modules in
+# my config.
+
 { ... }: {
 
   imports = [
@@ -13,12 +16,15 @@
     ./gnupg.nix
     ./grafana.nix
     ./honeypot.nix
+    ./influxdb2.nix
     ./jellyfin.nix
     ./keybase.nix
     ./mullvad.nix
     ./n8n.nix
     ./netdata.nix
     ./nextcloud.nix
+    ./paperless.nix
+    ./postgresql.nix
     ./prometheus.nix
     ./samba.nix
     ./secrets.nix

modules/nixos/services/gitea-runner.nix

@@ -1,3 +1,9 @@
+# Gitea Actions is a CI/CD service for the Gitea source code server, meaning it
+# allows us to run code operations (such as testing or deploys) when our git
+# repositories are updated. Any machine can act as a Gitea Action Runner, so
+# the Runners don't necessarily need to be running Gitea. All we need is an API
+# key for Gitea to connect to it and register ourselves as a Runner.
+
 { config, pkgs, lib, ... }:
 
 {

modules/nixos/services/gitea.nix

@@ -11,11 +11,21 @@ in {
         actions.ENABLED = true;
         metrics.ENABLED = true;
         repository = {
+          # Pushing to a repo that doesn't exist automatically creates one as
+          # private.
           DEFAULT_PUSH_CREATE_PRIVATE = true;
+
+          # Allow git over HTTP.
           DISABLE_HTTP_GIT = false;
+
+          # Allow requests hitting the specified hostname.
           ACCESS_CONTROL_ALLOW_ORIGIN = config.hostnames.git;
+
+          # Automatically create viable users/orgs on push.
           ENABLE_PUSH_CREATE_USER = true;
           ENABLE_PUSH_CREATE_ORG = true;
+
+          # Default when creating new repos.
           DEFAULT_BRANCH = "main";
         };
         server = {
@@ -25,11 +35,15 @@ in {
           SSH_PORT = 22;
           START_SSH_SERVER = false; # Use sshd instead
           DISABLE_SSH = false;
-          # SSH_LISTEN_HOST = "0.0.0.0";
-          # SSH_LISTEN_PORT = 122;
         };
+
+        # Don't allow public users to register accounts.
         service.DISABLE_REGISTRATION = true;
+
+        # Force using HTTPS for all session access.
         session.COOKIE_SECURE = true;
+
+        # Hide users' emails.
         ui.SHOW_USER_EMAIL = false;
       };
       extraConfig = null;
@@ -39,6 +53,7 @@ in {
     users.users.${config.user}.extraGroups = [ "gitea" ];
 
     caddy.routes = [
+      # Prevent public access to Prometheus metrics.
       {
         match = [{
           host = [ config.hostnames.git ];
@@ -49,6 +64,7 @@ in {
           status_code = "403";
         }];
       }
+      # Allow access to primary server.
       {
         match = [{ host = [ config.hostnames.git ]; }];
         handle = [{
@@ -63,6 +79,7 @@ in {
       }
     ];
 
+    # Scrape the metrics endpoint for Prometheus.
     prometheus.scrapeTargets = [
       "127.0.0.1:${
         builtins.toString config.services.gitea.settings.server.HTTP_PORT

modules/nixos/services/gnupg.nix

@@ -1,3 +1,5 @@
+# GPG is an encryption tool. This isn't really in use for me at the moment.
+
 { config, pkgs, lib, ... }: {
 
   options.gpg.enable = lib.mkEnableOption "GnuPG encryption.";

modules/nixos/services/grafana.nix

@@ -7,6 +7,7 @@ in {
 
   config = lib.mkIf config.services.grafana.enable {
 
+    # Allow Grafana to connect to email service
     secrets.mailpass-grafana = {
       source = ../../../private/mailpass-grafana.age;
       dest = "${config.secretsDirectory}/mailpass-grafana";

modules/nixos/services/honeypot.nix

@@ -1,7 +1,10 @@
-{ config, lib, pkgs, ... }:
+# This is a tool for blocking IPs of anyone who attempts to scan all of my
+# ports.
 
 # Currently has some issues that don't make this viable.
 
+{ config, lib, pkgs, ... }:
+
 # Taken from:
 # https://dataswamp.org/~solene/2022-09-29-iblock-implemented-in-nixos.html
 

modules/nixos/services/influxdb2.nix

@@ -0,0 +1,61 @@
+# InfluxDB is a timeseries database similar to Prometheus. While
+# VictoriaMetrics can also act as an InfluxDB, this version of it allows for
+# infinite retention separate from our other metrics, which can be nice for
+# recording health information, for example.
+
+{ config, lib, ... }: {
+
+  config = {
+
+    services.influxdb2 = {
+      provision = {
+        enable = true;
+        initialSetup = {
+          bucket = "default";
+          organization = "main";
+          passwordFile = config.secrets.influxdb2Password.dest;
+          retention = 0; # Keep data forever
+          tokenFile = config.secrets.influxdb2Token.dest;
+          username = "admin";
+        };
+      };
+      settings = { };
+    };
+
+    # Create credentials file for InfluxDB admin
+    secrets.influxdb2Password = lib.mkIf config.services.influxdb2.enable {
+      source = ../../../private/influxdb2-password.age;
+      dest = "${config.secretsDirectory}/influxdb2-password";
+      owner = "influxdb2";
+      group = "influxdb2";
+      permissions = "0440";
+    };
+    systemd.services.influxdb2Password-secret =
+      lib.mkIf config.services.influxdb2.enable {
+        requiredBy = [ "influxdb2.service" ];
+        before = [ "influxdb2.service" ];
+      };
+    secrets.influxdb2Token = lib.mkIf config.services.influxdb2.enable {
+      source = ../../../private/influxdb2-token.age;
+      dest = "${config.secretsDirectory}/influxdb2-token";
+      owner = "influxdb2";
+      group = "influxdb2";
+      permissions = "0440";
+    };
+    systemd.services.influxdb2Token-secret =
+      lib.mkIf config.services.influxdb2.enable {
+        requiredBy = [ "influxdb2.service" ];
+        before = [ "influxdb2.service" ];
+      };
+
+    caddy.routes = lib.mkIf config.services.influxdb2.enable [{
+      match = [{ host = [ config.hostnames.influxdb ]; }];
+      handle = [{
+        handler = "reverse_proxy";
+        upstreams = [{ dial = "localhost:8086"; }];
+      }];
+    }];
+
+  };
+
+}

modules/nixos/services/jellyfin.nix

@@ -1,3 +1,6 @@
+# Jellyfin is a self-hosted video streaming service. This means I can play my
+# server's videos from a webpage, mobile app, or TV client.
+
 { config, pkgs, lib, ... }: {
 
   config = lib.mkIf config.services.jellyfin.enable {
@@ -6,6 +9,7 @@
     users.users.jellyfin = { isSystemUser = true; };
 
     caddy.routes = [
+      # Prevent public access to Prometheus metrics.
       {
         match = [{
           host = [ config.hostnames.stream ];
@@ -16,6 +20,7 @@
           status_code = "403";
         }];
       }
+      # Allow access to normal route.
       {
         match = [{ host = [ config.hostnames.stream ]; }];
         handle = [{
@@ -47,6 +52,9 @@
     users.users.jellyfin.extraGroups =
       [ "render" "video" ]; # Access to /dev/dri
 
+    # Fix issue where Jellyfin-created directories don't allow access for media group
+    systemd.services.jellyfin.serviceConfig.UMask = lib.mkForce "0007";
+
     # Requires MetricsEnable is true in /var/lib/jellyfin/config/system.xml
     prometheus.scrapeTargets = [ "127.0.0.1:8096" ];
 

modules/nixos/services/keybase.nix

@@ -1,23 +1,23 @@
+# Keybase is an encrypted communications tool with a synchronized encrypted
+# filestore that can be mounted onto a machine's filesystem.
+
 { config, pkgs, lib, ... }: {
 
   options.keybase.enable = lib.mkEnableOption "Keybase.";
 
   config = lib.mkIf config.keybase.enable {
 
-    services.keybase.enable = true;
+    home-manager.users.${config.user} = lib.mkIf config.keybase.enable {
-    services.kbfs = {
+
-      enable = true;
+      services.keybase.enable = true;
-      # enableRedirector = true;
+      services.kbfs = {
-      mountPoint = "/run/user/1000/keybase/kbfs";
+        enable = true;
-    };
+        mountPoint = "keybase";
-    security.wrappers.keybase-redirector = {
+      };
-      setuid = true;
+
-      owner = "root";
+      # https://github.com/nix-community/home-manager/issues/4722
-      group = "root";
+      systemd.user.services.kbfs.Service.PrivateTmp = lib.mkForce false;
-      source = "${pkgs.kbfs}/bin/redirector";
-    };
 
-    home-manager.users.${config.user} = {
       home.packages = [ (lib.mkIf config.gui.enable pkgs.keybase-gui) ];
       home.file = let
         ignorePatterns = ''

modules/nixos/services/mullvad.nix

@@ -1,3 +1,5 @@
+# Mullvad is a VPN service. This isn't currently in use for me at the moment.
+
 { config, pkgs, lib, ... }: {
 
   options.mullvad.enable = lib.mkEnableOption "Mullvad VPN.";

modules/nixos/services/n8n.nix

@@ -1,3 +1,6 @@
+# n8n is an automation integration tool for connecting data from services
+# together with triggers.
+
 { config, lib, ... }: {
 
   options = {

modules/nixos/services/netdata.nix

@@ -1,3 +1,6 @@
+# Netdata is an out-of-the-box monitoring tool that exposes many different
+# metrics. Not currently in use, in favor of VictoriaMetrics and Grafana.
+
 { config, lib, ... }: {
 
   options.netdata.enable = lib.mkEnableOption "Netdata metrics.";

modules/nixos/services/nextcloud.nix

@@ -3,7 +3,7 @@
   config = lib.mkIf config.services.nextcloud.enable {
 
     services.nextcloud = {
-      package = pkgs.nextcloud27; # Required to specify
+      package = pkgs.nextcloud28; # Required to specify
       configureRedis = true;
       datadir = "/data/nextcloud";
       database.createLocally = true;
@@ -13,18 +13,26 @@
       config = {
         adminpassFile = config.secrets.nextcloud.dest;
         dbtype = "mysql";
-        extraTrustedDomains = [ config.hostnames.content ];
-        trustedProxies = [ "127.0.0.1" ];
       };
-      extraOptions = { default_phone_region = "US"; };
+      extraOptions = {
+        default_phone_region = "US";
+        # Allow access when hitting either of these hosts or IPs
+        trusted_domains = [ config.hostnames.content ];
+        trusted_proxies = [ "127.0.0.1" ];
+      };
       extraAppsEnable = true;
       extraApps = with config.services.nextcloud.package.packages.apps; {
         inherit calendar contacts;
+        # These apps are defined and pinned by overlay in flake.
         news = pkgs.nextcloudApps.news;
         external = pkgs.nextcloudApps.external;
         cookbook = pkgs.nextcloudApps.cookbook;
+        snappymail = pkgs.nextcloudApps.snappymail;
+      };
+      phpOptions = {
+        "opcache.interned_strings_buffer" = "16";
+        "output_buffering" = "0";
       };
-      phpOptions = { "opcache.interned_strings_buffer" = "16"; };
     };
 
     # Don't let Nginx use main ports (using Caddy instead)
@@ -47,7 +55,10 @@
             handle = [
               {
                 handler = "vars";
-                root = config.services.nextcloud.package;
+                # Grab the webroot out of the written config
+                # The webroot is a symlinked combined Nextcloud directory
+                root =
+                  config.services.nginx.virtualHosts.${config.services.nextcloud.hostName}.root;
               }
               {
                 handler = "headers";
@@ -56,13 +67,6 @@
               }
             ];
           }
-          {
-            match = [{ path = [ "/nix-apps*" "/store-apps*" ]; }];
-            handle = [{
-              handler = "vars";
-              root = config.services.nextcloud.home;
-            }];
-          }
           # Reroute carddav and caldav traffic
           {
             match =

modules/nixos/services/paperless.nix

@@ -0,0 +1,71 @@
+# Paperless-ngx is a document scanning and management solution.
+
+{ config, lib, ... }: {
+
+  config = lib.mkIf config.services.paperless.enable {
+
+    services.paperless = {
+      mediaDir = "/data/generic/paperless";
+      passwordFile = config.secrets.paperless.dest;
+      settings = {
+        PAPERLESS_OCR_USER_ARGS =
+          builtins.toJSON { invalidate_digital_signatures = true; };
+
+        # Enable if changing the path name in Caddy
+        # PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";
+        # PAPERLESS_STATIC_URL = "/paperless/static/";
+      };
+    };
+
+    # Allow Nextcloud and user to see files
+    users.users.nextcloud.extraGroups =
+      lib.mkIf config.services.nextcloud.enable [ "paperless" ];
+    users.users.${config.user}.extraGroups = [ "paperless" ];
+
+    caddy.routes = [{
+      match = [{
+        host = [ config.hostnames.paperless ];
+        # path = [ "/paperless*" ]; # Change path name in Caddy
+      }];
+      handle = [{
+        handler = "reverse_proxy";
+        upstreams = [{
+          dial =
+            "localhost:${builtins.toString config.services.paperless.port}";
+        }];
+      }];
+    }];
+
+    secrets.paperless = {
+      source = ../../../private/prometheus.age;
+      dest = "${config.secretsDirectory}/paperless";
+      owner = "paperless";
+      group = "paperless";
+      permissions = "0440";
+    };
+    systemd.services.paperless-secret = {
+      requiredBy = [ "paperless.service" ];
+      before = [ "paperless.service" ];
+    };
+
+    # Fix permissions on a regular schedule
+    systemd.timers.paperless-permissions = {
+      timerConfig = {
+        OnCalendar = "*-*-* *:0/5"; # Every 5 minutes
+        Unit = "paperless-permissions.service";
+      };
+      wantedBy = [ "timers.target" ];
+    };
+
+    # Fix paperless shared permissions
+    systemd.services.paperless-permissions = {
+      description = "Allow group access to paperless files";
+      serviceConfig = { Type = "oneshot"; };
+      script = ''
+        find ${config.services.paperless.mediaDir} -type f -exec chmod 640 -- {} +
+      '';
+    };
+
+  };
+
+}

modules/nixos/services/postgresql.nix

@@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }: {
+
+  services.postgresql = {
+    package = pkgs.postgresql_15;
+    settings = { };
+    identMap = "";
+    ensureUsers = [{
+      name = config.user;
+      ensureClauses = {
+        createdb = true;
+        createrole = true;
+        login = true;
+      };
+    }];
+  };
+
+  home-manager.users.${config.user}.home.packages =
+    lib.mkIf config.services.postgresql.enable [
+      pkgs.pgcli # Postgres client with autocomplete
+    ];
+
+}

modules/nixos/services/prometheus.nix

@@ -1,3 +1,9 @@
+# Prometheus is a timeseries database that exposes system and service metrics
+# for use in visualizing, monitoring, and alerting (with Grafana).
+
+# Instead of running traditional Prometheus, I generally run VictoriaMetrics as
+# a more efficient drop-in replacement.
+
 { config, pkgs, lib, ... }: {
 
   options.prometheus = {

modules/nixos/services/samba.nix

@@ -1,3 +1,5 @@
+# Samba is a Windows-compatible file-sharing service.
+
 { config, lib, ... }: {
 
   config = {

modules/nixos/services/sshd.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+# SSHD service for allowing SSH access to my machines.
+
+{ config, pkgs, lib, ... }: {
 
   options = {
     publicKey = lib.mkOption {
@@ -32,7 +34,10 @@
     services.sshguard.enable = true;
 
     # Add terminfo for SSH from popular terminal emulators
-    environment.enableAllTerminfo = true;
+    # Fix: terminfo now installs contour, which is broken on ARM
+    # - https://github.com/NixOS/nixpkgs/pull/253334
+    # - Will disable until fixed
+    environment.enableAllTerminfo = pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64;
   };
 
 }

modules/nixos/services/transmission.nix

@@ -1,3 +1,6 @@
+# Transmission is a bittorrent client, which can run in the background for
+# automated downloads with a web GUI.
+
 { config, pkgs, lib, ... }: {
 
   options = {

modules/nixos/services/vaultwarden.nix

@@ -1,3 +1,7 @@
+# Vaultwarden is an implementation of the Bitwarden password manager backend
+# service, which allows for self-hosting the synchronization of a Bitwarden
+# password manager client.
+
 { config, pkgs, lib, ... }:
 
 let vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory

modules/nixos/services/victoriametrics.nix

@@ -1,3 +1,6 @@
+# VictoriaMetrics is a more efficient drop-in replacement for Prometheus and
+# InfluxDB (timeseries databases built for monitoring system metrics).
+
 { config, pkgs, lib, ... }:
 
 let

modules/nixos/services/wireguard.nix

@@ -1,3 +1,6 @@
+# Wireguard is a VPN protocol that can be setup to create a mesh network
+# between machines on different LANs. This is currently not in use in my setup.
+
 { config, pkgs, lib, ... }: {
 
   options.wireguard.enable = lib.mkEnableOption "Wireguard VPN setup.";

modules/nixos/system/doas.nix

@@ -26,9 +26,14 @@
       };
     };
 
-    # Alias sudo to doas for convenience
+    home-manager.users.${config.user}.programs = {
-    home-manager.users.${config.user}.programs.fish.shellAliases = {
+
-      sudo = "doas";
+      # Alias sudo to doas for convenience
+      fish.shellAliases = { sudo = "doas"; };
+
+      # Disable overriding our sudo alias with a TERMINFO alias
+      kitty.settings.shell_integration = "no-sudo";
+
     };
 
   };

overlays/age.nix

@@ -1,5 +0,0 @@
-# Pin age because it is failing to build
-
-inputs: _final: prev: {
-  age = prev.age.overrideAttrs (old: { src = inputs.age; });
-}

overlays/bypass-paywalls-clean.nix

@@ -0,0 +1,20 @@
+inputs: _final: prev: {
+
+  # Based on:
+  # https://git.sr.ht/~rycee/nur-expressions/tree/master/item/pkgs/firefox-addons/default.nix#L34
+
+  bypass-paywalls-clean = let addonId = "magnolia@12.34";
+  in prev.stdenv.mkDerivation rec {
+    pname = "bypass-paywalls-clean";
+    version = "3.4.9.0";
+    src = inputs.bypass-paywalls-clean + "/bypass_paywalls_clean-latest.xpi";
+    preferLocalBuild = true;
+    allowSubstitutes = true;
+    buildCommand = ''
+      dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+      mkdir -p "$dst"
+      install -v -m644 "${src}" "$dst/${addonId}.xpi"
+    '';
+  };
+
+}

overlays/caddy.nix

@@ -31,7 +31,7 @@ in {
 
     src = prev.caddy.src;
 
-    vendorSha256 = "sha256:mwIsWJYKuEZpOU38qZOG1LEh4QpK4EO0/8l4UGsroU8=";
+    vendorHash = "sha256:pr2MI2Nv9y357lCEEh6aNdmD9FiCaJIkRfHaoWgdQIE=";
 
     overrideModAttrs = (_: {
       preBuild = ''

overlays/calibre-web-cloudflare.patch

@@ -1,8 +1,8 @@
 diff --git a/cps/__init__.py b/cps/__init__.py
-index 269e4aca..e2b828a9 100644
+index f4f8dbf2..7377acdf 100644
 --- a/cps/__init__.py
 +++ b/cps/__init__.py
-@@ -150,7 +150,6 @@ def create_app():
+@@ -151,7 +151,6 @@ def create_app():
  
      lm.login_view = 'web.login'
      lm.anonymous_user = ub.Anonymous
@@ -11,15 +11,17 @@ index 269e4aca..e2b828a9 100644
      db.CalibreDB.update_config(config)
      db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
 diff --git a/cps/admin.py b/cps/admin.py
-index 20c58aac..99d2ad19 100644
+index 045a9523..825a28af 100644
 --- a/cps/admin.py
 +++ b/cps/admin.py
-@@ -101,8 +101,6 @@ def admin_required(f):
+@@ -102,10 +102,6 @@ def admin_required(f):
  
  @admi.before_app_request
  def before_request():
--    if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
+-    if not ub.check_user_session(current_user.id,
+-                                 flask_session.get('_id')) and 'opds' not in request.path \
+-      and config.config_session == 1:
 -        logout_user()
      g.constants = constants
-     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
+     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
      g.allow_registration = config.config_public_reg

overlays/gh-collaborators.nix

@@ -0,0 +1,25 @@
+_final: prev: {
+
+  gh-collaborators = prev.buildGo120Module rec {
+    pname = "gh-collaborators";
+    version = "2.0.2";
+
+    src = prev.fetchFromGitHub {
+      owner = "katiem0";
+      repo = "gh-collaborators";
+      rev = version;
+      sha256 = "sha256-sz5LHkwZ28aA2vbMnFMzAlyGiJBDZm7jwDQYxgKBPLU=";
+    };
+
+    vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
+
+    ldflags = [
+      "-s"
+      "-w"
+      "-X github.com/katiem0/gh-collaborators/cmd.Version=${version}"
+      # "-X main.Version=${version}"
+    ];
+
+  };
+
+}