add links for readme diagram

add diagram to readme
reenable legendary and heroic games
2025-07-06 21:20:13 +00:00 · 2024-01-07 19:07:16 -05:00 · 2024-01-07 19:05:13 -05:00 · 2024-01-07 18:48:40 -05:00 · 2024-01-07 17:46:11 -05:00 · 2024-01-07 08:51:21 -05:00
60 changed files with 722 additions and 273 deletions
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -8,6 +8,7 @@ on:
 permissions:
  contents: write
  pull-requests: write
+  checks: write

 jobs:
  lockfile:
@ -31,7 +32,17 @@ jobs:
            dependencies
            automated
      - name: Check the Flake
+        id: check
        run: nix flake check
+      - name: Update Check Status
+        uses: LouisBrunner/checks-action@v1.6.1
+        if: always()
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: Update Flake
+          conclusion: ${{ job.status }}
+          output: |
+            {"summary":"${{ steps.check.outputs.stdout }}"}
      - name: Enable Pull Request Automerge
        if: success()
        run: |
--- a/README.md
+++ b/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 atypical choices for configuration.
+
+- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
+and source-controlled plugins, differing from host to host.
+- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based on
+dynamic service metadata.
+- [Grafana config](./modules/nixos/services/grafana.nix) based on dynamic
+service metadata.
+- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
+agenix.
+- Base16 [colorschemes](./colorscheme/) applied to multiple applications.
+
 ---

 # Installation
--- a/flake.lock
+++ b/flake.lock
@ -37,11 +37,11 @@
    "baleia-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1681806450,
-        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
+        "lastModified": 1704551058,
+        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
        "owner": "m00qek",
        "repo": "baleia.nvim",
-        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
+        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
        "type": "github"
      },
      "original": {
@ -53,28 +53,44 @@
    "bufferline-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1687763763,
-        "narHash": "sha256-wbOeylzjjScQXkrDbBU2HtrOZrp2YUK+wQ2aOkgxmRQ=",
+        "lastModified": 1695205521,
+        "narHash": "sha256-MQMpXMgUpZA0E9TunzjXeOQxDWSCTogXbvi9VJnv4Kw=",
        "owner": "akinsho",
        "repo": "bufferline.nvim",
-        "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
+        "rev": "6ecd37e0fa8b156099daedd2191130e083fb1490",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v4.2.0",
+        "ref": "v4.4.0",
        "repo": "bufferline.nvim",
        "type": "github"
      }
    },
+    "bypass-paywalls-clean": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704296449,
+        "narHash": "sha256-UkEaTOBEfPTxcNo9Iv2xUEW6jYWMJeaGKA38KF6Yuf0=",
+        "owner": "magnolia1234",
+        "repo": "bpc-uploads",
+        "rev": "dcd11128c6b7c6246fc6d199ce10d5ec796d4716",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "magnolia1234",
+        "repo": "bpc-uploads",
+        "type": "gitlab"
+      }
+    },
    "cmp-nvim-lsp-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1687494203,
-        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
+        "lastModified": 1702205473,
+        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
        "owner": "hrsh7th",
        "repo": "cmp-nvim-lsp",
-        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
+        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
        "type": "github"
      },
      "original": {
@ -90,11 +106,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696043447,
-        "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
+        "lastModified": 1704277720,
+        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
+        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
        "type": "github"
      },
      "original": {
@ -111,11 +127,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1695864092,
-        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
+        "lastModified": 1704318910,
+        "narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
+        "rev": "aef9a509db64a081186af2dc185654d78dc8e344",
        "type": "github"
      },
      "original": {
@ -124,6 +140,23 @@
        "type": "github"
      }
    },
+    "fidget-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702031048,
+        "narHash": "sha256-wbjQuOFd/2339TIrUA97PYsV8N3PZsS+xbyMsyZmki8=",
+        "owner": "j-hui",
+        "repo": "fidget.nvim",
+        "rev": "300018af4abd00610a345e382ca1f4b7ba420f77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "j-hui",
+        "ref": "v1.1.0",
+        "repo": "fidget.nvim",
+        "type": "github"
+      }
+    },
    "firefox-darwin": {
      "inputs": {
        "nixpkgs": [
@ -131,11 +164,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696034364,
-        "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=",
+        "lastModified": 1704588470,
+        "narHash": "sha256-CP+Eg9QbtD6Sgryp1WIVel1dxOBo/qKUU1UMzctMvWU=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df",
+        "rev": "89d4e4ae6eb41838020dbe0a13cc72506402e0e3",
        "type": "github"
      },
      "original": {
@ -147,11 +180,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@ -165,11 +198,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
        "type": "github"
      },
      "original": {
@ -201,11 +234,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
        "type": "github"
      },
      "original": {
@ -237,11 +270,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696063111,
-        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
+        "lastModified": 1704498488,
+        "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
+        "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
        "type": "github"
      },
      "original": {
@ -254,37 +287,40 @@
    "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-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ=",
+        "lastModified": 1699624334,
+        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.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.1/external-v5.2.1.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-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=",
+        "lastModified": 1703426420,
+        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/24.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/24.0.0/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
      }
    },
    "nil": {
@ -354,11 +390,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696058303,
-        "narHash": "sha256-eNqKWpF5zG0SrgbbtljFOrRgFgRzCc4++TMFADBMLnc=",
+        "lastModified": 1701689616,
+        "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "150f38bd1e09e20987feacb1b0d5991357532fb5",
+        "rev": "246219bc21b943c6f6812bb7744218ba0df08600",
        "type": "github"
      },
      "original": {
@ -369,11 +405,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1695830400,
-        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+        "lastModified": 1704194953,
+        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
+        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
        "type": "github"
      },
      "original": {
@ -383,22 +419,6 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "null-ls-nvim-src": {
      "flake": false,
      "locked": {
@ -417,11 +437,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1696080597,
-        "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=",
+        "lastModified": 1704598626,
+        "narHash": "sha256-HrjPegJaedzo3dPJq/AYZatn8ARTELen2m1vwC5yjHY=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6",
+        "rev": "3a216c262c910b70e23ee01a4479dcc40c58599b",
        "type": "github"
      },
      "original": {
@ -450,11 +470,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1695716495,
-        "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=",
+        "lastModified": 1704583223,
+        "narHash": "sha256-/Zz15BBm9sqOLK39wiHg5dQb38C18J8CSFR3B8qsHdA=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "934469b9b6df369e198fb3016969e56393b0dc07",
+        "rev": "78a5836092617205a999aefc75be1d842c299cbc",
        "type": "github"
      },
      "original": {
@ -466,11 +486,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1696061053,
-        "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=",
+        "lastModified": 1704537069,
+        "narHash": "sha256-PIqaMzakP0boyInkDagkl+95IwbMgEhgc/o7TnmD9m4=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32",
+        "rev": "5032f9952ad2a3a7f7792ac438c4f9e2bd53e0b9",
        "type": "github"
      },
      "original": {
@ -483,13 +503,14 @@
    "proton-ge": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-75A0VCVdYkiMQ1duE9r2+DLBJzV02vUozoVLeo/TIWQ=",
+        "lastModified": 1700610476,
+        "narHash": "sha256-IoClZ6hl2lsz9OGfFgnz7vEAGlSY2+1K2lDEEsJQOfU=",
        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
+        "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-16/GE-Proton8-16.tar.gz"
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
      }
    },
    "root": {
@ -498,9 +519,11 @@
        "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",
@ -605,16 +628,16 @@
    "telescope-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1686302912,
-        "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
+        "lastModified": 1697004956,
+        "narHash": "sha256-7SqYFnfCjotOBhuX6Wx1IOhgMKoxaoI1a4SKz1d5RVM=",
        "owner": "nvim-telescope",
        "repo": "telescope.nvim",
-        "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
+        "rev": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a",
        "type": "github"
      },
      "original": {
        "owner": "nvim-telescope",
-        "ref": "0.1.2",
+        "ref": "0.1.4",
        "repo": "telescope.nvim",
        "type": "github"
      }
@ -622,11 +645,11 @@
    "telescope-project-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1682606566,
-        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
+        "lastModified": 1701464478,
+        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
        "owner": "nvim-telescope",
        "repo": "telescope-project.nvim",
-        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
+        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
        "type": "github"
      },
      "original": {
@ -638,16 +661,16 @@
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1685434104,
-        "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
+        "lastModified": 1695636777,
+        "narHash": "sha256-o8xzoo7OuYrPnKlfrupQ24Ja9hZy1qQVnvwO0FO+4zM=",
        "owner": "akinsho",
        "repo": "toggleterm.nvim",
-        "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
+        "rev": "faee9d60428afc7857e0927fdc18daa6c409fa64",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v2.7.0",
+        "ref": "v2.8.0",
        "repo": "toggleterm.nvim",
        "type": "github"
      }
@ -655,11 +678,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1695263734,
-        "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=",
+        "lastModified": 1696959291,
+        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "fd4e40dab883d6456da4d847de8321aee9c80805",
+        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
        "type": "github"
      },
      "original": {
@ -672,11 +695,11 @@
    "tree-sitter-ini": {
      "flake": false,
      "locked": {
-        "lastModified": 1690815608,
-        "narHash": "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M=",
+        "lastModified": 1699877527,
+        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
        "owner": "justinmk",
        "repo": "tree-sitter-ini",
-        "rev": "7f11a02fb8891482068e0fe419965d7bade81a68",
+        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
        "type": "github"
      },
      "original": {
@ -721,11 +744,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1695282953,
-        "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=",
+        "lastModified": 1700218345,
+        "narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c",
+        "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
        "type": "github"
      },
      "original": {
@ -787,14 +810,16 @@
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1696053802,
-        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
+        "lastModified": 1704496463,
+        "narHash": "sha256-/LOWVVLccTJyNoS06bWAoTe+dtFfgM19uqpN0vjsBoc=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
+        "rev": "d2fd320bab0aa486383bbf5f13d5d8120700f911",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/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 = {
@ -77,6 +80,7 @@
      flake = false;
    };
    baleia-nvim-src = {
+      # https://github.com/m00qek/baleia.nvim/tags
      url = "github:m00qek/baleia.nvim";
      flake = false;
    };
@ -90,7 +94,7 @@
      flake = false;
    };
    telescope-nvim-src = {
-      url = "github:nvim-telescope/telescope.nvim/0.1.2";
+      url = "github:nvim-telescope/telescope.nvim/0.1.4";
      flake = false;
    };
    telescope-project-nvim-src = {
@ -98,11 +102,11 @@
      flake = false;
    };
    toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim/v2.7.0";
+      url = "github:akinsho/toggleterm.nvim/v2.8.0";
      flake = false;
    };
    bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim/v4.2.0";
+      url = "github:akinsho/bufferline.nvim/v4.4.0";
      flake = false;
    };
    nvim-tree-lua-src = {
@ -117,6 +121,11 @@
      url = "github:calops/hmts.nvim";
      flake = false;
    };
+    fidget-nvim-src = {
+      # https://github.com/j-hui/fidget.nvim/tags
+      url = "github:j-hui/fidget.nvim/v1.1.0";
+      flake = false;
+    };

    # Tree-Sitter Grammars
    tree-sitter-bash = {
@ -161,7 +170,14 @@
    proton-ge = {
      # https://github.com/GloriousEggroll/proton-ge-custom/releases
      url =
-        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz";
+        "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;
    };

@ -169,19 +185,19 @@
    nextcloud-news = {
      # https://github.com/nextcloud/news/releases
      url =
-        "https://github.com/nextcloud/news/releases/download/24.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.1/external-v5.2.1.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/nextcloud/cookbook/releases
+      # 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;
    };

@ -204,8 +220,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}";
@ -228,6 +246,9 @@
        (import ./overlays/betterlockscreen.nix)
        (import ./overlays/age.nix inputs)
        (import ./overlays/proton-ge.nix inputs)
+        (import ./overlays/gh-collaborators.nix)
+        (import ./overlays/bypass-paywalls-clean.nix inputs)
+        (import ./overlays/terraform.nix)
      ];

      # System types to support.
--- a/hosts/aws/main.tf
+++ b/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}",
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -58,6 +58,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
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -37,6 +37,7 @@ inputs.darwin.lib.darwinSystem {
      nixlang.enable = true;
      terraform.enable = true;
      python.enable = true;
+      rust.enable = true;
      lua.enable = true;
      kubernetes.enable = true;
      _1password.enable = true;
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -79,6 +79,7 @@ inputs.nixpkgs.lib.nixosSystem {
      services.prometheus.enable = false;
      services.vmagent.enable = true;
      services.samba.enable = true;
+      services.paperless.enable = true;

      # Allows private remote access over the internet
      cloudflareTunnel = {
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -99,6 +99,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;
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -30,20 +30,21 @@
          name = "default";
          isDefault = true;
          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
-            i-dont-care-about-cookies
+            sponsorblock
+            ublock-origin
+            ublacklist
+            vimium
            wappalyzer
          ];
          settings = {
@ -74,6 +75,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 +118,7 @@
              background-color: ${config.theme.colors.base00};
              color: ${config.theme.colors.base06} !important;
            }
-            .tab-content[selected=true] {
+            .tab-content[selected] {
              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
              background-color: ${config.theme.colors.base01} !important;
              color: ${config.theme.colors.base07} !important;
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@ -15,8 +15,9 @@
      home.packages = with pkgs; [ obsidian ];
    };

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

  };

--- a/modules/common/default.nix
+++ b/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).";
--- a/modules/common/neovim/config/github.lua
+++ b/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)
--- a/modules/common/neovim/config/kubernetes.lua
+++ b/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)
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -1,76 +1,110 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, lib, config, dsl, ... }: {

-  plugins = [
-    pkgs.vimPlugins.nvim-lspconfig
-    pkgs.vimPlugins.lsp-colors-nvim
-    pkgs.vimPlugins.null-ls-nvim
-  ];
+  # Terraform optional because non-free
+  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
+  options.github = lib.mkEnableOption "Whether to enable GitHub features";
+  options.kubernetes =
+    lib.mkEnableOption "Whether to enable Kubernetes features";

-  use.lspconfig.lua_ls.setup = dsl.callWith {
-    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
-  };
+  config =

-  use.lspconfig.nil_ls.setup = dsl.callWith {
-    cmd = [ "${pkgs.nil}/bin/nil" ];
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-  };
+    let

-  use.lspconfig.pyright.setup = dsl.callWith {
-    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
-  };
+      terraformFormat = if config.terraform then ''
+        require("null-ls").builtins.formatting.terraform_fmt.with({
+            command = "${pkgs.terraform}/bin/terraform",
+            extra_filetypes = { "hcl" },
+        }),
+      '' else
+        "";

-  use.lspconfig.terraformls.setup =
-    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
+    in {
+      plugins = [
+        pkgs.vimPlugins.nvim-lspconfig
+        pkgs.vimPlugins.null-ls-nvim
+        pkgs.vimPlugins.fidget-nvim
+      ];

-  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+      setup.fidget = { };

-  lua = ''
-    ${builtins.readFile ./lsp.lua}
+      use.lspconfig.lua_ls.setup = dsl.callWith {
+        settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+        cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
+      };

-    -- Prevent infinite log size (change this when debugging)
-    vim.lsp.set_log_level("off")
+      use.lspconfig.nil_ls.setup = dsl.callWith {
+        cmd = [ "${pkgs.nil}/bin/nil" ];
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      };

-    require("null-ls").setup({
-        sources = {
-            require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
-            require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
-            require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
-            require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
-            require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
-            require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
-            require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
-            require("null-ls").builtins.formatting.shfmt.with({
-                command = "${pkgs.shfmt}/bin/shfmt",
-                extra_args = { "-i", "4", "-ci" },
-            }),
-            require("null-ls").builtins.formatting.terraform_fmt.with({
-                command = "${pkgs.terraform}/bin/terraform",
-                extra_filetypes = { "hcl" },
-            }),
-        },
+      use.lspconfig.pyright.setup = dsl.callWith {
+        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+      };

-        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,
-    })
-  '';
+      use.lspconfig.terraformls.setup = dsl.callWith {
+        cmd = if config.terraform then [
+          "${pkgs.terraform-ls}/bin/terraform-ls"
+          "serve"
+        ] else
+          [ "echo" ];
+      };
+
+      use.lspconfig.rust_analyzer.setup = dsl.callWith {
+        cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
+        settings = {
+          "['rust-analyzer']" = { check = { command = "clippy"; }; };
+        };
+      };
+
+      vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+
+      lua = ''
+        ${builtins.readFile ./lsp.lua}
+
+        -- Prevent infinite log size (change this when debugging)
+        vim.lsp.set_log_level("off")
+
+        require("null-ls").setup({
+            sources = {
+                require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
+                require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+                require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+                require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
+                require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
+                require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
+                require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
+                require("null-ls").builtins.formatting.shfmt.with({
+                    command = "${pkgs.shfmt}/bin/shfmt",
+                    extra_args = { "-i", "4", "-ci" },
+                }),
+                ${terraformFormat}
+            },
+
+            on_attach = function(client, bufnr)
+                if client.supports_method("textDocument/formatting") then
+                    -- Auto-format on save
+                    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+                    vim.api.nvim_create_autocmd("BufWritePre", {
+                        group = augroup,
+                        buffer = bufnr,
+                        callback = function()
+                            vim.lsp.buf.format({ bufnr = bufnr })
+                        end,
+                    })
+                    -- Use internal formatting for bindings like gq.
+                    vim.api.nvim_create_autocmd("LspAttach", {
+                        callback = function(args)
+                            vim.bo[args.buf].formatexpr = nil
+                        end,
+                    })
+                end
+            end,
+        })
+      '';
+
+    };

 }
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@ -12,7 +12,7 @@

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

@ -69,10 +69,6 @@
    " Remember last position when reopening file
    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

-    " LaTeX options
-    au FileType tex inoremap ;bf \textbf{}<Esc>i
-    au BufWritePost *.tex silent! execute "!pdflatex -output-directory=%:p:h % >/dev/null 2>&1" | redraw!
-
    " Flash highlight when yanking
    au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
  '';
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -4,6 +4,7 @@
    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
      with pkgs.tree-sitter-grammars; [
        tree-sitter-bash
+        # tree-sitter-c
        tree-sitter-fish
        tree-sitter-hcl
        tree-sitter-ini
@ -24,7 +25,7 @@
    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;
--- a/modules/common/neovim/config/toggleterm.lua
+++ b/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)
--- a/modules/common/neovim/config/toggleterm.nix
+++ b/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 ""}
+  '';

 }
--- a/modules/common/neovim/config/tree.nix
+++ b/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;
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -5,6 +5,9 @@ let
  neovim = import ./package {
    inherit pkgs;
    colors = config.theme.colors;
+    terraform = config.terraform.enable;
+    github = true;
+    kubernetes = config.kubernetes.enable;
  };

 in {
--- a/modules/common/neovim/lua/keybinds.lua
+++ b/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>")

--- a/modules/common/neovim/package/default.nix
+++ b/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
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@ -6,6 +6,7 @@
    ./lua.nix
    ./nix.nix
    ./python.nix
+    ./rust.nix
    ./terraform.nix
  ];

--- a/modules/common/programming/rust.nix
+++ b/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 ];
+
+    };
+
+  };
+
+}
--- a/modules/common/programming/terraform.nix
+++ b/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 = {
--- a/modules/common/shell/direnv.nix
+++ b/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
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@ -123,9 +123,6 @@
        dr = "docker run --rm -it";
        db = "docker build . -t";

-        # Rust
-        ca = "cargo";
-
      };
      shellInit = "";
    };
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@ -58,6 +58,7 @@ in {
          git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
        gcob = "git switch -c";
        gb = "git branch";
+        gpd = "git push origin -d";
        gbd = "git branch -d";
        gbD = "git branch -D";
        gr = "git reset";
--- a/modules/common/shell/github.nix
+++ b/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";
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -25,6 +25,8 @@ 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
@ -44,10 +46,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 = {
--- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
@ -54,14 +54,19 @@ function obj:init()
    end)

    -- Launcher shortcuts
-    self.launcher:bind("ctrl", "space", function()
-    end)
+    self.launcher:bind("ctrl", "space", function() end)
    self.launcher:bind("", "return", function()
        self:switch("@kitty@")
    end)
    self.launcher:bind("", "C", function()
        self:switch("Calendar.app")
    end)
+    self.launcher:bind("shift", "D", function()
+        hs.execute("launchctl remove com.paloaltonetworks.gp.pangps")
+        hs.execute("launchctl remove com.paloaltonetworks.gp.pangpa")
+        hs.alert.show("Disconnected from GlobalProtect", nil, nil, 4)
+        self.launcher:exit()
+    end)
    self.launcher:bind("", "E", function()
        self:switch("Mail.app")
    end)
@ -80,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()
--- a/modules/darwin/utilities.nix
+++ b/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
      awscli2
      awslogs
      google-cloud-sdk
      ansible
-      vault
+      vault-bin
      consul
      noti # Create notifications programmatically
      ipcalc # Make IP network calculations
--- a/modules/nixos/graphical/i3.nix
+++ b/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";
--- a/modules/nixos/graphical/polybar.nix
+++ b/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" = {
--- a/modules/nixos/graphical/rofi/brightness.nix
+++ b/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 ;;
--- a/modules/nixos/graphical/rofi/power.nix
+++ b/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")
-            ${
-              builtins.toString ./rofi-prompt.sh
-            } 'Shutdown?' && doas shutdown now
+            confirm '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 ;;
--- a/modules/nixos/graphical/rofi/rofi-prompt.sh
+++ b/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 ;;
-    *) exit 1 ;;
+    "$yes") return 0 ;;
+    *) return 1 ;;
 esac
--- a/modules/nixos/hardware/networking.nix
+++ b/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;
--- a/modules/nixos/services/cloudflare.nix
+++ b/modules/nixos/services/cloudflare.nix
@ -73,7 +73,7 @@ in {
    };

    # Allows Nextcloud to trust Cloudflare IPs
-    services.nextcloud.config.trustedProxies = cloudflareIpRanges;
+    services.nextcloud.extraOptions.trusted_proxies = cloudflareIpRanges;

  };
 }
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@ -13,12 +13,14 @@
    ./gnupg.nix
    ./grafana.nix
    ./honeypot.nix
+    ./influxdb2.nix
    ./jellyfin.nix
    ./keybase.nix
    ./mullvad.nix
    ./n8n.nix
    ./netdata.nix
    ./nextcloud.nix
+    ./paperless.nix
    ./prometheus.nix
    ./samba.nix
    ./secrets.nix
--- a/modules/nixos/services/influxdb2.nix
+++ b/modules/nixos/services/influxdb2.nix
@ -0,0 +1,56 @@
+{ 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"; }];
+      }];
+    }];
+
+  };
+
+}
--- a/modules/nixos/services/jellyfin.nix
+++ b/modules/nixos/services/jellyfin.nix
@ -47,6 +47,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" ];

--- a/modules/nixos/services/keybase.nix
+++ b/modules/nixos/services/keybase.nix
@ -4,20 +4,17 @@

  config = lib.mkIf config.keybase.enable {

-    services.keybase.enable = true;
-    services.kbfs = {
-      enable = true;
-      # enableRedirector = true;
-      mountPoint = "/run/user/1000/keybase/kbfs";
-    };
-    security.wrappers.keybase-redirector = {
-      setuid = true;
-      owner = "root";
-      group = "root";
-      source = "${pkgs.kbfs}/bin/redirector";
-    };
+    home-manager.users.${config.user} = lib.mkIf config.keybase.enable {
+
+      services.keybase.enable = true;
+      services.kbfs = {
+        enable = true;
+        mountPoint = "keybase";
+      };
+
+      # https://github.com/nix-community/home-manager/issues/4722
+      systemd.user.services.kbfs.Service.PrivateTmp = lib.mkForce false;

-    home-manager.users.${config.user} = {
      home.packages = [ (lib.mkIf config.gui.enable pkgs.keybase-gui) ];
      home.file = let
        ignorePatterns = ''
--- a/modules/nixos/services/nextcloud.nix
+++ b/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,10 +13,12 @@
      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";
+        trusted_domains = [ config.hostnames.content ];
+        trusted_proxies = [ "127.0.0.1" ];
+      };
      extraAppsEnable = true;
      extraApps = with config.services.nextcloud.package.packages.apps; {
        inherit calendar contacts;
@ -47,7 +49,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 +61,6 @@
              }
            ];
          }
-          {
-            match = [{ path = [ "/nix-apps*" "/store-apps*" ]; }];
-            handle = [{
-              handler = "vars";
-              root = config.services.nextcloud.home;
-            }];
-          }
          # Reroute carddav and caldav traffic
          {
            match =
--- a/modules/nixos/services/paperless.nix
+++ b/modules/nixos/services/paperless.nix
@ -0,0 +1,48 @@
+{ config, lib, ... }: {
+
+  config = lib.mkIf config.services.paperless.enable {
+
+    services.paperless = {
+      mediaDir = "/data/generic/paperless";
+      passwordFile = config.secrets.paperless.dest;
+      extraConfig = {
+        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/";
+      };
+    };
+
+    users.users.paperless.extraGroups = [ "generic" ];
+
+    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" ];
+    };
+
+  };
+
+}
--- a/modules/nixos/system/doas.nix
+++ b/modules/nixos/system/doas.nix
@ -26,9 +26,14 @@
      };
    };

-    # Alias sudo to doas for convenience
-    home-manager.users.${config.user}.programs.fish.shellAliases = {
-      sudo = "doas";
+    home-manager.users.${config.user}.programs = {
+
+      # 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";
+
    };

  };
--- a/overlays/age.nix
+++ b/overlays/age.nix
@ -1,5 +1,9 @@
 # Pin age because it is failing to build
+# https://github.com/NixOS/nixpkgs/pull/265753

 inputs: _final: prev: {
-  age = prev.age.overrideAttrs (old: { src = inputs.age; });
+  age = prev.age.overrideAttrs (old: {
+    src = inputs.age;
+    doCheck = false; # https://github.com/FiloSottile/age/issues/517
+  });
 }
--- a/overlays/bypass-paywalls-clean.nix
+++ b/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"
+    '';
+  };
+
+}
--- a/overlays/caddy.nix
+++ b/overlays/caddy.nix
@ -31,7 +31,7 @@ in {

    src = prev.caddy.src;

-    vendorSha256 = "sha256:mwIsWJYKuEZpOU38qZOG1LEh4QpK4EO0/8l4UGsroU8=";
+    vendorHash = "sha256:pr2MI2Nv9y357lCEEh6aNdmD9FiCaJIkRfHaoWgdQIE=";

    overrideModAttrs = (_: {
      preBuild = ''
--- a/overlays/calibre-web-cloudflare.patch
+++ b/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
--- a/overlays/gh-collaborators.nix
+++ b/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}"
+    ];
+
+  };
+
+}
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -9,7 +9,7 @@ let

  # Package plugin - for plugins not found in nixpkgs at all
  plugin = pname: src:
-    prev.vimUtils.buildVimPluginFrom2Nix {
+    prev.vimUtils.buildVimPlugin {
      inherit pname src;
      version = "master";
    };
@ -33,6 +33,7 @@ in {
  bufferline-nvim =
    withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim;
  nvim-tree-lua = withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua;
+  fidget-nvim = withSrc prev.vimPlugins.fidget-nvim inputs.fidget-nvim;

  # Packaging plugins entirely with Nix
  baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
--- a/overlays/terraform.nix
+++ b/overlays/terraform.nix
@ -0,0 +1,12 @@
+# Fix for Terraform and Consul on Darwin:
+# https://github.com/NixOS/nixpkgs/pull/275534/files
+_final: prev: {
+  girara = prev.girara.overrideAttrs (old: {
+    mesonFlags = [
+      "-Ddocs=disabled"
+      (prev.lib.mesonEnable "tests"
+        ((prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform)
+          && (!prev.stdenv.isDarwin)))
+    ];
+  });
+}
--- a/private/influxdb2-password.age
+++ b/private/influxdb2-password.age
@ -0,0 +1,14 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBhUEdQ
+ejFtQWFabkl3YTJmUmRDS2M1elBrMU5yVHhWWlFLMHdOdlNsNEFRCmREU3ZZWlZi
+R1RLQVorT2dDbFRXc2toMExpNWR1WUEvaVlzUFJ5ZUU3azQKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIDY5OGpSWlFTT2EvUzV4ajQwUG5YL3loSWhGbjV6U2J4TkFhQm5Y
+RWhvMXcKbUVpQm5wRmtLRGV2SWYzb2c3dnZYREdRSnRtdjJJcjRKTk0rbnMyZmVB
+cwotPiBzc2gtZWQyNTUxOSBuanZYNUEgd0o4WGhTQnlkVGhhWG44MmQ1UXFVWjFO
+MS9JcVpEOEIvd3ZuNmVmN2d3dwpYNXF5V05WbHRobVlIWVM2VHN1TjcyVG81cHp1
+V0pnWTduZFFWQks2ZFY0Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBkWXlRejFNdHJk
+azg0aUpzL1JMSWUvWkdXUmpLc3pVUEZTNGFwTG0rRlNrCjMyVTE5c1pjRlowVlJ4
+YmFtRzEzV1dCU0FoeUJPMjQzWHErc0h4RWhLbDgKLS0tIHhzK20vTzFPdVROVW44
+MkNhb2VWZHBqeXY0MWZuTDFUMXdNazMwTG8yZTQK1CrrD2tin/3ZhV2D1XJvkbUN
+2Nw4ASdPdRXaQJw5CMhlrW6rgSnC81j0249F7D7ZfAlo62ANOfLyL9Lv2FVGzg==
+-----END AGE ENCRYPTED FILE-----
--- a/private/influxdb2-token.age
+++ b/private/influxdb2-token.age
@ -0,0 +1,14 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBmTnVo
+eFlINGttSEZYTlZucVVWemlMMk0reHNKcjF3SmhCQllXdmw5RzBBCnl0NWZVb1ZW
+MWRzc05pNVVWTlRyNzNRaDlYTm5TSVF3ZGNMclhyY0R3bUkKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIEppTjJPUmxlamdLY2xxRVBwcFBmTTdOM3dLU3h3YnA2TlhRWXRu
+OGJrR28KMW9JQUFDcXFLOTk4NDVHQmJucEZuOElLaG5Eb1lyK1NGTUJaMkFONit1
+dwotPiBzc2gtZWQyNTUxOSBuanZYNUEgZkF5MVNGK3FRV2JPVDFGMkY5SWxGWVVK
+YThUVFk2VGZZNXN6UWx3eFJ6MAp0d3NGWTRuLzNOb0VxdVUvZ1YwR0lWemc2NDR2
+VFI2eWRjS242SEJrQWx3Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBpY2JoaGRKY0ZR
+Y2txWFM1ODJyaW03b0xuRGlJMkVidEVZMGdiU1pTZ1hVCk0yeGF6VWU5LzF0Z1dL
+cnlDUCtLL01EWWo2Q0dYcjdtSjRtSnFjUHNWdzAKLS0tIEI4aWpNc0xqU3ZsLzcz
+TThFNXd0YjQ2MEMzc0JOQXZnTnBaTVg0V1hITzgK8GYZG8/fGXk6ELSB6rnLX0ke
+QqiztfVnV/fpgEgJ/K60Ea3aBe3ELpejzFKZfno+jesvnL5DCMGz7QRRpnThLQ==
+-----END AGE ENCRYPTED FILE-----
--- a/private/paperless.age
+++ b/private/paperless.age
@ -0,0 +1,15 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBWY3N0
+VkY0Y2tLQnNhZWdRVzFxU0plWThveUthK2NjZWNhZDd5ZGtXVVZ3CjVPc3YxbnBM
+MmozZFlORVppQmJrQ2ovWEFVVm81ZlBpRCtQQmRiNnBCaVUKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIEtvRFJEQXJLNjlyRldpM2pMdXNxWVZmVFl2NVJjRUtuQzNtbmJq
+UTBDR2cKQ1J4cHVkWHJZU1M4dnFIekx2ejlua0NjUUtET0EwN24rY2NPcGQ5eEp1
+TQotPiBzc2gtZWQyNTUxOSBuanZYNUEgVnBQOHV5VUk0N2lyU2NkdXovQmJYVGhL
+dnUwTG9oZkZKOUxFWTNiZkhBbwo2WjgyNHBhaGtFREJGVDk5TzJhZjRzKytaLzZR
+TDQxeU9pY24zQnJBYmN3Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBQQ3I2YnNNZVlX
+TEhNbWhRSjJRbk9DYnJIRUFieDBMRUtBRVhxZ1RQcVNNClNzU0VPMnh5bUFGVTZm
+ekJLSzFjT3dHVVdoQ3A5ZStCUk83Qk5rcWZmN3MKLS0tIFdvRG1mYzdUenhndkY2
+amo0ZGpjQkdabUdNRUJwV29CRXByVk8ySEZzTzAKsDY+DVJqZb/jCn6Xa/OqNheR
+uNlV5vVKUaZu5F+MTZqZaRYdn66TJVXgz5GydbgwQGs3l0K67ikPiTOoln0FapnB
+TQ==
+-----END AGE ENCRYPTED FILE-----
--- a/templates/poetry/flake.nix
+++ b/templates/poetry/flake.nix
@ -5,7 +5,7 @@
  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
  inputs.poetry2nix.url = "github:nix-community/poetry2nix";

-  outputs = { nixpkgs, flake-utils, poetry2nix }:
+  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
    flake-utils.lib.eachDefaultSystem (system:
      let
        pkgs = import nixpkgs {
--- a/templates/python/flake.nix
+++ b/templates/python/flake.nix
@ -11,7 +11,7 @@
    inputs.pypi-deps-db.follows = "pypi-deps-db";
  };

-  outputs = { nixpkgs, mach-nix }:
+  outputs = { self, nixpkgs, mach-nix }:
    let
      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
      forAllSystems = f:
--- a/templates/rust/flake.nix
+++ b/templates/rust/flake.nix
@ -0,0 +1,29 @@
+{
+  description = "Basic Rust project";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  outputs = { self, nixpkgs }:
+    let
+      forAllSystems = nixpkgs.lib.genAttrs [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
+    in {
+      devShells = forAllSystems (system:
+        let pkgs = import nixpkgs { inherit system; };
+        in {
+          default = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              gcc
+              rustc
+              cargo
+              cargo-watch
+              rustfmt
+              pkg-config
+              openssl
+            ];
+          };
+        });
+    };
+}