Cleanup inputs and update lockfile

.gitea/workflows/check-flake.yaml

@@ -12,16 +12,16 @@ env:
 
 jobs:
   check-flake:
-    runs-on: ubuntu-latest
+    runs-on: nixos
     steps:
-      - run: node --version
+      # - run: node --version
-      - name: Install basic dependencies
+      # - name: Install basic dependencies
-        run: apt-get update && apt-get install -y --no-install-recommends sudo curl ca-certificates xz-utils
+      #   run: apt-get update && apt-get install -y --no-install-recommends sudo curl ca-certificates xz-utils
 
-      - name: Install Nix
+      # - name: Install Nix
-        uses: https://github.com/cachix/install-nix-action@v20
+      #   uses: https://github.com/cachix/install-nix-action@v20
-        with:
+      #   with:
-          github_access_token: ${{ secrets.__GITHUB_TOKEN }}
+      #     github_access_token: ${{ secrets.__GITHUB_TOKEN }}
 
       - name: Install dependencies
         run: nix profile install nixpkgs#nodejs-18_x
@@ -31,12 +31,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get ENV var names
+      # - name: Get ENV var names
-        run: printenv | cut -d'=' -f1
+      #   run: printenv | cut -d'=' -f1
-
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
 
       - name: Check Flake
         run: nix flake check --show-trace

common/boot/bios.nix

@@ -13,11 +13,13 @@ in
   };
 
   config = mkIf cfg.enable {
+    # Use GRUB 2 for BIOS
     boot.loader = {
       timeout = 2;
       grub = {
         enable = true;
         device = cfg.device;
+        version = 2;
         useOSProber = true;
         configurationLimit = 20;
         theme = pkgs.nixos-grub2-theme;

common/boot/efi.nix

@@ -10,12 +10,14 @@ in
   };
 
   config = mkIf cfg.enable {
+    # Use GRUB2 for EFI
     boot.loader = {
       efi.canTouchEfiVariables = true;
       timeout = 2;
       grub = {
         enable = true;
         device = "nodev";
+        version = 2;
         efiSupport = true;
         useOSProber = true;
         #       memtest86.enable = true;

common/pc/chromium.nix

@@ -17,6 +17,38 @@ let
       "PREFIX=$(out)"
     ];
   };
+
+  nvidia-vaapi-driver = pkgs.stdenv.mkDerivation rec {
+    pname = "nvidia-vaapi-driver";
+    version = "0.0.5";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "elFarto";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY=";
+    };
+
+    patches = [
+      ./use-meson-v57.patch
+    ];
+
+    nativeBuildInputs = with pkgs; [
+      meson
+      cmake
+      ninja
+      pkg-config
+    ];
+
+    buildInputs = with pkgs; [
+      nv-codec-headers-11-1-5-1
+      libva
+      gst_all_1.gstreamer
+      gst_all_1.gst-plugins-bad
+      libglvnd
+    ];
+  };
+
 in
 {
   config = lib.mkIf cfg.enable {

common/pc/default.nix

@@ -52,8 +52,6 @@ in
       jellyfin-media-player
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
-      lxqt.pavucontrol-qt
-      barrier
 
       # For Nix IDE
       nixpkgs-fmt

common/pc/kde.nix

@@ -20,7 +20,5 @@ in
       # plasma5Packages.kmail-account-wizard
       kate
     ];
-
-    services.xserver.desktopManager.plasma5.useQtScaling = true;
   };
 }

common/pc/vscodium.nix

@@ -10,13 +10,12 @@ let
     dart-code.flutter
     golang.go
     jnoortheen.nix-ide
-    ms-vscode.cpptools
   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
     {
       name = "platformio-ide";
       publisher = "platformio";
       version = "3.1.1";
-      sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q=";
+      sha256 = "fwEct7Tj8bfTOLRozSZJGWoLzWRSvYz/KxcnfpO8Usg=";
     }
   ];
 

common/server/default.nix

@@ -10,6 +10,7 @@
     ./matrix.nix
     ./zerobin.nix
     ./gitea.nix
+    ./gitea-runner.nix
     ./privatebin/privatebin.nix
     ./radio.nix
     ./samba.nix

common/server/gitea-runner.nix

@@ -0,0 +1,52 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.gitea-runner;
+in
+{
+  options.services.gitea-runner = {
+    enable = lib.mkEnableOption "Enables gitea runner";
+    dataDir = lib.mkOption {
+      default = "/var/lib/gitea-runner";
+      type = lib.types.str;
+      description = lib.mdDoc "gitea runner data directory.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.docker.enable = true;
+
+    users.users.gitea-runner = {
+      description = "Gitea Runner Service";
+      home = cfg.dataDir;
+      useDefaultShell = true;
+      group = "gitea-runner";
+      isSystemUser = true;
+      createHome = true;
+      extraGroups = [
+        "docker" # allow creating docker containers
+      ];
+    };
+    users.groups.gitea-runner = { };
+
+    systemd.services.gitea-runner = {
+      description = "Gitea Runner";
+
+      serviceConfig = {
+        WorkingDirectory = cfg.dataDir;
+        User = "gitea-runner";
+        Group = "gitea-runner";
+      };
+
+      requires = [ "network-online.target" ];
+      after = [ "network.target" "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = with pkgs; [ gitea-actions-runner ];
+
+      script = ''
+        exec act_runner daemon
+      '';
+    };
+  };
+}

flake.lock

@@ -185,16 +185,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695825837,
+        "lastModified": 1691550298,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "narHash": "sha256-gR1u5VYwufp/FWN7BjXLWS+vHIit4+gcQY62k21RDPw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "43b03482680169dab7ed2f60f370fb23178cbd78",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
 
     flake-utils.url = "github:numtide/flake-utils";
 
@@ -75,7 +75,7 @@
                 name = "nixpkgs-patched";
                 src = nixpkgs;
                 patches = [
-                  ./patches/gamepadui.patch
+                  # currently no patches to nixpkgs
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });

machines/phil/default.nix

@@ -6,21 +6,5 @@
   ];
 
   networking.hostName = "phil";
-
+  services.gitea-runner.enable = true;
-  services.gitea-actions-runner.instances.inst = {
-    enable = true;
-    name = config.networking.hostName;
-    url = "https://git.neet.dev/";
-    tokenFile = "/run/agenix/gitea-actions-runner-token";
-    labels = [
-      # provide a debian base with nodejs for actions
-      "debian-latest:docker://node:18-bullseye"
-      # fake the ubuntu name, because node provides no ubuntu builds
-      "ubuntu-latest:docker://node:18-bullseye"
-      # provide native execution on the host
-      #"native:host"
-    ];
-  };
-  virtualisation.docker.enable = true;
-  age.secrets.gitea-actions-runner-token.file = ../../secrets/gitea-actions-runner-token.age;
 }

machines/phil/properties.nix

@@ -8,8 +8,8 @@
 
   systemRoles = [
     "server"
+    "gitea-runner"
     "nix-builder"
-    "gitea-actions-runner"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlgRPpuUkZqe8/lHugRPm/m2vcN9psYhh5tENHZt9I2";

machines/ray/default.nix

@@ -9,9 +9,6 @@
   services.tor.enable = true;
   services.tor.client.enable = true;
 
-  # don't use remote builders
-  nix.distributedBuilds = lib.mkForce false;
-
   # services.howdy.enable = true;
 
   hardware.openrazer.enable = true;
@@ -30,7 +27,6 @@
     # Wally Flashing rules for the Moonlander and Planck EZ
     SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
   '';
-  services.udev.packages = [ pkgs.platformio ];
   users.groups.plugdev = {
     members = [ "googlebot" ];
   };
@@ -56,9 +52,4 @@
 
   de.enable = true;
   de.touchpad.enable = true;
-
-  networking.firewall.allowedTCPPorts = [
-    # barrier
-    24800
-  ];
 }

machines/storage/s0/default.nix

@@ -9,24 +9,9 @@
 
   # system.autoUpgrade.enable = true;
 
-  # gitea runner and allow it to build ARM derivationsFV
+  # gitea runner and allow it to build ARM derivations
-  services.gitea-actions-runner.instances.inst = {
+  services.gitea-runner.enable = true;
-    enable = true;
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-    name = config.networking.hostName;
-    url = "https://git.neet.dev/";
-    tokenFile = "/run/agenix/gitea-actions-runner-token";
-    labels = [
-      # provide a debian base with nodejs for actions
-      "debian-latest:docker://node:18-bullseye"
-      # fake the ubuntu name, because node provides no ubuntu builds
-      "ubuntu-latest:docker://node:18-bullseye"
-      # provide native execution on the host
-      #"native:host"
-    ];
-  };
-  virtualisation.docker.enable = true;
-  age.secrets.gitea-actions-runner-token.file = ../../../secrets/gitea-actions-runner-token.age;
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # todo: still needed?
   nix.gc.automatic = lib.mkForce false; # allow the nix store to serve as a build cache
 
   # binary cache

machines/storage/s0/hardware-configuration.nix

@@ -31,8 +31,6 @@
   boot.initrd.luks.devices."enc-pv4".device = "/dev/disk/by-uuid/e2c7402a-e72c-4c4a-998f-82e4c10187bc";
 
   # mounts
-  services.zfs.autoScrub.enable = true;
-  services.zfs.trim.enable = true;
   fileSystems."/" =
     {
       device = "rpool/nixos/root";

machines/storage/s0/properties.nix

@@ -10,7 +10,6 @@
     "server"
     "pia"
     "binary-cache"
-    "gitea-actions-runner"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";

machines/zoidberg/default.nix

@@ -1,79 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  de.enable = true;
-
-  # Login DE Option: Steam
-  programs.steam.gamescopeSession.enable = true;
-  # programs.gamescope.capSysNice = true;
-
-  # Login DE Option: Kodi
-  services.xserver.desktopManager.kodi.enable = true;
-  services.xserver.desktopManager.kodi.package =
-    (
-      pkgs.kodi.passthru.withPackages (kodiPackages: with kodiPackages; [
-        jellyfin
-        joystick
-      ])
-    );
-  services.mount-samba.enable = true;
-
-  # Login DE Option: RetroArch
-  services.xserver.desktopManager.retroarch.enable = true;
-  services.xserver.desktopManager.retroarch.package = pkgs.retroarchFull;
-
-  # wireless xbox controller support
-  hardware.xone.enable = true;
-  boot.kernelModules = [ "xone-wired" "xone-dongle" ];
-  hardware.enableRedistributableFirmware = true;
-  hardware.enableAllFirmware = true;
-
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-opencl-runtime
-  ];
-  systemd.tmpfiles.rules = [
-    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.hip}"
-  ];
-
-  systemd.services.barrier-sddm = {
-    description = "Barrier mouse/keyboard share";
-    requires = [ "display-manager.service" ];
-    after = [ "network.target" "display-manager.service" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      Restart = "always";
-      RestartSec = 10;
-      # todo use user/group
-    };
-    path = with pkgs; [ barrier doas ];
-    script = ''
-      # Wait for file to show up. "display-manager.service" finishes a bit too soon
-      while ! [ -e /run/sddm/xauth_* ]; do sleep 1; done;
-      export XAUTHORITY=$(ls /run/sddm/xauth_*)
-      # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
-      barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
-    '';
-  };
-
-  users.users.cris = {
-    isNormalUser = true;
-    hashedPassword = "$y$j9T$LMGwHVauFWAcAyWSSmcuS/$BQpDyjDHZZbvj54.ijvNb03tr7IgX9wcjYCuCxjSqf6";
-    uid = 1001;
-    packages = with pkgs; [
-      maestral
-      maestral-gui
-    ] ++ config.users.users.googlebot.packages;
-  };
-
-  # Dr. John A. Zoidberg
-  users.users.john = {
-    isNormalUser = true;
-    hashedPassword = "";
-    uid = 1002;
-  };
-}

machines/zoidberg/hardware-configuration.nix

@@ -1,46 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  # boot
-  efi.enable = true;
-  boot.loader.timeout = lib.mkForce 15;
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-
-  # kernel
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # disks
-  remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/04231c41-2f13-49c0-8fce-0357eea67990";
-    allowDiscards = true;
-
-    # Fetch key from USB drive
-    keyFileSize = 4096;
-    keyFile = "/dev/disk/by-id/usb-Mass_Storage_Device_121220160204-0:0";
-    fallbackToPassword = true;
-  };
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/39ee326c-a42f-49f3-84d9-f10091a903cd";
-      fsType = "btrfs";
-    };
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/954B-AB3E";
-      fsType = "vfat";
-    };
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/44e36954-9f1c-49ae-af07-72b240f93a95"; }];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

machines/zoidberg/properties.nix

@@ -1,14 +0,0 @@
-{
-  hostNames = [
-    "zoidberg"
-  ];
-
-  arch = "x86_64-linux";
-
-  systemRoles = [
-    "personal"
-    "media-center"
-  ];
-
-  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvdC1EiLqSNVmk5L1p7cWRIrrlelbK+NMj6tEBrwqIq";
-}

patches/gamepadui.patch

@@ -1,13 +0,0 @@
-diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
-index 29c449c16946..f6c728eb7f0c 100644
---- a/nixos/modules/programs/steam.nix
-+++ b/nixos/modules/programs/steam.nix
-@@ -11,7 +11,7 @@ let
-   in
-     pkgs.writeShellScriptBin "steam-gamescope" ''
-       ${builtins.concatStringsSep "\n" exports}
--      gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
-+      gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
-     '';
- 
-   gamescopeSessionFile =

secrets/binary-cache-private-key.age

@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw eORh0m8mAPd3H/wjnHocuh/xheMuhLgWyzepL9RNii0
+-> ssh-ed25519 hPp1nw 4fyRGsaEo25EOj/VwPsF0tayghF0URctont4/re6OmY
-154IPIdkb8WpYgX/fj5jraQY5mN7udg3iaZ3VJB+3X8
+rs09DCSb2bd/v45a7ABxfLo+Sz3OPLkRzfnP5Tmgi0g
--> ssh-ed25519 dMQYog 0eg1j3jL736OwjeMB55z52A6P34mSEYL6ulrn72blj0
+-> ssh-ed25519 dMQYog seRjdySBF1GISaSUWqZNvoW4INDUCxvBKJOgvGeyX1Q
-UdFKIbrzAKCzZhYfH41z64cwkQRp1RZztYgknIEfoDc
+fe6JE5f9A48ujVtuc0QZ7e7pWW+Tu0yyQEyexTvQWAQ
--> K/&@p'&{-grease yb~ xHlc7m _t xm{3f
+-> Uqf![<-grease O}' _h*Y~ .@=$H,~W
-Gi2UGm5YXyByJuH6rRRBle/D5T7GS4FDt7Kv8aBKe8dfwUCu65OcvoaXzjm08EKA
+jDlO5MEGPDjJ44cAWuJaTeADbG+wz5PTqq9Pw75QV3Exrsb8/PNGOrUZKuSTCCl3
-m0yx
+g/z3ZHelBBqHp16ZTc+LSxDYgvnEfWMPZKo4mxgu
---- f79zGG5kBOul/cF0NJu1+f/NmaI0h/JcuHDano/1ghU
+--- GTBCzHJYUKbpcgq7+0HzBpqvo0F7TNSPjFKqdRDUYDk
-UĄ÷7°ĺó
ʤď1mĺÔE\{^Ł$źŐCx~2"±8¶Ćő?&öó°„ÂË‹(áä±
+ÈÚú¡T+ñ—êtµ(פÉF	ÆS<C386>/R±+¢¼Š¯‘âLÃÝcÁ‰·‹1
â<>
ÕwÝøº.iFd#TJ±clbâH€5(öï6)®y¯"
Ãà¼Î¿ž<C2BF>±~˺7!Õñ?(Qb
“]x(åÛ°Å1ÿðÃZsaôï<15>ûþåTÁ
-…aÝŔyßÝěĄ<EFBFBD>g¬â†řÇ	CYX}’Ö
‚-žWó‹iŢýŢ WZĚă'wŚNVVce9u±nÜXŔ)¤|(w´-{Ľ]ý«gŢX˘(~
Ő®ĽC¤l

secrets/cris-hashed-email-pw.age

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g MmInWcw6GlfzvN9kxFtTVWMX+UX9PHO5V35TzRcmex0
+-> ssh-ed25519 6AT2/g q8AlvC9Dt+b8320A4BP92FghOoPyKttivfrsxqG6DGM
-dSMoGNuJMpRwyWTAnjHpO9mJBCxsJ77M5fWA0F1gR6s
+GWz2QJY3QFc748DjHrybNxyAS/BmDgzIU8yoRFGbLjA
--> ssh-ed25519 dMQYog ua3OPiErZcVRNGf/uxv7PiBBFOKAUkaSSIV4UCMu5Wc
+-> ssh-ed25519 dMQYog i/6mNjO8XZGAxnN1SxJGr5uD+hzCIrh28+N7cvvXZGA
-L8kYIzyEXcAxAlPQbqasgiaQi7JARhja6vM6WzvdMrs
+hC+J+F9hVs8HZjLhCQ6RnGAHRE45G+p1oBPnwB+nBtE
--> CIn-grease !G{f,9h( Hjn\ \hTpE MAP<)J
+-> ]d^>n#.%-grease Qe6&35Kb ,",Wb`% 0SRX@d
-0u+eQDvbxgI6aDT7xqdwOX3A34E2T4Ft9bSF6KBpHqucHib9tA5lJHgtXwgkpa/P
+yXZqn1+E675gpQyFGk/c15Sc1/iwjI/6VrOE1RTcp0gJcsbtVv4kgYCkY+mK
-nbaJDnRWbM/AL7nnT7XpdLVO2r7w2ish4ALBgPvXxH/0iUXqvQk1B/E
+--- ykoio7g3wxV3VDvo2d3p/Y39NCh+cWPh7uL+Go30BLY
---- +aKXbSfk6VkxqtTn+fI8VhcgO7Dw0jNSUJOJlqCbEGM
+i“˜Q+€hnïI¼_MßGrrf¯EE~µ(fFyâÿé&ȃ>sÀX<C380>›ú¤9~<7E>ä*Ç~ŽBãÕ4R¯ü=;’Â{Ý´+^<5E>P…¨ûrFza·C䢞î4V’
-á? Þ÷Ùþq}` ¿Žiämó<>.6Û{I
¿þÌÛ°È„
csjRDþ¿“Á­çì$ŸZÍ’ƒ
”PîðßËŠj¡0—·Åĉ‹Ñ;ˆ{þ÷Œ¬CJx/*÷<>

secrets/gitea-actions-runner-token.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hPp1nw H88561/4YspJuLV0lOA7mfeHjwL291W/N3HWmiq8E0M
-mqLeaNk2B2OUZo4NEDLicpSN9Qw1NAsLOSCb3Ar+iXA
--> ssh-ed25519 dMQYog CUuZSrofDHbBLtxgc4kg2h3Qgs99c3oudBGGV0iP/24
-9D/ZjZqJh8XeUo/UFA6ojcJIlwUqYSg+Itx2vREXdas
--> p-grease #!rAT w\]efbQ
-/WNOqhMfFrl1holyeok7pf/joMso1LtjbB00BeUGecVdkDhj71TxLgc+5tor/3D/
-FC65ymMPL2t1j/G+qcow19X6bjWkytY
---- XDThYXsCIJLrOEBXbKwpnRSzvcBuVp+NiQ2Uung74fk
-—L93%g\šqcÃÂZÏ÷ÆH\ 7ß—Ü<E28094>€Liµ¹W u¶â]¶ÇT=ÒHjl%—HÁfW=ðjþí£³Î“Ë­ÂáJ’–1a<31>Kéþ

secrets/hostapd-pw-CXNK00BF9176.age

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 VyYH/Q evYn+9ipH4t4cT2lZOiwnGqSkU+bbdVw80S0rgAqt00
+-> ssh-ed25519 VyYH/Q X+fXLJz227KkBLu45rb9mUkkIpENSMtZeEJjl6qj5Xw
-Vr24AqHOqH5DQYYlyS0X+k6TnczKHRDGZCeoLOJkybE
+AFAFnvsiogoMMwsAJO0DDoaizL9lmCLsF4QHDjmubr0
--> ssh-ed25519 dMQYog 23GqNi0N24EtnRV25Ick+aurPOngZ2Zd279LmZH15WY
+-> ssh-ed25519 dMQYog P84+7TBcMFSALTn6FR/aXyqFE9DfOzp38ImkdWj7nE0
-FEo0GyymjnPrSjf608SyCH22FvaqEixyVcbXdQ+Z3zA
+PqOn1OL9Zt0x1pBIYOSKkkS//mbk1OX5pnDGp+OLYeI
--> (Rd{ky@}-grease D f/KA]Pe
+-> @?-grease
-8Ip1fddb0BYUwg62FSmUBp7O+TILFaCtWHcxheEyUlXPoY9TGTaySl6Znw9Mksde
+3JvpmcTxdTgvv6vPL8dXEwjR+g
-q2aAHn8
+--- aMYF1SbC+p01YWmg24+Ih78VPQcwzGU/P1cEfgRvXV8
---- ibLXcq9R/5X2jFKBABgsUcDiBjjuoA9SrCuFbGOiNBI
+ź	@$™sžQÂĽz<15>Ź®xkĘNfŰuŐ;§ż ÎvI0•ŞÇÎ^4.?, 8…çî
-¸Ó;ù½XôóÀ	m£hŽ²ý%펗
+6â×k@nWÃäT®‘0
%¡£vìï

secrets/hostapd-pw-experimental-tower.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 VyYH/Q 64dqV1h1JUR4j42fb1I5jhXGaY/qZeSKm1rBzQgbbw8
+-> ssh-ed25519 VyYH/Q biHhTmstx4FJmstCt7pYUjQlwZpgbFkZVlpzQu2Lf1w
-pJnxiMQ736hEEx674n1mZGzgLhRISKjZnHKh7NoVGVQ
+K2lHbhdETesM86K6fKk91/2Z0LRQcwVtnXxYOtVCCaE
--> ssh-ed25519 dMQYog z95pFmJuZTdFphdWJwLK7NSNQC0PqXw+aFtzt17xv0I
+-> ssh-ed25519 dMQYog cyeabgOaV3nLPdLYs4G1g41bMAEBnHlEXoeW+A7NLFw
-IET4jLrUiJAXsvOWkh2jWGdDgnib7fW90389V7P4C0w
+FRGdlHVQ81JjjYQ/PRoAq+JRMZ28rSBEUko8VHKNeDM
--> 2-grease \vwS,
+-> cyfV-grease +X51me hk_`YB> 6DFo`? V
-mEdgxTI1rxUMuAOhUUoitN0tfN4c6BU
+/EoPdwBCc9S2GafKdhDnPZE06kxZBlzAob0Eb2qEMuwzVJF+7LesiK0ilpSrzdPU
---- Efo4U1RV0Mcd2th5AoXpy8XL2LejIH4GaOKBPCSuQEE
+cVN1ka2+k4pH7os/QUuu6oW9r3SxCw
-ÍCLd…
Š~²ù1Öš£tcÊ/W%iΧ_¡v<C2A1>Æ#©<>¢;"øY¦x-©ôšuçÙ0gçûéN*^(Û,|
+--- FJOYm8/TVXlxV+9Ih376xWyJlKz2uk8KzPoY5FpIJjo
+C`Ń” -“Ýţo’YIEś_.y<>XăÝČË›iţëµFŘW±…Š¨Im5ŽA“ő*÷}Ŕßękî”ţ9űzë

secrets/iodine.age

@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g UG+Ub0bZK74/Ifa/YkZOc6B3cPl6oI7M4Ev1zxkFEh0
+-> ssh-ed25519 6AT2/g yTW46JmDIftcOqogIDjheXJf2sw/dG2WEJxfCXU/LDk
-z71vjnEqhL3kuLePbP0nKQNwU0mrCOO386wLdUhH5tU
+0Co5/Rn22kmdcPr61ZOrmZJbPFHx2wJ8/YkbDjcjqKo
--> ssh-ed25519 dMQYog t8H6XoIhhE4H9g4913sWgZ5BaYK04uk7Mj0FYnOdtTo
+-> ssh-ed25519 dMQYog RtZT0PwVL4kxUHilOhH2GBp8Z9WfyBkaxB62pjKpHA4
-U4Ygto4z3l4dcCsnGxnRo1YGBl6YZ5y5pnVBJXCSrOc
+muMlIt8VYQftMYacfdnQFeejfWpKTEG5gxbFNy97GTc
--> Bad-grease <$Y
+-> 4|)`7yq-grease P#\5k8 +f
-1xw
+jMegn6ATsj2Ai9B5Xmy+tay1nppwxvF1IGJH+hLNanYMsTIDZypM6UsNdzYQ/3mw
---- wiGO0H6gfd+3D/+V/rMNLGkDk6FPFUihXi43J82LAkg
+VZ9ooy8TKUgAJ7jsd6IrKw
-³8>`®À
s«»pú¨€¿U#ü™º¯KV%jbwïxN¸@
+--- tLaPQWJA0Hh5MrxfhaySURgY02K16IlzvsxKpOWGva0
-Žî@œª€iæ
+5?lﾇ'ｼ!ｹｺ<EFBDB9><EFBDBA>ﾜｷ匪Nxｽ+<2B>A9ﾟﾑﾘl/ｸﾞ諟ﾎ|旙<>Sｵ&ｺｻ､繃<>Q;_<>K
-Ow\º(@@Tòìèzá

secrets/nextcloud-pw.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g ZfG2BGntlwCXJgQsYqvoPsQe5Y0JLLs4Vanm2NEciV4
+-> ssh-ed25519 6AT2/g hXS7zxzYhlu5GrUAEAnaO+CizpbifjDxIwoAK55cjV0
-iEBfqquq6Kqnmj6djNQHSMlpyiFP+TM/mXSa+X4jJJ8
+xU7Z52cjARU8tmd1AJ9v8+QTQzfL/mNxP/f/bJAzYvo
--> ssh-ed25519 dMQYog r5DtWLdIDn58h5bwpvBMMP2VK/sm0B+qW1p8kpkVC38
+-> ssh-ed25519 dMQYog 8PEp5TmEOumhWUZvko42sOKpkqOCW9/zCrMqn+fJ2ws
-N1ABWvmnHjipSd/2XaNPDPOzB4hzmwmOhOACfAeHYOY
+wJo8x6+hyU8iJkTqGVecZ88hG661F3ZvEvVqpJzox5w
--> PfP*-grease >7 7pu;\o@ g
+-> x-grease tdW'\ +(>9 da%@^H6
-ZduZJ2nqJZ0RQXwxBjDZdQ49Q1xO2bTM0TSPbC/5WbIwPlBeN79CT46lSi/l+evk
+q04xwjRaNOBfNhAvik762vJHio/qTfR6qQW4QsD+wzEidRYRggNdQwTl+G4jkWAu
-UE6c9mUXNZvNdeUyyLzonENN0YSVW0ikQtRdKZwBsM0OTYWBGxkKx2fmasW3nQ
+fx0xZeiI5qVm6WG8lg
---- VPIFJ2C3BP6OZGP5rZC3Gzu7D0hhNcF23OMM6d/9Jmo
+--- pHx5BdqI3HubR9wAtPyfMaYbr8uqRwOS1qFJhtC4wuM
-xÆ2¹id5̬=J¬¦;S«³F`ù¬.Åi(Û“¬÷°øZjÉ`뢓>«ÁøÙÔ˜‰&€ÃM§:\g¿!£áÂ^ñDhr,[J²}
+Èv°ºg9sÉÉ¡§6:`Nlëªø`.‘•ÓÍPebÅSNn<>å­Ä8C<<3C>¥a=-¨Gh¤ò.ªfHm<48>»æUëç
PGpS}µxýùã#ÎT

secrets/pia-login.age

@@ -1,13 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g gPeZnJ8arK6xAGnEK9uTcGfwBI1pYjjv6VX4o9EBIns
+-> ssh-ed25519 6AT2/g J3H9xUUwUMB7VkHHGtsZaCm/GiyqTFUrEmsuwcrgrhE
-sKFfqnafLachTKE93Pb7gsZ5gdKis64N64BK5128LKg
+tn+zbj5cISZzkUzJcu7JlaqhE4Dr4fhczSJU2kV91AU
--> ssh-ed25519 hPp1nw e2taazZ3R6EBCbgh6Gg0Dc9p1K7zp5R7n9LIkWF/Wj8
+-> ssh-ed25519 hPp1nw 370YNPQn4mqeHjOvnIXkm+BzbrRNHkFICJaJhHCSHDQ
-+/VkcMDL1HNJhbc6/OxpiUe1dlO0lrc1hgkD/RrYXjY
+WLhDRA8jp50aKkY8t9GvyAHoLxYQD2Bhw3y01hwhoOA
--> ssh-ed25519 dMQYog znMKkv1O7F/EeAyvTfULUn/pWdai2NI0uBfWn/02xg0
+-> ssh-ed25519 dMQYog 1dwQN8hmbLY54OnRTXtcwAXHoYLLNV0IK/rQQ9ZgV2A
-45W9s4Vo8J+xOTGec9h6s0ra9ZSUA6JkorAAyqqlPfg
+gP2HQinVYW72oJRFW69qAeF/iNEEtJqya1iRMOugNKk
--> T/!XI-grease GJ_O'
+-> ~-grease 2%p4s G:$f41y " vZ87PA*|
-mAOW54Txa2H9WdEMog0g1XQjkC5z0wQIoqNlnbsjCSvM1UaPiiu6vJOJKCmJb1Z6
++hI029392lrjxlsXUI8opFVcUK+JOjgBYGMH
-3wyLN6lCIjkR
+--- juX+tgNpNr8it5QnbcBkR9u88vZkC47L5fIlZQNxPYg
---- yX7lzKnDkn+KkRVTumffcd/SJSznR5n6JtUgWkSSohk
+,J}¸œ}Y§˜B%ˆo~3M×½HÊ—]ºˆû©ðÔ¤–žËn0cVs(´;axc#o™Üüv'kˆù#]o<>N`ÆœøÁ´Ì¿<C38C>˜¼ûp<>ÒšKàøk†0(
-ãQô^àèyW; â§]Š+u>¥3wŒz±¨oêM:ã™øêúÀöŸÃ9,xv×KÁÜXT-K8rÔAç(@Ø-|³
-:PÈ<50>‡*H
6€'¹&Ôi

secrets/searx.age

@@ -1,8 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 dMQYog 82ZRseC994TzEUg20LuFD4kToykRtk7NISGrolHJO1Y
+-> ssh-ed25519 dMQYog yPsN2a4x6jsVoICJQrP5sJEiZEuLFcPMAAUOWIlAFAw
-rbSPACXEjLSHKYpZzGNGTKIjFSFCsoXA3Y8CIcPv8rg
+A4cPt0h2miu6maXCZqNDi3eBH+wz089PkTedPgjhVGQ
--> z/-grease zQd~R\dJ
+-> )0CM-grease {H^$`
-SeA2ve/+W285dHnBIfGbOFPLt4/ORrI6HeGeTnkackymUAh23+Ur581Duhjo3T3B
+z45BS81IhE6Xqdtz/idIzEExM7T8Sb7zl6NH6ODSJ7p6nRM
-j53tPUXXTwuXKpd4Ga0xpmr44Yo
+--- 9P/MF94zA5XDi+jwUMKHqVFqGCgGaYMaryevwvI5gsk
---- /mQNdS7QAVSNQQ1RRjD9dxMYFjI6UBgqHIA+hvHRPOU
+˝čá=¸,ööîóŁ oáŻH¸uVĘ·Hăźč–25ę˙Ťî1&Ł
C‰IŠä.áDs!ĄÍh?öPuo$"Ş­-’m}Ń!úi<•'
-Ëć:^˝AqĎvR­kŔa<C594>c–u\éůëľ:ă
ë©Ź<C2A9>jzç¶Ö˙'ÉDÚ¬=éŢ_îĐoĂYgbâfîL\ÇN`)Šdkó„<E2809E>ižbHߏ$°¨}2”)X<>Ú<EFBFBD>ÓS=8`ŞaÄ\»Uȇ’‚¸Óµ¸şľąÇß?¤<LęŢä€Ń;·
+wT»‘Ľ÷Ŕ([‘U˙H6¦Úď9×67Z_ÄĹ·ł…ܱŔ”Rü?„{^ÄH/{C©ůd?nđ˘ă÷śČ

secrets/secrets.nix

@@ -29,7 +29,7 @@ with roles;
 
   # cloud
   "nextcloud-pw.age".publicKeys = nextcloud;
-  "smb-secrets.age".publicKeys = personal ++ media-center;
+  "smb-secrets.age".publicKeys = personal;
 
   # services
   "searx.age".publicKeys = nobody;
@@ -43,7 +43,4 @@ with roles;
   # backups
   "backblaze-s3-backups.age".publicKeys = personal ++ server;
   "restic-password.age".publicKeys = personal ++ server;
-
-  # gitea actions runner
-  "gitea-actions-runner-token.age".publicKeys = gitea-actions-runner;
 }

secrets/wolframalpha.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g 3xkROcKh6I/oVGRwnvJ9Dy36JvYmsJQZq2DBvYC4Dz4
+-> ssh-ed25519 6AT2/g xp04CsJvlYhBZS5W/MSDLWGiNCegAjg4XPv43wU5u0g
-JunaGg8zg2SJZmBnuV0ZcDSc8vsMHgTd1RbDn8giy+Y
+i6q0YgKOFGaHOKVYMppNtcvjCFfHHqOS9M+oh2mqc1M
--> ssh-ed25519 dMQYog JG8QC1thl+CMlxoI1Y+ZUj0dQ3FXF4cquk7tdzfaS0E
+-> ssh-ed25519 dMQYog Mk90WFb+fYCFV7afu3+VbuAtOlvRAgpJGFGqn4ZWGjE
-zW7jyrXhVvyIq7HXfcRqkyZdg/wkWwNfPk5KbI2jH7I
+wHeScgV248lHiL0B/QEraD4QOBudezhJPrppY50u7S8
--> $"v%-grease `Xo|a eIFIq 7hBk?8%1
+-> G/9-grease
-ZoNiAXY1HE1GEQPd1aJirTitFgXf3HKcV2H6HxRpzWysUd1DGOsF/jScUO36JgIP
+0hCyP7pGu5xkk4eWJTpLWy6f8Zuo8wmgBSNFK7bgzfYdW29mdOrO2Ey3Oa2Gvtji
-sY8FA22PjyUv7g
+rze9v27gMUFRXOqPHNmaSjAneCwtcqTMReV+LZr9q9FN6qZnzAE
---- zFpfG3JQpSmE108GMEWLjGWMJe7cXVn3NN9vs8iDY3E
+--- /SN6cSyrvbDEHTiIvv4MdoVkIjz3yZkvtr2SVBE1rRk
-8f,ÕªÒÅðÚÏ*}V¥Æ@j†3ÿïCèM*@}ìy2Øì9€Éè ìN|y›æ
+
=„ñ1fJ…XÍô‹~ÃÝÆD¬c¹aFâ¨@ݹc=89;¿sôv®Ïú´‘