flake.lock: Update

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/457669db4259ff69d1ac1183aaa6000420940c1f' (2023-12-23)
  → 'github:ryantm/agenix/417caa847f9383e111d1397039c9d4337d024bf0' (2023-12-24)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/7763c6fd1f299cb9361ff2abf755ed9619ef01d6' (2023-12-13)
  → 'github:NixOS/nixos-hardware/a15b6e525f5737a47b4ce28445c836996fb2ea8c' (2023-12-25)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d65bceaee0fb1e64363f7871bc43dc1c6ecad99f' (2023-12-20)
  → 'github:NixOS/nixpkgs/0b3d618173114c64ab666f557504d6982665d328' (2023-12-21)
• Updated input 'secrets':
    'git+ssh://git@git.vimium.com/jordan/nix-secrets.git?ref=refs/heads/master&rev=4ec3e87d6a7b1f14d23c12c60cad62a6e43be4ca' (2023-12-25)
  → 'git+ssh://git@git.vimium.com/jordan/nix-secrets.git?ref=refs/heads/master&rev=ef1f91b155f3bdc4efb2824ad0c47b21b8b1bbfa' (2023-12-25)

README.md

@@ -9,16 +9,8 @@ System and user configuration for NixOS-based systems.
 | **Theme:** | adwaita |
 | **Terminal:** | Console |
 
-## Provisioning
+## Quick start
-> [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used for provisioning
+1. Copy SSH keypair and `known_hosts` to `~/.ssh`
-
+1. Import GPG keys and set ultimate trust with `echo "KEYID:6:" | gpg --import-ownertrust`
-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).
+1. `git clone git@git.vimium.com:jordan/nix-config.git projects/jordan/nix-config`
-
+1. `sudo nixos-rebuild switch --flake .#`
-Then run;
-```
-nix run github:nix-community/nixos-anywhere -- \
-  --disk-encryption-keys /tmp/secret.key /tmp/secret.key \
-  --extra-files "$temp" \
-  --flake .#<hostname> \
-  root@<ip>
-```

flake.lock

@@ -50,11 +50,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1704875591,
+        "lastModified": 1703087360,
-        "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=",
+        "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b",
+        "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7",
         "type": "github"
       },
       "original": {
@@ -63,34 +63,14 @@
         "type": "github"
       }
     },
-    "disko": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1705540973,
-        "narHash": "sha256-kNt/qAEy7ueV7NKbVc8YMHWiQAAgrir02MROYNI8fV0=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "0033adc6e3f1ed076f3ed1c637ef1dfe6bef6733",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1705281830,
+        "lastModified": 1703023593,
-        "narHash": "sha256-gpUrma8XjAnHULRmD5RRVVZJNvxFrIEyGQLx6oEE9D4=",
+        "narHash": "sha256-M+Cw6vh7xCDmIhyVuEPNmaNVUwpmdFQq8zlsXZTKees=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "eb7c43d11abc157f97d032018115c9f7b04ca4de",
+        "rev": "bad853333d9021e7012adb9b8fbfe7a7003f26bc",
         "type": "github"
       },
       "original": {
@@ -143,11 +123,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705476964,
+        "lastModified": 1703367386,
-        "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=",
+        "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "85c3b600f660abd86e94cbcd1c46733943197a07",
+        "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224",
         "type": "github"
       },
       "original": {
@@ -159,11 +139,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1705312285,
+        "lastModified": 1703545041,
-        "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
+        "narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
+        "rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c",
         "type": "github"
       },
       "original": {
@@ -206,11 +186,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1705458851,
+        "lastModified": 1703200384,
-        "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=",
+        "narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c",
+        "rev": "0b3d618173114c64ab666f557504d6982665d328",
         "type": "github"
       },
       "original": {
@@ -223,7 +203,6 @@
       "inputs": {
         "agenix": "agenix",
         "deploy-rs": "deploy-rs",
-        "disko": "disko",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
@@ -235,11 +214,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1704547919,
+        "lastModified": 1703545643,
-        "narHash": "sha256-yc0l7p6bHjR6HD6N09U/G3igHUPDUnZyFliTw7XC3VA=",
+        "narHash": "sha256-FS/acsRQ01Gj39P1t5CQ6cKOdwADmenk//vVmpA/EgU=",
         "ref": "refs/heads/master",
-        "rev": "b11b903ed707826a756b7803633f4684a19e637d",
+        "rev": "ef1f91b155f3bdc4efb2824ad0c47b21b8b1bbfa",
-        "revCount": 11,
+        "revCount": 9,
         "type": "git",
         "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
       },

flake.nix

@@ -5,10 +5,6 @@
     nixpkgs.url = "nixpkgs/nixos-23.11";
     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.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -28,7 +24,7 @@
     };
   };
 
-  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, disko, home-manager, nixos-hardware, secrets, ... }:
+  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, home-manager, nixos-hardware, secrets, ... }:
     let
       nixpkgsForSystem = system: inputs.nixpkgs;
       overlays = [
@@ -37,7 +33,6 @@
       ];
       commonModules = [
         agenix.nixosModules.age
-        disko.nixosModules.disko
         home-manager.nixosModule
         ./modules
       ];
@@ -71,7 +66,6 @@
         atlas = nixosSystem { system = "x86_64-linux"; name = "atlas"; };
         eos = nixosSystem { system = "x86_64-linux"; name = "eos"; };
         helios = nixosSystem { system = "x86_64-linux"; name = "helios"; };
-        hypnos = nixosSystem { system = "x86_64-linux"; name = "hypnos"; };
         odyssey = nixosSystem { system = "x86_64-linux"; name = "odyssey"; };
         pi = nixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
       };

hosts/hypnos/README.md

@@ -1,35 +0,0 @@
-# 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

@@ -1,50 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./disko-config.nix
-    ../desktop.nix
-  ];
-
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
-  networking = {
-    hostName = "hypnos";
-    hostId = "cf791898";
-  };
-
-  nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
-  modules = {
-    desktop = {
-      browsers = {
-        firefox.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

@@ -1,126 +0,0 @@
-{ 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

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
-    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-  };
-
-  networking.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
-

hosts/odyssey/audio.nix

@@ -1,11 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 let
   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
@@ -13,9 +10,10 @@ let
     }
   '';
 in {
-  boot.kernelModules = [ "snd-usb-audio" ];
   boot.extraModulePackages = [
-    (patched)
+    (snd-usb-audio-module.overrideAttrs (_: {
+      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+    }))
   ];
 
   environment.etc = {

hosts/odyssey/default.nix

@@ -59,12 +59,8 @@
         firefox.enable = true;
       };
       gaming.emulators = {
-        gamecube.enable = true;
         ps2.enable = true;
-        ps3.enable = true;
         psp.enable = true;
-        wii.enable = true;
-        xbox.enable = true;
       };
       media.graphics = {
         modeling.enable = true;

hosts/odyssey/hardware-configuration.nix

@@ -64,9 +64,5 @@
 
   networking.useDHCP = lib.mkDefault true;
 
-  environment.systemPackages = [
-    pkgs.apfs-fuse
-  ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hosts/pi/README.md

@@ -16,10 +16,3 @@ 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

@@ -17,78 +17,8 @@
     };
     deviceTree = {
       enable = true;
-      filter = "*rpi-4-*.dtb";
       overlays = [
-        {
+        { name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; }
-          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; [
@@ -105,66 +35,25 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
+    systemWide = true;
   };
 
-  age.secrets."files/services/home-assistant/secrets.yaml" = {
+  virtualisation.oci-containers = {
-    file = "${inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+    backend = "podman";
-    path = "${config.services.home-assistant.configDir}/secrets.yaml";
+    containers.homeassistant = {
-    owner = "hass";
+      volumes = [ "home-assistant:/config" ];
-    group = "hass";
+      environment.TZ = config.time.timeZone;
-  };
+      image = "ghcr.io/home-assistant/home-assistant:stable";
-
+      extraOptions = [
-  services.home-assistant = {
+        "--network=host"
-    enable = true;
+        "--device=/dev/ttyUSB0:/dev/ttyUSB0"
-    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;
@@ -183,13 +72,7 @@
     enable = true;
     dataDir = "/var/lib/zigbee2mqtt";
     settings = {
-      homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
+      homeassistant = true;
-        discovery_topic = "homeassistant";
-        status_topic = "hass/status";
-        legacy_entity_attributes = true;
-        legacy_triggers = true;
-      };
-      availability = true;
       frontend = true;
       device_options = {
         retain = true;
@@ -202,7 +85,6 @@
         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;

modules/default.nix

@@ -30,6 +30,8 @@
     ./security/gpg.nix
     ./security/pass.nix
     ./services/borgmatic
+    ./services/coturn
+    ./services/matrix
     ./shell/git
     ./shell/zsh
   ];

modules/desktop/gaming/emulators.nix

@@ -19,10 +19,6 @@ in {
       default = false;
       example = true;
     };
-    ps1.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
     ps2.enable      = lib.mkOption {
       default = false;
       example = true;
@@ -39,23 +35,14 @@ in {
       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; [
-      (lib.mkIf cfg.ps1.enable duckstation)
       (lib.mkIf cfg.ps2.enable pcsx2)
       (lib.mkIf cfg.ps3.enable rpcs3)
       (lib.mkIf cfg.psp.enable ppsspp)
@@ -64,11 +51,9 @@ in {
              cfg.gb.enable  ||
              cfg.snes.enable)
         higan)
-      (lib.mkIf cfg.switch.enable yuzu-early-access)
       (lib.mkIf (cfg.wii.enable ||
              cfg.gamecube.enable)
         dolphin-emu)
-      (lib.mkIf cfg.xbox.enable xemu)
     ];
   };
 }

modules/desktop/gnome.nix

@@ -17,7 +17,6 @@ in {
     };
 
     services.flatpak.enable = true;
-    services.fwupd.enable = true;
 
     programs.dconf.enable = true;
     dconf.settings = {
@@ -103,9 +102,6 @@ in {
         picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
         picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
       };
-      "org/gnome/desktop/peripherals/touchpad" = {
-        tap-to-click = true;
-      };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
         sort-directories-first = true;
@@ -135,7 +131,6 @@ in {
       };
       "org/gnome/mutter" = {
         center-new-windows = true;
-        edge-tiling = true;
         experimental-features = [ "scale-monitor-framebuffer" ];
       };
       "org/gnome/desktop/interface" = {
@@ -158,25 +153,9 @@ in {
     ];
 
     user.packages = with pkgs; [
-      authenticator
-      bottles
-      bustle
       celluloid
-      d-spy
-      drawing
       fragments
-      gnome.ghex
-      # gnome-builder
-      gnome-decoder
-      gnome-firmware
-      gnome-frog
-      gnome-obfuscate
-      gnome-podcasts
-      identity
       mission-center
-      newsflash
-      schemes
-      shortwave
     ];
 
     environment.systemPackages = with pkgs; [

modules/networking/wireless.nix

@@ -26,7 +26,7 @@ in {
       wireless = {
         enable = true;
         interfaces = cfg.interfaces;
-        environmentFile = config.age.secrets."passwords/networks".path;
+        environmentFile = config.age.secrets.passwords/networks.path;
         networks = {
           "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
         };

modules/services/coturn/default.nix

@@ -0,0 +1,59 @@
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.coturn;
+  domain = "vimium.com";
+in {
+  options.modules.services.coturn = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = {
+    age.secrets."passwords/services/coturn/secret" = {
+      file = "${inputs.secrets}/passwords/services/coturn/secret.age";
+    };
+
+    networking.firewall = {
+      allowedTCPPorts = [
+        5349  # STUN TLS
+        5350  # STUN TLS alt
+      ];
+      allowedUDPPortRanges = [
+        { from = 49152; to = 49999; } # TURN relay
+      ];
+    };
+
+    services.coturn = {
+      enable = true;
+      lt-cred-mech = true;
+      use-auth-secret = true;
+      static-auth-secret = ""; # TODO: Pass as extraConfig
+      realm = "turn.${domain}";
+      relay-ips = [
+        "198.244.190.160"
+      ];
+      no-tcp-relay = true;
+      extraConfig = ''
+        cipher-list="HIGH"
+        no-loopback-peers
+        no-multicast-peers
+      '';
+      secure-stun = true;
+      cert = "/var/lib/acme/turn.${domain}/fullchain.pem";
+      pkey = "/var/lib/acme/turn.${domain}/key.pem";
+      min-port = 49152;
+      max-port = 49999;
+    };
+
+    security.acme.certs = {
+      "turn.${domain}" = {
+        reloadServices = [ "coturn" ];
+      };
+    };
+  };
+}

modules/services/matrix/default.nix

@@ -0,0 +1,120 @@
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.matrix;
+  domain = "vimium.com";
+  clientConfig = {
+    "m.homeserver" = {
+      base_url = "https://matrix.${domain}";
+      server_name = domain;
+    };
+    "m.identity_server" = {};
+  };
+  serverConfig."m.server" = "matrix.${domain}:443";
+  mkWellKnown = data: ''
+    more_set_headers 'Content-Type: application/json';
+    return 200 '${builtins.toJSON data}';
+  '';
+in {
+  options.modules.services.matrix = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+    coturn = mkOption {
+      default = config.services.coturn.enable;
+      example = true;
+    };
+    elementWeb = mkOption {
+      default = true;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall = {
+      allowedTCPPorts = [
+        8448  # Matrix federation
+      ];
+    };
+
+    services.nginx = {
+      virtualHosts = {
+        "${domain}" = {
+          # Assume this listener is already setup
+          locations."= /.well-known/matrix/server".extraConfig = (mkWellKnown serverConfig);
+          locations."= /.well-known/matrix/client".extraConfig = (mkWellKnown clientConfig);
+        };
+        "matrix.${domain}" = {
+          forceSSL = true;
+          useACMEHost = "matrix.${domain}";
+          listen = [
+            { addr = "0.0.0.0"; port = 443; ssl = true; }
+            { addr = "0.0.0.0"; port = 80; }
+            { addr = "0.0.0.0"; port = 8448; ssl = true; }
+            { addr = "[::1]"; port = 443; ssl = true; }
+            { addr = "[::1]"; port = 80; }
+            { addr = "[::1]"; port = 8448; ssl = true; }
+          ];
+          locations = {
+            "/" = {
+              proxyPass = "http://localhost:8008";
+              extraConfig = ''
+                proxy_set_header X-Forwarded-For $remote_addr;
+              '';
+            };
+            "/_matrix" = {
+              proxyPass = "http://localhost:8008";
+              extraConfig = ''
+                proxy_set_header X-Forwarded-For $remote_addr;
+                client_max_body_size ${services.matrix-synapse.settings.max_upload_size};
+              '';
+            };
+            "/_synapse/client".proxyPass = "http://localhost:8008";
+          };
+        };
+        "chat.${domain}" = mkIf cfg.elementWeb {
+          forceSSL = true;
+          useACMEHost = "matrix.${domain}";
+          root = pkgs.element-web.override {
+            conf = {
+              default_server_config = clientConfig;
+              brand = "Vimium Chat";
+              branding = {
+                auth_header_logo_url = "https://vimium.com/images/logo.svg";
+                auth_footer_links = [
+                  { text = "Vimium.com"; url = "https://www.vimium.com"; }
+                ];
+              };
+            };
+          };
+        };
+      };
+    };
+
+    services.matrix-synapse = {
+      enable = true;
+      settings = {
+        database.name = "sqlite3";
+        enable_registration = false;
+        server_name = domain;
+        turn_shared_secret_file = mkIf cfg.coturn config.age.secrets."passwords/services/coturn/secret".path;
+        turn_uris = mkIf cfg.coturn [
+          "turn:${config.services.coturn.realm}:5349?transport=udp"
+          "turn:${config.services.coturn.realm}:5350?transport=udp"
+          "turn:${config.services.coturn.realm}:5349?transport=tcp"
+          "turn:${config.services.coturn.realm}:5350?transport=tcp"
+        ];
+      };
+    };
+
+    security.acme.certs = {
+      "matrix.${domain}" = {
+        extraDomainNames = mkIf cfg.elementWeb [ "chat.${domain}" ];
+        reloadServices = [ "matrix-synapse" ];
+      };
+    };
+  };
+}