Fix zitadel config

Flake lock file updates:

• Updated input 'secrets':
    'git+ssh://git@git.vimium.com/jordan/nix-secrets.git?ref=refs/heads/master&rev=0cf25cbc71fcfe7c16250847e5f31abd730e04c4' (2024-08-11)
  → 'git+ssh://git@git.vimium.com/jordan/nix-secrets.git?ref=refs/heads/master&rev=b47efe67031e12a2d5560b94fdb4de7dca3df80c' (2024-08-11)

.gitea/workflows/check.yml

@@ -0,0 +1,15 @@
+name: Check flake
+on:
+  push:
+    branches: ['master']
+jobs:
+  build-amd64-linux:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Check flake
+        run: |
+          echo "Checking flake at ${{ gitea.ref }}"
+          nix flake check

README.md

@@ -7,10 +7,49 @@ System and user configuration for NixOS-based systems.
 | **Shell:** | zsh |
 | **DE:** | GNOME |
 | **Theme:** | adwaita |
-| **Terminal:** | BlackBox |
+| **Terminal:** | Console |
+
+## Provisioning a new host
+> [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used
+> for provisioning
+
+Generate a new SSH host key in "$temp/etc/ssh" as per [this guide](https://nix-community.github.io/nixos-anywhere/howtos/secrets.html#example-decrypting-an-openssh-host-key-with-pass).
+```
+ssh-keygen -t ed25519 -f /tmp/ssh_host_ed25519_key
+```
+
+Update [nix-secrets](/jordan/nix-secrets) with the new host key to enable the system to decrypt
+any relevant secrets.
+
+In order to use the borgmatic module for backups, go to [borgbase.com](https://borgbase.com).
+Add the generated SSH host key and create a new repository for the system.
+
+Create a new directory under `hosts/` with a system configuration and disk layout.
+
+Boot the NixOS installer (or any Linux distribution) on the target.
+
+Then run:
+```
+nix run github:nix-community/nixos-anywhere -- \
+  --disk-encryption-keys /tmp/secret.key /tmp/secret.key \
+  --extra-files "$temp" \
+  --flake .#<hostname> \
+  root@<target-ip>
+```
+
+### Post install
+
+If backups are configured, you'll need to run:
+```
+borgmatic init --encryption repokey-blake2
+```
+then restart `borgmatic`.
+
+To join the Tailscale network, run:
+```
+tailscale up --login-server https://headscale.vimium.net
+```
+then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`.
+
+The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`.
 
-## Quick start
-1. Copy SSH keypair and `known_hosts` to `~/.ssh`
-1. Import GPG keys and set ultimate trust with `echo "KEYID:6:" | gpg --import-ownertrust`
-1. `git clone git@git.vimium.com:jordan/nix-config.git projects/jordan/nix-config`
-1. `sudo nixos-rebuild switch --flake .#`

flake.lock

@@ -1,73 +1,647 @@
 {
   "nodes": {
-    "firefox-gnome-theme": {
+    "agenix": {
-      "flake": false,
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1699621711,
+        "lastModified": 1723293904,
-        "narHash": "sha256-GUvBQbagF/7W1AriPVvJYA1cmk9Y/iWXghj3cIFYQzU=",
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
-        "owner": "rafaelmardojai",
+        "owner": "ryantm",
-        "repo": "firefox-gnome-theme",
+        "repo": "agenix",
-        "rev": "1c32013cdbe17406de496cdf5f6899b84c4bbfed",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
         "type": "github"
       },
       "original": {
-        "owner": "rafaelmardojai",
+        "owner": "ryantm",
-        "repo": "firefox-gnome-theme",
+        "repo": "agenix",
         "type": "github"
       }
     },
-    "home-manager": {
+    "blobs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1604995301,
+        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "type": "gitlab"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1718194053,
+        "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "disko": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1699748081,
+        "lastModified": 1723080788,
-        "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
+        "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
         "owner": "nix-community",
-        "repo": "home-manager",
+        "repo": "disko",
-        "rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
+        "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723137499,
+        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "revCount": 57,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722857853,
+        "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitea-github-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717248105,
+        "narHash": "sha256-BwSsIkl7DpN/c8HNXOh2aKjOuPmFsGybv4RegOC7Xq0=",
+        "ref": "main",
+        "rev": "4f829f88e6f443ff048c4d337bd010315aa4b50a",
+        "revCount": 101,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/gitea-github-theme.git"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/gitea-github-theme.git"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "kvlibadwaita": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1710621848,
+        "narHash": "sha256-xBl6zmpqTAH5MIT5iNAdW6kdOcB5MY0Dtrb95hdYpwA=",
+        "owner": "GabePoel",
+        "repo": "KvLibadwaita",
+        "rev": "87c1ef9f44ec48855fd09ddab041007277e30e37",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GabePoel",
+        "repo": "KvLibadwaita",
+        "type": "github"
+      }
+    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1723310128,
+        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixos-mailserver": {
+      "inputs": {
+        "blobs": "blobs",
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-24_05": "nixpkgs-24_05",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1718084203,
+        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "ref": "nixos-24.05",
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700097215,
+        "lastModified": 1703013332,
-        "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=",
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-24_05": {
+      "locked": {
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1723282977,
+        "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.05",
+        "type": "indirect"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat_3",
+        "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
+        "home-manager": "home-manager_3",
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1722925293,
+        "narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "nixos-24.05",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723232379,
+        "narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "agenix": "agenix",
+        "deploy-rs": "deploy-rs",
+        "disko": "disko",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "home-manager": "home-manager",
+        "gitea-github-theme": "gitea-github-theme",
-        "nixpkgs": "nixpkgs",
+        "home-manager": "home-manager_2",
+        "kvlibadwaita": "kvlibadwaita",
+        "nixos-hardware": "nixos-hardware",
+        "nixos-mailserver": "nixos-mailserver",
+        "nixpkgs": "nixpkgs_3",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixvim": "nixvim",
+        "plasma-manager": "plasma-manager",
+        "secrets": "secrets",
         "thunderbird-gnome-theme": "thunderbird-gnome-theme"
       }
     },
+    "secrets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723385164,
+        "narHash": "sha256-/z4nBwpHsGWl1gmGv7FQQgoOcPwUaVzL7rfjI5nTOLg=",
+        "ref": "refs/heads/master",
+        "rev": "b47efe67031e12a2d5560b94fdb4de7dca3df80c",
+        "revCount": 24,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "thunderbird-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1699285862,
+        "lastModified": 1721874544,
-        "narHash": "sha256-3TQYBJAeQ2fPFxQnD5iKRKKWFlN3GJhz1EkdwE+4m0k=",
+        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
         "owner": "rafaelmardojai",
         "repo": "thunderbird-gnome-theme",
-        "rev": "a899ca12204d19f4834fbd092aa5bb05dc4bd127",
+        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
         "type": "github"
       },
       "original": {
@@ -75,6 +649,63 @@
         "repo": "thunderbird-gnome-theme",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722330636,
+        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,83 +1,121 @@
 {
-  description = "NixOS/Darwin system configuration";
+  description = "NixOS system configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.05";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    # nixpkgs-master.url = "nixpkgs";
+    agenix.url = "github:ryantm/agenix";
+    deploy-rs.url = "github:serokell/deploy-rs";
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     firefox-gnome-theme = {
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
+    gitea-github-theme = {
+      url = "git+ssh://git@git.vimium.com/jordan/gitea-github-theme.git?ref=main";
+      flake = false;
+    };
+    kvlibadwaita = {
+      url = "github:GabePoel/KvLibadwaita";
+      flake = false;
+    };
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    nixos-mailserver = {
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixvim = {
+      url = "github:nix-community/nixvim/nixos-24.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    plasma-manager = {
+      url = "github:nix-community/plasma-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+    secrets = {
+      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
+      flake = false;
+    };
     thunderbird-gnome-theme = {
       url = "github:rafaelmardojai/thunderbird-gnome-theme";
       flake = false;
     };
   };
 
-  outputs = inputs @ { self, nixpkgs, home-manager, ... }:
+  outputs = inputs @ { self, nixpkgs, ... }:
     let
-      inherit (lib) attrValues;
+      inherit (nixpkgs) lib;
-      inherit (lib.my) mapModules mapModulesRec;
 
-      system = "x86_64-linux";
+      domain = "mesh.vimium.net";
+      forEverySystem = lib.getAttrs lib.systems.flakeExposed;
+      forEachSystem = lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+      mkDeployNode = hostName: {
+        hostname = "${hostName}.${domain}";
 
-      mkPkgs = pkgs: extraOverlays:
+        profiles.system = {
-        import pkgs {
+          user = "root";
-          inherit system;
+          path = inputs.deploy-rs.lib.${self.nixosConfigurations.${hostName}.config.system.build.toplevel.system}.activate.nixos self.nixosConfigurations.${hostName};
-          config.allowUnfree = true;
-          overlays = extraOverlays ++ (lib.attrValues self.overlays);
         };
-      pkgs = mkPkgs nixpkgs [];
-
-      lib = nixpkgs.lib.extend (self: super: {
-        my = import ./lib {
-          inherit pkgs inputs;
-          lib = self;
       };
+    in
+    {
+      overlays = lib.packagesFromDirectoryRecursive {
+        callPackage = path: overrides: import path;
+        directory = ./overlays;
+      };
+
+      legacyPackages = forEachSystem (system:
+        lib.packagesFromDirectoryRecursive {
+          callPackage = nixpkgs.legacyPackages.${system}.callPackage;
+          directory = ./pkgs;
         });
-    in {
-      lib = lib.my;
 
-      nixosConfigurations = {
+      nixosConfigurations = lib.pipe ./hosts [
-        atlas = nixpkgs.lib.nixosSystem {
+        builtins.readDir
+        (lib.filterAttrs (name: value: value == "directory"))
+        (lib.mapAttrs (name: value:
+          lib.nixosSystem {
+            specialArgs = { inherit self; };
+
             modules = [
-            inputs.home-manager.nixosModules.home-manager
+              {
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
+                networking = {
-            (import ./modules)
+                  inherit domain;
-            ./hosts/atlas
+                  hostName = name;
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        eos = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/eos
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        helios = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/helios
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        odyssey = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/odyssey
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-      };
                 };
               }
+              ./hosts/${name}
+            ];
+          }))
+      ];
+
+      devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
+        buildInputs = [
+          inputs.agenix.packages.x86_64-linux.agenix
+          inputs.deploy-rs.packages.x86_64-linux.deploy-rs
+        ];
+      };
+
+      deploy = {
+        magicRollback = true;
+        autoRollback = true;
+        sshUser = "root";
+        nodes = lib.genAttrs [ "mail" "pi" "skycam" "vps1" ] mkDeployNode;
+      };
+
+      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
+    };
+}
+

hosts/atlas/default.nix

@@ -1,27 +1,25 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
   ];
 
-  boot.loader.systemd-boot.enable = true;
+  nixpkgs.hostPlatform = "x86_64-linux";
-  boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "atlas";
+  boot.loader = {
-  networking.hostId = "8425e349";
+    systemd-boot.enable = true;
-  networking.networkmanager.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
 
-  nix.package = pkgs.nixFlakes;
+  networking = {
-  nix.extraOptions = ''
+    hostId = "8425e349";
-    experimental-features = nix-command flakes
+    networkmanager.enable = true;
-  '';
+  };
 
-  users.defaultUserShell = pkgs.zsh;
+  virtualisation.virtualbox.host.enable = true;
-
+  users.extraGroups.vboxusers.members = [ "jordan" ];
-  system.stateVersion = "22.11";
 
   modules = {
     desktop = {
@@ -43,15 +41,25 @@ with lib.my;
     };
     editors = {
       neovim.enable = true;
-      vscode.enable = true;
     };
     security = {
       gpg.enable = true;
       pass.enable = true;
     };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home/jordan/Documents"
+        ];
+        repoPath = "ssh://uzu2y5b1@uzu2y5b1.repo.borgbase.com/./repo";
+      };
+    };
     shell = {
       git.enable = true;
       zsh.enable = true;
     };
   };
+
+  system.stateVersion = "22.11";
 }

hosts/atlas/hardware-configuration.nix

@@ -1,70 +1,66 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
+    initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+    initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelParams = [ "elevator=none" ];
+    kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+    kernelParams = [ "elevator=none" ];
-  boot.supportedFilesystems = [ "zfs" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "rpool/system/root";
+    device = "rpool/system/root";
     fsType = "zfs";
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "rpool/user/home";
+    device = "rpool/user/home";
     fsType = "zfs";
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "rpool/local/nix";
+    device = "rpool/local/nix";
     fsType = "zfs";
   };
 
-  fileSystems."/tmp" =
+  fileSystems."/tmp" = {
-    { device = "rpool/local/tmp";
+    device = "rpool/local/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "rpool/system/var";
+    device = "rpool/system/var";
     fsType = "zfs";
   };
 
-  fileSystems."/var/log" =
+  fileSystems."/var/log" = {
-    { device = "rpool/system/var/log";
+    device = "rpool/system/var/log";
     fsType = "zfs";
   };
 
-  fileSystems."/var/tmp" =
+  fileSystems."/var/tmp" = {
-    { device = "rpool/system/var/tmp";
+    device = "rpool/system/var/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/00B2-0384";
+    device = "/dev/disk/by-uuid/00B2-0384";
     fsType = "vfat";
   };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/common.nix

@@ -0,0 +1,99 @@
+{ config, pkgs, self, ... }:
+
+{
+  imports = [
+    self.inputs.agenix.nixosModules.age
+    self.inputs.home-manager.nixosModule
+    ../modules
+  ];
+
+  nixpkgs.overlays = [
+    self.inputs.agenix.overlays.default
+    (import ../overlays/default.nix)
+    (
+      final: prev: {
+        unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
+      }
+    )
+  ];
+
+  time.timeZone = "Europe/London";
+
+  i18n.defaultLocale = "en_GB.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_GB.UTF-8";
+    LC_IDENTIFICATION = "en_GB.UTF-8";
+    LC_MEASUREMENT = "en_GB.UTF-8";
+    LC_MONETARY = "en_GB.UTF-8";
+    LC_NAME = "en_GB.UTF-8";
+    LC_NUMERIC = "en_GB.UTF-8";
+    LC_PAPER = "en_GB.UTF-8";
+    LC_TELEPHONE = "en_GB.UTF-8";
+    LC_TIME = "en_GB.UTF-8";
+  };
+
+  console.keyMap = "uk";
+
+  security.sudo.execWheelOnly = true;
+
+  services.openssh = {
+    enable = true;
+    settings = {
+      KbdInteractiveAuthentication = false;
+      PasswordAuthentication = false;
+      PermitRootLogin = "no";
+    };
+  };
+
+  services.journald.extraConfig = ''
+    SystemMaxUse=4G
+    MaxRetentionSec=90day
+  '';
+
+  users.defaultUserShell = pkgs.zsh;
+  programs.zsh.enable = true;
+
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+    buildMachines = [
+      {
+        hostName = "10.0.1.79";
+        sshUser = "root";
+        system = "aarch64-linux";
+        maxJobs = 6;
+        speedFactor = 1;
+        supportedFeatures = [ "big-parallel" "benchmark" ];
+      }
+    ];
+    distributedBuilds = true;
+    settings = {
+      connect-timeout = 5;
+      log-lines = 25;
+      min-free = 128000000;
+      max-free = 1000000000;
+      fallback = true;
+      trusted-users = [ "@wheel" ];
+      auto-optimise-store = true;
+      substituters = [
+        "http://odyssey.mesh.vimium.net"
+        "https://cache.nixos.org"
+      ];
+      trusted-public-keys = [
+        "odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
+      ];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "-d --delete-older-than 7d";
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    git
+    neovim
+  ];
+}

hosts/desktop.nix

@@ -1,35 +1,16 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
-with lib;
-with lib.my;
 {
-  time.timeZone = "Europe/London";
+  imports = [
+    ./common.nix
+  ];
 
-  i18n.defaultLocale = "en_GB.UTF-8";
+  nixpkgs.overlays = [
-  i18n.extraLocaleSettings = {
+    (import ../overlays/gnome)
-    LC_ADDRESS = "en_GB.UTF-8";
+  ];
-    LC_IDENTIFICATION = "en_GB.UTF-8";
-    LC_MEASUREMENT = "en_GB.UTF-8";
-    LC_MONETARY = "en_GB.UTF-8";
-    LC_NAME = "en_GB.UTF-8";
-    LC_NUMERIC = "en_GB.UTF-8";
-    LC_PAPER = "en_GB.UTF-8";
-    LC_TELEPHONE = "en_GB.UTF-8";
-    LC_TIME = "en_GB.UTF-8";
-  };
-
-  console.keyMap = "uk";
 
   services.printing.enable = true;
-  services.openssh = {
+  services.openssh.startWhenNeeded = true;
-    enable = true;
-    settings = {
-      KbdInteractiveAuthentication = false;
-      PasswordAuthentication = false;
-      PermitRootLogin = "no";
-    };
-    startWhenNeeded = true;
-  };
 
   sound.enable = true;
   hardware.pulseaudio.enable = false;
@@ -41,27 +22,58 @@ with lib.my;
     pulse.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
+  fileSystems."/mnt/library" = {
-    git
+    device = "library.mesh.vimium.net:/mnt/library";
-    neovim
+    fsType = "nfs";
-  ];
+    options = [
-
+      "nfsvers=4.2"
-  nix.settings = {
+      "bg"
-    connect-timeout = 5;
+      "soft"
-    log-lines = 25;
+      "timeo=20"
-    min-free = 128000000;
+      "retry=5"
-    max-free = 1000000000;
+      "nocto"
-    fallback = true;
+      "ro"
-    auto-optimise-store = true;
+      "x-systemd.automount"
-    substituters = [
+      "x-systemd.requires=tailscaled.service"
-      "http://odyssey.mesh.vimium.net"
+      "noauto"
-      "https://cache.nixos.org"
-    ];
-    trusted-public-keys = [
-      "odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
     ];
   };
 
-  modules.desktop.gnome.enable = true;
+  system.autoUpgrade = {
-  modules.networking.tailscale.enable = true;
+    enable = true;
+    flake = "git+ssh://git@git.vimium.com/jordan/nix-config.git";
+    randomizedDelaySec = "10min";
+  };
+
+  systemd.services.NetworkManager-wait-online.enable = false;
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    (nerdfonts.override { fonts = [ "BigBlueTerminal" "ComicShannsMono" "Terminus" "UbuntuMono" ]; })
+  ];
+
+  modules = {
+    desktop.gnome.enable = true;
+    networking.tailscale.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    bind
+    bmon
+    fd
+    ffmpeg
+    iotop
+    # unstable.nix-du
+    # unstable.nix-melt
+    unstable.nix-tree
+    unstable.nix-visualize
+    ripgrep
+    rsync
+    tcpdump
+    tokei
+    tree
+    wl-clipboard
+  ];
+
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 }

hosts/eos/default.nix

@@ -1,28 +1,22 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
   ];
 
-  boot.loader.systemd-boot.enable = true;
+  nixpkgs.hostPlatform = "x86_64-linux";
-  boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "eos";
+  boot.loader = {
-  networking.hostId = "cc858347";
+    systemd-boot.enable = true;
-  networking.networkmanager.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
 
-  nix.package = pkgs.nixFlakes;
+  networking = {
-  nix.extraOptions = ''
+    hostId = "cc858347";
-    experimental-features = nix-command flakes
+    networkmanager.enable = true;
-  '';
+  };
-  nix.settings.auto-optimise-store = true;
-
-  users.defaultUserShell = pkgs.zsh;
-
-  system.stateVersion = "22.11";
 
   dconf.settings = {
     "org/gnome/desktop/interface" = {
@@ -52,4 +46,6 @@ with lib.my;
       zsh.enable = true;
     };
   };
+
+  system.stateVersion = "22.11";
 }

hosts/eos/hardware-configuration.nix

@@ -1,71 +1,65 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
+    initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelParams = [ "elevator=none" ];
+    kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+    kernelParams = [ "elevator=none" ];
-  boot.supportedFilesystems = [ "zfs" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "rpool/system/root";
+    device = "rpool/system/root";
     fsType = "zfs";
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "rpool/user/home";
+    device = "rpool/user/home";
     fsType = "zfs";
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "rpool/local/nix";
+    device = "rpool/local/nix";
     fsType = "zfs";
   };
 
-  fileSystems."/tmp" =
+  fileSystems."/tmp" = {
-    { device = "rpool/local/tmp";
+    device = "rpool/local/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "rpool/system/var";
+    device = "rpool/system/var";
     fsType = "zfs";
   };
 
-  fileSystems."/var/log" =
+  fileSystems."/var/log" = {
-    { device = "rpool/system/var/log";
+    device = "rpool/system/var/log";
     fsType = "zfs";
   };
 
-  fileSystems."/var/tmp" =
+  fileSystems."/var/tmp" = {
-    { device = "rpool/system/var/tmp";
+    device = "rpool/system/var/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/28E6-5509";
+    device = "/dev/disk/by-uuid/28E6-5509";
     fsType = "vfat";
   };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/helios/default.nix

@@ -1,28 +1,25 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
   ];
 
-  boot.loader.grub.enable = true;
+  nixpkgs.hostPlatform = "x86_64-linux";
-  boot.loader.grub.device = "/dev/sda";
-  boot.loader.grub.zfsSupport = true;
 
-  networking.hostName = "helios";
+  boot = {
-  networking.hostId = "47d23505";
+    loader.grub = {
-  networking.networkmanager.enable = true;
+      enable = true;
+      device = "/dev/sda";
+      zfsSupport = true;
+    };
+  };
 
-  nix.package = pkgs.nixFlakes;
+  networking = {
-  nix.extraOptions = ''
+    hostId = "47d23505";
-    experimental-features = nix-command flakes
+    networkmanager.enable = true;
-  '';
+  };
-
-  users.defaultUserShell = pkgs.zsh;
-
-  system.stateVersion = "22.11";
 
   modules = {
     desktop = {
@@ -41,9 +38,20 @@ with lib.my;
       gpg.enable = true;
       pass.enable = true;
     };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home/jordan/Documents"
+        ];
+        repoPath = "ssh://b9cjl9hq@b9cjl9hq.repo.borgbase.com/./repo";
+      };
+    };
     shell = {
       git.enable = true;
       zsh.enable = true;
     };
   };
+
+  system.stateVersion = "22.11";
 }

hosts/helios/hardware-configuration.nix

@@ -1,65 +1,61 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
+    initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+    initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelParams = [ "elevator=none" ];
+    kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+    kernelParams = [ "elevator=none" ];
-  boot.supportedFilesystems = [ "zfs" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "rpool/system/root";
+    device = "rpool/system/root";
     fsType = "zfs";
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "rpool/user/home";
+    device = "rpool/user/home";
     fsType = "zfs";
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "rpool/local/nix";
+    device = "rpool/local/nix";
     fsType = "zfs";
   };
 
-  fileSystems."/tmp" =
+  fileSystems."/tmp" = {
-    { device = "rpool/local/tmp";
+    device = "rpool/local/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/var/log" =
+  fileSystems."/var/log" = {
-    { device = "rpool/system/var/log";
+    device = "rpool/system/var/log";
     fsType = "zfs";
   };
 
-  fileSystems."/var/tmp" =
+  fileSystems."/var/tmp" = {
-    { device = "rpool/system/var/tmp";
+    device = "rpool/system/var/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/sda1";
+    device = "/dev/sda1";
     fsType = "ext2";
   };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch

@@ -0,0 +1,102 @@
+From d310ddee0fb8e7a5a8b89668c6cb8f9dc863ce94 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sun, 28 Apr 2024 15:59:52 +0100
+Subject: [PATCH] Add apple_set_os EFI boot service
+
+---
+ drivers/firmware/efi/libstub/x86-stub.c | 59 +++++++++++++++++++++++++
+ include/linux/efi.h                     |  1 +
+ 2 files changed, 60 insertions(+)
+
+diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
+index d5a8182cf..be722c43a 100644
+--- a/drivers/firmware/efi/libstub/x86-stub.c
++++ b/drivers/firmware/efi/libstub/x86-stub.c
+@@ -449,6 +449,63 @@ static void setup_graphics(struct boot_params *boot_params)
+ 	}
+ }
+ 
++typedef struct {
++	u64 version;
++	void (*set_os_version) (const char *os_version);
++	void (*set_os_vendor) (const char *os_vendor);
++} apple_set_os_interface_t;
++
++static efi_status_t apple_set_os()
++{
++	apple_set_os_interface_t *set_os;
++	efi_guid_t set_os_guid = APPLE_SET_OS_PROTOCOL_GUID;
++	efi_status_t status;
++	void **handles;
++	unsigned long i, nr_handles, size = 0;
++
++	status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL,
++			     &set_os_guid, NULL, &size, handles);
++
++	if (status == EFI_BUFFER_TOO_SMALL) {
++		status = efi_bs_call(allocate_pool, EFI_LOADER_DATA,
++				     size, &handles);
++
++		if (status != EFI_SUCCESS)
++			return status;
++
++		status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL,
++				     &set_os_guid, NULL, &size, handles);
++	}
++
++	if (status != EFI_SUCCESS)
++		goto free_handle;
++
++	nr_handles = size / sizeof(void *);
++	for (i = 0; i < nr_handles; i++) {
++		void *h = handles[i];
++
++		status = efi_bs_call(handle_protocol, h,
++				     &set_os_guid, &set_os);
++
++		if (status != EFI_SUCCESS || !set_os)
++			continue;
++
++		if (set_os->version > 0) {
++			efi_bs_call((unsigned long)set_os->set_os_version,
++					"Mac OS X 10.9");
++		}
++
++		if (set_os->version >= 2) {
++			efi_bs_call((unsigned long)set_os->set_os_vendor,
++					"Apple Inc.");
++		}
++	}
++
++free_handle:
++	efi_bs_call(free_pool, uga_handle);
++
++	return status;
++}
+ 
+ static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status)
+ {
+@@ -951,6 +1008,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
+ 
+ 	setup_unaccepted_memory();
+ 
++	apple_set_os();
++
+ 	status = exit_boot(boot_params, handle);
+ 	if (status != EFI_SUCCESS) {
+ 		efi_err("exit_boot() failed!\n");
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index d59b0947f..81158014f 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -385,6 +385,7 @@ void efi_native_runtime_setup(void);
+ #define EFI_MEMORY_ATTRIBUTES_TABLE_GUID	EFI_GUID(0xdcfa911d, 0x26eb, 0x469f,  0xa2, 0x20, 0x38, 0xb7, 0xdc, 0x46, 0x12, 0x20)
+ #define EFI_CONSOLE_OUT_DEVICE_GUID		EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4,  0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)
+ #define APPLE_PROPERTIES_PROTOCOL_GUID		EFI_GUID(0x91bd12fe, 0xf6c3, 0x44fb,  0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0)
++#define APPLE_SET_OS_PROTOCOL_GUID		EFI_GUID(0xc5c5da95, 0x7d5c, 0x45e6,  0xb2, 0xf1, 0x3f, 0xd5, 0x2b, 0xb1, 0x00, 0x77)
+ #define EFI_TCG2_PROTOCOL_GUID			EFI_GUID(0x607f766c, 0x7455, 0x42be,  0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
+ #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID	EFI_GUID(0x1e2ed096, 0x30e2, 0x4254,  0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25)
+ #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
+-- 
+2.42.0
+

hosts/hypnos/README.md

@@ -0,0 +1,35 @@
+# Hypnos
+
+## Overview
+15-inch MacBook Pro 11,3 (Mid 2014).
+
+## Specs
+* CPU - Intel Core i7-4870HQ @ 2.50GHz
+* Memory - 16 GB DDR3
+* GPU - Intel Iris Pro 5200
+* GPU - NVIDIA GeForce GT 750M
+* NIC - Broadcom BCM43xx 802.11ac
+
+### Disks
+Device | Partitions _(filesystem, size, usage)_
+--- | ---
+Apple SSD SM0512F | `/dev/sda1` (EFI, 256 MiB, NixOS Boot) <br> `/dev/sda2` (ZFS, 500 GiB, NixOS Root)
+
+#### ZFS pool layout
+```
+rpool/
+├── local
+│   ├── nix
+│   └── tmp
+├── system
+│   ├── root
+│   └── var
+└── user
+    └── home
+```
+
+See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `hypnos.mesh.vimium.net`.

hosts/hypnos/default.nix

@@ -0,0 +1,67 @@
+{ config, lib, self, ... }:
+
+{
+  imports = [
+    self.inputs.disko.nixosModules.disko
+    ./hardware-configuration.nix
+    ./disko-config.nix
+    ../desktop.nix
+  ];
+
+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config = {
+      allowUnfree = true;
+      nvidia.acceptLicense = true;
+    };
+  };
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+
+  networking.hostId = "cf791898";
+
+  # nvidia 470 driver doesn't work with Wayland
+  services = {
+    xserver = {
+      displayManager.gdm.wayland = lib.mkForce false;
+      videoDrivers = [ "nvidia" ];
+    };
+    displayManager = {
+      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      sddm.wayland.enable = lib.mkForce false;
+    };
+  };
+
+  # Workaround for label rendering bug in GTK4 with nvidia 470 driver
+  environment.sessionVariables.GSK_RENDERER = "gl";
+
+  modules = {
+    desktop = {
+      browsers = {
+        firefox.enable = true;
+      };
+      media.recording = {
+        audio.enable = true;
+      };
+    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
+    shell = {
+      git.enable = true;
+      zsh.enable = true;
+    };
+  };
+
+  system.stateVersion = "22.11";
+}

hosts/hypnos/disko-config.nix

@@ -0,0 +1,126 @@
+{ lib, ... }:
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/disk/by-id/ata-APPLE_SSD_SM0512F_S1K5NYBF736152";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "256M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "rpool";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      rpool = {
+        type = "zpool";
+        options = {
+          ashift = "12";
+        };
+        rootFsOptions = {
+          canmount = "off";
+          mountpoint = "none";
+          dnodesize = "auto";
+          xattr = "sa";
+        };
+        postCreateHook = "zfs snapshot rpool@blank";
+        datasets = {
+          local = {
+            type = "zfs_fs";
+            options = {
+              mountpoint = "none";
+            };
+          };
+          "local/nix" = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+            options = {
+              atime = "off";
+              mountpoint = "legacy";
+            };
+          };
+          "local/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              setuid = "off";
+              devices = "off";
+              mountpoint = "legacy";
+            };
+          };
+          system = {
+            type = "zfs_fs";
+            mountpoint = "/";
+            options = {
+              mountpoint = "legacy";
+            };
+          };
+          "system/var" = {
+            type = "zfs_fs";
+            mountpoint = "/var";
+            options = {
+              mountpoint = "legacy";
+            };
+          };
+          "system/var/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/var/tmp";
+            options = {
+              devices = "off";
+              mountpoint = "legacy";
+            };
+          };
+          "system/var/log" = {
+            type = "zfs_fs";
+            mountpoint = "/var/log";
+            options = {
+              compression = "on";
+              acltype = "posix";
+              mountpoint = "legacy";
+            };
+          };
+          user = {
+            type = "zfs_fs";
+            options = {
+              mountpoint = "none";
+              encryption = "aes-256-gcm";
+              keyformat = "passphrase";
+              keylocation = "file:///tmp/secret.key";
+            };
+            # use this to read the key during boot
+            postCreateHook = ''
+              zfs set keylocation="prompt" "rpool/$name";
+            '';
+          };
+          "user/home" = {
+            type = "zfs_fs";
+            mountpoint = "/home";
+            options = {
+              setuid = "off";
+              devices = "off";
+              mountpoint = "legacy";
+            };
+          };
+        };
+      };
+    };
+  };
+}
+

hosts/hypnos/hardware-configuration.nix

@@ -0,0 +1,38 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
+    extraModulePackages = [
+      config.boot.kernelPackages.broadcom_sta
+      config.boot.kernelPackages.nvidiaPackages.legacy_470
+    ];
+  };
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  hardware = {
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
+      modesetting.enable = true;
+      powerManagement.enable = true;
+    };
+    opengl = {
+      enable = true;
+      extraPackages = with pkgs; [
+        libvdpau-va-gl
+      ];
+      driSupport = true;
+      driSupport32Bit = true;
+    };
+  };
+}
+

hosts/library/README.md

@@ -0,0 +1,46 @@
+# Library
+
+## Overview
+Media and public file server.
+
+## Specs
+* CPU - AMD Ryzen 5 5600G @ 3.90GHz
+* Chipset - AMD B550
+* Memory - 64 GB DDR4
+* Motherboard - ASRock B550M Pro4
+* Case - Fractal Design Node 804
+
+### Disks
+Device | Partitions _(filesystem, size, usage)_
+--- | ---
+Samsung 980 Evo | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS `rpool`, 200 GiB, NixOS Root)
+
+#### ZFS datasets
+```
+rpool/
+├── local
+│   ├── nix
+│   └── tmp
+├── system
+│   ├── root
+│   └── var
+└── user
+    └── home
+
+library/
+├── books
+├── fonts
+├── movies
+├── music
+├── software
+├── tv
+├── videos
+└── web
+```
+
+See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind the `rpool` datasets.
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.
+

hosts/library/default.nix

@@ -0,0 +1,195 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  boot = {
+    loader.systemd-boot.enable = true;
+    loader.efi.canTouchEfiVariables = true;
+    zfs.extraPools = [ "library" ];
+  };
+
+  networking = {
+    hostId = "d24ae953";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [
+        22  # SSH
+      ];
+    };
+  };
+
+  services.zfs = {
+    autoScrub = {
+      enable = true;
+      pools = [ "library" ];
+    };
+    autoSnapshot = {
+      enable = true;
+      flags = "-k -p --utc";
+      frequent = 0;
+      hourly = 0;
+      daily = 7;
+      monthly = 1;
+    };
+  };
+
+  services.nfs.server = {
+    enable = true;
+  };
+
+  services.grafana = {
+    enable = true;
+    settings = {
+      server = {
+        domain = "library.mesh.vimium.net";
+        http_addr = "0.0.0.0";
+        http_port = 3000;
+      };
+    };
+  };
+
+  services.prometheus = {
+    enable = true;
+    port = 9001;
+    exporters = {
+      node = {
+        enable = true;
+        enabledCollectors = [ "systemd" ];
+        port = 9002;
+      };
+      zfs = {
+        enable = true;
+        port = 9003;
+      };
+    };
+    scrapeConfigs = [
+      {
+        job_name = "node";
+        static_configs = [{
+          targets = [
+            "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
+            "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
+          ];
+        }];
+      }
+    ];
+  };
+
+  systemd.services.vps1-tunnel = {
+    enable = true;
+    description = "vps1.mesh.vimium.net SSH tunnel";
+    after = [
+      "network-online.target"
+      "jellyfin.service"
+    ];
+    wants = [ "network-online.target" ];
+    serviceConfig = {
+      Type="simple";
+      ExecStart=pkgs.lib.mkForce ''
+        ${pkgs.openssh}/bin/ssh \
+          -NT \
+          -o ExitOnForwardFailure=yes \
+          -o ServerAliveInterval=60 \
+          -o TCPKeepAlive=no \
+          -i %h/.ssh/id_jellyfin \
+          -R localhost:8000:localhost:8000 \
+          jellyfin@vps1.mesh.vimium.net
+      '';
+      Restart="always";
+      RestartSec=20;
+    };
+    wantedBy = [ "default.target" ];
+  };
+
+  services.nginx = let
+    proxyConfig = ''
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+
+      proxy_set_header Range $http_range;
+      proxy_set_header If-Range $http_if_range;
+
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+    '';
+  in {
+    enable = true;
+    package = pkgs.openresty;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedTlsSettings = true;
+    clientMaxBodySize = "2G";
+    virtualHosts = {
+      "library.mesh.vimium.net" = {
+        locations."/" = {
+          root = "/mnt/library";
+          extraConfig = ''
+            autoindex on;
+          '';
+        };
+      };
+      "jellyfin.vimium.com" = {
+        default = true;
+        listen = [
+          {
+            addr = "127.0.0.1";
+            port = 8000;
+          }
+        ];
+        locations."/" = {
+          proxyPass = "http://localhost:8096";
+          extraConfig = proxyConfig;
+        };
+        locations."/metrics" = {
+          return = "404";
+        };
+      };
+    };
+  };
+
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+    ];
+    driSupport = true;
+  };
+  users.users.jellyfin.extraGroups = [ "video" "render" ];
+  services.jellyfin = {
+    enable = true;
+    cacheDir = "/var/cache/jellyfin";
+    dataDir = "/var/lib/jellyfin";
+  };
+
+  modules = {
+    podman.enable = true;
+    security = {
+      gpg.enable = true;
+    };
+    shell = {
+      zsh.enable = true;
+    };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          config.services.jellyfin.dataDir
+          "/home/jordan"
+        ];
+        repoPath = "ssh://b61758r4@b61758r4.repo.borgbase.com/./repo";
+      };
+    };
+  };
+
+  system.stateVersion = "22.11";
+}
+

hosts/library/hardware-configuration.nix

@@ -0,0 +1,68 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };
+
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };
+
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };
+
+  fileSystems."/var/lib/containers/storage" = {
+    device = "rpool/system/var/lib-containers-storage";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
+
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };
+
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/F697-F1C0";
+    fsType = "vfat";
+  };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
+

hosts/mail/README.md

@@ -0,0 +1,18 @@
+# Mail server
+
+## Overview
+Mail server hosted in OVH.
+
+## Specs
+* CPU - ??
+* Memory - ??
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+NVMe | `/dev/sda1` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`.
+

hosts/mail/default.nix

@@ -0,0 +1,51 @@
+{ config, lib, self, ... }:
+
+{
+  imports = [
+    self.inputs.disko.nixosModules.disko
+    ./hardware-configuration.nix
+    ./disko-config.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  networking = {
+    hostId = "08ac2f14";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [
+        22    # SSH
+      ];
+    };
+  };
+
+  users = {
+    users = {
+      root = {
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+      };
+    };
+  };
+
+  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
+  modules = {
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/var/dkim"
+          "/var/lib"
+          "/var/vmail"
+        ];
+        repoPath = "ssh://kg2mpt28@kg2mpt28.repo.borgbase.com/./repo";
+      };
+      mail.enable = true;
+    };
+  };
+
+  system.stateVersion = "22.11";
+}

hosts/mail/disko-config.nix

@@ -0,0 +1,55 @@
+{ lib, ... }:
+{
+  disko.devices = {
+    disk.disk1 = {
+      device = lib.mkDefault "/dev/sda";
+      type = "disk";
+      content = {
+        type = "gpt";
+        partitions = {
+          boot = {
+            name = "boot";
+            size = "2M";
+            type = "EF02";
+          };
+          esp = {
+            name = "ESP";
+            size = "300M";
+            type = "EF00";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+          root = {
+            name = "root";
+            size = "100%";
+            content = {
+              type = "lvm_pv";
+              vg = "pool";
+            };
+          };
+        };
+      };
+    };
+    lvm_vg = {
+      pool = {
+        type = "lvm_vg";
+        lvs = {
+          root = {
+            size = "100%FREE";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+              mountOptions = [
+                "defaults"
+              ];
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/mail/hardware-configuration.nix

@@ -0,0 +1,22 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+      kernelModules = [ "nvme" ];
+    };
+    loader.grub = {
+      efiSupport = true;
+      efiInstallAsRemovable = true;
+    };
+    tmp.cleanOnBoot = true;
+  };
+
+  zramSwap.enable = true;
+}
+

hosts/odyssey/default.nix

@@ -1,57 +1,38 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
   ];
 
-  boot.loader.systemd-boot = {
+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config = {
+      allowUnfree = true;
+      nvidia.acceptLicense = true;
+    };
+  };
+
+  boot.loader = {
+    systemd-boot = {
       enable = true;
       graceful = true;
       netbootxyz.enable = true;
     };
-  boot.loader.efi.canTouchEfiVariables = true;
+    efi.canTouchEfiVariables = true;
+  };
 
-  networking.hostName = "odyssey";
+  networking = {
-  networking.hostId = "c5e68d78";
+    hostId = "c5e68d78";
+    networkmanager.enable = true;
+    firewall.trustedInterfaces = [ "lxdbr0" "virbr0" ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
+  };
 
-  networking.networkmanager.enable = true;
+  virtualisation = {
-
+    libvirtd.enable = true;
-  environment.etc."pipewire/pipewire.conf.d/surround.conf".text = ''
+    lxd.enable = true;
-    context.modules = [
+  };
-      {
-        name = libpipewire-module-loopback
-        args = {
-          node.description = "1824c Surround"
-          capture.props = {
-            node.name = "1824c_Speakers"
-            media.class = "Audio/Sink"
-            audio.position = [ FL FR FC SL SR LFE ]
-          }
-          playback.props = {
-            node.name = "playback.1824c_Speakers"
-            audio.position = [ AUX0 AUX1 AUX2 AUX3 AUX4 AUX5 ]
-            target.object = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output"
-            stream.dont-remix = true
-            node.passive = true
-          }
-        }
-      }
-    ]
-  '';
-
-  nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  virtualisation.libvirtd.enable = true;
-
-  users.defaultUserShell = pkgs.zsh;
-
-  system.stateVersion = "22.11";
 
   services.nix-serve = {
     enable = true;
@@ -74,6 +55,17 @@ with lib.my;
       browsers = {
         firefox.enable = true;
       };
+      gaming = {
+        emulators = {
+          gamecube.enable = true;
+          ps2.enable = true;
+          ps3.enable = true;
+          psp.enable = true;
+          wii.enable = true;
+          xbox.enable = true;
+        };
+        lutris.enable = true;
+      };
       media.graphics = {
         modeling.enable = true;
         raster.enable = true;
@@ -83,6 +75,7 @@ with lib.my;
         audio.enable = true;
         video.enable = true;
       };
+      office.libreoffice.enable = true;
     };
     dev = {
       node.enable = true;
@@ -90,13 +83,32 @@ with lib.my;
     editors = {
       neovim.enable = true;
     };
+    hardware.presonus-studio.enable = true;
     security = {
       gpg.enable = true;
       pass.enable = true;
     };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home/jordan/Documents"
+          "/home/jordan/Downloads"
+          "/home/jordan/Music"
+          "/home/jordan/Pictures"
+          "/home/jordan/projects"
+          "/home/jordan/Videos"
+          "/home/jordan/.mozilla"
+        ];
+        repoPath = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo";
+      };
+      gitea-runner.enable = true;
+    };
     shell = {
       git.enable = true;
       zsh.enable = true;
     };
   };
+
+  system.stateVersion = "22.11";
 }

hosts/odyssey/hardware-configuration.nix

@@ -1,78 +1,73 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
-let
+{
-  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
+  imports = [
-    kernel = config.boot.kernelPackages.kernel;
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelPackages = pkgs.linuxPackages;
+    supportedFilesystems = [ "ntfs" ];
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
-in {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  hardware = {
-  boot.initrd.kernelModules = [ ];
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  boot.kernelModules = [ "kvm-intel" ];
+    nvidia = {
-  boot.extraModulePackages = [
-    (snd-usb-audio-module.overrideAttrs (_: {
-      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
-    }))
-  ];
-  boot.supportedFilesystems = [ "ntfs" ];
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-  hardware.nvidia = {
       modesetting.enable = true;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
       powerManagement.enable = true;
     };
+  };
+
   services.xserver.videoDrivers = [ "nvidia" ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "rpool/system/root";
+    device = "rpool/system/root";
     fsType = "zfs";
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "rpool/user/home";
+    device = "rpool/user/home";
     fsType = "zfs";
   };
 
-  fileSystems."/var" =
+  fileSystems."/var" = {
-    { device = "rpool/system/var";
+    device = "rpool/system/var";
     fsType = "zfs";
   };
 
-  fileSystems."/tmp" =
+  fileSystems."/tmp" = {
-    { device = "rpool/local/tmp";
+    device = "rpool/local/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/var/log" =
+  fileSystems."/var/log" = {
-    { device = "rpool/system/var/log";
+    device = "rpool/system/var/log";
     fsType = "zfs";
   };
 
-  fileSystems."/var/tmp" =
+  fileSystems."/var/tmp" = {
-    { device = "rpool/system/var/tmp";
+    device = "rpool/system/var/tmp";
     fsType = "zfs";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/E63E-8E75";
+    device = "/dev/disk/by-uuid/E63E-8E75";
     fsType = "vfat";
   };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+
+  environment.systemPackages = [
+    pkgs.apfs-fuse
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/pi/README.md

@@ -0,0 +1,25 @@
+# Pi
+
+## Overview
+Raspberry Pi 4
+
+## Specs
+* SoC - Broadcom BCM2711
+* CPU - ARM Cortex-A72 @ 1.8 GHz
+* Memory - 8 GB LPDDR4
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+SD card | `/dev/mmcblk0` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `pi.mesh.vimium.net`.
+
+## Devices and connections
+
+- SONOFF Zigbee 3.0 USB Dongle Plus (connected to USB 2.0 port to avoid [interference](https://www.unit3compliance.co.uk/2-4ghz-intra-system-or-self-platform-interference-demonstration/))
+- HDMI to ONKYO HT-R990
+- S/PDIF to ONKYO HT-R990
+- Ethernet to ONKYO HT-R990

hosts/pi/default.nix

@@ -0,0 +1,253 @@
+{ config, lib, pkgs, self, ... }:
+
+{
+  imports = [
+    self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "aarch64-linux";
+
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      fkms-3d.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+      overlays = [
+        {
+          name = "audio-off-overlay";
+          dtsText = ''
+            /dts-v1/;
+            /plugin/;
+
+            / {
+              compatible = "brcm,bcm2711";
+
+              fragment@0 {
+                target = <&vchiq>;
+
+                __overlay__ {
+                  status = "disabled";
+                };
+              };
+            };
+          '';
+        }
+        {
+          # Adapted from: https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
+          # changes:
+          # - modified top-level "compatible" field from bcm2835 to bcm2711
+          # - s/i2s_clk_consumer/i2s/ (name on bcm2711 platform)
+          name = "hifiberry-digi-pro";
+          dtsText = ''
+            /dts-v1/;
+            /plugin/;
+
+            / {
+                compatible = "brcm,bcm2711";
+
+                fragment@0 {
+                    target = <&i2s>;
+                    __overlay__ {
+                        status = "okay";
+                    };
+                };
+
+                fragment@1 {
+                    target = <&i2c1>;
+                    __overlay__ {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "okay";
+
+                        wm8804@3b {
+                            #sound-dai-cells = <0>;
+                            compatible = "wlf,wm8804";
+                            reg = <0x3b>;
+                            PVDD-supply = <&vdd_3v3_reg>;
+                            DVDD-supply = <&vdd_3v3_reg>;
+                            status = "okay";
+                        };
+                    };
+                };
+
+                fragment@2 {
+                    target = <&sound>;
+                    __overlay__ {
+                        compatible = "hifiberry,hifiberry-digi";
+                        i2s-controller = <&i2s>;
+                        status = "okay";
+                        clock44-gpio = <&gpio 5 0>;
+                        clock48-gpio = <&gpio 6 0>;
+                    };
+                };
+            };
+          '';
+        }
+      ];
+    };
+    firmware = with pkgs; [
+      firmwareLinuxNonfree
+      wireless-regdb
+    ];
+  };
+
+  networking.hostId = "731d1660";
+
+  sound.enable = true;
+
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  age.secrets."files/services/home-assistant/secrets.yaml" = {
+    file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+    path = "${config.services.home-assistant.configDir}/secrets.yaml";
+    owner = "hass";
+    group = "hass";
+  };
+
+  services.home-assistant = {
+    enable = true;
+    extraComponents = [
+      "api"
+      "alert"
+      "auth"
+      "backup"
+      "command_line"
+      "default_config"
+      "homekit_controller"
+      "homekit"
+      "http"
+      "icloud"
+      "jellyfin"
+      "metoffice"
+      "mqtt"
+      "onkyo"
+      "ping"
+      "proximity"
+      "radio_browser"
+      "scrape"
+      "sensor"
+      "system_health"
+    ];
+    config = {
+      default_config = {};
+      backup = {};
+      homeassistant = {
+        name = "Home";
+        latitude = "!secret latitude";
+        longitude = "!secret longitude";
+        country = "GB";
+        temperature_unit = "C";
+        time_zone = config.time.timeZone;
+        unit_system = "metric";
+      };
+      mqtt = { };
+      scene = "!include scenes.yaml";
+      automation = "!include automations.yaml";
+      system_health = { };
+      recorder = {
+        purge_keep_days = 365;
+      };
+    };
+  };
+
+  services.mosquitto = {
+    enable = true;
+    listeners = [{
+      acl = [ "pattern readwrite #" ];
+      omitPasswordAuth = true;
+      port = 1883;
+      settings = {
+        allow_anonymous = true;
+      };
+    }];
+  };
+
+  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+    file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+    path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
+    owner = "zigbee2mqtt";
+    group = "zigbee2mqtt";
+  };
+
+  services.zigbee2mqtt = {
+    package = pkgs.unstable.zigbee2mqtt;
+    enable = true;
+    dataDir = "/var/lib/zigbee2mqtt";
+    settings = {
+      homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
+        discovery_topic = "homeassistant";
+        status_topic = "hass/status";
+        legacy_entity_attributes = true;
+        legacy_triggers = true;
+      };
+      availability = true;
+      frontend = true;
+      device_options = {
+        retain = true;
+      };
+      serial = {
+        port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
+      };
+      advanced = {
+        channel = 20;
+        network_key = "!secret.yaml network_key";
+        pan_id = 13001;
+        ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+        transmit_power = 20;
+      };
+      mqtt = {
+        version = 5;
+        server = "mqtt://localhost:1883";
+      };
+    };
+  };
+
+  modules = {
+    networking = {
+      wireless = {
+        enable = true;
+        interfaces = [ "wlan0" ];
+      };
+    };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/var/lib/mosquitto"
+          "/var/lib/zigbee2mqtt"
+        ];
+        repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
+      };
+    };
+  };
+
+  # Connection to ONKYO HT-R990
+  networking.interfaces.end0 = {
+    ipv4.addresses = [{
+      address = "172.16.0.1";
+      prefixLength = 30;
+    }];
+  };
+
+  environment.systemPackages = with pkgs; [
+    python311Packages.onkyo-eiscp
+    libraspberrypi
+    raspberrypi-eeprom
+  ];
+
+  system.stateVersion = "22.11";
+}
+

hosts/pi/hardware-configuration.nix

@@ -0,0 +1,31 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
+  ];
+
+  boot = {
+    # Stop ZFS kernel being built
+    supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
+    tmp.cleanOnBoot = true;
+  };
+
+  # Fix missing modules
+  # https://github.com/NixOS/nixpkgs/issues/154163
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
+    })
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+}
+

hosts/server.nix

@@ -1,39 +1,59 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 {
-  time.timeZone = "Europe/London";
+  imports = [
-
+    ./common.nix
-  i18n.defaultLocale = "en_GB.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_GB.UTF-8";
-    LC_IDENTIFICATION = "en_GB.UTF-8";
-    LC_MEASUREMENT = "en_GB.UTF-8";
-    LC_MONETARY = "en_GB.UTF-8";
-    LC_NAME = "en_GB.UTF-8";
-    LC_NUMERIC = "en_GB.UTF-8";
-    LC_PAPER = "en_GB.UTF-8";
-    LC_TELEPHONE = "en_GB.UTF-8";
-    LC_TIME = "en_GB.UTF-8";
-  };
-
-  console.keyMap = "uk";
-
-  services.openssh = {
-    enable = true;
-    settings = {
-      KbdInteractiveAuthentication = false;
-      PasswordAuthentication = false;
-      PermitRootLogin = "no";
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    git
-    neovim
   ];
 
+  documentation.enable = false;
+
+  fonts.fontconfig.enable = false;
+
+  security = {
+    acme = {
+      acceptTerms = true;
+      defaults = {
+        email = "hostmaster@vimium.com";
+        group = "nginx";
+        webroot = "/var/lib/acme/acme-challenge";
+      };
+    };
+    # auditd.enable = true;
+    # audit = {
+    #   enable = true;
+    #   rules = [
+    #     "-a exit,always -F arch=b64 -S execve"
+    #   ];
+    # };
+  };
+
+  systemd = {
+    enableEmergencyMode = false;
+
+    sleep.extraConfig = ''
+      AllowSuspend=no
+      AllowHibernation=no
+    '';
+
+    watchdog = {
+      runtimeTime = "20s";
+      rebootTime = "30s";
+    };
+  };
+
+  services.fail2ban = {
+    enable = true;
+    bantime = "1h";
+    bantime-increment = {
+      enable = true;
+      maxtime = "24h";
+      rndtime = "7m";
+    };
+    ignoreIP = [
+      "100.64.0.0/10"
+    ];
+  };
+
   modules.networking.tailscale = {
     enable = true;
     restrictSSH = false;

hosts/skycam/README.md

@@ -0,0 +1,29 @@
+# Skycam
+
+## Overview
+Raspberry Pi 4-based webcam
+
+## Specs
+* SoC - Broadcom BCM2711
+* CPU - ARM Cortex-A72 @ 1.8 GHz
+* Memory - 8 GB LPDDR4
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+SD card | `/dev/mmcblk0` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `skycam.mesh.vimium.net`.
+
+## Devices and connections
+- Camera Module 3 with wide-angle lens
+
+## Building
+To generate a compressed SD card image for Skycam, run:
+`nix build '.#nixosConfigurations.skycam.config.system.build.sdImage'`
+
+Once a card is imaged, the existing SSH host keys should be copied to
+`/etc/ssh` manually to enable secret decryption.
+

hosts/skycam/default.nix

@@ -0,0 +1,111 @@
+{ config, lib, pkgs, self, ... }:
+
+{
+  imports = [
+    self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "aarch64-linux";
+
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
+      overlays =
+        let
+          mkCompatibleDtsFile = dtbo:
+            let
+              drv = pkgs.runCommand "fix-dts" { nativeBuildInputs = with pkgs; [ dtc gnused ]; } ''
+                mkdir "$out"
+                dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
+              '';
+            in
+              "${drv}/overlay.dts";
+
+          inherit (config.boot.kernelPackages) kernel;
+        in
+          [
+            {
+              name = "imx708.dtbo";
+              dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
+            }
+            {
+              name = "vc4-kms-v3d-pi4.dtbo";
+              dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
+            }
+          ];
+    };
+    firmware = with pkgs; [
+      firmwareLinuxNonfree
+    ];
+  };
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
+    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
+  '';
+
+  nixpkgs.overlays = [
+    (import ./../../overlays/libcamera)
+  ];
+
+  networking = {
+    hostId = "731d1660";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 8080 ];
+      allowedUDPPorts = [ 8080 ];
+    };
+  };
+
+  users.users.root = {
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+    ];
+  };
+
+  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
+  systemd.services.ustreamer = {
+    enable = true;
+    description = "uStreamer service";
+    unitConfig = {
+      Type = "simple";
+      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
+    };
+    serviceConfig = {
+      ExecStart = ''${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
+        --host=0.0.0.0 \
+        --resolution=4608x2592
+      '';
+      DynamicUser = "yes";
+      SupplementaryGroups = [ "video" ];
+      Restart = "always";
+      RestartSec = 10;
+    };
+    wantedBy = [ "network-online.target" ];
+    confinement.mode = "chroot-only";
+  };
+
+  environment.systemPackages = with pkgs; [
+    camera-streamer
+    git
+    neovim
+    libcamera
+    libraspberrypi
+    raspberrypi-eeprom
+    v4l-utils
+    unstable.ustreamer
+  ];
+
+  system.stateVersion = "24.05";
+}

hosts/skycam/hardware-configuration.nix

@@ -0,0 +1,33 @@
+{ config, lib, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
+  ];
+
+  boot = {
+    kernelModules = [ "bcm2835-v4l2" ];
+    kernelParams = [
+      "cma=512M"
+      "panic=0"
+    ];
+    supportedFilesystems = lib.mkForce [ "f2fs" "vfat" "xfs" ];
+    tmp.cleanOnBoot = false;
+  };
+
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
+    })
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+}
+

hosts/vps1/README.md

@@ -0,0 +1,18 @@
+# vps1
+
+## Overview
+VPS hosted in OVH.
+
+## Specs
+* CPU - ??
+* Memory - ??
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+NVMe | `/dev/sda1` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.
+

hosts/vps1/default.nix

@@ -0,0 +1,161 @@
+{ config, lib, self, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  networking = {
+    hostId = "08bf6db3";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [
+        22    # SSH
+      ];
+    };
+  };
+
+  users = {
+    users = {
+      jellyfin = {
+        isSystemUser = true;
+        group = "jellyfin";
+        shell = "/bin/sh";
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaaS+KMAEAymZhIJGC4LK8aMhUzhpmloUgvP2cxeBH4 jellyfin"
+        ];
+      };
+      root = {
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+      };
+    };
+    groups = {
+      jellyfin = { };
+    };
+  };
+
+  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
+  services.postgresql = {
+    ensureUsers = [
+      {
+        name = "zitadel";
+        ensureDBOwnership = true;
+        ensureClauses = {
+          superuser = true;
+        };
+      }
+    ];
+    ensureDatabases = [ "zitadel" ];
+  };
+
+  age.secrets."files/services/zitadel/masterkey" = {
+    file = "${self.inputs.secrets}/files/services/zitadel/masterkey.age";
+    owner = "zitadel";
+    group = "zitadel";
+  };
+
+  systemd.services.zitadel = {
+    requires = [ "postgresql.service" ];
+    after = [ "postgresql.service" ];
+  };
+
+  services.zitadel = {
+    enable = true;
+    masterKeyFile = config.age.secrets."files/services/zitadel/masterkey".path;
+    settings = {
+      Database.postgres = {
+        Host = "/run/postgresql";
+        Port = 5432;
+        Database = "zitadel";
+        User = {
+          Username = "zitadel";
+          SSL.Mode = "disable";
+        };
+        Admin = {
+          ExistingDatabase = "zitadel";
+          Username = "zitadel";
+          SSL.Mode = "disable";
+        };
+      };
+      ExternalDomain = "id.vimium.com";
+      ExternalPort = 443;
+      ExternalSecure = true;
+      Machine = {
+        Identification = {
+          Hostname.Enabled = true;
+          PrivateIp.Enabled = false;
+          Webhook.Enabled = false;
+        };
+      };
+      Port = 8081;
+      WebAuthNName = "Vimium";
+    };
+    steps.FirstInstance = {
+      InstanceName = "Vimium";
+      Org.Name = "Vimium";
+      Org.Human = {
+        UserName = "jordan@vimium.com";
+        FirstName = "Jordan";
+        LastName = "Holt";
+        Email = {
+          Address = "jordan@vimium.com";
+          Verified = true;
+        };
+        Password = "Password1!";
+        PasswordChangeRequired = true;
+      };
+      LoginPolicy.AllowRegister = false;
+    };
+  };
+
+  services.nginx.virtualHosts."id.vimium.com" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      extraConfig = ''
+        grpc_pass grpc://localhost:${builtins.toString config.services.zitadel.settings.Port};
+        grpc_set_header Host $host:$server_port;
+      '';
+    };
+  };
+
+  modules = rec {
+    databases.postgresql.enable = true;
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home"
+          "/var/lib"
+          "/var/www"
+        ];
+        repoPath = "ssh://p91y8oh7@p91y8oh7.repo.borgbase.com/./repo";
+      };
+      coturn = {
+        enable = true;
+        realm = "turn.vimium.com";
+        matrixIntegration = true;
+      };
+      gitea.enable = true;
+      headscale.enable = true;
+      matrix = {
+        enable = true;
+        bridges = {
+          signal = true;
+          whatsapp = true;
+        };
+        usePostgresql = databases.postgresql.enable;
+      };
+      nginx.enable = true;
+      photoprism.enable = true;
+    };
+  };
+
+  system.stateVersion = "22.11";
+}

hosts/vps1/hardware-configuration.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+      kernelModules = [ "nvme" ];
+    };
+    loader.grub.device = "/dev/sda";
+    tmp.cleanOnBoot = true;
+  };
+
+  zramSwap.enable = true;
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/sda1";
+      fsType = "ext4";
+    };
+  };
+}
+

lib/attrs.nix

@@ -1,26 +0,0 @@
-{ lib, ... }:
-
-with builtins;
-with lib;
-rec {
-  # attrsToList
-  attrsToList = attrs:
-    mapAttrsToList (name: value: { inherit name value; }) attrs;
-
-  # mapFilterAttrs ::
-  #   (name -> value -> bool)
-  #   (name -> value -> { name = any; value = any; })
-  #   attrs
-  mapFilterAttrs = pred: f: attrs: filterAttrs pred (mapAttrs' f attrs);
-
-  # Generate an attribute set by mapping a function over a list of values.
-  genAttrs' = values: f: listToAttrs (map f values);
-
-  # anyAttrs :: (name -> value -> bool) attrs
-  anyAttrs = pred: attrs:
-    any (attr: pred attr.name attr.value) (attrsToList attrs);
-
-  # countAttrs :: (name -> value -> bool) attrs
-  countAttrs = pred: attrs:
-    count (attr: pred attr.name attr.value) (attrsToList attrs);
-}

lib/default.nix

@@ -1,19 +0,0 @@
-
-{ inputs, lib, pkgs, ... }:
-
-let
-  inherit (lib) makeExtensible attrValues foldr;
-  inherit (modules) mapModules;
-
-  modules = import ./modules.nix {
-    inherit lib;
-    self.attrs = import ./attrs.nix { inherit lib; self = {}; };
-  };
-
-  mylib = makeExtensible (self:
-    with self; mapModules ./.
-      (file: import file { inherit self lib pkgs inputs; }));
-in
-mylib.extend
-  (self: super:
-    foldr (a: b: a // b) {} (attrValues super))

lib/modules.nix

@@ -1,53 +0,0 @@
-{ self, lib, ... }:
-
-let
-  inherit (builtins) attrValues readDir pathExists concatLists;
-  inherit (lib) id mapAttrsToList filterAttrs hasPrefix hasSuffix nameValuePair removeSuffix;
-  inherit (self.attrs) mapFilterAttrs;
-in
-rec {
-  mapModules = dir: fn:
-    mapFilterAttrs
-      (n: v:
-        v != null &&
-        !(hasPrefix "_" n))
-      (n: v:
-        let path = "${toString dir}/${n}"; in
-        if v == "directory" && pathExists "${path}/default.nix"
-        then nameValuePair n (fn path)
-        else if v == "regular" &&
-                n != "default.nix" &&
-                hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
-
-  mapModules' = dir: fn:
-    attrValues (mapModules dir fn);
-
-  mapModulesRec = dir: fn:
-    mapFilterAttrs
-      (n: v:
-        v != null &&
-        !(hasPrefix "_" n))
-      (n: v:
-        let path = "${toString dir}/${n}"; in
-        if v == "directory"
-        then nameValuePair n (mapModulesRec path fn)
-        else if v == "regular" && n != "default.nix" && hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
-
-  mapModulesRec' = dir: fn:
-    let
-      dirs =
-        mapAttrsToList
-          (k: _: "${dir}/${k}")
-          (filterAttrs
-            (n: v: v == "directory" && !(hasPrefix "_" n))
-            (readDir dir));
-      files = attrValues (mapModules dir id);
-      paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs);
-    in map fn paths;
-}

lib/nixos.nix

@@ -1,25 +0,0 @@
-{ inputs, lib, pkgs, ... }:
-
-with lib;
-with lib.my;
-let sys = "x86_64-linux";
-in {
-  mkHost = path: attrs @ { system ? sys, ... }:
-    nixosSystem {
-      inherit system;
-      specialArgs = { inherit lib inputs system; };
-      modules = [
-        {
-          nixpkgs.pkgs = pkgs;
-          networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));
-        }
-        (filterAttrs (n: v: !elem n [ "system" ]) attrs)
-        ../.   # /default.nix
-        (import path)
-      ];
-    };
-
-  mapHosts = dir: attrs @ { system ? system, ... }:
-    mapModules dir
-      (hostPath: mkHost hostPath attrs);
-}

lib/options.nix

@@ -1,35 +0,0 @@
-{ lib, ... }:
-
-let
-  inherit (lib) mkOption types;
-in
-rec {
-  mkOpt = type: default:
-    mkOption { inherit type default; };
-
-  mkOpt' = type: default: description:
-    mkOption { inherit type default description; };
-
-  mkBoolOpt = default: mkOption {
-    inherit default;
-    type = types.bool;
-    example = true;
-  };
-
-  mkStringOpt = default: mkOption {
-    inherit default;
-    type = types.lines;
-    example = "";
-  };
-
-  mkListOfStringOpt = default: mkOption {
-    inherit default;
-    type = types.listOf types.lines;
-    example = [ "a" "b" "c" ];
-  };
-
-  mkPath = path:
-    if path != null
-    then toString path
-    else "";
-}

modules/databases/postgresql.nix

@@ -0,0 +1,41 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.modules.databases.postgresql;
+in {
+  options.modules.databases.postgresql = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.postgresql = {
+      enable = true;
+      enableJIT = true;
+      initdbArgs = [
+        "--allow-group-access"
+        "--encoding=UTF8"
+        "--locale=C"
+      ];
+      settings = {
+        log_connections = true;
+        log_disconnections = true;
+        log_destination = lib.mkForce "syslog";
+      };
+    };
+
+    services.borgmatic.settings = {
+      postgresql_databases = [
+        {
+          name = "all";
+        }
+      ];
+    };
+  };
+}

modules/default.nix

@@ -1,12 +1,18 @@
 {
   imports = [
     ./options.nix
+    ./podman.nix
+    ./databases/postgresql.nix
     ./desktop/gnome.nix
+    ./desktop/forensics.nix
+    ./desktop/hyprland.nix
+    ./desktop/kde.nix
     ./desktop/mimeapps.nix
     ./desktop/apps/qbittorrent.nix
     ./desktop/apps/slack.nix
     ./desktop/apps/thunderbird.nix
     ./desktop/apps/zoom.nix
+    ./desktop/browsers/brave.nix
     ./desktop/browsers/firefox.nix
     ./desktop/gaming/emulators.nix
     ./desktop/gaming/lutris.nix
@@ -25,9 +31,21 @@
     ./dev/zig.nix
     ./editors/neovim
     ./editors/vscode.nix
+    ./hardware/presonus-studio.nix
     ./networking/tailscale.nix
+    ./networking/wireless.nix
     ./security/gpg.nix
     ./security/pass.nix
+    ./services/borgmatic
+    ./services/chrony
+    ./services/coturn
+    ./services/gitea
+    ./services/gitea-runner
+    ./services/headscale
+    ./services/mail
+    ./services/matrix
+    ./services/nginx
+    ./services/photoprism
     ./shell/git
     ./shell/zsh
   ];

modules/desktop/apps/qbittorrent.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.qbittorrent;
 in {
   options.modules.desktop.apps.qbittorrent = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       qbittorrent
     ];

modules/desktop/apps/slack.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.slack;
 in {
   options.modules.desktop.apps.slack = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       slack
     ];

modules/desktop/apps/thunderbird.nix

@@ -1,15 +1,16 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, self, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.thunderbird;
 in {
   options.modules.desktop.apps.thunderbird = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
   
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
-    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;
+    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = self.inputs.thunderbird-gnome-theme;
 
     home.programs.thunderbird = {
       enable = true;

modules/desktop/apps/zoom.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.zoom;
 in {
   options.modules.desktop.apps.zoom = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       zoom-us
     ];

modules/desktop/browsers/brave.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.browsers.brave;
+in {
+  options.modules.desktop.browsers.brave = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      brave
+    ];
+  };
+}

modules/desktop/browsers/firefox.nix

@@ -1,15 +1,16 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, self, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.browsers.firefox;
 in {
   options.modules.desktop.browsers.firefox = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
-    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
+    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = self.inputs.firefox-gnome-theme;
 
     home.programs.firefox = {
       enable = true;
@@ -26,30 +27,87 @@ in {
         '';
         settings = {
           ## GNOME theme
-          "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.cs
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.css
           "browser.uidensity" = 0; # Set UI density to normal
           "svg.context-properties.content.enabled" = true; # Enable SVG context-propertes
           "browser.theme.dark-private-windows" = false; # Disable private window dark theme
+          "widget.gtk.rounded-bottom-corners.enabled" = true; # Enable rounded bottom window corners
 
           ## Preferences
           "browser.ctrlTab.sortByRecentlyUsed" = true;
+          "browser.discovery.enabled" = false;
+          "browser.download.open_pdf_attachments_inline" = true;
+          "browser.menu.showViewImageInfo" = true;
           "browser.newtabpage.enabled" = false;
+          "browser.newtabpage.activity-stream.showSponsored" = false;
+          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+          "browser.newtabpage.activity-stream.default.sites" = "";
+          "browser.privatebrowsing.forceMediaMemoryCache" = true;
           "browser.search.widget.inNavBar" = true;
           "browser.startup.page" = 3;
           "browser.startup.homepage" = "https://www.vimium.com";
           "browser.toolbars.bookmarks.visibility" = "never";
+          "browser.uitour.enabled" = false;
+          "browser.urlbar.suggest.engines" = false;
+          "browser.urlbar.suggest.calculator" = true;
+          "browser.urlbar.trending.featureGate" = false;
+          "browser.urlbar.unitConversion.enabled" = true;
+          "cookiebanners.service.mode" = 1;
+          "cookiebanners.service.mode.privateBrowsing" = 1;
+          "network.IDN_show_punycode" = true;
+
+          ## Performance
+          "browser.cache.jsbc_compression_level" = 3;
+          "content.notify.interval" = 100000;
+          "dom.enable_web_task_scheduling" = true;
+          "dom.security.sanitizer.enabled" = true;
+          "gfx.canvas.accelerated.cache-items" = 4096;
+          "gfx.canvas.accelerated.cache-size" = 512;
+          "gfx.content.skia-font-cache-size" = 20;
+          "gfx.webrender.all" = true;
+          "gfx.webrender.compositor" = true;
+          "gfx.webrender.enable" = true;
+          "image.mem.decode_bytes_at_a_time" = 32768;
+          "layers.acceleration.force-enabled" = true;
+          "layout.css.grid-template-masonry-value.enabled" = true;
+          "media.ffmpeg.vaapi.enabled" = true;
+          "media.memory_cache_max_size" = 65536;
+          "media.cache_readahead_limit" = 7200;
+          "media.cache_resume_threshold" = 3600;
+          "network.dns.disablePrefetch" = true;
+          "network.dns.disablePrefetchFromHTTPS" = true;
+          "network.dnsCacheExpiration" = 3600;
+          "network.http.max-connections" = 1800;
+          "network.http.max-persistent-connections-per-server" = 10;
+          "network.http.max-urgent-start-excessive-connections-per-host" = 5;
+          "network.http.pacing.requests.enabled" = false;
+          "network.predictor.enabled" = false;
+          "network.prefetch-next" = false;
+          "network.ssl_tokens_cache_capacity" = 10240;
+          "pdfjs.enableScripting" = false;
+          "security.mixed_content.block_display_content" = true;
 
           ## Experiments
           "app.normandy.enabled" = false;
           "app.normandy.api_url" = "";
           "app.normandy.user_id" = "";
+          "app.shield.optoutstudies.enabled" = false;
+          "browser.shopping.experience2023.active" = false;
+          "browser.shopping.experience2023.enabled" = false;
           "extensions.screenshots.disabled" = true;
           "extensions.screenshots.upload-disabled" = true;
           "experiments.supported" = false;
           "experiments.enabled" = false;
           "experiments.manifest.uri" = "";
           "network.allow-experiments" = false;
-          "privacy.trackingprotection.enabled" = false;
+
+          ## Privacy
+          "dom.private-attribution.submission.enabled" = false;
+          # "privacy.resistFingerprinting" = true;
+          "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = false;
+          "privacy.trackingprotection.enabled" = true;
+          "privacy.trackingprotection.pbmode.enabled" = true;
+          "privacy.userContext.enabled" = true;
 
           ## Geo
           "geo.enabled" = false;
@@ -96,12 +154,34 @@ in {
           "dom.battery.enabled" = false;
           "dom.vr.enabled" = false;
           "media.navigator.enabled" = false;
-          "dom.webaudio.enabled" = false;
+          # "dom.webaudio.enabled" = false;
 
           ## Isolation
           "privacy.firstparty.isolate" = true;
           "privacy.firstparty.isolate.restrict_opener_access" = true;
 
+          ## Telemetry
+          "beacon.enabled" = false;
+          "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+          "browser.newtabpage.activity-stream.telemetry" = false;
+          "browser.send_pings" = false;
+          "datareporting.policy.dataSubmissionEnabled" = false;
+          "datareporting.healthReport.uploadEnabled" = false;
+          "toolkit.coverage.opt-out" = true;
+          "toolkit.coverage.endpoint.base" = "";
+          "toolkit.telemetry.archive.enabled" = false;
+          "toolkit.telemetry.bhrPing.enabled" = false;
+          "toolkit.telemetry.coverage.opt-out" = true;
+          "toolkit.telemetry.enabled" = false;
+          "toolkit.telemetry.firstShutdownPing.enabled" = false;
+          "toolkit.telemetry.hybridContent.enabled" = false;
+          "toolkit.telemetry.newProfilePing.enabled" = false;
+          "toolkit.telemetry.reportingPolicy.firstRun" = false;
+          "toolkit.telemetry.server" = "data:,";
+          "toolkit.telemetry.shutdownPingSender.enabled" = false;
+          "toolkit.telemetry.unified" = false;
+          "toolkit.telemetry.updatePing.enabled" = false;
+
           ## Pocket/Hello
           "loop.enabled" = false;
           "loop.feedback.baseUrl" = "";
@@ -123,6 +203,10 @@ in {
           "browser.pocket.useLocaleList" = false;
           "brwoser.pocket.enabledLocales" = "";
 
+          ## Plugins
+          "plugin.state.flash" = 0;
+          "plugin.state.java" = 0;
+
           ## Misc
           "browser.selfsupport.url" = "";
         };

modules/desktop/forensics.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.forensics;
+in {
+  options.modules.desktop.forensics = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      acquire
+      afflib
+      autopsy
+      fatcat
+      foremost
+      hstsparser
+      networkminer
+      sleuthkit
+      testdisk-qt
+      tracee
+    ];
+  };
+}

modules/desktop/gaming/emulators.nix

@@ -1,34 +1,74 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.emulators;
 in {
   options.modules.desktop.gaming.emulators = {
-    ds.enable       = mkBoolOpt false;
+    ds.enable       = lib.mkOption {
-    gb.enable       = mkBoolOpt false;
+      default = false;
-    gba.enable      = mkBoolOpt false;
+      example = true;
-    gamecube.enable = mkBoolOpt false;
+    };
-    ps2.enable      = mkBoolOpt false;
+    gb.enable       = lib.mkOption {
-    ps3.enable      = mkBoolOpt false;
+      default = false;
-    psp.enable      = mkBoolOpt false;
+      example = true;
-    snes.enable     = mkBoolOpt false;
+    };
-    wii.enable      = mkBoolOpt false;
+    gba.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gamecube.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps1.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps2.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps3.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    psp.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    snes.enable     = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    switch.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    wii.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    xbox.enable     = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {
     user.packages = with pkgs; [
-      (mkIf cfg.ps2.enable pcsx2)
+      (lib.mkIf cfg.ps1.enable duckstation)
-      (mkIf cfg.ps3.enable rpcs3)
+      (lib.mkIf cfg.ps2.enable unstable.pcsx2)
-      (mkIf cfg.psp.enable ppsspp)
+      (lib.mkIf cfg.ps3.enable rpcs3)
-      (mkIf cfg.ds.enable desmume)
+      (lib.mkIf cfg.psp.enable unstable.ppsspp)
-      (mkIf (cfg.gba.enable ||
+      (lib.mkIf cfg.ds.enable desmume)
+      (lib.mkIf (cfg.gba.enable ||
              cfg.gb.enable  ||
              cfg.snes.enable)
         higan)
-      (mkIf (cfg.wii.enable ||
+      (lib.mkIf cfg.switch.enable yuzuPackages.mainline)
+      (lib.mkIf (cfg.wii.enable ||
              cfg.gamecube.enable)
         dolphin-emu)
+      (lib.mkIf cfg.xbox.enable unstable.xemu)
     ];
   };
 }

modules/desktop/gaming/lutris.nix

@@ -1,16 +1,22 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.lutris;
 in {
   options.modules.desktop.gaming.lutris = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
-      lutris
+      (lutris.override {
+        extraPkgs = pkgs: [
+          winePackages.staging
+          wine64Packages.staging
+        ];
+      })
       vulkan-loader
       vulkan-tools
     ];

modules/desktop/gaming/steam.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.steam;
 in {
   options.modules.desktop.gaming.steam = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.steam.enable = true;
 
     systemd.extraConfig = "DefaultLimitNOFILE=1048576";

modules/desktop/gnome.nix

@@ -1,14 +1,15 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, self, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gnome;
 in {
   options.modules.desktop.gnome = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver = {
       enable = true;
       displayManager.gdm.enable = true;
@@ -16,46 +17,101 @@ in {
     };
 
     services.flatpak.enable = true;
+    services.fwupd.enable = true;
 
     programs.dconf.enable = true;
     dconf.settings = {
-      "com/raggesilver/BlackBox" = {
+      "io/github/celluloid-player/celluloid" = {
-        theme-dark = "Dracula";
+        draggable-video-area-enable = true;
-        font = "Ubuntu Mono 14";
+      };
-        remember-window-size = true;
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        cursor-theme = "Adwaita";
+        enable-hot-corners = false;
+        font-name = "Cantarell 11";
+        gtk-theme = "adw-gtk3-dark";
+        icon-theme = "MoreWaita";
+        monospace-font-name = "UbuntuMono Nerd Font 11";
+        toolbar-style = "both-horiz";
+      };
+      "org/gnome/desktop/peripherals/touchpad" = {
+        tap-to-click = true;
+      };
+      "org/gnome/desktop/sound" = {
+        theme-name = "freedesktop";
+      };
+      "org/gnome/desktop/search-providers" = {
+        disabled = [ "org.gnome.Epiphany.desktop" ];
+      };
+      "org/gnome/desktop/wm/keybindings" = {
+        switch-group = [ "<Super>grave" ];
+        switch-group-backward = [ "<Shift><Super>grave" ];
+      };
+      "org/gnome/desktop/wm/preferences" = {
+        button-layout = "appmenu:close";
+      };
+      "org/gnome/gnome-session" = {
+        auto-save-session = true;
+      };
+      "org/gnome/gnome-system-monitor" = {
+        show-dependencies = true;
+      };
+      "org/gnome/mutter" = {
+        center-new-windows = true;
+        edge-tiling = true;
+        experimental-features = [ "scale-monitor-framebuffer" ];
+      };
+      "org/gnome/settings-daemon/plugins/media-keys" = {
+        volume-up = [
+          "<Shift>F12"
+          "XF86AudioRaiseVolume"
+        ];
+        volume-down = [
+          "<Shift>F11"
+          "XF86AudioLowerVolume"
+        ];
       };
       "org/gnome/shell" = {
         disable-user-extensions = false;
         enabled-extensions = [
-          # "another-window-session-manager@gmail.com"
+          "appindicatorsupport@rgcjonas.gmail.com"
+          # "arcmenu@arcmenu.com"
           "blur-my-shell@aunetx"
+          # "browser-tabs@com.github.harshadgavali"
           "burn-my-windows@schneegans.github.com"
+          "clipboard-indicator@tudmotu.com"
+          "CoverflowAltTab@palatis.blogspot.com"
+          # "dash-to-panel@jderose9.github.com"
           # "desktop-cube@schneegans.github.com"
-          # "desktop-zoom@colin.kinlo.ch"
+          # "EasyScreenCast@iacopodeenosee.gmail.com"
           "espresso@coadmunkee.github.com"
           "flypie@schneegans.github.com"
           # "forge@jmmaranan.com"
-          "hue-lights@chlumskyvaclav@gmail.com"
+          "gsconnect@andyholmes.github.io"
+          # "gSnap@micahosborne"
+          # "hidetopbar@mathieu.bidon.ca"
           "just-perfection-desktop@just-perfection"
-          "paperwm@hedning:matrix.org"
+          # "mediacontrols@cliffniff.github.com"
+          # "mousefollowsfocus@matthes.biz"
+          # "pano@elhan.io"
+          # "paperwm@hedning:matrix.org"
+          "pip-on-top@rafostar.github.com"
+          # "rounded-window-corners@yilozt"
           # "search-light@icedman.github.com"
-          # "space-bar@luchrioh"
           # "smart-auto-move@khimaros.com"
-          # "systemd-manager@hardpixel.eu"
+          "space-bar@luchrioh"
-          # "tailscale-status@maxgallup.github.com"
           # "tiling-assistant@leleat-on-github"
+          "tilingshell@ferrarodomenico.com"
           "Vitals@CoreCoding.com"
+          "windowIsReady_Remover@nunofarruca@gmail.com"
+          # "worksets@blipk.xyz"
           # "wsmatrix@martin.zurowietz.de"
         ];
         favorite-apps = [
           "firefox.desktop"
           "org.gnome.Nautilus.desktop"
-          "com.raggesilver.BlackBox.desktop"
         ];
       };
-      "org/gnome/shell/extensions/another-window-session-manager" = {
-        enable-autorestore-sessions = true;
-      };
       "org/gnome/shell/extensions/blur-my-shell/panel" = {
         static-blur = true;
       };
@@ -67,8 +123,14 @@ in {
         glide-open-effect = true;
         glide-close-effect = true;
       };
-      "org/gnome/shell/extensions/desktop-zoom" = {
+      "org/gnome/shell/extensions/dash-to-panel" = {
-        mag-factor-delta = 0.07;
+        intellihide = true;
+        panel-positions = ''
+          {"0":"TOP"}
+        '';
+        trans-panel-opacity = 0.3;
+        trans-use-custom-opacity = true;
+        trans-use-dynamic-opacity = true;
       };
       "org/gnome/shell/extensions/espresso" = {
         enable-fullscreen = true;
@@ -78,18 +140,32 @@ in {
           "com.obsproject.Studio.desktop"
         ];
       };
-      "org/gnome/shell/extensions/paperwm" = {
+      "org/gnome/shell/extensions/flypie" = {
-        use-default-background = true;
+        preview-on-right-side = true;
       };
       "org/gnome/shell/extensions/forge" = {
         window-gap-size = 8;
         window-gap-hidden-on-single = false;
       };
+      "org/gnome/shell/extensions/hidetopbar" = {
+        mouse-sensitive = true;
+        mouse-sensitive-fullscreen-window = true;
+        enable-active-window = false;
+      };
       "org/gnome/shell/extensions/just-perfection" = {
         activities-button = false;
         window-demands-attention-focus = true;
         workspace-wrap-around = true;
       };
+      "org/gnome/shell/extensions/paperwm" = {
+        use-default-background = true;
+      };
+      "org/gnome/shell/extensions/pip-on-top" = {
+        stick = true;
+      };
+      "org/gnome/shell/extensions/search-light" = {
+        popup-at-cursor-monitor = true;
+      };
       "org/gnome/shell/extensions/space-bar/behavior" = {
         enable-activate-workspace-shortcuts = true;
         show-empty-workspaces = true;
@@ -102,9 +178,15 @@ in {
         screen-left-gap = 8;
         window-gap = 8;
       };
-      "org/gnome/desktop/background" = {
+      "org/gnome/shell/extensions/tilingshell" = {
-        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.webp";
+        inner-gaps = 16;
-        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.webp";
+        outer-gaps = 8;
+        enable-blur-snap-assistant = true;
+      };
+      "org/gnome/Console" = {
+        font-scale = 1.4;
+        use-system-font = false;
+        custom-font = "ComicShannsMono Nerd Font 10";
       };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
@@ -114,98 +196,92 @@ in {
         show-hidden = true;
         sort-directories-first = true;
       };
-      "org/gnome/settings-daemon/plugins/media-keys" = {
-        volume-up = [
-          "<Shift>F12"
-          "XF86AudioRaiseVolume"
-        ];
-        volume-down = [
-          "<Shift>F11"
-          "XF86AudioLowerVolume"
-        ];
-        screensaver = [
-          "<Shift><Super>l"
-        ];
-      };
-      "org/gnome/gnome-session" = {
-        auto-save-session = true;
-      };
-      "org/gnome/gnome-system-monitor" = {
-        show-dependencies = true;
-      };
-      "org/gnome/Console" = {
-        font-scale = 1.4;
-      };
-      "org/gnome/mutter" = {
-        center-new-windows = true;
-        experimental-features = [ "scale-monitor-framebuffer" ];
-      };
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-        enable-hot-corners = false;
-        monospace-font-name = "Ubuntu Mono 11";
-      };
-      "org/gnome/desktop/wm/keybindings" = {
-        switch-group = [ "<Super>grave" ];
-        switch-group-backward = [ "<Shift><Super>grave" ];
-      };
-      "io/github/celluloid-player/celluloid" = {
-        draggable-video-area-enable = true;
-      };
     };
 
-    fonts.fonts = with pkgs; [
+    environment.sessionVariables = {
-      noto-fonts
+      QT_STYLE_OVERRIDE = lib.mkForce "kvantum";
-      ubuntu_font_family
+      QT_WAYLAND_DECORATION = lib.mkForce "adwaita";
-    ];
+    };
+
+    home.configFile = {
+      "Kvantum/kvantum.kvconfig".text = lib.generators.toINI {} {
+        General.theme = "KvLibadwaitaDark";
+      };
+      "Kvantum/KvLibadwaita".source = "${self.inputs.kvlibadwaita}/src/KvLibadwaita";
+    };
 
     user.packages = with pkgs; [
+      authenticator
+      # bottles
+      # bustle
       celluloid
-    ];
+      # d-spy
+      # drawing
+      # fragments
+      gnome.dconf-editor
+      gnome.ghex
+      # gnome-builder
+      gnome-decoder
+      gnome-firmware
+      gnome-frog
+      # gnome-obfuscate
+      gnome-podcasts
+      identity
+      mission-center
+      mousam
+      newsflash
+      # schemes
+      shortwave
+      sysprof
+    ] ++ (if config.virtualisation.podman.enable then [
+      pods
+    ] else []);
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs.unstable; [
-      bind
+      adw-gtk3
-      blackbox-terminal
+      kdePackages.qtstyleplugin-kvantum
-      bmon
+      libsForQt5.qtstyleplugin-kvantum
-      fd
+      morewaita-icon-theme
-      ffmpeg
+      nautilus-python
-      gnome.gnome-boxes
+      qadwaitadecorations
-      gnomeExtensions.another-window-session-manager
+      qadwaitadecorations-qt6
-      # gnomeExtensions.bifocals
+
+      ## Shell extensions
+      gnomeExtensions.appindicator
+      gnomeExtensions.arcmenu
       gnomeExtensions.blur-my-shell
       gnomeExtensions.browser-tabs
       gnomeExtensions.burn-my-windows
+      gnomeExtensions.clipboard-indicator
+      gnomeExtensions.coverflow-alt-tab
+      gnomeExtensions.dash-to-panel
       gnomeExtensions.desktop-cube
-      gnomeExtensions.desktop-zoom
+      gnomeExtensions.easyScreenCast
       gnomeExtensions.espresso
-      gnome44Extensions."flypie@schneegans.github.com"
+      gnomeExtensions.fly-pie
-      # gnomeExtensions.forge
+      gnomeExtensions.forge
-      # gnomeExtensions.gsnap
+      gnomeExtensions.gsconnect
-      gnomeExtensions.hue-lights
+      gnomeExtensions.gsnap
+      gnomeExtensions.hide-top-bar
       gnomeExtensions.just-perfection
-      # gnomeExtensions.mutter-primary-gpu
+      gnomeExtensions.media-controls
+      gnomeExtensions.mouse-follows-focus
+      gnomeExtensions.pano
       gnomeExtensions.paperwm
-      # gnomeExtensions.pip-on-top
+      gnomeExtensions.pip-on-top
+      gnomeExtensions.rounded-window-corners
       gnomeExtensions.search-light
       gnomeExtensions.smart-auto-move
       gnomeExtensions.space-bar
-      gnomeExtensions.systemd-manager
-      gnomeExtensions.tailscale-status
       gnomeExtensions.tiling-assistant
-      # gnomeExtensions.todotxt
+      gnomeExtensions.tiling-shell
+      gnomeExtensions.todotxt
       gnomeExtensions.vitals
-      # gnomeExtensions.window-is-ready-remover
+      gnomeExtensions.window-is-ready-remover
-      # gnomeExtensions.worksets
+      gnomeExtensions.worksets
-      # gnomeExtensions.workspace-matrix
+      gnomeExtensions.workspace-matrix
-      iotop
-      ripgrep
-      rsync
-      tcpdump
-      tokei
-      tree
-      wl-clipboard
     ];
 
-    home.services.gpg-agent.pinentryFlavor = "gnome3";
+    home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
   };
 }

modules/desktop/hyprland.nix

@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.hyprland;
+in {
+  options.modules.desktop.hyprland = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.hyprland.enable = true;
+
+    networking.networkmanager.enable = true;
+
+    user.packages = with pkgs; [
+      mpv
+    ];
+
+    environment.systemPackages = with pkgs; [
+      adw-gtk3
+    ];
+
+    home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  };
+}

modules/desktop/kde.nix

@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.kde;
+in {
+  options.modules.desktop.kde = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services = {
+      xserver = {
+        enable = true;
+      };
+      desktopManager.plasma6.enable = true;
+      displayManager.sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
+    };
+
+    networking.networkmanager.enable = true;
+
+    user.packages = with pkgs; [
+      kmail
+      mpv
+    ];
+
+    environment.systemPackages = with pkgs; [
+      adw-gtk3
+    ];
+
+    home.services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;
+  };
+}

modules/desktop/media/graphics.nix

@@ -1,21 +1,28 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.media.graphics;
 in {
   options.modules.desktop.media.graphics = {
-    modeling.enable = mkBoolOpt false;
+    modeling.enable = lib.mkOption {
-    raster.enable   = mkBoolOpt false;
+      default = false;
-    vector.enable   = mkBoolOpt false;
+      example = true;
+    };
+    raster.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    vector.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {
     user.packages = with pkgs; [
-      (mkIf cfg.modeling.enable blender)
+      (lib.mkIf cfg.modeling.enable blender)
-      (mkIf cfg.raster.enable gimp)
+      (lib.mkIf cfg.raster.enable gimp)
-      (mkIf cfg.raster.enable krita)
+      (lib.mkIf cfg.raster.enable krita)
-      (mkIf cfg.vector.enable inkscape)
+      (lib.mkIf cfg.vector.enable inkscape)
     ];
   };
 }

modules/desktop/media/recording.nix

@@ -1,12 +1,16 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.media.recording;
 in {
   options.modules.desktop.media.recording = {
-    audio.enable = mkBoolOpt false;
+    audio.enable = lib.mkOption {
-    video.enable = mkBoolOpt false;
+      default = false;
+      example = true;
+    };
+    video.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {

modules/desktop/mimeapps.nix

@@ -1,17 +1,18 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let
   cfg = config.modules.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
 in {
   options.modules.desktop.mimeapps = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     xdg.mime.defaultApplications = {
       # Audio/video
       "audio/x-vorbis+ogg" = avApp;

modules/desktop/office/libreoffice.nix

@@ -1,16 +1,38 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+let
-with lib.my;
+  cfg = config.modules.desktop.office.libreoffice;
-let cfg = config.modules.desktop.office.libreoffice;
+  # libreoffice-gtk4 = pkgs.libreoffice.override {
+  #   extraMakeWrapperArgs = [
+  #     "--set SAL_USE_VCLPLUGIN gtk4"
+  #   ];
+  #   unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
+  #     buildInputs = oldAttrs.buildInputs ++ [
+  #       pkgs.gtk4
+  #     ];
+  #     configureFlags = oldAttrs.configureFlags ++ [
+  #       "--disable-werror"
+  #       "--enable-gtk4"
+  #     ];
+  #     passthru = oldAttrs.passthru // {
+  #       inherit (pkgs) gtk4;
+  #     };
+  #   });
+  # };
 in {
   options.modules.desktop.office.libreoffice = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      libreoffice
+      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      hunspell
+      hunspellDicts.en-gb-large
+      hunspellDicts.en-us-large
     ];
   };
 }

modules/dev/cc.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.cc;
 in {
   options.modules.dev.cc = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       clang
       gcc

modules/dev/java.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.java;
 in {
   options.modules.dev.java = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       jdk
     ];

modules/dev/lua.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.lua;
 in {
   options.modules.dev.lua = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       lua
     ];

modules/dev/node.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.node;
 in {
   options.modules.dev.node = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       nodejs_latest
     ];

modules/dev/python.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.python;
 in {
   options.modules.dev.python = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       python310
     ];

modules/dev/rust.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.rust;
 in {
   options.modules.dev.rust = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       rustc
       rustup

modules/dev/scala.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.scala;
 in {
   options.modules.dev.scala = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       jdk
       sbt

modules/dev/shell.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.shell;
 in {
   options.modules.dev.shell = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       shellcheck
     ];

modules/dev/zig.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.zig;
 in {
   options.modules.dev.zig = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       zig
     ];

modules/editors/neovim/default.nix

@@ -1,134 +1,139 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let
   cfg = config.modules.editors.neovim;
-  dev = config.modules.dev;
 in {
   options.modules.editors.neovim = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
+    home.programs.nixvim = {
-      (neovim.override {
+      enable = true;
-        configure = {
+      defaultEditor = true;
-          customRC = ''
+
-            luafile ~/.config/nvim/init.lua
+      viAlias = true;
-          '';
+      vimAlias = true;
-          packages.myPlugins = with pkgs.vimPlugins; {
+
-            start = [
+      options = {
-              (nvim-treesitter.withPlugins (
+        number = true;
-                plugins: with plugins; [
+        tabstop = 2;
-                  bash
+        shiftwidth = 2;
-                  c
+        expandtab = true;
-                  cmake
+        foldlevel = 99;
-                  cpp
+        splitbelow = true;
-                  css
+        splitright = true;
-                  dockerfile
+        undofile = true;
-                  elm
+        updatetime = 100;
-                  glsl
+        list = true;
-                  graphql
+      };
-                  haskell
+
-                  http
+      globals = {
-                  html
+        mapleader = ",";
-                  java
+        maplocalleader = ",";
-                  javascript
+      };
-                  jsdoc
+
-                  json
+      clipboard = {
-                  json5
+        register = "unnamedplus";
-                  latex
+
-                  lua
+        providers.wl-copy.enable = true;
-                  markdown
+      };
-                  ninja
+
-                  nix
+      plugins.comment.enable = true;
-                  org
+
-                  perl
+      plugins.hmts.enable = true;
-                  php
+
-                  pug
+      plugins.lightline.enable = true;
-                  python
+
-                  regex
+      plugins.luasnip.enable = true;
-                  rst
+
-                  ruby
+      plugins.lsp = {
-                  rust
+        enable = true;
-                  scala
+        servers = {
-                  scss
+          bashls.enable = true;
-                  toml
+          ccls.enable = true;
-                  tsx
+          cssls.enable = true;
-                  typescript
+          eslint.enable = true;
-                  vim
+          gopls.enable = true;
-                  yaml
+          html.enable = true;
-                  zig
+          lua-ls.enable = true;
-                ]
+          pylsp.enable = true;
-              ))
+          nixd.enable = true;
-              nvim-treesitter-context
+          rust-analyzer = {
-              nvim-treesitter-textobjects
+            enable = true;
-              nvim-lspconfig
+            installCargo = true;
+            installRustc = true;
+          };
+          tsserver.enable = true;
+        };
+      };
+
+      plugins.nvim-autopairs.enable = true;
+
+      plugins.cmp = {
+        enable = true;
+        autoEnableSources = true;
+        settings = {
+          sources = [
+            { name = "nvim_lsp"; }
+            { name = "path"; }
+            { name = "buffer"; }
           ];
+          mapping = {
+            "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+            "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+            "<CR>" = "cmp.mapping.confirm({ select = true })";
+          };
         };
       };
-      })
-    ] ++
 
-    # Install appropriate language servers
+      plugins.telescope = {
-    (if dev.cc.enable then [
+        enable = true;
-      ccls                                            # C/C++
+        keymaps = {
-    ] else []) ++
+          "<leader>ff" = "find_files";
-    (if dev.java.enable then [
+          "<leader>fg" = "live_grep";
-      java-language-server                            # Java
+          "<leader>b" = "buffers";
-      ltex-ls                                         # LaTeX
+          "<leader>fh" = "help_tags";
-    ] else []) ++
+          "<C-p>" = "git_files";
-    (if dev.lua.enable then [
+          "<C-f>" = "live_grep";
-      sumneko-lua-language-server                     # Lua
+        };
-    ] else []) ++
+      };
-    (if dev.node.enable then [
-      nodePackages.bash-language-server               # Bash
-      nodePackages.dockerfile-language-server-nodejs  # Dockerfile
-      nodePackages.graphql-language-service-cli       # GraphQL
-      nodePackages.purescript-language-server         # PureScript
-      nodePackages.svelte-language-server             # Svelte
-      nodePackages.typescript-language-server         # JavaScript/TypeScript
-      nodePackages.vim-language-server                # Vim
-      nodePackages.vscode-langservers-extracted       # HTML, CSS, JSON, ESLint
-      nodePackages.vue-language-server                # Vue.js
-      nodePackages.yaml-language-server               # YAML
-    ] else []) ++
-    (if dev.python.enable then [
-      cmake-language-server                           # CMake
-      python310Packages.python-lsp-server             # Python
-    ] else []) ++
-    (if dev.rust.enable then [
-      rust-analyzer                                   # Rust
-    ] else []) ++
-    (if dev.scala.enable then [
-      metals                                          # Scala
-    ] else []) ++
-    (if dev.zig.enable then [
-      zls                                             # Zig
-    ] else []);
 
-    home.configFile = {
+      plugins.treesitter = {
-      "nvim/init.lua".source = ./init.lua;
+        enable = true;
-      "nvim/lua" = { source = ./lua; recursive = true; };
+
-      "nvim/lua/config/lsp.lua".text = ''
+        nixvimInjections = true;
-        -- This file is autogenerated, do not edit.
+
-        ${if dev.cc.enable then "require('config.lsp.cc')\n" else ""}
+        folding = true;
-        ${if dev.java.enable then "require('config.lsp.java')\n" else ""}
+        indent = true;
-        ${if dev.lua.enable then "require('config.lsp.lua')\n" else ""}
+      };
-        ${if dev.node.enable then "require('config.lsp.node')\n" else ""}
+
-        ${if dev.python.enable then "require('config.lsp.python')\n" else ""}
+      plugins.treesitter-refactor = {
-        ${if dev.rust.enable then "require('config.lsp.rust')\n" else ""}
+        enable = true;
-        ${if dev.scala.enable then "require('config.lsp.scala')\n" else ""}
+        highlightDefinitions = {
-        ${if dev.zig.enable then "require('config.lsp.zig')\n" else ""}
+          enable = true;
-      '';
+          clearOnCursorMove = false;
+        };
+      };
+
+      plugins.undotree.enable = true;
+
+      # plugins.gitsigns.enable = true;
+      # plugins.gitgutter.enable = true;
+      # plugins.goyo.enable = true;
+      # plugins.fugitive.enable = true;
+      # plugins.fzf-lua.enable = true;
+      # plugins.neo-tree.enable = true;
+      # plugins.none-ls.enable = true;
+      # plugins.nvim-tree.enable = true;
+      # plugins.oil.enable = true;
+      # plugins.project-nvim.enable = true;
+      # plugins.surround.enable = true;
     };
 
     env.EDITOR = "nvim";
-
-    environment.shellAliases = {
-      vim = "nvim";
-      v   = "nvim";
-    };
   };
 }

modules/editors/neovim/init.lua

@@ -1,6 +0,0 @@
-require("config.core")
-require("config.keymap")
-require("config.treesitter")
-require("config.plugins")
-require("config.lsp")
-

modules/editors/neovim/lua/config/core.lua

@@ -1,36 +0,0 @@
-local o = vim.opt
-local wo = vim.wo
-local bo = vim.bo
-
--- Global dirs
-local cachedir = os.getenv("XDG_CACHE_HOME")
-o.backupdir = cachedir .. "/nvim/backup/"
-o.directory = cachedir .. "/nvim/swap/"
-o.undodir   = cachedir .. "/nvim/undo/"
-
--- Global
-o.breakindent = true
-o.clipboard = "unnamedplus"
-o.compatible = false
-o.encoding = "utf-8"
-o.expandtab = true
-o.foldlevel = 99
-o.hidden = true
-o.hlsearch = false
-o.ignorecase = true
-o.laststatus = 2
-o.listchars = { eol = '↲', tab = '▸ ', trail = '·' }
-o.relativenumber = true
-o.shiftwidth = 2
-o.showmode = false
-o.smartcase = true
-o.smarttab = true
-o.softtabstop = 2
-o.synmaxcol = 150
-o.tabstop = 4
-o.undofile = true
-o.wildmenu = true
-
--- Window
-
--- Buffer

modules/editors/neovim/lua/config/keymap.lua

@@ -1,35 +0,0 @@
-local keymap = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
-vim.g.mapleader = ","
-
--- Modes
---   Normal = "n",
---   Insert = "i",
---   Visual = "v",
---   Visual Block = "x",
---   Term = "t",
---   Command = "c"
-
-keymap("n", "<Left>", "<Nop>", opts)
-keymap("n", "<Right>", "<Nop>", opts)
-keymap("n", "<Up>", "<Nop>", opts)
-keymap("n", "<Down>", "<Nop>", opts)
-
-keymap("n", "<C-h>", "<C-w>h", { noremap = true })
-keymap("n", "<C-j>", "<C-w>j", { noremap = true })
-keymap("n", "<C-k>", "<C-w>k", { noremap = true })
-keymap("n", "<C-l>", "<C-w>l", { noremap = true })
-
-keymap("n", "gV", "`[v`]", opts)
-
-keymap("n", ";", ":", { noremap = true })
-
--- Bubble single lines with vim-unimpaired
-keymap("n", "<C-Up>", "[e", opts)
-keymap("n", "<C-Down>", "]e", opts)
-
--- Bubble multiple lines with vim-unimpaired
-keymap("v", "<C-Up>", "[egv", opts)
-keymap("v", "<C-Down>", "]egv", opts)
-

modules/editors/neovim/lua/config/lsp/cc.lua

@@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires C/C++
-lspconfig.ccls.setup{}
-

modules/editors/neovim/lua/config/lsp/java.lua

@@ -1,6 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Java
-lspconfig.java_language_server.setup{}
-lspconfig.ltex.setup{}
-

modules/editors/neovim/lua/config/lsp/lua.lua

@@ -1,22 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Lua
-lspconfig.sumneko_lua.setup {
-  settings = {
-    Lua = {
-      runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-        version = 'LuaJIT',
-      },
-      diagnostics = {
-        -- Get the language server to recognize the `vim` global
-        globals = {'vim'},
-      },
-      -- Do not send telemetry data containing a randomized but unique identifier
-      telemetry = {
-        enable = false,
-      },
-    },
-  },
-}
-

modules/editors/neovim/lua/config/lsp/node.lua

@@ -1,17 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Node.js
-lspconfig.bashls.setup{}
-lspconfig.cssls.setup{}
-lspconfig.dockerls.setup{}
-lspconfig.eslint.setup{}
-lspconfig.graphql.setup{}
-lspconfig.html.setup{}
-lspconfig.jsonls.setup{}
-lspconfig.purescriptls.setup{}
-lspconfig.svelte.setup{}
-lspconfig.tsserver.setup{}
-lspconfig.vimls.setup{}
-lspconfig.vuels.setup{}
-lspconfig.yamlls.setup{}
-

modules/editors/neovim/lua/config/lsp/python.lua

@@ -1,6 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Python
-lspconfig.cmake.setup{}
-lspconfig.pylsp.setup{}
-

modules/editors/neovim/lua/config/lsp/rust.lua

@@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Rust
-lspconfig.rls.setup{}
-

modules/editors/neovim/lua/config/lsp/scala.lua

@@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Scala
-lspconfig.metals.setup{}
-

modules/editors/neovim/lua/config/lsp/zig.lua

@@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
--- Requires Zig
-lspconfig.zls.setup{}
-

modules/editors/neovim/lua/config/plugins.lua

@@ -1,77 +0,0 @@
-local fn = vim.fn
-
-local install_path = fn.stdpath "data" .. "/site/pack/packer/start/packer.nvim"
-if fn.empty(fn.glob(install_path)) > 0 then
-  PACKER_BOOTSTRAP = fn.system {
-    "git",
-    "clone",
-    "--depth",
-    "1",
-    "https://github.com/wbthomason/packer.nvim",
-    install_path,
-  }
-  print "Installing packer close and reopen Neovim..."
-  vim.cmd [[packadd packer.nvim]]
-end
-
-vim.cmd [[
-  augroup packer_user_config
-    autocmd!
-    autocmd BufWritePost plugins.lua source <afile> | PackerSync
-  augroup end
-]]
-
-local status_ok, packer = pcall(require, "packer")
-if not status_ok then
-  return
-end
-
-packer.init {
-  display = {
-    open_fn = function()
-      return require("packer.util").float { border = "rounded" }
-    end,
-  },
-}
-
-return packer.startup(function(use)
-  -- Utilities
-  use { "wbthomason/packer.nvim", opt = true }
-  use { "mbbill/undotree" }
-  use { "nvim-lua/plenary.nvim" }
-  use { "tpope/vim-fugitive", event = "User InGitRepo" }
-
-  -- Editing
-  use { "andymass/vim-matchup" }
-  use { "godlygeek/tabular" }
-  use { "JoosepAlviste/nvim-ts-context-commentstring" }
-  use { "kana/vim-textobj-user" }
-  use { "mg979/vim-visual-multi", branch = "master" }
-  use { "p00f/nvim-ts-rainbow" }
-  use { "terryma/vim-expand-region" }
-  use { "tommcdo/vim-exchange", event = "VimEnter" }
-  use { "tpope/vim-abolish" }
-  use { "tpope/vim-commentary", event = "VimEnter" }
-  use { "tpope/vim-repeat", event = "VimEnter" }
-  use { "tpope/vim-surround", event = "VimEnter" }
-  use { "windwp/nvim-autopairs" }
-  use { "windwp/nvim-ts-autotag" }
-
-  -- UI
-  use { "junegunn/goyo.vim" }
-  use { "junegunn/limelight.vim" }
-  use { "markonm/traces.vim" }
-
-  -- Searching
-  use { "nvim-telescope/telescope.nvim", config = [[require('config.telescope')]] }
-  use { "cljoly/telescope-repo.nvim", requires = "telescope.nvim" }
-  use { "dyng/ctrlsf.vim" }
-
-  -- LSP
-  use { "jose-elias-alvarez/null-ls.nvim" }
-
-  if PACKER_BOOTSTRAP then
-    require("packer").sync()
-  end
-end)
-

modules/editors/neovim/lua/config/telescope.lua

@@ -1,46 +0,0 @@
-local status_ok, telescope = pcall(require, "telescope")
-if not status_ok then
-  return
-end
-
-local actions = require("telescope.actions")
-
-telescope.setup({
-  defaults = {
-    file_ignore_patterns = { ".git/", "node_modules" },
-  },
-  mappings = {
-    i = {
-      ["<Down>"] = actions.cycle_history_next,
-      ["<Up>"] = actions.cycle_history_prev,
-      ["<C-j>"] = actions.move_selection_next,
-      ["<C-k>"] = actions.move_selection_previous,
-    },
-  },
-  extensions = {
-    repo = {
-      list = {
-        fd_opts = {
-          "--no-ignore-vcs",
-        },
-        search_dirs = {
-          "~/projects",
-          "~/repos",
-          "~/workspace",
-        },
-      },
-    },
-  },
-})
-
-telescope.load_extension("repo")
-
-local keymap = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
-keymap("n", "<Leader>ff", "<cmd>Telescope find_files<cr>", opts)
-keymap("n", "<Leader>fg", "<cmd>Telescope live_grep<cr>", opts)
-keymap("n", "<Leader>fb", "<cmd>Telescope buffers<cr>", opts)
-keymap("n", "<Leader>fh", "<cmd>Telescope help_tags<cr>", opts)
-keymap("n", "<Leader>fr", "<cmd>Telescope repo list<cr>", opts)
-

modules/editors/neovim/lua/config/treesitter.lua

@@ -1,35 +0,0 @@
-require("nvim-treesitter.configs").setup({
-  ignore_install = {},
-  highlight = {
-    enable = true,
-    disable = {},
-  },
-  indent = { enable = true },
-  incremental_selection = {
-    enable = true,
-    keymaps = {
-      init_selection = "gnn",
-      node_incremental = "grn",
-      scope_incremental = "grc",
-      node_decremental = "grm",
-    },
-  },
-  -- Extensions
-  autotag = { enable = true },
-  context_commentstring = { enable = true },
-  matchup = { enable = true },
-  rainbow = { enable = true },
-  textobjects = {
-    select = {
-      enable = true,
-      keymaps = {
-        ["af"] = "@function.outer",
-        ["if"] = "@function.inner",
-      },
-    },
-  },
-})
-
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-

modules/editors/vscode.nix

@@ -1,16 +1,49 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.editors.vscode;
 in {
   options.modules.editors.vscode = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
     home.programs.vscode = {
       enable = true;
+      extensions = with pkgs.vscode-extensions; [
+        asvetliakov.vscode-neovim
+        brettm12345.nixfmt-vscode
+        coolbear.systemd-unit-file
+        editorconfig.editorconfig
+        golang.go
+        graphql.vscode-graphql-syntax
+        mattn.lisp
+        # mkhl.direnv
+        ms-python.vscode-pylance
+        ms-vscode.cpptools
+        ms-vscode.hexeditor
+        piousdeer.adwaita-theme
+        # redhat.java
+        # sumneko.lua
+      ];
+      userSettings = {
+        "editor.renderLineHighlight" = "none";
+        "extensions.experimental.affinity" = {
+          "asvetliakov.vscode-neovim" = 1;
+        };
+        "files.autoSave" = "off";
+        "window.autoDetectColorScheme" = true;
+        "window.commandCenter" = true;
+        "window.titleBarStyle" = "custom";
+        "workbench.iconTheme" = null;
+        "workbench.preferredDarkColorTheme" = "Adwaita Dark";
+        "workbench.preferredLightColorTheme" = "Adwaita Light";
+        "workbench.tree.indent" = 12;
+      };
     };
   };
 }

modules/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch

@@ -1,4 +1,4 @@
-From c16be6b3b4da5a55e3ff4258ada123b5f03757e5 Mon Sep 17 00:00:00 2001
+From daebf42bd955f6f8d971af967c675e4e339cb0b2 Mon Sep 17 00:00:00 2001
 From: Jordan Holt <jordan@vimium.com>
 Date: Sun, 12 Nov 2023 12:13:39 +0000
 Subject: [PATCH] Update device ID for PreSonus 1824c
@@ -6,8 +6,9 @@ Subject: [PATCH] Update device ID for PreSonus 1824c
 ---
  sound/usb/format.c       | 4 ++--
  sound/usb/mixer_quirks.c | 2 +-
+ sound/usb/mixer_s1810c.c | 2 +-
  sound/usb/quirks.c       | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ 4 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/sound/usb/format.c b/sound/usb/format.c
 index ab5fed9f55b6..da50a4782414 100644
@@ -37,6 +38,19 @@ index 898bc3baca7b..c3135459c38c 100644
  		err = snd_sc1810_init_mixer(mixer);
  		break;
  	case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */
+diff --git a/sound/usb/mixer_s1810c.c b/sound/usb/mixer_s1810c.c
+index fac4bbc6b275..5bc2e66d452c 100644
+--- a/sound/usb/mixer_s1810c.c
++++ b/sound/usb/mixer_s1810c.c
+@@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
+ 		return 0;
+ 
+ 	dev_info(&dev->dev,
+-		 "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
++		 "Presonus Studio 1824c, device_setup: %u\n", chip->setup);
+ 	if (chip->setup == 1)
+ 		dev_info(&dev->dev, "(8out/18in @ 48kHz)\n");
+ 	else if (chip->setup == 2)
 diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
 index ab2b938502eb..b86832edaaa0 100644
 --- a/sound/usb/quirks.c
@@ -53,5 +67,5 @@ index ab2b938502eb..b86832edaaa0 100644
  
  
 -- 
-2.40.1
+2.42.0
 

modules/hardware/presonus-studio.nix

@@ -0,0 +1,88 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.modules.hardware.presonus-studio;
+  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
+    kernel = config.boot.kernelPackages.kernel;
+  };
+  patched = snd-usb-audio-module.overrideAttrs (prev: {
+    patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+  });
+  upmixConfig = {
+    "stream.properties" = {
+      "channelmix.upmix" = true;
+      "channelmix.upmix-method" = "psd";
+    };
+  };
+in {
+  options.modules.hardware.presonus-studio = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.kernelModules = [ "snd-usb-audio" ];
+    boot.extraModulePackages = [
+      (patched)
+    ];
+
+    # Workaround for mainline module loading instead of patched module
+    systemd.services.reload-snd-usb-audio = {
+      description = "Reload snd_usb_audio kernel module";
+      wantedBy = [ "sound.target" ];
+      serviceConfig.Type = "oneshot";
+      path = with pkgs; [
+        kmod
+      ];
+      script = ''
+        # Only reload if device hasn't been initialised
+        if ! cat /proc/asound/card*/usbmixer | grep -q "Mute Main Out Switch"; then
+          rmmod snd_usb_audio
+          insmod /run/booted-system/kernel-modules/lib/modules/$(uname -r)/extra/snd-usb-audio.ko.xz
+        fi
+      '';
+    };
+
+    services.pipewire.extraConfig = {
+      pipewire = {
+        "10-network" = {
+          "context.modules" = [
+            {
+              "name" = "libpipewire-module-rtp-session";
+              "args" = {
+                "stream.props" = {
+                  "node.name" = "rtp-source";
+                };
+              };
+            }
+          ];
+        };
+        "surround" = {
+          "context.modules" = [
+            {
+              "name" = "libpipewire-module-loopback";
+              "args" = {
+                "node.description" = "Genelec 4.1 Surround";
+                "capture.props" = {
+                  "node.name" = "Genelec_Speakers";
+                  "media.class" = "Audio/Sink";
+                  "audio.position" = [ "FL" "FR" "SL" "SR" "LFE" ];
+                };
+                "playback.props" = {
+                  "node.name" = "playback.Genelec_Speakers";
+                  "audio.position" = [ "AUX0" "AUX1" "AUX3" "AUX4" "AUX5" ];
+                  "target.object" = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output";
+                  "stream.dont-remix" = true;
+                  "node.passive" = true;
+                };
+              };
+            }
+          ];
+        };
+      };
+      pipewire-pulse."40-upmix" = upmixConfig;
+      client-rt."40-upmix" = upmixConfig;
+    };
+  };
+ } 

modules/networking/tailscale.nix

@@ -1,17 +1,40 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, self, ... }:
 
-with lib;
+let
-with lib.my;
+  cfg = config.modules.networking.tailscale;
-let cfg = config.modules.networking.tailscale;
+  headscale = "https://headscale.vimium.net";
+  hostname = config.networking.hostName;
 in {
   options.modules.networking.tailscale = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
-    restrictSSH = mkBoolOpt true;
+      default = false;
+      example = true;
+    };
+    restrictSSH = lib.mkOption {
+      default = true;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."passwords/services/tailscale/${hostname}-authkey" = {
+      file = "${self.inputs.secrets}/passwords/services/tailscale/${hostname}-authkey.age";
+    };
+
+    environment.systemPackages = [ pkgs.tailscale ];
+
+    services.tailscale = {
+      enable = true;
+      authKeyFile = config.age.secrets."passwords/services/tailscale/${hostname}-authkey".path;
+
+      extraUpFlags = [
+        "--login-server"
+        headscale
+      ];
     };
 
-  config = mkIf cfg.enable {
-    services.tailscale.enable = true;
     services.openssh.openFirewall = !cfg.restrictSSH;
+
     networking.firewall = {
       checkReversePath = "loose";
       trustedInterfaces = [ "tailscale0" ];

modules/networking/wireless.nix

@@ -0,0 +1,60 @@
+{ config, lib, pkgs, self, ... }:
+
+with lib;
+
+let cfg = config.modules.networking.wireless;
+in {
+  options.modules.networking.wireless = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Automatically connect to known networks";
+    };
+    interfaces = mkOption {
+      default = [ ];  # All interfaces
+      example = [ "wlan0" ];
+      description = mdDoc "Interfaces for `wpa_supplicant` to bind to";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    age.secrets."passwords/networks" = {
+      file = "${self.inputs.secrets}/passwords/networks.age";
+    };
+
+    networking = {
+      wireless = {
+        enable = true;
+        interfaces = cfg.interfaces;
+        environmentFile = config.age.secrets."passwords/networks".path;
+        networks = {
+          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+        };
+      };
+      networkmanager.ensureProfiles.profiles = {
+        "Apollo" = {
+          connection = {
+            id = "Apollo 600 Mbps";
+            type = "wifi";
+          };
+          wifi = {
+            mode = "infrastructure";
+            ssid = "Apollo 600 Mbps";
+          };
+          wifi-security = {
+            auth-alg = "open";
+            key-mgmt = "wpa-psk";
+            psk = "";
+          };
+          ipv4 = {
+            method = "auto";
+          };
+          ipv6 = {
+            addr-gen-mode = "stable-privacy";
+            method = "auto";
+          };
+        };
+      };
+    };
+  };
+}

modules/options.nix

@@ -1,21 +1,20 @@
-{ config, options, lib, home-manager, ... }:
+{ config, options, lib, self, ... }:
 
 with lib;
-with lib.my;
 {
   options = with types; {
-    user = mkOpt attrs { };
+    user = mkOption { type = attrs; default = { }; };
 
     home = {
-      configFile  = mkOpt' attrs { } "Files to place in $XDG_CONFIG_HOME";
+      configFile  = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_CONFIG_HOME"; };
-      dataFile    = mkOpt' attrs { } "Files to place in $XDG_DATA_HOME";
+      dataFile    = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_DATA_HOME"; };
-      file        = mkOpt' attrs { } "Files to place directly in $HOME";
+      file        = mkOption { type = attrs; default = { }; description = "Files to place directly in $HOME"; };
-      packages    = mkOpt' attrs { } "User-level installed packages";
+      packages    = mkOption { type = attrs; default = { }; description = "User-level installed packages"; };
-      programs    = mkOpt' attrs { } "Programs managed directly from home-manager";
+      programs    = mkOption { type = attrs; default = { }; description = "Programs managed directly from home-manager"; };
-      services    = mkOpt' attrs { } "Services managed directly from home-manager";
+      services    = mkOption { type = attrs; default = { }; description = "Services managed directly from home-manager"; };
     };
 
-    dconf.settings = mkOpt' attrs { } "dconf settings to enable";
+    dconf.settings = mkOption { type = attrs; default = { }; description = "dconf settings to enable"; };
 
     env = mkOption {
       type = attrsOf (oneOf [ str path (listOf (either str path)) ]);
@@ -30,18 +29,20 @@ with lib.my;
   };
 
   config = {
+    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
     user =
       let user = builtins.getEnv "USER";
           name = if elem user [ "" "root" ] then "jordan" else user;
       in {
         inherit name;
         isNormalUser = true;
-        extraGroups = [ "networkmanager" "wheel" ];
+        extraGroups = [ "networkmanager" "wheel" "lxd" ];
         description = "Jordan Holt";
         useDefaultShell = true;
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
         ];
+        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
         home = "/home/${name}";
         group = "users";
         uid = 1000;
@@ -65,12 +66,15 @@ with lib.my;
         };
         dconf.settings = mkAliasDefinitions options.dconf.settings;
       };
+
+      sharedModules = [
+        self.inputs.nixvim.homeManagerModules.nixvim
+        self.inputs.plasma-manager.homeManagerModules.plasma-manager
+      ];
     };
 
     users.users.${config.user.name} = mkAliasDefinitions options.user;
 
-    nixpkgs.config.allowUnfree = true;
-
     environment.extraInit =
       concatStringsSep "\n"
         (mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env);

modules/podman.nix

@@ -0,0 +1,45 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.podman;
+in {
+  options.modules.podman = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Enable podman on this host";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    virtualisation = {
+      docker.enable = false;
+
+      podman = {
+        enable = true;
+        defaultNetwork.settings.dns_enabled = true;
+        autoPrune = {
+          enable = true;
+          dates = "weekly";
+          flags = [ "--all" ];
+        };
+        extraPackages = [ pkgs.zfs ];
+      };
+
+      containers.storage.settings.storage = {
+        driver = "zfs";
+        graphroot = "/var/lib/containers/storage";
+        runroot = "/run/containers/storage";
+      };
+
+      oci-containers.backend = "podman";
+    };
+
+    networking.firewall.interfaces."podman+" = {
+      allowedUDPPorts = [ 53 ];
+      allowedTCPPorts = [ 53 ];
+    };
+  };
+}

modules/security/gpg.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.security.gpg;
 in {
   options.modules.security.gpg = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.programs.gpg = {
       enable = true;
     };

modules/security/pass.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.security.pass;
 in {
   options.modules.security.pass = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.programs.password-store = {
       enable = true;
       package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);

modules/services/borgmatic/default.nix

@@ -0,0 +1,61 @@
+{ config, lib, self, ... }:
+
+let
+  cfg = config.modules.services.borgmatic;
+  hostname = config.networking.hostName;
+in {
+  options.modules.services.borgmatic = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      description = lib.mdDoc "Enable backups on this host with `borgmatic`";
+    };
+    directories = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [];
+      example = [
+        "/home/jordan/Documents"
+      ];
+      description = lib.mdDoc "List of directories to backup";
+    };
+    repoPath = lib.mkOption {
+      type = lib.types.str;
+      example = "ssh://example@example.repo.borgbase.com/./repo";
+      description = lib.mdDoc "Destination borg repository for backup";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."passwords/services/borg/${hostname}-passphrase" = {
+      file = "${self.inputs.secrets}/passwords/services/borg/${hostname}-passphrase.age";
+    };
+
+    services.borgmatic = {
+      enable = true;
+      settings = {
+        source_directories = cfg.directories;
+        repositories = [
+          { label = "borgbase"; path = cfg.repoPath; }
+        ];
+        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/${hostname}-passphrase".path}";
+        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
+        keep_daily = 7;
+        keep_weekly = 4;
+        keep_monthly = 6;
+      };
+    };
+
+    services.postgresql.ensureUsers = [
+      {
+        name = "root";
+        ensureClauses.superuser = true;
+      }
+    ];
+
+    # Add `pg_dumpall` to unit environment
+    systemd.services.borgmatic.path = [ config.services.postgresql.package ];
+
+    # Without this override, `cat` is unavailable for `encryption_passcommand`
+    systemd.services.borgmatic.confinement.fullUnit = true;
+  };
+}

modules/services/chrony/default.nix

@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.chrony;
+in {
+  options.modules.services.chrony = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable chrony NTP deamon";
+    };
+
+    config = mkIf cfg.enable {
+      services.chrony = {
+        enable = true;
+
+        servers = [
+          "uk.pool.ntp.org"
+          "time.cloudflare.com"
+        ];
+
+        extraConfig = ''
+          makestep 1.0 3
+
+          bindaddress 0.0.0.0
+          port 123
+          allow
+        '';
+      };
+
+      services.timesyncd.enable = mkForce false;
+
+      networking.firewall = {
+        allowedUDPPorts = [ 123 ];
+        allowedTCPPorts = [ 123 ];
+      };
+    };
+  };
+}

modules/services/coturn/default.nix

@@ -0,0 +1,118 @@
+{ config, lib, self, ... }:
+
+let
+  cfg = config.modules.services.coturn;
+in {
+  options.modules.services.coturn = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    realm = lib.mkOption {
+      type = lib.types.str;
+      description = "The realm to be used by the TURN server.";
+      example = "turn.vimium.com";
+    };
+    matrixIntegration = lib.mkOption {
+      default = false;
+      description = "Configure the matrix-synapse module to use this TURN server.";
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall = let
+      range = with config.services.coturn; lib.singleton {
+        from = min-port;
+        to = max-port;
+      };
+    in {
+      allowedTCPPorts = [
+        3478  # TURN listener
+        5349  # STUN TLS
+        5350  # STUN TLS alt
+      ];
+      allowedUDPPorts = [
+        3478  # TURN listener
+        5349  # TLS
+        5350  # TLS alt
+      ];
+      allowedUDPPortRanges = range; # TURN peer relays
+    };
+
+    security.acme.certs = {
+      "${config.services.coturn.realm}" = {
+        group = "turnserver";
+        reloadServices = [ "coturn" ];
+      };
+    };
+
+    age.secrets = {
+      "passwords/services/coturn/static-auth-secret" = {
+        file = "${self.inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
+        owner = "turnserver";
+        group = "turnserver";
+      };
+    } // (if cfg.matrixIntegration then {
+      "passwords/services/coturn/matrix-turn-config.yml" = {
+        file = "${self.inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
+        owner = "matrix-synapse";
+        group = "matrix-synapse";
+      };
+    } else {});
+
+    services.coturn = rec {
+      enable = true;
+      realm = cfg.realm;
+      use-auth-secret = true;
+      static-auth-secret-file = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
+      cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
+      pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
+      min-port = 49000;
+      max-port = 50000;
+      no-cli = true;
+      no-tcp-relay = true;
+      extraConfig = ''
+        cipher-list="HIGH"
+        no-multicast-peers
+
+        # Ban private CIDR blocks
+        denied-peer-ip=0.0.0.0-0.255.255.255
+        denied-peer-ip=10.0.0.0-10.255.255.255
+        denied-peer-ip=100.64.0.0-100.127.255.255
+        denied-peer-ip=127.0.0.0-127.255.255.255
+        denied-peer-ip=169.254.0.0-169.254.255.255
+        denied-peer-ip=172.16.0.0-172.31.255.255
+        denied-peer-ip=192.0.0.0-192.0.0.255
+        denied-peer-ip=192.0.2.0-192.0.2.255
+        denied-peer-ip=192.88.99.0-192.88.99.255
+        denied-peer-ip=192.168.0.0-192.168.255.255
+        denied-peer-ip=198.18.0.0-198.19.255.255
+        denied-peer-ip=198.51.100.0-198.51.100.255
+        denied-peer-ip=203.0.113.0-203.0.113.255
+        denied-peer-ip=240.0.0.0-255.255.255.255
+        denied-peer-ip=::1
+        denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
+        denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
+        denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
+        denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
+        denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+      '';
+    };
+
+    services.matrix-synapse = lib.mkIf cfg.matrixIntegration {
+      settings = with config.services.coturn; {
+        turn_uris = [
+          "turn:${realm}:3478?transport=udp"
+          "turn:${realm}:3478?transport=tcp"
+        ];
+        turn_user_lifetime = "1h";
+      };
+      extraConfigFiles = [
+        config.age.secrets."passwords/services/coturn/matrix-turn-config.yml".path
+      ];
+    };
+  };
+}

modules/services/gitea-runner/default.nix

@@ -0,0 +1,226 @@
+{ pkgs, config, lib, self, ... }:
+
+# Based on: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix
+
+with lib;
+
+let
+  cfg = config.modules.services.gitea-runner;
+  hostname = config.networking.hostName;
+  giteaUrl = "https://git.vimium.com";
+
+  storeDepsBins = with pkgs; [
+    coreutils
+    findutils
+    gnugrep
+    gawk
+    git
+    nix
+    nix-update
+    bash
+    jq
+    nodejs
+  ];
+
+  storeDeps = pkgs.runCommand "store-deps" { } ''
+    mkdir -p $out/bin
+    for dir in ${toString storeDepsBins}; do
+      for bin in "$dir"/bin/*; do
+        ln -s "$bin" "$out/bin/$(basename "$bin")"
+      done
+    done
+
+    # Add SSL CA certs
+    mkdir -p $out/etc/ssl/certs
+    cp -a "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" $out/etc/ssl/certs/ca-bundle.crt
+  '';
+in
+{
+  options.modules.services.gitea-runner = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Enable a runner for Gitea Actions on this host";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    modules.podman.enable = true;
+
+    systemd.services = {
+      gitea-runner-nix-image = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "podman.service" ];
+        requires = [ "podman.service" ];
+        path = [ config.virtualisation.podman.package pkgs.gnutar pkgs.shadow pkgs.getent ];
+        script = ''
+          set -eux -o pipefail
+          mkdir -p etc/nix
+
+          # Create an unpriveleged user that we can use also without the run-as-user.sh script
+          touch etc/passwd etc/group
+          groupid=$(cut -d: -f3 < <(getent group nix-ci-user))
+          userid=$(cut -d: -f3 < <(getent passwd nix-ci-user))
+          groupadd --prefix $(pwd) --gid "$groupid" nix-ci-user
+          emptypassword='$6$1ero.LwbisiU.h3D$GGmnmECbPotJoPQ5eoSTD6tTjKnSWZcjHoVTkxFLZP17W9hRi/XkmCiAMOfWruUwy8gMjINrBMNODc7cYEo4K.'
+          useradd --prefix $(pwd) -p "$emptypassword" -m -d /tmp -u "$userid" -g "$groupid" -G nix-ci-user nix-ci-user
+
+          cat <<NIX_CONFIG > etc/nix/nix.conf
+          accept-flake-config = true
+          experimental-features = nix-command flakes
+          NIX_CONFIG
+
+          cat <<NSSWITCH > etc/nsswitch.conf
+          passwd:    files mymachines systemd
+          group:     files mymachines systemd
+          shadow:    files
+
+          hosts:     files mymachines dns myhostname
+          networks:  files
+
+          ethers:    files
+          services:  files
+          protocols: files
+          rpc:       files
+          NSSWITCH
+
+          # list the content as it will be imported into the container
+          tar -cv . | tar -tvf -
+          tar -cv . | podman import - gitea-runner-nix
+        '';
+        serviceConfig = {
+          RuntimeDirectory = "gitea-runner-nix-image";
+          WorkingDirectory = "/run/gitea-runner-nix-image";
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+      };
+
+      gitea-runner-nix = {
+        after = [ "gitea-runner-nix-image.service" ];
+        requires = [ "gitea-runner-nix-image.service" ];
+
+        serviceConfig = {
+          # Hardening (may overlap with DynamicUser=)
+          # The following options are only for optimizing output of systemd-analyze
+          AmbientCapabilities = "";
+          CapabilityBoundingSet = "";
+          # ProtectClock= adds DeviceAllow=char-rtc r
+          DeviceAllow = "";
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectSystem = "strict";
+          RemoveIPC = true;
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          UMask = "0066";
+          ProtectProc = "invisible";
+          SystemCallFilter = [
+            "~@clock"
+            "~@cpu-emulation"
+            "~@module"
+            "~@mount"
+            "~@obsolete"
+            "~@raw-io"
+            "~@reboot"
+            "~@swap"
+            # needed by go?
+            #"~@resources"
+            "~@privileged"
+            "~capset"
+            "~setdomainname"
+            "~sethostname"
+          ];
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ];
+
+          # Needs network access
+          PrivateNetwork = false;
+          # Cannot be true due to Node
+          MemoryDenyWriteExecute = false;
+
+          # The more restrictive "pid" option makes `nix` commands in CI emit
+          # "GC Warning: Couldn't read /proc/stat"
+          # You may want to set this to "pid" if not using `nix` commands
+          ProcSubset = "all";
+          # Coverage programs for compiled code such as `cargo-tarpaulin` disable
+          # ASLR (address space layout randomization) which requires the
+          # `personality` syscall
+          # You may want to set this to `true` if not using coverage tooling on
+          # compiled code
+          LockPersonality = false;
+
+          # Note that this has some interactions with the User setting; so you may
+          # want to consult the systemd docs if using both.
+          DynamicUser = true;
+        };
+      };
+    };
+
+    users.users.nix-ci-user = {
+      group = "nix-ci-user";
+      description = "Used for running nix-based CI jobs";
+      home = "/var/empty";
+      isSystemUser = true;
+    };
+    users.groups.nix-ci-user = { };
+
+    age.secrets."files/services/gitea-runner/${hostname}-token" = {
+      file = "${self.inputs.secrets}/files/services/gitea-runner/${hostname}-token.age";
+      group = "podman";
+    };
+
+    services.gitea-actions-runner.instances = {
+      act = {
+        enable = true;
+        url = giteaUrl;
+        name = "act-runner-${hostname}";
+
+        tokenFile = config.age.secrets."files/services/gitea-runner/${hostname}-token".path;
+        settings = {
+          cache.enabled = true;
+          runner.capacity = 4;
+        };
+
+        labels = [
+          "debian-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"
+          "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"
+        ];
+      };
+      nix = {
+        enable = true;
+        url = giteaUrl;
+        name = "nix-runner-${hostname}";
+
+        tokenFile = config.age.secrets."files/services/gitea-runner/${hostname}-token".path;
+        settings = {
+          cache.enabled = true;
+          container = {
+            options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nix-ci-user";
+            network = "host";
+            valid_volumes = [
+              "/nix"
+              "${storeDeps}/bin"
+              "${storeDeps}/etc/ssl"
+            ];
+          };
+          runner.capacity = 4;
+        };
+
+        labels = [
+          "nix:docker://gitea-runner-nix"
+        ];
+      };
+    };
+  };
+}

modules/services/gitea/default.nix

@@ -0,0 +1,93 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.gitea;
+in {
+  options.modules.services.gitea = {
+    enable = lib.mkEnableOption "gitea";
+    domain = lib.mkOption {
+      type = lib.types.string;
+      default = "git.vimium.com";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    users = {
+      users.git = {
+        isSystemUser = true;
+        useDefaultShell = true;
+        group =  "git";
+        extraGroups = [ "gitea" ];
+        home = config.services.gitea.stateDir;
+      };
+      groups.git = { };
+    };
+
+    services.nginx = {
+      upstreams.gitea = {
+        servers = {
+          "unix:${config.services.gitea.settings.server.HTTP_ADDR}" = { };
+        };
+      };
+      virtualHosts = {
+        "${cfg.domain}" = {
+          forceSSL = true;
+          enableACME = true;
+          locations."/".proxyPass = "http://gitea";
+        };
+      };
+    };
+
+    systemd.tmpfiles.rules = [
+      "d '${config.services.gitea.customDir}/public/assets/css' 0750 ${config.services.gitea.user} ${config.services.gitea.group} - -"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github.css' - - - - ${self.inputs.gitea-github-theme}/theme-github.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-auto.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-dark.css"
+    ];
+
+    services.gitea = rec {
+      package = pkgs.unstable.gitea;
+      enable = true;
+      user = "git";
+      appName = "Vimium Git";
+      stateDir = "/var/lib/gitea";
+      repositoryRoot = "${stateDir}/repositories";
+      database = {
+        type = "sqlite3";
+        inherit user;
+        path = "${stateDir}/gitea.db";
+      };
+      lfs = {
+        enable = true;
+        contentDir = "${stateDir}/lfs";
+      };
+      settings = {
+        server = {
+          DOMAIN = config.networking.domain;
+          LANDING_PAGE = "explore";
+          OFFLINE_MODE = true;
+          PROTOCOL = "http+unix";
+          SSH_USER = "git";
+          SSH_DOMAIN = "${cfg.domain}";
+          SSH_PORT = lib.head config.services.openssh.ports;
+          ROOT_URL = "https://${cfg.domain}/";
+        };
+        service.DISABLE_REGISTRATION = true;
+        session.COOKIE_SECURE = true;
+        log = {
+          ROOT_PATH = "${stateDir}/log";
+          "logger.router.MODE" = "";
+        };
+        ui = {
+          THEMES = "gitea,arc-green,github,github-auto,github-dark";
+          DEFAULT_THEME = "github-dark";
+        };
+        actions.ENABLED = true;
+        indexer = {
+          REPO_INDEXER_ENABLED = true;
+        };
+        packages.CHUNKED_UPLOAD_PATH = lib.mkForce "${stateDir}/data/tmp/package-upload";
+      };
+    };
+  };
+}

modules/services/headscale/default.nix

@@ -0,0 +1,59 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.headscale;
+  fqdn = "headscale.vimium.net";
+in {
+  options.modules.services.headscale = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.headscale ];
+
+    services.headscale = {
+      enable = true;
+
+      port = 8080;
+
+      settings = {
+        ip_prefixes = [
+          "100.64.0.0/10"
+        ];
+        server_url = "https://${fqdn}";
+        dns_config = {
+          base_domain = "vimium.net";
+          extra_records = [
+            {
+              name = "grafana.mesh.vimium.net";
+              type = "A";
+              value = "100.64.0.6";
+            }
+            {
+              name = "home.mesh.vimium.net";
+              type = "A";
+              value = "100.64.0.7";
+            }
+          ];
+        };
+        logtail.enabled = false;
+      };
+    };
+
+    services.nginx.virtualHosts = {
+      "${fqdn}" = {
+        forceSSL = true;
+        enableACME = true;
+        locations."/" = {
+          proxyPass = "http://localhost:${toString config.services.headscale.port}";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}