nixd neovim setup

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/8c8388ade72e58efdeae71b4cbb79e872c23a56b' (2024-10-03)
  → 'github:lnl7/nix-darwin/48b50b3b137be5cfb9f4d006835ce7c3fe558ccc' (2024-10-08)
• Updated input 'disko':
    'github:nix-community/disko/48ebb577855fb2398653f033b3b2208a9249203d' (2024-10-05)
  → 'github:nix-community/disko/bdbdb725d632863bdedb80baabf21327614dd237' (2024-10-11)
• Updated input 'firefox-darwin':
    'github:bandithedoge/nixpkgs-firefox-darwin/1cab93c0c087555cb21dd9ceb383b0d15deade32' (2024-10-06)
  → 'github:bandithedoge/nixpkgs-firefox-darwin/8a3143c1ce147481db4463e71bc3b7002e6ebc56' (2024-10-12)
• Updated input 'home-manager':
    'github:nix-community/home-manager/509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e' (2024-10-04)
  → 'github:nix-community/home-manager/2b13611eaed8326789f76f70d21d06fbb14e3e47' (2024-10-11)
• Updated input 'nextcloud-snappymail':
    'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-06)
  → 'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-12)
• Updated input 'nixos-generators':
    'github:nix-community/nixos-generators/9ae128172f823956e54947fe471bc6dfa670ecb4' (2024-10-03)
  → 'github:nix-community/nixos-generators/40c8d30c490414910fc63626ad1b67af7db40cd3' (2024-10-10)
• Updated input 'nixos-generators/nixlib':
    'github:nix-community/nixpkgs.lib/bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1' (2024-09-29)
  → 'github:nix-community/nixpkgs.lib/b61309c3c1b6013d36299bc8285612865b3b9e4c' (2024-10-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04)
  → 'github:nixos/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04)
  → 'github:nixos/nixpkgs/c505ebf777526041d792a49d5f6dd4095ea391a7' (2024-10-11)
• Updated input 'nur':
    'github:nix-community/nur/1841d27c08fb58b1bb3e7944711938e719dd532e' (2024-10-06)
  → 'github:nix-community/nur/1d143f52b0a046924ee7fe74bce0bd2e10e07c3d' (2024-10-12)
• Updated input 'nvim-lint-src':
    'github:mfussenegger/nvim-lint/27f44d1cc3d733a38a736acb902f94879d99c76c' (2024-10-03)
  → 'github:mfussenegger/nvim-lint/f707b3ae50417067fa63fdfe179b0bff6b380da1' (2024-10-10)
• Updated input 'nvim-tree-lua-src':
    'github:kyazdani42/nvim-tree.lua/c9104a5d079db5a158c9562c54689df27d52dccc' (2024-09-30)
  → 'github:kyazdani42/nvim-tree.lua/5ad87620ec9d1190d15c88171a3f0122bc16b0fe' (2024-10-11)
• Updated input 'wsl':
    'github:nix-community/NixOS-WSL/31a18ceaeac81e75d10b05ab0dfb4fcc79d4ed1a' (2024-10-05)
  → 'github:nix-community/NixOS-WSL/0fc8d9bb51cc46b31d950513df6d088905c8fe55' (2024-10-10)

.github/workflows/update.yml

@@ -3,7 +3,7 @@ name: Update Flake
 on:
   workflow_dispatch: # allows manual triggering
   schedule:
-    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
+    - cron: '33 3 * * 6' # runs weekly on Saturday at 03:33
 
 permissions:
   contents: write
@@ -19,12 +19,14 @@ jobs:
         uses: actions/checkout@v3
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@v11
+        with:
+          nix-package-url: https://releases.nixos.org/nix/nix-2.18.4/nix-2.18.4-x86_64-linux.tar.xz
       - name: Check Nixpkgs Inputs
         uses: DeterminateSystems/flake-checker-action@v7
       - name: Add Nix Cache
         uses: DeterminateSystems/magic-nix-cache-action@v6
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v21
+        uses: DeterminateSystems/update-flake-lock@v23
         id: update
         with:
           pr-title: "Update flake.lock" # Title of PR to be created

flake.lock

@@ -3,11 +3,11 @@
     "baleia-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717182435,
+        "lastModified": 1721805312,
-        "narHash": "sha256-duI3myrJSvmtjF9n7NVrVOsuSo1O3JEypA5ghBHsULc=",
+        "narHash": "sha256-qA1x5kplP2I8bURO0I4R0gt/zeznu9hQQ+XHptLGuwc=",
         "owner": "m00qek",
         "repo": "baleia.nvim",
-        "rev": "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1",
+        "rev": "1b25eac3ac03659c3d3af75c7455e179e5f197f7",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718662658,
+        "lastModified": 1728385805,
-        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
+        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
+        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718846788,
+        "lastModified": 1728687662,
-        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
+        "narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
+        "rev": "bdbdb725d632863bdedb80baabf21327614dd237",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718930737,
+        "lastModified": 1728694479,
-        "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=",
+        "narHash": "sha256-NFFW6RrOTBuIk29LKtAO3MU5Y0ll7zAp9Skd9HvCGfs=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "087919070dffc9798a8cb753e97babe287f06c25",
+        "rev": "8a3143c1ce147481db4463e71bc3b7002e6ebc56",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1726560853,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -244,14 +244,30 @@
         "type": "github"
       }
     },
+    "gh-collaborators": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717117275,
+        "narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
+        "owner": "katiem0",
+        "repo": "gh-collaborators",
+        "rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "katiem0",
+        "repo": "gh-collaborators",
+        "type": "github"
+      }
+    },
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1715076655,
+        "lastModified": 1727357627,
-        "narHash": "sha256-vDTqJQzLyg0nmlC+CrLnPkYti1rPxmvRW8eQq/9Zg+M=",
+        "narHash": "sha256-8FJlLw5LApQs7S8xEh2UE9wdYCAweZTbvgozCGPfQJc=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "19a91816c123173a4551a6a04f2882338f20db1d",
+        "rev": "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa",
         "type": "github"
       },
       "original": {
@@ -267,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718983978,
+        "lastModified": 1728685293,
-        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
+        "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
+        "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
         "type": "github"
       },
       "original": {
@@ -291,11 +307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718893255,
+        "lastModified": 1727470707,
-        "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=",
+        "narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
         "owner": "hraban",
         "repo": "mac-app-util",
-        "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc",
+        "rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
         "type": "github"
       },
       "original": {
@@ -307,52 +323,53 @@
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "lastModified": 1702545935,
+        "lastModified": 1719431638,
-        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
+        "narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
       }
     },
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1699624334,
+        "lastModified": 1710338675,
-        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
+        "narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "lastModified": 1703426420,
+        "lastModified": 1718102703,
-        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
+        "narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
       }
     },
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
+        "lastModified": 1728704544,
-        "type": "file",
+        "narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
-        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
       },
       "original": {
-        "type": "file",
+        "type": "tarball",
-        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
       }
     },
     "nix2vim": {
@@ -363,11 +380,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718621825,
+        "lastModified": 1727867024,
-        "narHash": "sha256-bSfjwRgKKpLyjEDPRAF1hlJKc7QDoqopalHwNCB/eAA=",
+        "narHash": "sha256-yimXLupF3hG57imRMpqWho/Wstcj7P8Yh8t0SBiX+dQ=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "1db11dbf8a4d124e02244fa5c4ff219b672a8e5b",
+        "rev": "da26caae6c7776eedbc6514a0f57f1ccd6a759ed",
         "type": "github"
       },
       "original": {
@@ -378,11 +395,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1712450863,
+        "lastModified": 1728176478,
-        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
+        "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
+        "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
         "type": "github"
       },
       "original": {
@@ -399,11 +416,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718025593,
+        "lastModified": 1728522165,
-        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
+        "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
+        "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
         "type": "github"
       },
       "original": {
@@ -414,11 +431,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718895438,
+        "lastModified": 1728492678,
-        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {
@@ -444,13 +461,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1728627514,
+        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
-        "lastModified": 1719001822,
+        "lastModified": 1728704557,
-        "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=",
+        "narHash": "sha256-HnYBB+oE+03rNDzTTVazBcysPOu5udRpTOGpP7/A5Ow=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "e7edcaeae9db01224266febe88eb7d3411055636",
+        "rev": "1d143f52b0a046924ee7fe74bce0bd2e10e07c3d",
         "type": "github"
       },
       "original": {
@@ -462,11 +495,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717789608,
+        "lastModified": 1728582620,
-        "narHash": "sha256-LNYFxAM9lQNNOIOc+IgKgbSRp2U09B/9HivSCwMyUpQ=",
+        "narHash": "sha256-wfui4kE3oxveCJPjJfkJSbE69zVTeAsasDdfJkElmn8=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce",
+        "rev": "f707b3ae50417067fa63fdfe179b0bff6b380da1",
         "type": "github"
       },
       "original": {
@@ -495,11 +528,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717900986,
+        "lastModified": 1728614821,
-        "narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=",
+        "narHash": "sha256-WYtu+jtsQSFqruTxdzkHE9UQJBE2TGoNoFar36AAoqo=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "2086e564c4d23fea714e8a6d63b881e551af2f41",
+        "rev": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe",
         "type": "github"
       },
       "original": {
@@ -511,16 +544,16 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1718957498,
+        "lastModified": 1705679158,
-        "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=",
+        "narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23",
+        "rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
-        "ref": "master",
+        "ref": "v0.9.2",
         "repo": "nvim-treesitter",
         "type": "github"
       }
@@ -567,6 +600,7 @@
         "disko": "disko",
         "fidget-nvim-src": "fidget-nvim-src",
         "firefox-darwin": "firefox-darwin",
+        "gh-collaborators": "gh-collaborators",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
@@ -578,6 +612,7 @@
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "nixpkgs-caddy": "nixpkgs-caddy",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "nvim-lint-src": "nvim-lint-src",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
@@ -585,8 +620,10 @@
         "nvim-treesitter-src": "nvim-treesitter-src",
         "ren": "ren",
         "rep": "rep",
+        "snipe-nvim-src": "snipe-nvim-src",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
+        "tiny-inline-diagnostic-nvim-src": "tiny-inline-diagnostic-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
         "tree-sitter-bash": "tree-sitter-bash",
         "tree-sitter-ini": "tree-sitter-ini",
@@ -600,6 +637,22 @@
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
+    "snipe-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1724418876,
+        "narHash": "sha256-G4g/OzyXhDhX84HkxlhFSy6E+EAGxH+HL1Bw5s5FWHE=",
+        "owner": "leath-dub",
+        "repo": "snipe.nvim",
+        "rev": "f1abd4aaaef6398b45dcddc9f1a40dd982f732b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "leath-dub",
+        "repo": "snipe.nvim",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -665,11 +718,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701464478,
+        "lastModified": 1725880250,
-        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
+        "narHash": "sha256-wO/cm5PT1L0hFr/CX466w0UimoFg/tWrDK8T0QeKZMU=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
+        "rev": "796200876bb0fe8157b8eb1ce03d927d3827a052",
         "type": "github"
       },
       "original": {
@@ -678,19 +731,35 @@
         "type": "github"
       }
     },
+    "tiny-inline-diagnostic-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726582328,
+        "narHash": "sha256-NBcUVUSnk2TlbSr/vFTbp3Rh35ms8lAcfDqpmE1KTq4=",
+        "owner": "rachartier",
+        "repo": "tiny-inline-diagnostic.nvim",
+        "rev": "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rachartier",
+        "repo": "tiny-inline-diagnostic.nvim",
+        "type": "github"
+      }
+    },
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1713792255,
+        "lastModified": 1721232722,
-        "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=",
+        "narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6",
+        "rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.11.0",
+        "ref": "v2.12.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
@@ -698,11 +767,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1715005250,
+        "lastModified": 1725407033,
-        "narHash": "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY=",
+        "narHash": "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed",
+        "rev": "c8713e50f0bd77d080832fc61ad128bc8f2934e9",
         "type": "github"
       },
       "original": {
@@ -715,11 +784,11 @@
     "tree-sitter-ini": {
       "flake": false,
       "locked": {
-        "lastModified": 1716889525,
+        "lastModified": 1725233451,
-        "narHash": "sha256-IyHrIxcmuzs60zUiJv4E3nSkhSkgbcaLDUdeDx5mlHk=",
+        "narHash": "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU=",
         "owner": "justinmk",
         "repo": "tree-sitter-ini",
-        "rev": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c",
+        "rev": "962568c9efa71d25720ab42c5d36e222626ef3a6",
         "type": "github"
       },
       "original": {
@@ -731,11 +800,11 @@
     "tree-sitter-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1710150044,
+        "lastModified": 1725894603,
-        "narHash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=",
+        "narHash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
         "owner": "MunifTanjim",
         "repo": "tree-sitter-lua",
-        "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
+        "rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
         "type": "github"
       },
       "original": {
@@ -764,11 +833,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1714528221,
+        "lastModified": 1725324041,
-        "narHash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=",
+        "narHash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7",
+        "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
         "type": "github"
       },
       "original": {
@@ -835,11 +904,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718710563,
+        "lastModified": 1728588346,
-        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
+        "narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
+        "rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
         "type": "github"
       },
       "original": {

flake.nix

@@ -7,6 +7,9 @@
     # Used for system packages
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    # Used for specific stable packages
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+
     # Used for caddy plugins
     nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";
 
@@ -88,7 +91,7 @@
     };
     nvim-treesitter-src = {
       # https://github.com/nvim-treesitter/nvim-treesitter/tags
-      url = "github:nvim-treesitter/nvim-treesitter/master";
+      url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
       flake = false;
     };
     telescope-nvim-src = {
@@ -102,7 +105,7 @@
     };
     toggleterm-nvim-src = {
       # https://github.com/akinsho/toggleterm.nvim/tags
-      url = "github:akinsho/toggleterm.nvim/v2.11.0";
+      url = "github:akinsho/toggleterm.nvim/v2.12.0";
       flake = false;
     };
     bufferline-nvim-src = {
@@ -127,6 +130,14 @@
       url = "github:mfussenegger/nvim-lint";
       flake = false;
     };
+    tiny-inline-diagnostic-nvim-src = {
+      url = "github:rachartier/tiny-inline-diagnostic.nvim";
+      flake = false;
+    };
+    snipe-nvim-src = {
+      url = "github:leath-dub/snipe.nvim";
+      flake = false;
+    };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
@@ -174,26 +185,32 @@
       flake = false;
     };
 
+    gh-collaborators = {
+      url = "github:katiem0/gh-collaborators";
+      flake = false;
+    };
+
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
       flake = false;
     };
     nextcloud-external = {
       # https://github.com/nextcloud-releases/external/releases
-      url = "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
       flake = false;
     };
     nextcloud-cookbook = {
       # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
       flake = false;
     };
     nextcloud-snappymail = {
       # https://github.com/the-djmaze/snappymail/releases
       # https://snappymail.eu/repository/nextcloud
-      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
+      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
+      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
       flake = false;
     };
   };
@@ -218,12 +235,15 @@
           mail.smtpHost = "smtp.purelymail.com";
           dotfilesRepo = "https://github.com/nmasur/dotfiles";
           hostnames = {
+            audiobooks = "read.${baseName}";
+            files = "files.${baseName}";
             git = "git.${baseName}";
             influxdb = "influxdb.${baseName}";
             irc = "irc.${baseName}";
             metrics = "metrics.${baseName}";
             minecraft = "minecraft.${baseName}";
-            n8n = "n8n2.${baseName}";
+            n8n = "n8n.${baseName}";
+            notifications = "ntfy.${baseName}";
             prometheus = "prom.${baseName}";
             paperless = "paper.${baseName}";
             secrets = "vault.${baseName}";
@@ -231,6 +251,7 @@
             content = "cloud.${baseName}";
             books = "books.${baseName}";
             download = "download.${baseName}";
+            status = "status.${baseName}";
             transmission = "transmission.${baseName}";
           };
         };
@@ -240,13 +261,12 @@
         inputs.nur.overlay
         inputs.nix2vim.overlay
         (import ./overlays/neovim-plugins.nix inputs)
-        (import ./overlays/calibre-web.nix)
         (import ./overlays/disko.nix inputs)
         (import ./overlays/tree-sitter.nix inputs)
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/gh-collaborators.nix)
+        (import ./overlays/gh-collaborators.nix inputs)
         (import ./overlays/ren-rep.nix inputs)
       ];
 
@@ -319,6 +339,7 @@
             system = "x86_64-linux";
             format = "iso";
             specialArgs = {
+              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
               pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
             };
             modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
@@ -327,6 +348,7 @@
             system = "x86_64-linux";
             format = "amazon";
             specialArgs = {
+              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
               pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
             };
             modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [

hosts/flame/default.nix

@@ -17,6 +17,7 @@
 inputs.nixpkgs.lib.nixosSystem rec {
   system = "aarch64-linux";
   specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
     pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
   };
   modules = [
@@ -79,6 +80,9 @@ inputs.nixpkgs.lib.nixosSystem rec {
       services.gitea.enable = true;
       services.vaultwarden.enable = true;
       services.minecraft-server.enable = true; # Setup Minecraft server
+      services.n8n.enable = true;
+      services.ntfy-sh.enable = true;
+      services.uptime-kuma.enable = true;
       system.autoUpgrade.enable = true;
 
       # Allows private remote access over the internet

hosts/lookingglass/default.nix

@@ -34,7 +34,6 @@ inputs.darwin.lib.darwinSystem {
         dark = true;
       };
       mail.user = globals.user;
-      mole.enable = true;
       atuin.enable = true;
       charm.enable = true;
       neovim.enable = true;
@@ -54,6 +53,7 @@ inputs.darwin.lib.darwinSystem {
       _1password.enable = true;
       slack.enable = true;
       wezterm.enable = true;
+      yt-dlp.enable = true;
     }
   ];
 }

hosts/swan/default.nix

@@ -11,6 +11,7 @@
 inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
   specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
     pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
   };
   modules = [
@@ -66,6 +67,14 @@ inputs.nixpkgs.lib.nixosSystem rec {
         devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
       };
 
+      zramSwap.enable = true;
+      swapDevices = [
+        {
+          device = "/swapfile";
+          size = 4 * 1024; # 4 GB
+        }
+      ];
+
       boot.zfs = {
         # Automatically load the ZFS pool on boot
         extraPools = [ "tank" ];
@@ -96,6 +105,8 @@ inputs.nixpkgs.lib.nixosSystem rec {
       cloudflare.enable = true;
       dotfiles.enable = true;
       arrs.enable = true;
+      filebrowser.enable = true;
+      services.audiobookshelf.enable = true;
       services.bind.enable = true;
       services.caddy.enable = true;
       services.jellyfin.enable = true;

hosts/tempest/default.nix

@@ -8,8 +8,12 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
+  specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
   modules = [
     globals
     inputs.home-manager.nixosModules.home-manager
@@ -118,6 +122,7 @@ inputs.nixpkgs.lib.nixosSystem {
         dwarf-fortress.enable = true;
         enable = true;
         steam.enable = true;
+        moonlight.enable = true;
         legendary.enable = true;
         lutris.enable = true;
         ryujinx.enable = true;

modules/common/applications/1password.nix

@@ -22,10 +22,9 @@
       "1password-cli"
     ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [
+      home.packages = [
-        _1password-gui
+        pkgs._1password
-        _1password
+      ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
-      ];
     };
 
     # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app

modules/common/applications/default.nix

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

modules/common/applications/firefox.nix

@@ -71,6 +71,8 @@
             "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
+            "browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
+            "browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
           };
           userChrome = ''
             :root {
@@ -157,6 +159,15 @@
         };
       };
 
+      # Mimic nixpkgs package environment for read-only profiles.ini management
+      # From: https://github.com/booxter/home-manager/commit/dd1602e306fec366280f5953c5e1b553e3d9672a
+      home.sessionVariables = {
+        MOZ_LEGACY_PROFILES = 1;
+        MOZ_ALLOW_DOWNGRADE = 1;
+      };
+
+      # launchd.user.envVariables = config.home-manager.users.${config.user}.home.sessionVariables;
+
       xdg.mimeApps = {
         associations.added = {
           "text/html" = [ "firefox.desktop" ];

modules/common/applications/kitty.nix

@@ -34,10 +34,13 @@
       programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
 
       # Display images in the terminal
-      programs.fish.shellAliases = {
+      programs.fish.interactiveShellInit = # fish
-        icat = "kitty +kitten icat";
+        ''
-        ssh = "kitty +kitten ssh";
+          if test "$TERM" = "xterm-kitty"
-      };
+              alias icat="kitty +kitten icat"
+              alias ssh="kitty +kitten ssh"
+          end
+        '';
 
       programs.kitty = {
         enable = true;

modules/common/applications/mole.nix

@@ -1,110 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-
-  # Build kdl-py
-  kdl-py = pkgs.python311.pkgs.buildPythonPackage rec {
-    pname = "kdl-py";
-    version = "1.2.0";
-    pyproject = true;
-    src = pkgs.fetchPypi {
-      inherit pname version;
-      hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM=";
-    };
-    build-system = [ pkgs.python311.pkgs.setuptools ];
-    # has no tests
-    doCheck = false;
-  };
-
-  mole = pkgs.python311.pkgs.buildPythonPackage rec {
-    pname = "mole";
-    version = "0.7.1";
-    pyproject = true;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "eblume";
-      repo = pname;
-      rev = "30bb052a97050b1fa89c287855d834f7952b195a";
-      sha256 = "sha256-DUWsfyICCfFQ2ZQBYSQVoA3eLdKC8djUylKgGdHIyJo=";
-    };
-
-    patches = [
-      (builtins.toString (
-        pkgs.writeText "pyproject.toml.patch" ''
-          diff --git a/pyproject.toml b/pyproject.toml
-          index 12ce0f5..787e978 100644
-          --- a/pyproject.toml
-          +++ b/pyproject.toml
-          @@ -12,11 +12,11 @@ packages = [
-           [tool.poetry.dependencies]
-           python = "^3.11"
-           # Now back to the regular dependencies
-          -typer = {extras = ["all"], version = "^0.9"}
-          +typer = {extras = ["all"], version = "^0.12"}
-           todoist-api-python = "^2.1.3"
-           openai = "^1.2.4"
-           rich = "^13.4.2"
-          -watchdog = "^3.0.0"
-          +watchdog = "^4.0.0"
-           pydub = "^0.25.1"
-           requests = "^2.31.0"
-           pyyaml = "^6.0.1"
-        ''
-      ))
-    ];
-
-    # Used during build time
-    nativeBuildInputs = [ pkgs.python311Packages.poetry-core ];
-
-    # Used during run time
-    buildInputs = [
-      pkgs._1password
-      pkgs.nb-cli
-    ];
-
-    # Both build and run time
-    propagatedBuildInputs = [
-      pkgs.python311Packages.typer
-      pkgs.python311Packages.todoist-api-python
-      pkgs.python311Packages.openai
-      pkgs.python311Packages.rich
-      pkgs.python311Packages.watchdog
-      pkgs.python311Packages.pydub
-      pkgs.python311Packages.requests
-      pkgs.python311Packages.pyyaml
-      pkgs.python311Packages.pydantic
-      pkgs.python311Packages.pendulum
-      kdl-py
-      pkgs.ffmpeg
-    ];
-
-    build-system = [ pkgs.python311.pkgs.setuptools ];
-
-    # has no tests
-    doCheck = false;
-
-  };
-
-in
-{
-
-  options = {
-    mole = {
-      enable = lib.mkEnableOption {
-        description = "Enable Mole.";
-        default = false;
-      };
-    };
-  };
-
-  config = lib.mkIf config.mole.enable {
-    home-manager.users.${config.user} = {
-      home.packages = [ mole ];
-    };
-  };
-}

modules/common/applications/wezterm.nix

@@ -119,6 +119,9 @@
                 font = wezterm.font('${font}', { weight = 'Bold'}),
                 font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
 
+                -- Fix color blocks instead of text
+                front_end = "WebGpu",
+
                 -- Tab Bar
                 hide_tab_bar_if_only_one_tab = true,
                 window_frame = {
@@ -169,7 +172,7 @@
                   -- super-t open new tab in new dir
                   {
                     key = 't',
-                    mods = 'SUPER',
+                    mods = ${if pkgs.stdenv.isDarwin then "'SUPER'" else "'ALT'"},
                     action = wezterm.action.SpawnCommandInNewTab {
                       cwd = wezterm.home_dir,
                     },

modules/common/default.nix

@@ -77,6 +77,10 @@
       default = [ ];
     };
     hostnames = {
+      files = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for files server (Filebrowser).";
+      };
       git = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for git server (Gitea).";
@@ -129,6 +133,14 @@
         type = lib.types.str;
         description = "Hostname for n8n automation.";
       };
+      notifications = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for push notification services (ntfy).";
+      };
+      status = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for status page (Uptime-Kuma).";
+      };
       transmission = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for peer2peer downloads (Transmission).";

modules/common/neovim/config/bufferline.nix

@@ -6,6 +6,7 @@
   plugins = [
     pkgs.vimPlugins.bufferline-nvim
     pkgs.vimPlugins.vim-bbye # Better closing of buffers
+    pkgs.vimPlugins.snipe-nvim # Jump between open buffers
   ];
   setup.bufferline = {
     options = {
@@ -15,6 +16,7 @@
       offsets = [ { filetype = "NvimTree"; } ];
     };
   };
+  setup.snipe = { };
   lua = ''
     -- Move buffers
     vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
@@ -22,5 +24,7 @@
 
     -- Kill buffer
     vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
-  '';
+
+    -- Jump to buffer
+    vim.keymap.set("n", "gb", require("snipe").open_buffer_menu, { silent = true }) '';
 }

modules/common/neovim/config/lsp.nix

@@ -11,6 +11,11 @@
   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";
+  options.nixosConfiguration = lib.mkOption {
+    type = lib.types.str;
+    description = "Configuration to use for nixd options checking";
+    default = "default";
+  };
 
   config = {
     plugins = [
@@ -19,9 +24,11 @@
       pkgs.vimPlugins.fidget-nvim
       pkgs.vimPlugins.nvim-lint
       pkgs.vimPlugins.vim-table-mode
+      pkgs.vimPlugins.tiny-inline-diagnostic-nvim
     ];
 
     setup.fidget = { };
+    setup.tiny-inline-diagnostic = { };
 
     use.lspconfig.lua_ls.setup = dsl.callWith {
       settings = {
@@ -41,6 +48,21 @@
     use.lspconfig.nixd.setup = dsl.callWith {
       cmd = [ "${pkgs.nixd}/bin/nixd" ];
       capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      # settings = {
+      #   nixd = {
+      #     options = {
+      #       nixos = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #       home-manager = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).homeConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #       darwin = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #     };
+      #   };
+      # };
     };
 
     use.lspconfig.pyright.setup = dsl.callWith {
@@ -71,6 +93,9 @@
           files = {
             excludeDirs = [ ".direnv" ];
           };
+          cargo = {
+            features = "all";
+          };
         };
       };
     };
@@ -133,6 +158,9 @@
 
       -- Prevent infinite log size (change this when debugging)
       vim.lsp.set_log_level("off")
+
+      -- Hide buffer diagnostics (use tiny-inline-diagnostic.nvim instead)
+      vim.diagnostic.config({ virtual_text = false })
     '';
   };
 }

modules/common/neovim/config/misc.nix

@@ -10,7 +10,8 @@
     pkgs.vimPlugins.vim-eunuch # File manipulation commands
     pkgs.vimPlugins.vim-fugitive # Git commands
     pkgs.vimPlugins.vim-repeat # Better repeat using .
-    pkgs.vimPlugins.glow-nvim # Markdown preview popup
+    pkgs.vimPlugins.vim-abolish # Keep capitalization in substitute (Subvert)
+    pkgs.vimPlugins.markview-nvim # Markdown preview
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper
   ];
@@ -21,7 +22,7 @@
       names = false;
     };
   };
-  setup.glow = { };
+  setup.markview = { };
   setup.which-key = { };
 
   vim.o = {
@@ -57,8 +58,8 @@
 
   # Better backup, swap and undo storage
   vim.o.backup = true; # Easier to recover and more secure
-  vim.bo.swapfile = false; # Instead of swaps, create backups
+  vim.opt.undofile = true; # Keeps undos after quit
-  vim.bo.undofile = true; # Keeps undos after quit
+  vim.opt.swapfile = false; # Instead of swaps, create backups
   vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
   vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
 

modules/common/neovim/config/toggleterm.nix

@@ -14,11 +14,6 @@
     open_mapping = dsl.rawLua "[[<c-\\>]]";
     hide_numbers = true;
     direction = "float";
-    float_opts = {
-      width = dsl.rawLua "vim.o.columns - 4";
-      height = dsl.rawLua "vim.o.lines - 4";
-      row = 0;
-    };
   };
 
   lua = ''

modules/common/neovim/default.nix

@@ -13,6 +13,7 @@ let
     terraform = config.terraform.enable;
     github = true;
     kubernetes = config.kubernetes.enable;
+    nixosConfiguration = config.networking.hostName; # Used for Nixd
   };
 in
 {
@@ -50,9 +51,9 @@ in
 
         # Create a desktop option for launching Neovim from a file manager
         # (Requires launching the terminal and then executing Neovim)
-        xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
+        xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
           name = "Neovim wrapper";
-          exec = "kitty nvim %F";
+          exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} nvim %F";
           mimeType = [
             "text/plain"
             "text/markdown"

modules/common/neovim/lua/keybinds.lua

@@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
 key("n", "cq", ":cclose<CR>")
 
 -- Other
-key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
+key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
-key("n", "Y", "y$")                                         --- Copy to end of line
+key("n", "Y", "y$") --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
-key("v", "D", "y'>gp")                                      --- Duplicate selected
+key("v", "D", "y'>gp") --- Duplicate selected
-key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
+key("x", "<Leader>p", '"_dP') --- Paste but keep register

modules/common/neovim/package/default.nix

@@ -32,6 +32,7 @@
   terraform ? false,
   github ? false,
   kubernetes ? false,
+  nixosConfiguration ? "default",
   ...
 }:
 
@@ -44,6 +45,7 @@ pkgs.neovimBuilder {
     terraform
     github
     kubernetes
+    nixosConfiguration
     ;
   imports = [
     ../config/align.nix

modules/common/shell/bash/scripts/terraform-init.sh

@@ -6,14 +6,15 @@ BUCKET_NAME_PART_1="t2"
 BUCKET_NAME_PART_2="global"
 BUCKET_NAME_PART_3="terraformstate"
 
-WORKFLOW_FILE=".github/workflows/terraform.yml"
+PROJECT_ROOT=$(git rev-parse --show-toplevel)
+WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/terraform.yml"
 
-if [ ! -f $WORKFLOW_FILE ]; then
+if [ ! -f "$WORKFLOW_FILE" ]; then
-    WORKFLOW_FILE=".github/workflows/apply.yml"
+    WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/apply.yml"
 fi
 
 AWS_ACCOUNT_NUMBER=$(
-    awk '/aws_account_number: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
+    awk '/aws_account_number: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
         echo "$(
             read -r s
             s=${s//\'/}
@@ -23,7 +24,7 @@ AWS_ACCOUNT_NUMBER=$(
 
 if [ -z "${AWS_ACCOUNT_NUMBER}" ]; then
     AWS_ACCOUNT_NUMBER=$(
-        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
+        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
             echo "$(
                 read -r s
                 s=${s//\'/}

modules/common/shell/fish/default.nix

@@ -76,6 +76,10 @@
           description = "Full git commit on notes";
           body = builtins.readFile ./functions/syncnotes.fish;
         };
+        _which = {
+          description = "Identify the path to a program in the shell";
+          body = "command --search (string sub --start=2 $argv)";
+        };
       };
       interactiveShellInit = ''
         fish_vi_key_bindings
@@ -101,10 +105,18 @@
         "-" = "cd -";
         mkd = "mkdir -pv";
 
+        # Convert a program into its full path
+        "=" = {
+          position = "anywhere";
+          regex = "=\\w+";
+          function = "_which";
+        };
+
         # System
         s = "sudo";
         sc = "systemctl";
         scs = "systemctl status";
+        sca = "systemctl cat";
         m = "make";
         t = "trash";
 

modules/common/shell/git.nix

@@ -113,6 +113,11 @@ in
         gpd = "git push origin -d";
         gbd = "git branch -d";
         gbD = "git branch -D";
+        gdd = {
+          position = "anywhere";
+          setCursor = true;
+          expansion = "BRANCH=% git push origin -d $BRANCH and git branch -d $BRANCH";
+        };
         gr = "git reset";
         grh = "git reset --hard";
         gm = "git merge";
@@ -158,6 +163,13 @@ in
                 and git branch -D $branch
               '';
             };
+            git-delete-both = {
+              argumentNames = "branch";
+              body = ''
+                git push origin -d $branch
+                git branch -d $branch
+              '';
+            };
             git-merge-fuzzy = {
               body = ''
                 set branch (git-fuzzy-branch "merge from...")

modules/common/shell/work.nix

@@ -12,34 +12,36 @@
     home.packages =
       let
         ldap_scheme = "ldaps";
-        magic_number = "2";
-        magic_end_seq = "corp";
         magic_prefix = "take";
-        ldap_host = "${magic_prefix}${magic_number}.t${magic_number}.${magic_end_seq}";
         ldap_port = 636;
-        ldap_dc_1 = "${magic_prefix}${magic_number}";
-        ldap_dc_2 = "t${magic_number}";
-        ldap_dc_3 = magic_end_seq;
         ldap_script = pkgs.writeShellScriptBin "ldap" ''
-          # if ! [ "$LDAP_HOST" ]; then
+          if ! [ "$LDAP_HOST" ]; then
-          #     echo "No LDAP_HOST specified!"
+              echo "No LDAP_HOST specified!"
-          #     exit 1
+              exit 1
-          # fi
+          fi
           SEARCH_FILTER="$@"
           ldapsearch -LLL \
               -B -o ldif-wrap=no \
-              -H "${ldap_scheme}://${ldap_host}:${builtins.toString ldap_port}" \
+              -H "${ldap_scheme}://''${LDAP_HOST}:${builtins.toString ldap_port}" \
-              -D "${pkgs.lib.toUpper magic_prefix}${magic_number}\\${pkgs.lib.toLower config.user}" \
+              -D "${pkgs.lib.toUpper magic_prefix}2\\${pkgs.lib.toLower config.user}" \
-              -w "$(${pkgs._1password}/bin/op item get T${magic_number} --fields label=password)" \
+              -w "$(${pkgs._1password}/bin/op item get T2 --fields label=password)" \
-              -b "DC=${ldap_dc_1},DC=${ldap_dc_2},DC=${ldap_dc_3}" \
+              -b "dc=''${LDAP_HOST//./,dc=}" \
-              -s "sub" -x "(cn=$SEARCH_FILTER)" \
+              -s "sub" -x "(cn=''${SEARCH_FILTER})" \
               | jq --slurp \
                   --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
         '';
         ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
           ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
         '';
         ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
           ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
         '';
       in

modules/darwin/system.nix

@@ -23,6 +23,8 @@
 
     system = {
 
+      stateVersion = 5;
+
       keyboard = {
         remapCapsLockToControl = true;
         enableKeyMapping = true; # Allows for skhd
@@ -106,7 +108,6 @@
             "${pkgs.discord}/Applications/Discord.app"
             "${pkgs.obsidian}/Applications/Obsidian.app"
             "${pkgs.wezterm}/Applications/WezTerm.app"
-            "/System/Applications/System Settings.app"
           ];
         };
 

modules/darwin/user.nix

@@ -14,6 +14,9 @@
       # shell = pkgs.fish; # Default shell
     };
 
+    # This might fix the shell issues
+    # users.knownUsers = [ config.user ];
+
     home-manager.users.${config.user} = {
 
       # Default shell setting doesn't work

modules/darwin/utilities.nix

@@ -19,7 +19,6 @@
       pkgs.visidata # CSV inspector
       pkgs.dos2unix # Convert Windows text files
       pkgs.inetutils # Includes telnet
-      pkgs.youtube-dl # Convert web videos
       pkgs.pandoc # Convert text documents
       pkgs.mpd # TUI slideshows
       pkgs.mpv # Video player
@@ -27,12 +26,14 @@
       pkgs.awscli2
       pkgs.ssm-session-manager-plugin
       pkgs.awslogs
+      pkgs.stu # TUI for AWS S3
       pkgs.google-cloud-sdk
       pkgs.vault-bin
       pkgs.consul
       pkgs.noti # Create notifications programmatically
       pkgs.ipcalc # Make IP network calculations
       pkgs.teams
+      pkgs.cloudflared # Allow connecting to Cloudflare tunnels
       (pkgs.writeShellApplication {
         name = "ocr";
         runtimeInputs = [ pkgs.tesseract ];

modules/nixos/applications/calendar.nix

@@ -0,0 +1,37 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    calendar = {
+      enable = lib.mkEnableOption {
+        description = "Enable calendar.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.calendar.enable) {
+    home-manager.users.${config.user} = {
+
+      accounts.calendar.accounts.default = {
+        basePath = "other/calendars"; # Where to save calendars in ~ directory
+        name = "personal";
+        local.type = "filesystem";
+        primary = true;
+        remote = {
+          passwordCommand = [ "" ];
+          type = "caldav";
+          url = "https://${config.hostnames.content}/remote.php/dav/principals/users/${config.user}";
+          userName = config.user;
+        };
+      };
+
+      home.packages = with pkgs; [ gnome-calendar ];
+    };
+  };
+}

modules/nixos/applications/default.nix

@@ -2,6 +2,7 @@
 {
 
   imports = [
+    ./calendar.nix
     ./calibre.nix
     ./nautilus.nix
   ];

modules/nixos/applications/nautilus.nix

@@ -20,7 +20,7 @@
 
     # Quick preview with spacebar
     services.gnome.sushi.enable = true;
-    environment.systemPackages = [ pkgs.gnome.nautilus ];
+    environment.systemPackages = [ pkgs.nautilus ];
 
     home-manager.users.${config.user} = {
 
@@ -28,13 +28,13 @@
       xsession.windowManager.i3.config.keybindings = {
         "${
           config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-        }+n" = "exec --no-startup-id ${pkgs.gnome.nautilus}/bin/nautilus";
+        }+n" = "exec --no-startup-id ${pkgs.nautilus}/bin/nautilus";
       };
 
       # Generates a QR code and previews it with sushi
       programs.fish.functions = {
         qr = {
-          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.sushi}/bin/sushi /tmp/qr.png";
         };
       };
 

modules/nixos/gaming/default.nix

@@ -12,6 +12,7 @@
     ./legendary.nix
     ./lutris.nix
     ./minecraft-server.nix
+    ./moonlight.nix
     ./ryujinx.nix
     ./steam.nix
   ];

modules/nixos/gaming/dwarf-fortress.nix

@@ -9,7 +9,10 @@
   options.gaming.dwarf-fortress.enable = lib.mkEnableOption "Dwarf Fortress free edition.";
 
   config = lib.mkIf config.gaming.dwarf-fortress.enable {
-    unfreePackages = [ "dwarf-fortress" ];
+    unfreePackages = [
+      "dwarf-fortress"
+      "phoebus-theme"
+    ];
     environment.systemPackages =
       let
         dfDesktopItem = pkgs.makeDesktopItem {

modules/nixos/gaming/moonlight.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.gaming.moonlight.enable = lib.mkEnableOption "Enable Moonlight game streaming client.";
+
+  config = lib.mkIf config.gaming.moonlight.enable {
+    environment.systemPackages = with pkgs; [ moonlight-qt ];
+  };
+}

modules/nixos/graphical/polybar.nix

@@ -42,7 +42,7 @@
             module-margin = 1;
             modules-left = "i3";
             modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date keyboard power";
+            modules-right = "mailcount network pulseaudio date power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -209,12 +209,6 @@
             label-foreground = config.theme.colors.base06;
             # 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 = "  ";

modules/nixos/hardware/audio.nix

@@ -36,8 +36,6 @@ in
 {
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
-    sound.enable = true;
-
     # Enable PipeWire
     services.pipewire = {
       enable = true;

modules/nixos/hardware/keyboard.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 {
 
   config = lib.mkIf config.physical {
@@ -17,24 +12,30 @@
       autoRepeatInterval = 40;
     };
 
-    # Use capslock as escape and/or control
+    # Swap Caps-Lock with Escape when pressed or LCtrl when held/combined with others
-    services.keyd = {
+    # Inspired by: https://www.youtube.com/watch?v=XuQVbZ0wENE
+    services.kanata = {
       enable = true;
-      keyboards = {
+      keyboards.default = {
-        default = {
+        devices = [
-          ids = [ "*" ];
+          "/dev/input/by-id/usb-Logitech_Logitech_G710_Keyboard-event-kbd"
-          settings = {
+          "/dev/input/by-id/usb-Logitech_Logitech_G710_Keyboard-if01-event-kbd"
-            main = {
+        ];
-              capslock = "overload(control, esc)";
+        extraDefCfg = "process-unmapped-keys yes";
-            };
+        config = ''
-          };
+          (defsrc
-        };
+              caps
+          )
+          (defalias
+              escctrl (tap-hold-press 1000 1000 esc lctrl)
+          )
+          (deflayer base
+              @escctrl
+          )
+        '';
       };
     };
 
-    # 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/mouse.nix

@@ -21,5 +21,15 @@
       accelProfile = "flat";
       accelSpeed = "1.15";
     };
+
+    # Cursor
+    home-manager.users.${config.user}.home.pointerCursor = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+      size = 24;
+      gtk.enable = true;
+      x11.enable = true;
+    };
+
   };
 }

modules/nixos/hardware/zfs.nix

@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
 
   options = {
@@ -8,7 +13,7 @@
   config = lib.mkIf (config.server && config.zfs.enable) {
 
     # Only use compatible Linux kernel, since ZFS can be behind
-    boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    boot.kernelPackages = pkgs.linuxPackages; # Defaults to latest LTS
     boot.kernelParams = [ "nohibernate" ];
     boot.supportedFilesystems = [ "zfs" ];
     services.prometheus.exporters.zfs.enable = config.prometheus.exporters.enable;

modules/nixos/services/arr.nix

@@ -14,6 +14,11 @@ let
       url = "localhost:7878";
       apiKey = config.secrets.radarrApiKey.dest;
     };
+    readarr = {
+      exportarrPort = "9711";
+      url = "localhost:8787";
+      apiKey = config.secrets.readarrApiKey.dest;
+    };
     sonarr = {
       exportarrPort = "9708";
       url = "localhost:8989";
@@ -61,6 +66,10 @@ in
         enable = true;
         group = "media";
       };
+      readarr = {
+        enable = true;
+        group = "media";
+      };
     };
 
     # Create a media group to be shared between services
@@ -110,6 +119,21 @@ in
           }
         ];
       }
+      {
+        group = "download";
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/readarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = arrConfig.readarr.url; } ];
+          }
+        ];
+      }
       {
         group = "download";
         match = [
@@ -223,6 +247,11 @@ in
       dest = "/var/private/radarr-api";
       prefix = "API_KEY=";
     };
+    secrets.readarrApiKey = {
+      source = ../../../private/radarr-api-key.age;
+      dest = "/var/private/readarr-api";
+      prefix = "API_KEY=";
+    };
     secrets.sonarrApiKey = {
       source = ../../../private/sonarr-api-key.age;
       dest = "/var/private/sonarr-api";

modules/nixos/services/audiobookshelf.nix

@@ -0,0 +1,44 @@
+{ config, lib, ... }:
+{
+
+  options = {
+    hostnames.audiobooks = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname for audiobook server (Audiobookshelf).";
+    };
+  };
+
+  config = lib.mkIf config.services.audiobookshelf.enable {
+
+    services.audiobookshelf = {
+      dataDir = "audiobookshelf";
+    };
+
+    # Allow web traffic to Caddy
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.audiobooks ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.audiobookshelf.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.audiobooks ];
+
+    # Grant user access to Audiobookshelf directories
+    users.users.${config.user}.extraGroups = [ config.services.audiobookshelf.group ];
+
+    # Grant audiobookshelf access to media and Calibre directories
+    users.users.${config.services.audiobookshelf.user}.extraGroups = [
+      "media"
+      "calibre-web"
+    ];
+
+  };
+
+}

modules/nixos/services/backups.nix

@@ -44,6 +44,10 @@
       settings = { };
     };
 
+    # Broken on 2024-08-23
+    # https://github.com/NixOS/nixpkgs/commit/0875d0ce1c778f344cd2377a5337a45385d6ffa0
+    nixpkgs.config.permittedInsecurePackages = [ "litestream-0.3.13" ];
+
     # Wait for secret to exist
     systemd.services.litestream = {
       after = [ "backup-secret.service" ];

modules/nixos/services/caddy.nix

@@ -46,7 +46,7 @@
 
     # Force Caddy to 403 if not coming from allowlisted source
     caddy.cidrAllowlist = [ "127.0.0.1/32" ];
-    caddy.routes = [
+    caddy.routes = lib.mkBefore [
       {
         match = [ { not = [ { remote_ip.ranges = config.caddy.cidrAllowlist; } ]; } ];
         handle = [
@@ -58,42 +58,155 @@
       }
     ];
 
-    services.caddy = {
+    services.caddy =
-      adapter = "''"; # Required to enable JSON
+      let
-      configFile = pkgs.writeText "Caddyfile" (
+        default_logger_name = "other";
-        builtins.toJSON {
+        roll_size_mb = 25;
-          apps.http.servers.main = {
+        # Extract list of hostnames (fqdns) from current caddy routes
-            listen = [ ":443" ];
+        getHostnameFromMatch = match: if (lib.hasAttr "host" match) then match.host else [ ];
+        getHostnameFromRoute =
+          route:
+          if (lib.hasAttr "match" route) then (lib.concatMap getHostnameFromMatch route.match) else [ ];
+        hostnames_non_unique = lib.concatMap getHostnameFromRoute config.caddy.routes;
+        hostnames = lib.unique hostnames_non_unique;
+        # Create attrset of subdomains to their fqdns
+        hostname_map = builtins.listToAttrs (
+          map (hostname: {
+            name = builtins.head (lib.splitString "." hostname);
+            value = hostname;
+          }) hostnames
+        );
+      in
+      {
+        adapter = "''"; # Required to enable JSON
+        configFile = pkgs.writeText "Caddyfile" (
+          builtins.toJSON {
+            apps.http.servers.main = {
+              listen = [ ":443" ];
 
-            # These routes are pulled from the rest of this repo
+              # These routes are pulled from the rest of this repo
-            routes = config.caddy.routes;
+              routes = config.caddy.routes;
-            errors.routes = config.caddy.blocks;
+              errors.routes = config.caddy.blocks;
 
-            logs = { }; # Uncommenting collects access logs
+              # Uncommenting collects access logs
-          };
+              logs = {
-          apps.http.servers.metrics = { }; # Enables Prometheus metrics
+                inherit default_logger_name;
-          apps.tls.automation.policies = config.caddy.tlsPolicies;
+                # Invert hostnames keys and values
-
+                logger_names = lib.mapAttrs' (name: value: {
-          # Setup logging to file
+                  name = value;
-          logging.logs.main = {
+                  value = name;
-            encoder = {
+                }) hostname_map;
-              format = "console";
+              };
             };
-            writer = {
+            apps.http.servers.metrics = { }; # Enables Prometheus metrics
-              output = "file";
+            apps.tls.automation.policies = config.caddy.tlsPolicies;
-              filename = "${config.services.caddy.logDir}/caddy.log";
+
-              roll = true;
+            # Setup logging to journal and files
-              roll_size_mb = 1;
+            logging.logs =
-            };
+              {
-            level = "INFO";
+                # System logs and catch-all
-          };
+                # Must be called `default` to override Caddy's built-in default logger
-        }
+                default = {
-      );
+                  level = "INFO";
+                  encoder.format = "console";
+                  writer = {
+                    output = "stderr";
+                  };
+                  exclude = (map (hostname: "http.log.access.${hostname}") (builtins.attrNames hostname_map)) ++ [
+                    "http.log.access.${default_logger_name}"
+                  ];
+                };
+                # This is for the default access logs (anything not captured by hostname)
+                other = {
+                  level = "INFO";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/other.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "http.log.access.${default_logger_name}" ];
+                };
+                # This is for using the Caddy API, which will probably never happen
+                admin = {
+                  level = "INFO";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/admin.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "admin" ];
+                };
+                # This is for TLS cert management tracking
+                tls = {
+                  level = "INFO";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/tls.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "tls" ];
+                };
+                # This is for debugging
+                debug = {
+                  level = "DEBUG";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/debug.log";
+                    roll = true;
+                    roll_keep = 1;
+                    inherit roll_size_mb;
+                  };
+                };
+              }
+              # These are the access logs for individual hostnames
+              // (lib.mapAttrs (name: value: {
+                level = "INFO";
+                encoder.format = "json";
+                writer = {
+                  output = "file";
+                  filename = "${config.services.caddy.logDir}/${name}-access.log";
+                  roll = true;
+                  inherit roll_size_mb;
+                };
+                include = [ "http.log.access.${name}" ];
+              }) hostname_map)
+              # We also capture just the errors separately for easy debugging
+              // (lib.mapAttrs' (name: value: {
+                name = "${name}-error";
+                value = {
+                  level = "ERROR";
+                  encoder.format = "json";
+                  writer = {
+                    output = "file";
+                    filename = "${config.services.caddy.logDir}/${name}-error.log";
+                    roll = true;
+                    inherit roll_size_mb;
+                  };
+                  include = [ "http.log.access.${name}" ];
+                };
+              }) hostname_map);
+          }
+        );
+      };
+
+    systemd.services.caddy.serviceConfig = {
+
+      # Allows Caddy to serve lower ports (443, 80)
+      AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+
+      # Prevent flooding of logs by rate-limiting
+      LogRateLimitIntervalSec = "5s"; # Limit period
+      LogRateLimitBurst = 100; # Limit threshold
+
     };
 
-    # 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

modules/nixos/services/cloudflare.nix

@@ -78,6 +78,8 @@ in
         issuers = [
           {
             module = "acme";
+            email = "acme@${config.mail.server}";
+            account_key = "{env.ACME_ACCOUNT_KEY}";
             challenges = {
               dns = {
                 provider = {
@@ -92,7 +94,18 @@ in
       }
     ];
     # Allow Caddy to read Cloudflare API key for DNS validation
-    systemd.services.caddy.serviceConfig.EnvironmentFile = config.secrets.cloudflare-api.dest;
+    systemd.services.caddy.serviceConfig.EnvironmentFile = [
+      config.secrets.cloudflare-api.dest
+      config.secrets.letsencrypt-key.dest
+    ];
+
+    # Private key is used for LetsEncrypt
+    secrets.letsencrypt-key = {
+      source = ../../../private/letsencrypt-key.age;
+      dest = "${config.secretsDirectory}/letsencrypt-key";
+      owner = "caddy";
+      group = "caddy";
+    };
 
     # API key must have access to modify Cloudflare DNS records
     secrets.cloudflare-api = {
@@ -104,8 +117,14 @@ in
 
     # Wait for secret to exist
     systemd.services.caddy = {
-      after = [ "cloudflare-api-secret.service" ];
+      after = [
-      requires = [ "cloudflare-api-secret.service" ];
+        "cloudflare-api-secret.service"
+        "letsencrypt-key-secret.service"
+      ];
+      requires = [
+        "cloudflare-api-secret.service"
+        "letsencrypt-key-secret.service"
+      ];
     };
 
     # Allows Nextcloud to trust Cloudflare IPs
@@ -116,6 +135,9 @@ in
       [ "127.0.0.1" ] ++ cloudflareIpRanges
     );
 
+    # Using dyn-dns instead of ddclient because I can't find a way to choose
+    # between proxied and non-proxied records for Cloudflare using just
+    # ddclient.
     services.cloudflare-dyndns =
       lib.mkIf ((builtins.length config.services.cloudflare-dyndns.domains) > 0)
         {

modules/nixos/services/default.nix

@@ -5,6 +5,7 @@
 {
 
   imports = [
+    ./audiobookshelf.nix
     ./arr.nix
     ./backups.nix
     ./bind.nix
@@ -12,6 +13,7 @@
     ./calibre.nix
     ./cloudflare-tunnel.nix
     ./cloudflare.nix
+    ./filebrowser.nix
     ./identity.nix
     ./irc.nix
     ./gitea-runner.nix
@@ -26,6 +28,7 @@
     ./n8n.nix
     ./netdata.nix
     ./nextcloud.nix
+    ./ntfy.nix
     ./paperless.nix
     ./postgresql.nix
     ./prometheus.nix
@@ -33,6 +36,7 @@
     ./secrets.nix
     ./sshd.nix
     ./transmission.nix
+    ./uptime-kuma.nix
     ./vaultwarden.nix
     ./victoriametrics.nix
     ./wireguard.nix

modules/nixos/services/filebrowser.nix

@@ -0,0 +1,74 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  user =
+    if config.services.nextcloud.enable then
+      config.services.phpfpm.pools.nextcloud.user
+    else
+      "filebrowser";
+
+  dataDir = "/var/lib/filebrowser";
+
+  settings = {
+    port = 8020;
+    baseURL = "";
+    address = "";
+    log = "stdout";
+    database = "${dataDir}/filebrowser.db";
+    root = "";
+    "auth.method" = "json";
+    username = config.user;
+    # Generate password: htpasswd -nBC 10 "" | tr -d ':\n'
+    password = "$2y$10$ze1cMob0k6pnXRjLowYfZOVZWg4G.dsPtH3TohbUeEbI0sdkG9.za";
+  };
+
+in
+{
+
+  options.filebrowser.enable = lib.mkEnableOption "Use Filebrowser.";
+
+  config = lib.mkIf config.filebrowser.enable {
+
+    environment.etc."filebrowser/.filebrowser.json".text = builtins.toJSON settings;
+
+    systemd.services.filebrowser = lib.mkIf config.filebrowser.enable {
+      description = "Filebrowser cloud file services";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      startLimitIntervalSec = 14400;
+      startLimitBurst = 10;
+      serviceConfig = {
+        ExecStart = "${pkgs.filebrowser}/bin/filebrowser";
+        DynamicUser = !config.services.nextcloud.enable; # Unique user if not using Nextcloud
+        User = user;
+        Group = user;
+        ReadWritePaths = [ dataDir ];
+        StateDirectory = [ "filebrowser" ];
+        Restart = "on-failure";
+        RestartPreventExitStatus = 1;
+        RestartSec = "5s";
+      };
+    };
+
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.files ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString settings.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.files ];
+
+  };
+
+}

modules/nixos/services/grafana.nix

@@ -53,6 +53,7 @@ in
             uid = promUid;
           }
         ];
+        # TODO: Add option to pull services from a list like Caddy does
         dashboards.settings.providers = [
           {
             name = "test";
@@ -368,6 +369,18 @@ in
                           range = true;
                           refId = "C";
                         }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "readarr_system_status";
+                          hide = false;
+                          legendFormat = "Readarr";
+                          range = true;
+                          refId = "F";
+                        }
                         {
                           datasource = {
                             type = "prometheus";
@@ -669,7 +682,7 @@ in
                           };
                           editorMode = "code";
                           exemplar = false;
-                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[1d])'';
+                          "expr" = ''delta(zfs_dataset_used_bytes{name="tank"}[1d])'';
                           hide = false;
                           instant = false;
                           interval = "";
@@ -683,7 +696,7 @@ in
                             uid = promUid;
                           };
                           editorMode = "code";
-                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[7d])'';
+                          "expr" = ''delta(zfs_dataset_used_bytes{name="tank"}[7d])'';
                           hide = false;
                           legendFormat = "Past Week";
                           range = true;
@@ -695,7 +708,7 @@ in
                             uid = promUid;
                           };
                           editorMode = "code";
-                          "expr" = ''increase(zfs_dataset_used_bytes{name="tank"}[30d])'';
+                          "expr" = ''delta(zfs_dataset_used_bytes{name="tank"}[30d])'';
                           hide = false;
                           legendFormat = "Past Month";
                           range = true;
@@ -819,6 +832,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8787";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Readarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/readarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -885,6 +920,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8086";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "InfluxDB";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.influxdb}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -929,6 +986,28 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:9000";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "The Lounge";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.irc}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                           {
                             matcher = {
                               id = "byName";
@@ -1039,6 +1118,50 @@ in
                               }
                             ];
                           }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.paperless.port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Paperless";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.paperless}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.audiobookshelf.port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Audiobookshelf";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.audiobooks}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                         ];
                       };
                       gridPos = {
@@ -2321,7 +2444,7 @@ in
                       datasourceUid = promUid;
                       model = {
                         editorMode = "code";
-                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
+                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
                         hide = false;
                         instant = true;
                         intervalMs = 1000;
@@ -2418,7 +2541,7 @@ in
                   execErrState = "Error";
                   for = "5m";
                   annotations = {
-                    description = "Cloudflare Tunnel for {{ $job }}.";
+                    description = "Cloudflare Tunnel for {{ index $labels \"job\" }}.";
                     summary = "Cloudflare Tunnel is down.";
                   };
                   isPaused = false;

modules/nixos/services/n8n.nix

@@ -9,12 +9,18 @@
     unfreePackages = [ "n8n" ];
 
     services.n8n = {
+      webhookUrl = "https://${config.hostnames.n8n}";
       settings = {
         listen_address = "127.0.0.1";
         port = 5678;
+
       };
     };
 
+    systemd.services.n8n.environment = {
+      N8N_EDITOR_BASE_URL = config.services.n8n.webhookUrl;
+    };
+
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.n8n ];
 

modules/nixos/services/nextcloud.nix

@@ -26,6 +26,8 @@
         trusted_domains = [ config.hostnames.content ];
         trusted_proxies = [ "127.0.0.1" ];
         maintenance_window_start = 4; # Run jobs at 4am UTC
+        log_type = "file";
+        loglevel = 1; # Include all actions in the log
       };
       extraAppsEnable = true;
       extraApps = {

modules/nixos/services/ntfy.nix

@@ -0,0 +1,33 @@
+{ config, lib, ... }:
+
+{
+
+  config = lib.mkIf config.services.ntfy-sh.enable {
+    services.ntfy-sh = {
+      settings = {
+        base-url = "https://${config.hostnames.notifications}";
+        upstream-base-url = "https://ntfy.sh";
+        listen-http = ":8333";
+        behind-proxy = true;
+        auth-default-access = "deny-all";
+        auth-file = "/var/lib/ntfy-sh/user.db";
+      };
+    };
+
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.notifications ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost${config.services.ntfy-sh.settings.listen-http}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.notifications ];
+
+  };
+}

modules/nixos/services/samba.nix

@@ -7,7 +7,7 @@
 
     services.samba = lib.mkIf config.services.samba.enable {
       openFirewall = true;
-      shares.data = {
+      settings.data = {
         path = "/data";
         browseable = "yes";
         "read only" = "no";

modules/nixos/services/uptime-kuma.nix

@@ -0,0 +1,32 @@
+{ config, lib, ... }:
+{
+
+  config = lib.mkIf config.services.uptime-kuma.enable {
+
+    services.uptime-kuma = {
+      settings = {
+        PORT = "3033";
+      };
+    };
+
+    # Allow web traffic to Caddy
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.status ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [
+              { dial = "localhost:${config.services.uptime-kuma.settings.PORT}"; }
+            ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.status ];
+
+  };
+
+}

modules/nixos/services/victoriametrics.nix

@@ -5,6 +5,7 @@
   config,
   pkgs,
   lib,
+  pkgs-stable,
   ...
 }:
 
@@ -38,6 +39,10 @@ in
 
   config = {
 
+    services.victoriametrics.extraOptions = [
+      "-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
+    ];
+
     systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
       description = "VictoriaMetrics basic auth proxy";
       after = [ "network.target" ];
@@ -84,7 +89,10 @@ in
     # VMAgent
 
     services.vmagent = {
+      package = pkgs-stable.vmagent;
       prometheusConfig = prometheusConfig;
+      # https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5567
+      extraArgs = [ "-promscrape.maxScrapeSize 450000000" ];
       remoteWrite = {
         url = "https://${config.hostnames.prometheus}/api/v1/write";
         basicAuthUsername = username;

modules/nixos/system/journald.nix

@@ -4,7 +4,10 @@
   # How long to keep journalctl entries
   # This helps to make sure log disk usage doesn't grow too unwieldy
   services.journald.extraConfig = ''
-    SystemMaxUse=100M
+    SystemMaxUse=4G
+    SystemKeepFree=10G
+    SystemMaxFileSize=128M
+    SystemMaxFiles=500
     MaxFileSec=1month
     MaxRetentionSec=2month
   '';

overlays/calibre-web-cloudflare.patch

@@ -1,27 +0,0 @@
-diff --git a/cps/__init__.py b/cps/__init__.py
-index f4f8dbf2..7377acdf 100644
---- a/cps/__init__.py
-+++ b/cps/__init__.py
-@@ -151,7 +151,6 @@ def create_app():
- 
-     lm.login_view = 'web.login'
-     lm.anonymous_user = ub.Anonymous
--    lm.session_protection = 'strong' if config.config_session == 1 else "basic"
- 
-     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 045a9523..825a28af 100644
---- a/cps/admin.py
-+++ b/cps/admin.py
-@@ -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 \
--      and config.config_session == 1:
--        logout_user()
-     g.constants = constants
-     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
-     g.allow_registration = config.config_public_reg

overlays/calibre-web.nix

@@ -1,7 +0,0 @@
-# Fix: https://github.com/janeczku/calibre-web/issues/2422
-
-_final: prev: {
-  calibre-web = prev.calibre-web.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [ ./calibre-web-cloudflare.patch ];
-  });
-}

overlays/gh-collaborators.nix

@@ -1,15 +1,9 @@
-_final: prev: {
+inputs: _final: prev: {
 
   gh-collaborators = prev.buildGoModule rec {
     pname = "gh-collaborators";
     version = "v2.0.3";
-
+    src = inputs.gh-collaborators;
-    src = prev.fetchFromGitHub {
-      owner = "nmasur";
-      repo = "gh-collaborators";
-      rev = version;
-      sha256 = "sha256-XgAZ/+7QxIRKiAZ4Gp/rLgTABSXkVjFQ8TbXOFj9vpM=";
-    };
 
     # vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
     vendorHash = "sha256-fykxRb2U9DDsXorRTLiVWmhMY89N7RS07sal8ww6gz4=";

overlays/neovim-plugins.nix

@@ -38,5 +38,7 @@ in
     base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
     baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
     hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
+    tiny-inline-diagnostic-nvim = plugin "tiny-inline-diagnostic-nvim" inputs.tiny-inline-diagnostic-nvim-src;
+    snipe-nvim = plugin "snipe-nvim" inputs.snipe-nvim-src;
   };
 }

overlays/nextcloud-apps.nix

@@ -5,21 +5,25 @@ inputs: _final: prev: {
       url = inputs.nextcloud-news.outPath;
       sha256 = inputs.nextcloud-news.narHash;
       license = "agpl3Plus";
+      unpack = true;
     };
     external = prev.fetchNextcloudApp {
       url = inputs.nextcloud-external.outPath;
       sha256 = inputs.nextcloud-external.narHash;
       license = "agpl3Plus";
+      unpack = true;
     };
     cookbook = prev.fetchNextcloudApp {
       url = inputs.nextcloud-cookbook.outPath;
       sha256 = inputs.nextcloud-cookbook.narHash;
       license = "agpl3Plus";
+      unpack = true;
     };
     snappymail = prev.fetchNextcloudApp {
       url = inputs.nextcloud-snappymail.outPath;
       sha256 = inputs.nextcloud-snappymail.narHash;
       license = "agpl3Plus";
+      unpack = true;
     };
   };
 }

private/letsencrypt-key.age

@@ -0,0 +1,21 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBCc2hS
+RUw4Y200allVODI0QTYxdXlHSHRiS1pWWHg5SW9tZ0tGVmc2ajJZCitXeEd0dk9K
+MmRkZlRYd253RWFzNXpUR0xuTXI2dWVhNFZpQnNlU0VFdEUKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIHNScVkwd1RmVGhNcFVSRTlxQzlvSUc2cGxNWUc0YVJ5RjRydk9J
+RG1peDQKVU5iN1ZmWEJyOXBiNWdiRFlnNFFKR09vaFB4SWZWK0x3VWJwMDZtYlBj
+MAotPiBzc2gtZWQyNTUxOSBuanZYNUEgSXR5OEk5cWZHUEZ3WmFCUTVFeTBnTG5h
+cmNxVWFLV2JhUTRBaUJGWERncwpYMFBIN0kySXdjOE5YcS85bXRCRnRsK3NyMHY4
+N0JKelFyeHB6T1dEZ2VnCi0+IHNzaC1lZDI1NTE5IENxSU9VQSAyQVJYRXJ1cFVl
+dldaa0Qydlc3MzlFYnN5YUx0amdWZm5PcWovRm1MaVg0CkJsSFZRdGJIZzA1T0Ny
+bUNnL0Zxa05ubHluSVBUenVCZTZpYlA5UUFEMDQKLT4gc3NoLWVkMjU1MTkgejFP
+Y1p3IDFPQU5HZm5mRFl5NnNLVHUvdUlmTEtyS0djNWZaMWg5VDl1ZldNTkVWbXMK
+RkVBTzNUa0d6c3NJUHQrazdKWXNZY3NIRzRndGdRNjFjMXZCSEhIQnIyYwotLS0g
+VzNOa3dXS0hrMWxNUlJ4UzAxNlkzSXM4RWc1RGFzQjFyb1dGZXFnL3RCVQoq002V
+S5MQqBjKKOacO4OWgn5KpmU2D7zJWJjNMxH80L6HFNoyOj4wNa+8TA0Q7MTn3bKN
+YvAuwbDAGjjDt8vZFKOiZB0xAex+H7A1MVvuGIA8xQa6iNBMwj7nWTLif5pCbVk+
+9aAAprcJVDJx4TeFXlNF6XtcQ3J8abwi6TDqNFpfwwBb/wruyzutgvlOiz1XSBX0
+xlCGckq/BCnItLURIb7zhqRMqk/JODPjOKArmP86nCq25Wm+W5JQ8ViQ7LHJyoFj
+zbiwabqeBJZgqoVdVMj8Glz+91RVodn6f9VwQcHINgHxmkd6j2z75AmWZecwD2ic
+pUMnikqIMI0B3zW5H38t2cJv+aIMTl7lH5Hf1P5jEn3NPw==
+-----END AGE ENCRYPTED FILE-----