diff --git a/.sops.yaml b/.sops.yaml
index 29ebd08..3c5974c 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -9,20 +9,10 @@ keys:
# cspell:disable
- &artemision age1jd2dcpykagz20kpk2kkchte3augqncwfn6nywursx0dkfyze6feqdzxkq2
- &artemision-home age1t29a6z6cfy8m3cnc8uva0ey833vhcppue8psyumts7mtyf0zufcqvfshuc
- - &bob age13jg97cvy63fzd2ccthcwvfyyxzw5vmwun8s0afq5l4xm0mhl6pjqhne063
- - &jeeves age128ehc0ssgwnuv4r8ayfyu7r80e82xrkmv63g7h9y9q4mhk4w9dyqfymc2w
- - &jeeves-jr age1lffr5f5nz0nrenv3ekgy27e8sztsx4gfp3hfymkz77mqaa5a4gts0ncrrh
- &palatine-hill age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej
- - &rhapsody-in-green age1c7adjulcrma0m7l5ur8efxdjzyskrqcwssfkt77a9rmma7gzss5q02pgmy
# cspell:enable
-admins: &admins
- - *admin_alice
- - *admin_richie
-
servers: &servers
- - *jeeves
- - *jeeves-jr
- *palatine-hill
# add new users by executing: sops users/<user>/secrets.yaml
@@ -31,38 +21,19 @@ servers: &servers
# update keys by executing: sops updatekeys secrets.yaml
# note: add .* before \.yaml if you'd like to use the mergetool config
creation_rules:
- - path_regex: systems/jeeves/secrets\.yaml$
- key_groups:
- - pgp: *admins
- age:
- - *jeeves
-
- - path_regex: systems/jeeves-jr/secrets\.yaml$
- key_groups:
- - pgp: *admins
- age:
- - *jeeves-jr
-
- path_regex: users/alice/secrets.*\.yaml$
key_groups:
- pgp:
- *admin_alice
age:
- *palatine-hill
- - *jeeves
- - *jeeves-jr
- *artemision
- *artemision-home
- path_regex: systems/palatine-hill/secrets.*\.yaml$
key_groups:
- - pgp: *admins
- age:
- - *palatine-hill
-
- - path_regex: systems/palatine-hill/keys/zfs-.*-key$
- key_groups:
- - pgp: *admins
+ - pgp:
+ - *admin_alice
age:
- *palatine-hill
@@ -73,13 +44,3 @@ creation_rules:
age:
- *artemision
- - path_regex: users/richie/secrets\.yaml$
- key_groups:
- - pgp:
- - *admin_richie
- age:
- - *palatine-hill
- - *jeeves
- - *jeeves-jr
- - *rhapsody-in-green
- - *bob
diff --git a/systems/jeeves-jr/arch_mirror.nix b/systems/jeeves-jr/arch_mirror.nix
deleted file mode 100644
index af5fc99..0000000
--- a/systems/jeeves-jr/arch_mirror.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ inputs, pkgs, ... }:
-let
- vars = import ./vars.nix;
-in
-{
- virtualisation.oci-containers.containers.arch_mirror = {
- image = "ubuntu/apache2:latest";
- volumes = [
- "${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
- "${vars.main_mirror}:/data"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
-
- systemd.services.sync_mirror = {
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
- wantedBy = [ "multi-user.target" ];
- description = "validates startup";
- path = [ pkgs.rsync ];
- serviceConfig = {
- Environment = "MIRROR_DIR=${vars.main_mirror}/archlinux/";
- Type = "simple";
- ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
- };
- };
-}
diff --git a/systems/jeeves-jr/configuration.nix b/systems/jeeves-jr/configuration.nix
deleted file mode 100644
index 7c45f78..0000000
--- a/systems/jeeves-jr/configuration.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pkgs, ... }:
-{
- imports = [
- ../../users/richie/global/ssh.nix
- ./arch_mirror.nix
- ./docker
- ./home_assistant.nix
- ./networking.nix
- ./services.nix
- ];
-
- boot = {
- zfs.extraPools = [ "Main" ];
- filesystem = "zfs";
- useSystemdBoot = true;
- };
-
- environment.systemPackages = with pkgs; [ docker-compose ];
-
- services = {
- openssh = {
- ports = [ 352 ];
- listenAddresses = [
- { addr = "192.168.95.35"; }
- { addr = "192.168.90.35"; }
- ];
- };
-
- smartd.enable = true;
-
- sysstat.enable = true;
-
- usbguard = {
- enable = true;
- rules = ''
- allow id 1532:0241
- '';
- };
-
- zfs = {
- trim.enable = true;
- autoScrub.enable = true;
- };
- };
-
- system.stateVersion = "23.05";
-}
diff --git a/systems/jeeves-jr/default.nix b/systems/jeeves-jr/default.nix
deleted file mode 100644
index 01f0304..0000000
--- a/systems/jeeves-jr/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
- users = [
- "alice"
- "richie"
- ];
-}
diff --git a/systems/jeeves-jr/docker/default.nix b/systems/jeeves-jr/docker/default.nix
deleted file mode 100644
index e384ee5..0000000
--- a/systems/jeeves-jr/docker/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, ... }:
-{
- imports =
- let
- files = builtins.attrNames (builtins.readDir ./.);
- nixFiles = builtins.filter (name: lib.hasSuffix ".nix" name && name != "default.nix") files;
- in
- map (file: ./. + "/${file}") nixFiles;
-
- virtualisation.oci-containers.backend = "docker";
-}
diff --git a/systems/jeeves-jr/docker/haproxy.cfg b/systems/jeeves-jr/docker/haproxy.cfg
deleted file mode 100644
index 67f6b58..0000000
--- a/systems/jeeves-jr/docker/haproxy.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-global
- log stdout format raw local0
-
-defaults
- log global
- mode http
- retries 3
- maxconn 2000
- timeout connect 5s
- timeout client 50s
- timeout server 50s
- timeout http-request 10s
- timeout http-keep-alive 2s
- timeout queue 5s
- timeout tunnel 2m
- timeout client-fin 1s
- timeout server-fin 1s
-
-
-#Application Setup
-frontend ContentSwitching
- bind *:80
- bind *:443 ssl crt /etc/ssl/certs/cloudflare.pem
- mode http
-
- # tmmworkshop.com
- acl host_mirror hdr(host) -i mirror.tmmworkshop.com jeeves
- acl host_uptime_kuma hdr(host) -i uptimekuma-jeevesjr.tmmworkshop.com
- acl host_homeassistant hdr(host) -i homeassistant.tmmworkshop.com
-
- use_backend mirror_nodes if host_mirror
- use_backend uptime_kuma_nodes if host_uptime_kuma
- use_backend home_asistant_nodes if host_homeassistant
-
-# tmmworkshop.com
-backend mirror_nodes
- mode http
- server server arch_mirror:80
-
-backend uptime_kuma_nodes
- mode http
- server server uptime_kuma:3001
-
-backend home_asistant_nodes
- mode http
- server server 192.168.95.35:8123
diff --git a/systems/jeeves-jr/docker/uptime_kuma.nix b/systems/jeeves-jr/docker/uptime_kuma.nix
deleted file mode 100644
index 3a46640..0000000
--- a/systems/jeeves-jr/docker/uptime_kuma.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-let
- vars = import ../vars.nix;
-in
-{
- virtualisation.oci-containers.containers = {
- uptime_kuma = {
- image = "louislam/uptime-kuma:latest";
- volumes = [
- "${vars.main_docker_configs}/uptime_kuma:/app/data"
- "/var/run/docker.sock:/var/run/docker.sock"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- };
-}
diff --git a/systems/jeeves-jr/docker/web.nix b/systems/jeeves-jr/docker/web.nix
deleted file mode 100644
index c518459..0000000
--- a/systems/jeeves-jr/docker/web.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, ... }:
-{
- virtualisation.oci-containers.containers = {
- haproxy = {
- image = "haproxy:latest";
- user = "600:600";
- environment = {
- TZ = "Etc/EST";
- };
- volumes = [
- "${config.sops.secrets."docker/haproxy_cert".path}:/etc/ssl/certs/cloudflare.pem"
- "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg"
- ];
- dependsOn = [
- "arch_mirror"
- "uptime_kuma"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- cloud_flare_tunnel = {
- image = "cloudflare/cloudflared:latest";
- cmd = [
- "tunnel"
- "run"
- ];
- environmentFiles = [ config.sops.secrets."docker/cloud_flare_tunnel".path ];
- dependsOn = [ "haproxy" ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- };
- sops = {
- defaultSopsFile = ../secrets.yaml;
- secrets = {
- "docker/cloud_flare_tunnel".owner = "docker-service";
- "docker/haproxy_cert".owner = "docker-service";
- };
- };
-
-}
diff --git a/systems/jeeves-jr/hardware.nix b/systems/jeeves-jr/hardware.nix
deleted file mode 100644
index 8c7c11f..0000000
--- a/systems/jeeves-jr/hardware.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- config,
- lib,
- modulesPath,
- ...
-}:
-{
- imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
- swapDevices = [ { device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed"; } ];
- boot = {
- kernelModules = [ "kvm-amd" ];
- extraModulePackages = [ ];
- initrd = {
- kernelModules = [ ];
- availableKernelModules = [
- "xhci_pci"
- "ahci"
- "nvme"
- "usbhid"
- "usb_storage"
- "sd_mod"
- ];
- };
- };
-
- fileSystems = {
- "/" = lib.mkDefault {
- device = "/dev/disk/by-uuid/c59f7261-ebab-4cc9-8f1d-3f4c2e4b1971";
- fsType = "ext4";
- };
-
- "/boot" = {
- device = "/dev/disk/by-uuid/7295-A442";
- fsType = "vfat";
- };
- };
-}
diff --git a/systems/jeeves-jr/home_assistant.nix b/systems/jeeves-jr/home_assistant.nix
deleted file mode 100644
index 6b8e6d5..0000000
--- a/systems/jeeves-jr/home_assistant.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- services.home-assistant = {
- enable = true;
- openFirewall = true;
- config = {
- http = {
- server_port = 8123;
- server_host = [
- "192.168.95.35"
- "192.168.90.35"
- "192.168.98.4"
- ];
- use_x_forwarded_for = true;
- trusted_proxies = "172.100.0.4";
- };
- homeassistant = {
- time_zone = "America/New_York";
- unit_system = "imperial";
- temperature_unit = "F";
- };
- assist_pipeline = { };
- backup = { };
- bluetooth = { };
- config = { };
- dhcp = { };
- energy = { };
- history = { };
- homeassistant_alerts = { };
- image_upload = { };
- logbook = { };
- media_source = { };
- mobile_app = { };
- ssdp = { };
- sun = { };
- webhook = { };
- zeroconf = { };
- };
- extraPackages =
- python3Packages: with python3Packages; [
- psycopg2
- gtts
- aioesphomeapi
- esphome-dashboard-api
- bleak-esphome
- pymetno
- ];
- extraComponents = [ "isal" ];
- };
-}
diff --git a/systems/jeeves-jr/networking.nix b/systems/jeeves-jr/networking.nix
deleted file mode 100644
index 09d5314..0000000
--- a/systems/jeeves-jr/networking.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- networking = {
- hostId = "1beb3026";
- firewall.enable = false;
- };
-
- systemd.network = {
- enable = true;
-
- netdevs = {
- "20-ioit-vlan" = {
- netdevConfig = {
- Kind = "vlan";
- Name = "ioit-vlan";
- };
- vlanConfig.Id = 20;
- };
- };
-
- networks = {
- "10-lan" = {
- matchConfig.Name = "enp4s0";
- DHCP = "yes";
- vlan = [ "ioit-vlan" ];
- linkConfig.RequiredForOnline = "routable";
- };
- "40-ioit-vlan" = {
- matchConfig.Name = "ioit-vlan";
- DHCP = "yes";
- };
- };
- };
-
- services.zerotierone = {
- enable = true;
- joinNetworks = [ "e4da7455b2ae64ca" ];
- };
-}
-# 22/tcp open ssh
-# 800/tcp open mdbs_daemon
-# 5355/tcp open llmnr
-# 8123/tcp open polipo
-# 9993/tcp open palace-2
diff --git a/systems/jeeves-jr/secrets.yaml b/systems/jeeves-jr/secrets.yaml
deleted file mode 100644
index 2b231ac..0000000
--- a/systems/jeeves-jr/secrets.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-docker:
- cloud_flare_tunnel: ENC[AES256_GCM,data:E+XYu5AxS8Ew9OVIfbH5gLkMk+rZ4yT96tSGAwL4smedkddoevRnqil78LtFNYKV8Zo3MpuA8q/c4Me0KrrlSAvwJz1T2cev0dKnuTei3MHZxK7RwWYo9UMJH+aV+l343OY9nvGBj6ryTM3wKyUIoqSmOnRCAbYmhkkqN0wFO+Mxxqjw6nf5UEeeKb36k2NwlhjjnscOKe+wo3sXhjjzVXrE3IOUQJM3hWWukMElcYewVgJmstRidKiNCRMi1/UYMk/Nfhk=,iv:yFJ5SbHB3wZ0FEF0k9KrWye55ref7OqbQPd8oMLTmH4=,tag:p3K4yGR6X2+uKIj4H6rZ+g==,type:str]
- haproxy_cert: ENC[AES256_GCM,data:1n2BurHeWI+j7CMQ7qk3DUl+8MgqRsgtYQ1TxJKcPXuz0YBkg6SUp95lPZv6Jo+2OIaVxCoWpiuoLp8YgtJgnZo4S9QVG2qi60sWCSf4acMRSg0hIA/pdcslogZc5LrsBOTINZCODE4mz7Bya42f+RfVfwPGT7Buz8MniW6kfT9cr3iuq+BQc6513sHhDHgZJgwdfP5x9XrwEtaBl41Db7ejGTrza9jtsHqkrD8j3Pf1XJDhACrTeB7Uqh68sjwc2giAc/2bInDayvnKFHqHaLFTUMAbCeMPOiEZSK4UaWrSMk5I5wDVu8Ya8nBostHlPOBT06gFxT13aEe3Ox3/ctBm/83BXhFfjEaYy6AbMhbp29nxUogVjMICs3FiHG3XBz7vsVxxcBvLXp1Bw3ml5Vd7ACKQPe+r1T54aIdYMoab8DhKPMqb/6TQwrhWD3je4wwOHzzQq9psE1hlB2lJsRnAsVAy9a7M5aBpj0v2pCPVjxjkGHqUUgN+w4hzPPf10A0dWiaXc3k8bWcwc1SlJwHvYxphyZEjNQAzXrAkUPcuy4+9c7LwniMdu5qoUL/oZPW5VHWgtrUO9IlAgduiEujrAW96zfz4jfM0UBqJHT58l/WHHmBM8bMsRDHTnc43uvdoU+VgjtTiFERBi+Xm5mXCqWd4d5Y5P8ozIwGho8UdLqmR9Y2nth1mrs//FIh9mZ7i7QQGHBzoR7ICRDX2ghK98J4RMfF2ph0I+nhWpoCq056xItoVZyAEWQSR4ptpAaKMX4Crd3hrK6tZmyvaTrk5IsNaf5hrS+Fw8uTYUAM+3E6kb1TJwFvUH1plkwU83iBRlboRO5d1ahESp5nifZIVz+KBStLjUVWfXnelPCkH55LVnobgk0zekoEeNLKq+Q5wOBmR28rYXVp/q+FNCgxEW+tXIswmC72jbsDxM/oMHBQnYsmEy5dTxU2X/IzmrZfWod07fRblkWRplzLGyEjsY7CquHlG119LuHcWFOUGxYm3bgn1pGnIV3cBLvbInEAPK0apqSXMBSJw0mk/ihtdx8ANidMn8nhkHVjo/Bo9orH3tJdw8l7x+Cei347CkiQZz21jHvL1qcV/EAAxBnT4c5WtOljo13ntk8RiARdye4hcUXpORIUhH8zq88RNquOkF5QjV8C/u2EaUhQYqy3Xts49v7S9I8LLzjrrfY/IDQVqlJsAgkNuwvheTlya5JoeTasscLfLt3iJ7LsbzWWqQrfn3KQJp3H4Gxh/uqak/V5ROBahHQ4KpXzsDG++XLE0o7W4BFQbrBYV99mlGzB1blmX30C8S+b8n1u+oMXfH8oY20Jm5UQcV5/JNK8WG69ihonRDXdX7fy2WGzylql2hj+3aoYYdYpFAeHVLNzj9vAIxPHzvK0JmwdynsFLo4Hpyn7KN+6L3MSACjAOc3SxY20XxjmqJSWVEM0tq4Zbe/VdhOF1L4pyIBMKQC2XwrWyturTboh86qAfyxtYzEQXGLzz585nVnwj9PLmXQw98M8JWwsFq58ZsOdQZKhN3e0aSY2opSigmXQ9ZJeCF+6KbwElOSz4pDfkZIXqZc+LCzEl5IO1CxLWCTIIfN3Gx60W3vz8QohydoCBt2FLHH3lBiAEitWxYQhsfdlFExQa1/+0WSk3wK5dEA7SPaBWKq+xtPR0yUmuT/JN4VPX+hqqkVHigk8+XfqE/H1as9JbYo92N6xBd2ZrNzhFIkMykUOT+0etVtyOdXLkxdV9lwaBX9ARPHJV7g35e52UspX335aLGE0GtCaIbHRwJuENCIixo7sbdmB9i9xSTeg+7RBQAWpuR7O6firAEKWOGBaYzDUBnqt++Q2wUuMnQBJE/9bh,iv:3FuXEQxbTvbdnBnwPxF+T8QZvQoWX/WXx3lpDBXML1k=,tag:g1Y4qY+XoSA6K/LCKbllOw==,type:str]
-server-validation:
- webhook: ENC[AES256_GCM,data:/6QI+KKKJkbVO7YsxcU/gnjgp9scNzqzq56wnqAU88YdYYNU7FaRifzH00RlEb9VYvNBlT0FggnZSSX1rNN5W63tLaiYFn/GVfjlUSnwrgueTVG8Sor6HtYTIfMOdPm9B7jflpECk7ByguoDlimH0J1QrcWd+Kqx772sH63bKV1GbCaYSkRHQp9QbvbO,iv:p5W/xniUe75RqJA9PtMcNRnsY4kUBeD0p6iQDLbkSSc=,tag:dh2a8/Doyznjd1hswmXMuQ==,type:str]
-sops:
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
- age:
- - recipient: age1lffr5f5nz0nrenv3ekgy27e8sztsx4gfp3hfymkz77mqaa5a4gts0ncrrh
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2NXJJMjBjeU9XQS9YZGxQ
- V1h5RlNUVTA5Mkx3M3ZobGs5WFA0NXFGakR3CnIxVk9nYU1aWkNoZ0F0WGd0ck5Q
- VWpSU0ZRdENTWnFVOVNQY0Z4ems4MEUKLS0tIFVqcGJtZWRxSTZwZWhjYm56bnkr
- QmcxMmhaaGZXU1VFN0pvT1VDN3hpcGsKXUlVytBrz8sUorTSHXZaOMYA5U6qUpas
- ZJiHtVGxRVwCpraHWLmQTRkO6pT36cEVsfsMnFH6NLOMOvA3vLX8/g==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-07-07T23:09:51Z"
- mac: ENC[AES256_GCM,data:nZPpOrOSKc+7dcbpBdZRH5FLih6o5Ii5bLWgzZ7xP/BZ36vp7ypdncE/jS0/Rz2AiOOrK0G9ovEOoL7jOMrqaUBAJNPzXTX/IdOcFrsxPL47saZKWQHqXkGXrX49nafeea7VtEvoM4qK2AiyYl2ogir+Mw304mhDIUqHhPNNvQs=,iv:ykOg2Pxpp+Sap648UZaiaRVMutWTdUXvP+Pi2cWy86g=,tag:AARw0YmjcesHLdS31i+B3g==,type:str]
- pgp:
- - created_at: "2024-03-23T05:49:12Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA84hNUGIgI/nARAAgcuMhO3nmxYY8KiW6AYxU2rFo2OQnpzZVtbMJB43wDQX
- 0UAOVmUyhGM2wd3tJgnvyfnguy6p3LfjZrXdTkTzrv5yCJVvKXhORcLisjaXLS8H
- TCe9Fa4I9CvKo/yyRsRYS59niql0ocTs1Eb7cLiKuX19RIuQ7TjMPnjkdj5xXooa
- kPJXfwL1SpUU3kjhuTHqWlD0m5t0RPiTpDym8fExMSvbTWyMY0BPA+qD1atMeUik
- i3x2boqfoyD1GZ64Z5NrxRD0dN6TQvJLX1K1XTzanUhvfsy/PvDftCHKQc2n2Opk
- btnKZa1mfiiLUQly+njSvH8ERYg27j5ACEQ0V9rtGPa3xnVYZm6Z5h0v68aqsotJ
- aOzJa7/k0ZV/tBD1pT+9T2a/W9v4U+KdKKL19ebNvMtFxy50jN8SQsrTtxv5G5fA
- sc+HkrcnLezFHYtGG85PfbTGsKMWpwu+4BrcmuW6dBcADZ1fZdkqgi+GcYGL2xy1
- bddjuOWnzXb93t1pSIkaHcVWc6s5Atf3IB/liyNEux4kdquOHZQJi0WBi0l8GEmG
- /ggJN4shRqtMqEkomaZkyZMsHnkmenusjbIlKJrwolhZSyDP8Kk5iPYXMxG21vrr
- YpWHr388q8H7+ksnxYiNFXyY2cQKtOsD3UMIV8edMc/lHjTOi0BFNMHmU3WDsajS
- XAGXsys00baAzcQHIS0jijU4mJQAqYL3S7FrcDGW8qhTGFpQ8ngVLvwLfqMvUn8v
- LB3M5/7+Ld8xV4AZWr8mvv+7ZNNnnZzImETCLnekfvLEV9F2pTCH2Z21RPEL
- =XWl7
- -----END PGP MESSAGE-----
- fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
- - created_at: "2024-03-23T05:49:12Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA29thaGx06tOARAAoI93A3cy3V2dJo8HBIrLC2RK3SKBkPiPFjWO/Zvnv8Q0
- IhfzjusX+3f8HIa3CxJjTbOktcq+A2a4EyBes2Rd4bX9H2Fs2VVrSmUf3S/dO1b5
- GiZamHnC+1zsXUB5IFcfjMSzeKKsOWYu9DmUcalsseo/XVJjxw9DzRnPUesI/aMs
- y5kKKtNDcvAK4AWidME6LTP9FgiMx09sQfuAl4YCJv1trOvxt+dN932fbAkHVAq0
- Lc90rG6LDLT1w/8i9evBRRX/ZexAI3vTGn/nTqKi+B9BdFA4dY0KiHtGIS+UNtNo
- vL6PTKIRejGfqt13DwUWRobKnezcpJkTkdz+Pa+cQhdwSL2tFjr0hEbZL3e76YEx
- CNsgbB9h0pIm/2YvhG1k0f0skWfjXLAtR6PQPKu1OycppX02fbK9XRShb+Fik7P+
- GfFLxf4JYAMMOHsxP30EVQONiR9XsITH149GSZ3nTBX7vUsk3b7Z+ou1Ma27EhiW
- iPWTqpDgLQ/VZW+027h/l8iwv52L8eE6Y+LE32jNUTQjMW3OWKw9zknX4wciNR07
- EPAy8eC9rfhUVnTB7RJlTOY03yyEiBjowJn/0e0g8+AUMKC4mAuasPUwPhptQ6pH
- 8up/75WglUAg04eni0p5g6X7rGj+09OEDNMtvYVt7HglX7T86O2sBcVKa/j095jS
- XAGIy2HXf+By9BFKM4q6uuAh4QceHn2QaQ/ckhYGMrHulzAeORPxYaYdXoeEj18k
- auBqSPzj8E9yPi4jl+miEO9BgVhRW45cxBbn2XV2KE08PIP9mZ2jxK9Ne4HQ
- =jkZ+
- -----END PGP MESSAGE-----
- fp: 29F5017C95D9E60B1B1E8407072B0E0B8312DFE3
- unencrypted_suffix: _unencrypted
- version: 3.8.1
diff --git a/systems/jeeves-jr/services.nix b/systems/jeeves-jr/services.nix
deleted file mode 100644
index 101bcb6..0000000
--- a/systems/jeeves-jr/services.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- config,
- inputs,
- pkgs,
- ...
-}:
-{
- systemd = {
- services.startup_validation = {
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
- wantedBy = [ "multi-user.target" ];
- description = "validates startup";
- path = [ pkgs.zfs ];
- serviceConfig = {
- Type = "oneshot";
- EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
- ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
- };
- };
- timers.startup_validation = {
- wantedBy = [ "timers.target" ];
- timerConfig = {
- OnBootSec = "10min";
- Unit = "startup_validation.service";
- };
- };
- };
- sops = {
- defaultSopsFile = ./secrets.yaml;
- secrets."server-validation/webhook".owner = "root";
- };
-}
diff --git a/systems/jeeves-jr/vars.nix b/systems/jeeves-jr/vars.nix
deleted file mode 100644
index 5d3870a..0000000
--- a/systems/jeeves-jr/vars.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-let
- zfs_main = "/ZFS/Main";
-in
-{
- inherit zfs_main;
- # main
- main_docker = "${zfs_main}/Docker";
- main_docker_configs = "${zfs_main}/Docker/configs";
- main_mirror = "${zfs_main}/Mirror";
-}
diff --git a/systems/jeeves/arch_mirror.nix b/systems/jeeves/arch_mirror.nix
deleted file mode 100644
index b7d1e6a..0000000
--- a/systems/jeeves/arch_mirror.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ inputs, pkgs, ... }:
-let
- vars = import ./vars.nix;
-in
-{
- virtualisation.oci-containers.containers.arch_mirror = {
- image = "ubuntu/apache2:latest";
- volumes = [
- "${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
- "${vars.media_mirror}:/data"
- ];
- ports = [ "800:80" ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
-
- systemd.services.sync_mirror = {
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
- wantedBy = [ "multi-user.target" ];
- description = "validates startup";
- path = [ pkgs.rsync ];
- serviceConfig = {
- Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/";
- Type = "simple";
- ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
- };
- };
-}
diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix
deleted file mode 100644
index b8522af..0000000
--- a/systems/jeeves/configuration.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-{ pkgs, ... }:
-let
- vars = import ./vars.nix;
-in
-{
- imports = [
- ../../users/richie/global/ssh.nix
- ../../users/richie/global/syncthing_base.nix
- ./arch_mirror.nix
- ./docker
- ./networking.nix
- ./programs.nix
- ./services.nix
- ];
-
- boot = {
- zfs.extraPools = [
- "media"
- "storage"
- "torrenting"
- ];
- filesystem = "zfs";
- useSystemdBoot = true;
- };
-
- environment = {
- systemPackages = with pkgs; [ docker-compose ];
- etc = {
- # Creates /etc/lynis/custom.prf
- "lynis/custom.prf" = {
- text = ''
- skip-test=BANN-7126
- skip-test=BANN-7130
- skip-test=DEB-0520
- skip-test=DEB-0810
- skip-test=FIRE-4513
- skip-test=HRDN-7222
- skip-test=KRNL-5820
- skip-test=LOGG-2190
- skip-test=LYNIS
- skip-test=TOOL-5002
- '';
- mode = "0440";
- };
- };
- };
-
- services = {
- nfs.server.enable = true;
-
- openssh.ports = [ 629 ];
-
- plex = {
- enable = true;
- dataDir = vars.media_plex;
- };
-
- smartd.enable = true;
-
- sysstat.enable = true;
-
- syncthing.guiAddress = "192.168.90.40:8384";
- syncthing.settings.folders = {
- "notes" = {
- id = "l62ul-lpweo"; # cspell:disable-line
- path = vars.media_notes;
- devices = [
- "bob"
- "phone"
- "rhapsody-in-green"
- ];
- fsWatcherEnabled = true;
- };
- "books" = {
- id = "6uppx-vadmy"; # cspell:disable-line
- path = "${vars.storage_syncthing}/books";
- devices = [
- "bob"
- "phone"
- "rhapsody-in-green"
- ];
- fsWatcherEnabled = true;
- };
- "important" = {
- id = "4ckma-gtshs"; # cspell:disable-line
- path = "${vars.storage_syncthing}/important";
- devices = [
- "bob"
- "phone"
- "rhapsody-in-green"
- ];
- fsWatcherEnabled = true;
- };
- "music" = {
- id = "vprc5-3azqc"; # cspell:disable-line
- path = "${vars.storage_syncthing}/music";
- devices = [
- "bob"
- "phone"
- "rhapsody-in-green"
- ];
- fsWatcherEnabled = true;
- };
- "projects" = {
- id = "vyma6-lqqrz"; # cspell:disable-line
- path = "${vars.storage_syncthing}/projects";
- devices = [
- "bob"
- "rhapsody-in-green"
- ];
- fsWatcherEnabled = true;
- };
- };
-
- usbguard = {
- enable = false;
- rules = ''
- allow id 1532:0241
- '';
- };
-
- zfs = {
- trim.enable = true;
- autoScrub.enable = true;
- };
- };
- systemd = {
- services."snapshot_manager" = {
- description = "ZFS Snapshot Manager";
- requires = [ "zfs-import.target" ];
- after = [ "zfs-import.target" ];
- serviceConfig = {
- Environment = "ZFS_BIN=${pkgs.zfs}/bin/zfs";
- Type = "oneshot";
- ExecStart = "${pkgs.python3}/bin/python3 ${vars.media_scripts}/ZFS/snapshot_manager.py --config-file='${./snapshot_config.toml}'";
- };
- };
- timers."snapshot_manager" = {
- wantedBy = [ "timers.target" ];
- timerConfig = {
- OnBootSec = "15m";
- OnUnitActiveSec = "15m";
- Unit = "snapshot_manager.service";
- };
- };
- };
-
- sops = {
- defaultSopsFile = ./secrets.yaml;
- secrets = {
- "zfs/backup_key".path = "/root/zfs/backup_key";
- "zfs/docker_key".path = "/root/zfs/docker_key";
- "zfs/main_key".path = "/root/zfs/main_key";
- "zfs/notes_key".path = "/root/zfs/notes_key";
- "zfs/plex_key".path = "/root/zfs/plex_key";
- "zfs/postgres_key".path = "/root/zfs/postgres_key";
- "zfs/qbit_key".path = "/root/zfs/qbit_key";
- "zfs/scripts_key".path = "/root/zfs/scripts_key";
- "zfs/syncthing_key".path = "/root/zfs/syncthing_key";
- "zfs/vault_key".path = "/root/zfs/vault_key";
- };
- };
-
- system.stateVersion = "23.11";
-}
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
deleted file mode 100644
index 01f0304..0000000
--- a/systems/jeeves/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
- users = [
- "alice"
- "richie"
- ];
-}
diff --git a/systems/jeeves/docker/default.nix b/systems/jeeves/docker/default.nix
deleted file mode 100644
index e384ee5..0000000
--- a/systems/jeeves/docker/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, ... }:
-{
- imports =
- let
- files = builtins.attrNames (builtins.readDir ./.);
- nixFiles = builtins.filter (name: lib.hasSuffix ".nix" name && name != "default.nix") files;
- in
- map (file: ./. + "/${file}") nixFiles;
-
- virtualisation.oci-containers.backend = "docker";
-}
diff --git a/systems/jeeves/docker/filebrowser.nix b/systems/jeeves/docker/filebrowser.nix
deleted file mode 100644
index 0ff75fa..0000000
--- a/systems/jeeves/docker/filebrowser.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-let
- vars = import ../vars.nix;
-in
-{
- virtualisation.oci-containers.containers.filebrowser = {
- image = "hurlenko/filebrowser:latest";
- extraOptions = [ "--network=web" ];
- volumes = [
- "/zfs:/data"
- "${vars.media_docker_configs}/filebrowser:/config"
- ];
- autoStart = true;
- user = "1000:users";
- };
-}
diff --git a/systems/jeeves/docker/haproxy.cfg b/systems/jeeves/docker/haproxy.cfg
deleted file mode 100644
index 6b663c8..0000000
--- a/systems/jeeves/docker/haproxy.cfg
+++ /dev/null
@@ -1,68 +0,0 @@
-global
- log stdout format raw local0
- # stats socket /run/haproxy/admin.sock mode 660 level admin expose-fd listeners
- stats timeout 30s
-
-defaults
- log global
- mode http
- retries 3
- maxconn 2000
- timeout connect 5s
- timeout client 50s
- timeout server 50s
- timeout http-request 10s
- timeout http-keep-alive 2s
- timeout queue 5s
- timeout tunnel 2m
- timeout client-fin 1s
- timeout server-fin 1s
-
-
-#Application Setup
-frontend ContentSwitching
- bind *:80
- bind *:443 ssl crt /etc/ssl/certs/cloudflare.pem
- mode http
- # tmmworkshop.com
- acl host_mirror hdr(host) -i mirror.tmmworkshop.com
- acl host_dndrules hdr(host) -i dndrules.tmmworkshop.com
- acl host_grafana hdr(host) -i grafana.tmmworkshop.com
- acl host_filebrowser hdr(host) -i filebrowser.tmmworkshop.com
- acl host_uptime_kuma hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
- acl host_overseerr hdr(host) -i overseerr.tmmworkshop.com
-
- use_backend mirror_nodes if host_mirror
- use_backend dndrules_nodes if host_dndrules
- use_backend grafana_nodes if host_grafana
- use_backend filebrowser_nodes if host_filebrowser
- use_backend uptime_kuma_nodes if host_uptime_kuma
- use_backend overseerr_nodes if host_overseerr
-
-backend mirror_nodes
- mode http
- server server arch_mirror:80
-
-backend mirror_rsync
- mode http
- server server arch_mirror:873
-
-backend grafana_nodes
- mode http
- server server grafana:3000
-
-backend dndrules_nodes
- mode http
- server server dnd_file_server:80
-
-backend filebrowser_nodes
- mode http
- server server filebrowser:8080
-
-backend uptime_kuma_nodes
- mode http
- server server uptime_kuma:3001
-
-backend overseerr_nodes
- mode http
- server server overseerr:5055
diff --git a/systems/jeeves/docker/internal.nix b/systems/jeeves/docker/internal.nix
deleted file mode 100644
index 08ddc06..0000000
--- a/systems/jeeves/docker/internal.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{ config, ... }:
-let
- vars = import ../vars.nix;
-in
-{
- virtualisation.oci-containers.containers = {
- qbit = {
- image = "ghcr.io/linuxserver/qbittorrent:latest";
- ports = [
- "6881:6881"
- "6881:6881/udp"
- "8082:8082"
- "29432:29432"
- ];
- volumes = [
- "${vars.media_docker_configs}/qbit:/config"
- "${vars.torrenting_qbit}:/data"
- ];
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- WEBUI_PORT = "8082";
- };
- autoStart = true;
- };
- qbitvpn = {
- image = "binhex/arch-qbittorrentvpn:latest";
- extraOptions = [ "--cap-add=NET_ADMIN" ];
- ports = [
- "6882:6881"
- "6882:6881/udp"
- "8081:8081"
- "8118:8118"
- ];
- volumes = [
- "${vars.media_docker_configs}/qbitvpn:/config"
- "${vars.torrenting_qbitvpn}:/data"
- "/etc/localtime:/etc/localtime:ro"
- ];
- environment = {
- WEBUI_PORT = "8081";
- PUID = "600";
- PGID = "100";
- VPN_ENABLED = "yes";
- VPN_CLIENT = "openvpn";
- STRICT_PORT_FORWARD = "yes";
- ENABLE_PRIVOXY = "yes";
- LAN_NETWORK = "192.168.90.0/24";
- NAME_SERVERS = "1.1.1.1,1.0.0.1";
- UMASK = "000";
- DEBUG = "false";
- DELUGE_DAEMON_LOG_LEVEL = "debug";
- DELUGE_WEB_LOG_LEVEL = "debug";
- };
- environmentFiles = [ config.sops.secrets."docker/qbit_vpn".path ];
- autoStart = true;
- };
- bazarr = {
- image = "ghcr.io/linuxserver/bazarr:latest";
- ports = [ "6767:6767" ];
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- };
- volumes = [
- "${vars.media_docker_configs}/bazarr:/config"
- "${vars.storage_plex}/movies:/movies"
- "${vars.storage_plex}/tv:/tv"
- ];
- autoStart = true;
- };
- prowlarr = {
- image = "ghcr.io/linuxserver/prowlarr:latest";
- ports = [ "9696:9696" ];
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- };
- volumes = [ "${vars.media_docker_configs}/prowlarr:/config" ];
- autoStart = true;
- };
- radarr = {
- image = "ghcr.io/linuxserver/radarr:latest";
- ports = [ "7878:7878" ];
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- };
- volumes = [
- "${vars.media_docker_configs}/radarr:/config"
- "${vars.storage_plex}/movies:/movies"
- "${vars.torrenting_qbitvpn}:/data"
- ];
- autoStart = true;
- };
- sonarr = {
- image = "ghcr.io/linuxserver/sonarr:latest";
- ports = [ "8989:8989" ];
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- };
- volumes = [
- "${vars.media_docker_configs}/sonarr:/config"
- "${vars.storage_plex}/tv:/tv"
- "${vars.torrenting_qbitvpn}:/data"
- ];
- autoStart = true;
- };
- overseerr = {
- image = "ghcr.io/linuxserver/overseerr";
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- };
- volumes = [ "${vars.media_docker_configs}/overseerr:/config" ];
- dependsOn = [
- "radarr"
- "sonarr"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- whisper = {
- image = "ghcr.io/linuxserver/faster-whisper:latest";
- ports = [ "10300:10300" ];
- environment = {
- PUID = "600";
- PGID = "100";
- TZ = "America/New_York";
- WHISPER_MODEL = "tiny-int8";
- WHISPER_LANG = "en";
- WHISPER_BEAM = "1";
- };
- volumes = [ "${vars.media_docker_configs}/whisper:/config" ];
- autoStart = true;
- };
- };
- sops = {
- defaultSopsFile = ../secrets.yaml;
- secrets."docker/qbit_vpn".owner = "docker-service";
- };
-}
diff --git a/systems/jeeves/docker/postgresql.nix b/systems/jeeves/docker/postgresql.nix
deleted file mode 100644
index a3938b1..0000000
--- a/systems/jeeves/docker/postgresql.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, ... }:
-let
- vars = import ../vars.nix;
-in
-{
- users = {
- users.postgres = {
- isSystemUser = true;
- group = "postgres";
- uid = 999;
- };
- groups.postgres = {
- gid = 999;
- };
- };
-
- virtualisation.oci-containers.containers = {
- postgres = {
- image = "postgres:16";
- ports = [ "5432:5432" ];
- volumes = [ "${vars.media_database}/postgres:/var/lib/postgresql/data" ];
- environment = {
- POSTGRES_USER = "admin";
- POSTGRES_DB = "archive";
- POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256";
- };
- environmentFiles = [ config.sops.secrets."docker/postgres".path ];
- autoStart = true;
- user = "postgres:postgres";
- };
- };
-
- sops = {
- defaultSopsFile = ../secrets.yaml;
- secrets."docker/postgres".owner = "postgres";
- };
-}
diff --git a/systems/jeeves/docker/uptime_kuma.nix b/systems/jeeves/docker/uptime_kuma.nix
deleted file mode 100644
index 484c0ad..0000000
--- a/systems/jeeves/docker/uptime_kuma.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-let
- vars = import ../vars.nix;
-in
-{
- virtualisation.oci-containers.containers = {
- uptime_kuma = {
- image = "louislam/uptime-kuma:latest";
- volumes = [
- "${vars.media_docker_configs}/uptime_kuma:/app/data"
- "/var/run/docker.sock:/var/run/docker.sock"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- };
-}
diff --git a/systems/jeeves/docker/web.nix b/systems/jeeves/docker/web.nix
deleted file mode 100644
index c30f39c..0000000
--- a/systems/jeeves/docker/web.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ config, ... }:
-let
- vars = import ../vars.nix;
-in
-{
- virtualisation.oci-containers.containers = {
- grafana = {
- image = "grafana/grafana-enterprise:latest";
- volumes = [ "${vars.media_docker_configs}/grafana:/var/lib/grafana" ];
- user = "600:600";
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- dnd_file_server = {
- image = "ubuntu/apache2:latest";
- volumes = [
- "${../../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
- "${vars.storage_main}/Table_Top/:/data"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- haproxy = {
- image = "haproxy:latest";
- user = "600:600";
- environment = {
- TZ = "Etc/EST";
- };
- volumes = [
- "${config.sops.secrets."docker/haproxy_cert".path}:/etc/ssl/certs/cloudflare.pem"
- "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg"
- ];
- dependsOn = [
- "arch_mirror"
- "dnd_file_server"
- "filebrowser"
- "grafana"
- "overseerr"
- "uptime_kuma"
- ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- cloud_flare_tunnel = {
- image = "cloudflare/cloudflared:latest";
- user = "600:600";
- cmd = [
- "tunnel"
- "run"
- ];
- environmentFiles = [ config.sops.secrets."docker/cloud_flare_tunnel".path ];
- dependsOn = [ "haproxy" ];
- extraOptions = [ "--network=web" ];
- autoStart = true;
- };
- };
-
- sops = {
- defaultSopsFile = ../secrets.yaml;
- secrets = {
- "docker/cloud_flare_tunnel".owner = "docker-service";
- "docker/haproxy_cert".owner = "docker-service";
- };
- };
-}
diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix
deleted file mode 100644
index e4bbc90..0000000
--- a/systems/jeeves/hardware.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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,
- modulesPath,
- ...
-}:
-
-{
- imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
- boot = {
- initrd.availableKernelModules = [
- "mpt3sas"
- "nvme"
- "xhci_pci"
- "ahci"
- "uas"
- "usb_storage"
- "usbhid"
- "sd_mod"
- "sr_mod"
- ];
- initrd.kernelModules = [ "dm-snapshot" ];
- kernelModules = [ "kvm-amd" ];
- extraModulePackages = [ ];
- };
-
- fileSystems."/" = lib.mkDefault {
- device = "/dev/disk/by-uuid/0f78fa87-30be-4173-b0fa-eaa956cf83aa";
- fsType = "ext4";
- };
-
- fileSystems."/boot" = {
- device = "/dev/disk/by-uuid/BB77-2647";
- fsType = "vfat";
- };
-
- swapDevices = [ { device = "/dev/disk/by-uuid/4c797a94-be32-43d3-89ac-7f02912c7cf5"; } ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/systems/jeeves/networking.nix b/systems/jeeves/networking.nix
deleted file mode 100644
index 6d715b1..0000000
--- a/systems/jeeves/networking.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- networking = {
- hostId = "1beb3027";
- firewall.enable = false;
- };
-
- systemd.network = {
- enable = true;
- networks = {
- "10-1GB_Primary" = {
- matchConfig.Name = "enp98s0f0";
- DHCP = "yes";
- };
- };
- networks = {
- "10-1GB_Secondary" = {
- matchConfig.Name = "enp98s0f1";
- DHCP = "yes";
- };
- };
- networks = {
- "10-10GB_Primary" = {
- matchConfig.Name = "enp97s0f0np0";
- DHCP = "yes";
- linkConfig.RequiredForOnline = "routable";
- };
- };
- networks = {
- "10-10GB_Secondary" = {
- matchConfig.Name = "enp97s0f1np1";
- DHCP = "yes";
- };
- };
- };
-
- services.zerotierone = {
- enable = true;
- joinNetworks = [ "e4da7455b2ae64ca" ];
- };
-}
diff --git a/systems/jeeves/programs.nix b/systems/jeeves/programs.nix
deleted file mode 100644
index 9828f7d..0000000
--- a/systems/jeeves/programs.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
- environment.systemPackages = with pkgs; [ filebot ];
-}
diff --git a/systems/jeeves/scripts/plex_permission.sh b/systems/jeeves/scripts/plex_permission.sh
deleted file mode 100644
index 18094e8..0000000
--- a/systems/jeeves/scripts/plex_permission.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-plex_dir="/zfs/storage/plex/"
-
-chown docker-service:users -R "$plex_dir"
-find "$plex_dir" -type f -exec chmod 664 {} \;
-find "$plex_dir" -type d -exec chmod 775 {} \;
diff --git a/systems/jeeves/secrets.yaml b/systems/jeeves/secrets.yaml
deleted file mode 100644
index 9c6c30d..0000000
--- a/systems/jeeves/secrets.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-docker:
- postgres: ENC[AES256_GCM,data:IpXIrRDzyGFjDz908w1NNb0GBna/ce9lCtOkXrpUfyllsTWca6AeqaRo23bL4jfFGfHn0Zf9okLO,iv:IwO7vJJHFfm0SGcJETpWtdhr41jPddN9nuVAH/Ooa7Y=,tag:xstwPvpvkNOZucxvzq2+ag==,type:str]
- cloud_flare_tunnel: ENC[AES256_GCM,data:Qx7g0tNSfVs9VnkuYw47XJjfF+RS9B5gvpBliGL93X8K/7iiyt0NxwWyAkmmaLat5h/Yu7C71rwBIIZsKf7Ke3YS0PfEpga76ftKt3h7VKMQNT7yAcU3LY4v2h3Molnzw2fnAhxfHkogJuAsZeJW9dIjo9H2QpSh/tn9kpC+PGb/T9dcqMm4fJPqP+rIcFCfhJl9iDOKOMQ9+xVNnKZ2HQlAwPMCz29BgGCxh0cYYk9ftXPK7ZnhjwUj4bfnaKfByIPpAtk=,iv:8yz2vXanGZfOkZF/D0RP2LPqHebbOM/XBPg2eCCGs8g=,tag:67da31iZTQaMURKf9dfiJw==,type:str]
- qbit_vpn: ENC[AES256_GCM,data:SRkcWb2wTTfWlgkbDSN6j5+dXnG670qFGtG2x4fajkE8eK4U30DTxrlbzta5ZMtm0Y9bquy3DcaSMF/u9CBrLbBS8mhcJw==,iv:LpkS7O+eutPUDpY5NlYjgafK6UuFsS+18yNpB+JmzcM=,tag:0Y+vj80MAbh2U+UsyH3MEA==,type:str]
- haproxy_cert: ENC[AES256_GCM,data:6yRv0cz/vBVguAPOsENhmH2uwwgL5AkOkkDQQ+PVPEEiOTIn1WPONhnG0UqR3FsWJal8qECH/zTF1XMmdK4VHQXwMA8gGScpIrgeWuhdCbXsJ7RxZBzVESOCo8ZOcR43w3Qih+0iz3SsNmX262/D7DIzKYlLovyoJDGZa5jo0n2zCZiRfbdal8m02dplaFHMsGy6+Gn3Uijo9MnnuWvgihBh1ekRnpSzVM4/IyyvUunK0vEapVsgOq+brdW2x0BQFgL3PLGaJbAbzFhXYI1MmD+D7RzOGSzNmrj1ezea+b2Lb/p8CATh05i+lz6530U6iwun0lcREDxPrJgU0TsI/JZGSq3blHn9lZuHmnwBp05LsliBO+yoxgqnC45/xTZwiSdlyqqnXHlXPuBS7UoJFlll93aIpULfNZMyqx/FO5ckmV0nuNVMCrF7JfsE+t/XNs077kB4FKYNk4TDodKyn2scfypQFK7qprW9JKJwx0Se8FWU2fMKsuMszElMLudRHagyDVO+LJ+/ta6Qj68CRU1g8cQANh4Q6PwI0HABX3J5n3ERQUxZvVeCq9FRMJ7JE0was3QfBGGPROHksK+rP9y8g8CFRgGjwzDoxslaYO+tIiIsaDcqbTiOQDTiDh4/ioqX9EENrA8qIEtKSn6m35+4pwY0xvKToAnI7vhwQ93A1mZrwKXgoNSShA4Q+MfSEIuJd6LJihLh5IFvl595iOpGDWCJsXZnDL3K8B6oofPTtLnOOQC4sy9wGiNshdgfv6aVwpdPKvOtFwHmu1n8eZInfSZgUdwUaHHMXjrXHboBQ6ZPsrdZBt9ADSUpz+uN6+TgXq6HLWHSqtmrWS6jABQfbpHH7pLZAXuii4MsnTEr1rOEbtgZTH6Sedd57Pp5MpNXDg950vd9plCkGPiRfDUWXHnRw8frWfoTS+eOqkVwJ0+v48IskuYLZSCAF0/kumtbySDQStNowF+cAp7lk24Cp8W8PXw/LqI8U8FijVxMPtgzLwRKKd10zRI+Jrsi9E8YXSKCaFMIBLottRHwdvWA7aIYnuVTxzCmHt1jhJN349bjC/yTIuIS4gW+XlriFqip17Eq/878+Uduwf1+Fxqdpv8kDleyqix0SO/JmhQijgIUhc3Im3whXicEu6vlivzJGyjA/ljFyJvV/irRK/VrIWEoA5nLX74fmF9Ku/O94pDIPaKCsCP+N/fOPLG5ucw6lPxllZS9qg2cNsl9ajXGPu8GBB4FaZUt/Ufid6xjC5YloictI3Bp5x2glhpxzQ8zAbv5vpBA0h6xhkt4NSmxWurvBmRoRnBdYIvEaeoehj10yLpiY4DsZYLTU5IrLV/aYlb2q4K2OKRvYOBQgeDtEkIMqHYWsddfKHi+1KjQ/176DDIbUoYb4XtPJmNOcIeRM2oiaCcTzerU5TXL5qBl213buTcIPaV0sVVxoH+2RYBM28mjQoj8sHwQLLuFve0MeUZzfJ8MqMM+Guhn25aw4R0tGkiRBUL5d8l86awOpqXtFiK2QTh3S7QeZoCA80YVH5r6FdqMz34UgwEFo0nfBcH2nSnDwpcBrbwzV6/Xahck4nVaIn6znJPqlIKntfeXJuXl/9ulpwx7D4mL7hLcal9WY62KZ1PQ+NHz5WjaPbgLMdeNFFr6CKGGqSPkTOhjgQ1y4ChuYfbVn+yZRqUwhFWtKuuouAZXH55KkVlsB39H+oNYp0hqAUiVkeawHqbTgOHb+llz0uF7r0TGD23aMXeV58n0i3xsDET9mhxSyj5vUo5iqY8eEqgn4mOvsdp6rkpC4c91drgV/gFJu2jgCvVVdG/mHFVnZEv5+/rA2reqdqMTBOpLQNEbL5Ih1LKG,iv:PUp78PWvy+lmcLiR295BGiVTLnAPX+du4lcw/Pvq/KE=,tag:k/3H2+jF9no751mvO5S5WQ==,type:str]
-zfs:
- backup_key: ENC[AES256_GCM,data:sJzR/DfM6+tmmcewZT+NAJk0gj8wmU43QfFCRCj9+2GITOS8suRL7E5rHTherCZgRe79T90ikM97bYf9RbZdtQ==,iv:j8F3BG/hh7UK3kC+pB6WO0OHlSSHn0jo90AgaTdpyNY=,tag:5hraDn8YqS/q57y26AXwjw==,type:str]
- docker_key: ENC[AES256_GCM,data:HiW+3IYJCgqg9HJmPYQinhb6kWJouORABKniryY5e35tf8BQGKn1ldgj4Dw+79SYmvIUbf4ZSja0Ziz1isKTWA==,iv:6vBtbIlTHC+PUgyXYb92SnMTuWd8jCaEzZ3Vmv2QHhA=,tag:izKWtAQWRfn5tAYKyOO+ZQ==,type:str]
- main_key: ENC[AES256_GCM,data:6ZZQc7TSAuK4PrxQxegPrFMjT1SZlRGgg5VgVg1e6ZM1RO9ZDjhcmpFRd1pkbm5DEJKq1VpUxTvxXGQDrMYO9A==,iv:Yp2jTtBd8gjB8Sdfb06ZBLpVd/KCjs/pfnBRT2ll/0c=,tag:F0HSbkZ8Z45WkUY/VNwvHg==,type:str]
- notes_key: ENC[AES256_GCM,data:y3fTl3aNl8RaZwBR2thy7qfxilw+wGEj8+tTuRr+z+A6ol9N6droFNBHQcK3yWDWP8MhMKe1efWhgbZ0Raz17A==,iv:BbBjMtsb2ZDJjgbgkXP3SYl3xklI5xWmW3X9mlLlvdI=,tag:Ic3rLP30wApmOeLGFEYgVA==,type:str]
- plex_key: ENC[AES256_GCM,data:fWzTSKkVCkWmZ9ZDv1/OYYZPsQKV54Ib98Bq4A+4ibT9mk28Zp7XeczOJVj6+K4+04EQgQj8RyP2x70tuFp3Xg==,iv:pyHzIo4ws4Lyd5zVflUa7yjNVefTTpEdkjCVmXDuucE=,tag:msn0NFXuq3zKGY5vE1nR1Q==,type:str]
- postgres_key: ENC[AES256_GCM,data:mLa0A6pJXZ7BX9bYat9mQ30Dx/KWU9KHjiApuapBUbRtH+gtAJRGwLeXJPyMTOirFwuWWTdOts8dTMESWp7eOg==,iv:MFyo2LbdsYeoUyhWEv0EWKXNFhxoLjNs5M7ar6dlrjw=,tag:KpaatId8TdVzAEelD1tlzQ==,type:str]
- qbit_key: ENC[AES256_GCM,data:19XIzi4waSOLdfgKo8z6NMX9Ee4Xw1/JqbjQEvKwWh+ar2r5P3sFJMHI394ebx4vITO0lOzl/EwcUiWt7LB6uw==,iv:s+TWyb5SzeCFZAZdKs28o7s8So++eLqR1Qc9ZWjUGwY=,tag:teHdPEhWkzDWizJD/czA6w==,type:str]
- scripts_key: ENC[AES256_GCM,data:2htMEDCByUbCQ1loPEDCVNtXXqffCRHMpiobEDHI506hdEk6d/N7lmlUIqLa5YCNB6ozt0y6EEKBxnbouEHIWQ==,iv:eUYmsliDF49BNSpF+KSiT1rlPtzQpmhNC8Cy2tahMX8=,tag:8xCvm1LwDPArJ/woIO23Bg==,type:str]
- syncthing_key: ENC[AES256_GCM,data:36zfmVuCEHFED3ODeoGuAxJvySY1SxWT9ml+DFvb01KdUqIGZDZj1cKoZCH+GsgYJMsQF6t+uqZJOGeyNmzMlg==,iv:17tLW4ytRpUmmltA4UIZGhsrNAGRjvucxxt9zLM3C54=,tag:YWirDB0fYSpu1evqVaoa+Q==,type:str]
- vault_key: ENC[AES256_GCM,data:kFZa5oRVXuSp7W7311i0d8b7I0Y3P8bZbBoaaICuH1IlMLBVd6SUhL8cfFU66yj91W6uUJU/Oy7NpP3rM9mhGw==,iv:neRhOqW/b2DpUqoA5JJxLS4fSqj8ZGxRXv4pEPm7Wtc=,tag:bfAD3GAO6F2hBCZy7P7KUA==,type:str]
-server-validation:
- webhook: ENC[AES256_GCM,data:54MQzwEOf6uS6cgnPeJizRXMvGTGxLf6q1N3tGDxxpXKmSJedW+kpY2GoV91SxeeTWUyDKQcWp2fs5SwrdfDFHID9JN4wWJM0JjADggZ6u+BMEH01nnXpCJlhGq6cxDkI6gNSVgNVQW/eYNHDhnVmwwGpse4q62G1TmKlziBCv1Qahn4c3O+bOOEssio,iv:2Rcg7XSCmQeFd2oaX4GxSGXwgE3Ep1WsoPRRYo0dvH0=,tag:rPjDghxdcpME5SwoPKWv2w==,type:str]
-sops:
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
- age:
- - recipient: age128ehc0ssgwnuv4r8ayfyu7r80e82xrkmv63g7h9y9q4mhk4w9dyqfymc2w
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTREhIRUd1K3JCM29mVHVv
- d2Q4eFBLWnRUTGEzelZOMS9ScXNyV3ZGbHpNCjNCSEhmTDQ4VUtta0RXdXJUY0da
- Vld5WDlJS3oyWkk5KzUzam9PYXZSa1kKLS0tIHJuaktpU3hnUWEwZzc4eHNjSitI
- bVhXamJyMWMvODUvajk2aDZnQ1k1blEKoNIYxUA+k+DA+1WYq5BSa0iXuQ2Lctuy
- 9W7OO2m+QGzjdLLM0uS7WWGXWP2cDDgUGcqozTqM0Oqi2/OY0Bo3Jg==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-07-07T23:09:43Z"
- mac: ENC[AES256_GCM,data:36CZLl3+VSFTSTj9jDT9972XZMXjaY5jo9FZ7I7L0sOSBRH8vQ+tFww7hVHe5M2w/+YA0SRGH3r8WCbie6GeRjmY+BZu42H656K0WrpRN8ERFv+io8geACdqUsLo1VLjhDrfXaGnNOHLpmMC5dqyPXlOphiolt+ArKOBLuqtrnY=,iv:jaL/l1zwYusThKeR9C62fEGHwiv4fEvCarSiavjxQ0U=,tag:xgygx6KM/J4w55CzdLeCUg==,type:str]
- pgp:
- - created_at: "2024-03-02T20:52:17Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA84hNUGIgI/nARAAxQSkqnR75Rd1htAv7esbpmXlrZH+frTL6V4jGoAiqTeF
- TSA46E2nl7rVqPTws74OOb+O5bN3OkHSmmWzIbj6Pc8YnqY4t9N69zoCHtsbI1kn
- FQ4WwUdzofIUMKwF+E31/knyKbf/IjSKTZKcDQmn6QErOdDmsN9/z6+ixLt+rdsz
- lKwMX8axgmwgRsWI1Xhlb1qs4TZxheQQ4A4WYYNB1NhH0ZTIehI+FGe+wHh36UXf
- cY/Z7KRLdozoLsuuAIAoXx/dr3KpwuyKHfp9MdZLzO/tvS9vA1i+tKRXmiDs2uuv
- itCOTrt1H7LEpUfdBYD9ll2mdiRnVzR4DxNnGLPkxsyAglejTxR897DcYFC9xhie
- X6UfKTOIeAGXVUqphp8HB0CEFBW982246kDSKdOI/R3+X4T5fvMpLTb5XvkOlCIi
- JUwXxoq3SA06a8WCS6QH8jLnXrcCKzX1TJh0RzT7/RUvKDN6uxxccxOksMExvgBG
- nqfOcLiCXBzluCseDgmjcW0/arm1d88Kd7ayMv25CX1Py5uRRQOkqqnCdNIk5Yy5
- 0R+KyOPeZPThVTE1DhJ3QyF499XMoFjerHyanwIlvkAQtet1k8EKih1KSD9N38ga
- K1HRowhoPMkszsU6+LZYL3MD0aUkfz53b7JvzIxYsfJgztwg3ki0qteEXUNyLMTS
- XgG9xHF63wa7IwBtKgQKX/CVCwpg5EuNfwbACbIQAC9QZ/F6z+Ud2UJkSs94UUF4
- aOGb2P1QFvLbP7m+7TNmvuLT5BDcS2XE0IWRDilkeiFU6ijGW8+iQ5oTzv+TmA0=
- =JbRX
- -----END PGP MESSAGE-----
- fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
- - created_at: "2024-03-02T20:52:17Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA29thaGx06tOARAAm8GMWZxxY1UBYK7p60Hlw2qCOH7KZ5cby8vm9dWz3Tnt
- +YKW2SsRniwY6KaSVvnUuRBY75BF6jahW6+h9Nvhsrsvq680UIaQtO6l6KmtnxHV
- S6vEDmvoFZVWG1xOEGYHVQ+GF9elIwuYrzST1OU3vATMstMxrm0WQJ2lOq7YpuGi
- hNoMK3nMxpmTlT49CYn2sGX3PlNA4qDOVo/fwL5m3lV5mKzJNs7q8IakbPZm6yqR
- wGjfkHq3ZlKnTUC66sBX8yvSoZ2cM6vrYhxgb1Um8z9BKLpAb7Rr9AXB5IUWxSkz
- jXyEi9aDySDxv2HkjP3fE4D5wtC1neS8YsYDBcSsqoXt5sKAs1DOvzLbIOkObH3Y
- uSxozoGJu5CVnBrOpxXdNf1RMnww85uxSAupiLQ2fsC/0AaeGB8dPYIZr/WekWAR
- RF3igqZX7KVRuomUOt9fwJoHnRr1GWCHqYTB3P7/e52JcmCggBRLcnhC/1MKgMtN
- RJh8Uuu9aXCBfR148W+s76xIdVwypPWbk8l911TdL1eRKx+d+kxAa1ugIqihvkBQ
- sGjZltEe0ogAsDpS0Cy/HRH8Yz1Qk2gTh1QZiv865aVVfWu0OTU27TlfCyMQQCkO
- LtBfOWylV6pJG3aaO2QA+4f4ab8flxdg8DrmBlhudzYY2goHIcfe+CdPygrKB/nS
- XgEx1HFw47B1YJxY7FiFgEwnI6/AJuf136u1i484nVYXAr5PtnyaXH7kqVozHouT
- sPkE1v7+EpOIbhEdXQxbSG0AXKomUwu4SJgxSitdTajAQYfHHfTVjdnUqyl8QHw=
- =wX5X
- -----END PGP MESSAGE-----
- fp: 29F5017C95D9E60B1B1E8407072B0E0B8312DFE3
- unencrypted_suffix: _unencrypted
- version: 3.8.1
diff --git a/systems/jeeves/services.nix b/systems/jeeves/services.nix
deleted file mode 100644
index 6861f94..0000000
--- a/systems/jeeves/services.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- config,
- inputs,
- pkgs,
- ...
-}:
-{
- systemd = {
- services = {
- plex_permission = {
- description = "maintains /zfs/storage/plex permissions";
- serviceConfig = {
- Type = "oneshot";
- ExecStart = "${pkgs.bash}/bin/bash ${./scripts/plex_permission.sh}";
- };
- };
- startup_validation = {
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
- wantedBy = [ "multi-user.target" ];
- description = "validates startup";
- path = [ pkgs.zfs ];
- serviceConfig = {
- EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
- Type = "oneshot";
- ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
- };
- };
- };
- timers = {
- plex_permission = {
- wantedBy = [ "timers.target" ];
- timerConfig = {
- OnBootSec = "1h";
- OnCalendar = "daily 03:00";
- Unit = "plex_permission.service";
- };
- };
- startup_validation = {
- wantedBy = [ "timers.target" ];
- timerConfig = {
- OnBootSec = "10min";
- Unit = "startup_validation.service";
- };
- };
- };
- };
- sops = {
- defaultSopsFile = ./secrets.yaml;
- secrets."server-validation/webhook".owner = "root";
- };
-}
diff --git a/systems/jeeves/snapshot_config.toml b/systems/jeeves/snapshot_config.toml
deleted file mode 100644
index d422f02..0000000
--- a/systems/jeeves/snapshot_config.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-["media/Notes"]
-15_min = 8
-hourly = 24
-daily = 30
-monthly = 12
-
-["storage/plex"]
-15_min = 6
-hourly = 2
-daily = 1
-monthly = 0
-
-["media/plex"]
-15_min = 6
-hourly = 2
-daily = 1
-monthly = 0
-
-["media/notes"]
-15_min = 8
-hourly = 24
-daily = 30
-monthly = 12
-
-["media/docker"]
-15_min = 3
-hourly = 12
-daily = 14
-monthly = 2
diff --git a/systems/jeeves/vars.nix b/systems/jeeves/vars.nix
deleted file mode 100644
index 707170f..0000000
--- a/systems/jeeves/vars.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-let
- zfs_media = "/zfs/media";
- zfs_storage = "/zfs/storage";
- zfs_torrenting = "/zfs/torrenting";
-in
-{
- inherit zfs_media zfs_storage zfs_torrenting;
- # media
- media_database = "${zfs_media}/syncthing/database";
- media_docker = "${zfs_media}/docker";
- media_docker_configs = "${zfs_media}/docker/configs";
- media_mirror = "${zfs_media}/mirror";
- media_notes = "${zfs_media}/notes";
- media_plex = "${zfs_media}/plex/";
- media_scripts = "${zfs_media}/scripts";
- # storage
- storage_main = "${zfs_storage}/main";
- storage_plex = "${zfs_storage}/plex";
- storage_syncthing = "${zfs_storage}/syncthing";
- # torrenting
- torrenting_qbit = "${zfs_torrenting}/qbit";
- torrenting_qbitvpn = "${zfs_torrenting}/qbitvpn";
-}
diff --git a/systems/palatine-hill/keys/zfs-attic-key b/systems/palatine-hill/keys/zfs-attic-key
deleted file mode 100644
index fb34bd5..0000000
--- a/systems/palatine-hill/keys/zfs-attic-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:WoJfZqlMPpb3ub0HGOyZvIlte5F6T7OIwJ3aFYe1tuM=,iv:2VivO2x6lIrYOHUTg3bi1p2iRSvm7J/zyL7f09bmSLo=,tag:NFRSIsp1LvupCEMuTQS/nw==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqeVhwUmNyN256YnowRHJa\nQldwZmpQZWR1dFJoZzF6blo3NWR6WFJhT1dVCmtnb3BPTW5NeEk5Y0FWVXFDUUR6\nV3kyaHpscWc4U1pFVDBFSE9qZCtaakkKLS0tIHF0QVZTazdVQWk3Sk5wTjYvOFNQ\ndTNUbW1UMnQ0RkYydmVQbzVwVG93TzQKSeg+Z2tFmrIAmg9Noit0hcmii6DTI0fu\nqCZCk/+WZrf53kxgpDHXlWhOKIyxiVgQyb/LwPWe3kOS8oOpiPhO5g==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:3eJM5AKZRHweMxDq7NE3zLTGpPrVfAeCw8xwv0s8s7/ooILuel/vfGaqYi/12dtFiK1+Ag5nhxp4fOiLRGpgT6W02Y5FOnxv4YBQT9Tuv+/Ypr1WlMTFp4S3SWdO+6iVRJrnJYZz0QC831hxnQ/PNiH7DvKXeZjqfZGotCRpv0E=,iv:CmzxWWpkT1lLevki8ZygCnXLXwkprWJG6giCzKWZtmQ=,tag:6DESpuEhSH1dKlxZnelikw==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:27:36Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ//RxBt9UJcnb5rVsV0XRhrt6CQ1bEXGTR/b5r+QRglCYQQ\nL1n5NXlNKPRk2vrRXcQE3q39dcc6xkg0LeVGSBKZKuE+9TG97KZQ6xfPUucWRQEj\nwaxgzHkZUZfZYlojFiHLIto39K63LjEYCq8KYQDMfOgx1uY2vEGHDdfpQt46zmhF\nSsMkCEDHAW5JPa+8JxP9K39xTXpz1r+M8+VyOacx4f5j8u0qdR24Lf5cPrGIOylh\n4YNS0MPxMAuXR27mblijVITUDhH4I8Zpr+hM8xa1k+1I4EjRtO8c5ADnjQ67I5kR\nE2ZrSaki+dubRYZ1XkfVrWVAmSs3kE/x3LSF9Kw5kQBIYtpZoP/cuRZX0F0OXwor\n8SDZCS8LYq3z9/zUK3Mi3A+Rfai1/eI5WJqhYMN8lSvOP73SLN3jFHkgUSILgE1q\nMapn3MVmQEtayM/CHDWzHuKhfMJje4mCpRHbr5PHzX99jsOKxpO4tTI8Cw7eCnFm\n1q9T51pSH+YsEX6lRZ1H+kz2s4DYcLBK4M5YWbAdm32X+MRi1kZnFeDyZo1d99sY\nd7seb7ITAb7lOB0qM5ZgoRczx25BbT94KEILIlpL94QtMUenuIxOA0lww/JScsja\nnphB1nvyT0wSsZlcPSHdV41Tjqk6FKQy/V96SHSQwZ7yz6SGJIDCUH3Rp1EwWg7S\nXAEY31iLhOLFv+C+8K7gWnm4kH/MFOx7f2DlyNWLAV+dzP7bo7G3YgRnJrG08mRP\nQiXwIK06/Vn3nBcW8NyDa7p1WZ6V3t9TfWOLA7iiEoz4EQYlCFIr6ELog/fm\n=FsHJ\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:27:36Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOAQ//fWq7EbsGD12yyZb6e7+BPcWJ6nNYmnb0E0eurtV5pBG1\nt/tvn6ZPT4noUyzOk4bhyBTiHaLQMMnrRNhp3wIpQrW4AlhvURU4shLrkRWmOPQ6\nXItYNm9REO40EHaxDC9YIt3j5HLEeNqRwgiq8m8kxIHZIWw12x6tct6TEgH+FmtI\nNIZyuPPW/jkMOcU8a49KlgGfDYIr78gZGYQYuFxNbCc38uyRAXa6udM5079bAhzf\nfn5qZcdriomQq5r5dhB10MbllNkxP9f2p/ia3vPKOz+hS3GB3IScgvzJrpkdnDEa\nVmNEWm3bN+fpxA8E43LSuR9u9BJHIQjacHrqDI3Hl6lvuvKgcJvrxK0dxYwAxbPE\nvFdA18kn4HxUbRxwH7WrA4weozQDFamEtIyO8MqtGgz4MAOf3A4cMbbodSww2OGJ\nWjjwtEf5KB1R5dpNqJcFJ0OGQINAp5+TFrOOPFYcPsTBVvxiKToT0XUITbcZILcy\nhnH2Jgu8yngQaSlqLHcwaTUUmQFMxqtp9mntjAfirH3ZjEessr7b+Wj0XETBMr96\nRR/dxUAysXcr0RtKct0enpUgeuXpxPwULBsczQCkP1wULQX2VOtbkXZPWUy5AkWV\ne8X9ElcbqiVCgVQKpAjjGT/seTuo6e18/pa2a6cKLTtgOXzz56A3fK0zAu0QKArS\nXAHa2408UsGWmHTVVMFJRR9KorLX6wcuRDST0VneQnCMpLKKrE73sxi2GLES9Ddu\n9/P8AnBg9MZYv58sYie1mcJFQr/EugKWhgkolzz1/l6KOHDhWpu8i0ME6ogH\n=5eLP\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-backup-key b/systems/palatine-hill/keys/zfs-backup-key
deleted file mode 100644
index e65c74a..0000000
--- a/systems/palatine-hill/keys/zfs-backup-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:ZIEsrztgVYaYJU93rNUuoaVLalV7ZeSIqVtkl9SZtWs=,iv:27ulcGcA8QZ/uOrvwmanwTfbSAk/dEDEIq3aDJy9an4=,tag:8hf4qaPh3LwDUhkQA2XXXQ==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2WVBxTW13SmtNOElrMlRZ\nUUtBNStOUGpiVUJrYWF4QTVRYjdyMkdpNzM0CmpTeUhzRXJxSlc2T1ZNMk9HS1dF\nbVRTdEZ3WmxVbTdNYWE1bm9QT203MFkKLS0tIGVmcGdlbjg2OVVJUTNKZXdKQzFL\nWHllVS9mRDZiOUtEYk5BTTJha2EyVncKMMRWiiUDqiIIUStreYUg71gUk1/qvsqd\n6Vohxao7nF5/rzwAhVJWle+niz0GaxJxQpYCR48HsmDqg/y4ilRepg==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:xIuwEx95QQw21edo37cj852AQXEDZlCqhLQZ5hs/kZHfi4E6IyRgw0EomRHhQMyMOygu57dYo29XHDH4RDfF/2pES7uMx5CufcE8qfoSNtN8JSXpyeJESPBnA8aUKafSkySx0Xc1pIVah0TGxeGhwJY2XiLLOjozl0xLXLZ6xQk=,iv:v9Ql+ERhovaON6yP3goUioz99Eso4St1MyuFxV+x51s=,tag:u6mw6IABsiVYskGpa5oRvg==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:29:56Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ/+OLIrOqbanYmBf6kvOxFyEYtHFFPJ/JKLj6/sgN10S+oK\nlCU2n0VTONx2T2ZqPlUix+Yg11FAjcK9GxwauoO6EDyYtIGh104frTgET5RUanIk\ndL+kh3u+IIv9CFtJC05TxHok5gz0ArNo3SurUuMMZ08ttD4+XXa6SzrDjkEWDbKT\nIdSngRwXHaMxekRbVqt/kbwBiBwlKSomRDgQXF2F8iGE/zN694T3r6lFHC2xY4Ec\nMIeKRw3Ye1y6M/p/w8iwb5uphi1mT8+JO5pZAE/z95WvwUDOBfliGZkVeYbx9JtM\n1cDhy0Bf18KkTDCb3/Ik5wqQZ+mDGhyx4QeH6yMO7zgO7axzAzyuG8RvupwBNZzW\nlhOqOSpSpD8xg0fpJmjehbgJMFIgk+jOApsud4aYtPUN0S4m/42SUPYrForPK3ih\n5oJXJYghJjlm+ZlB6BG/fTcNRaw1qhtxF1RCz9T3LWGUDUh79m9wKMC3AkbGeEiO\nqCMr4X+vEc8UvMAjm9Mr7eHgNq5OHq0z3J4XZOX/hYZA/l9qN3y7fRye23yaL2qx\nIUOIDLZJXlnFNc/UQ7w0rZRlne0iaQj6Fr85QRsHTppjMEmJnxg3D5VcU9TDvU7o\nbcDsjP+wtRHi8l4aQztsdCeD+3AbnVF+nhru8Gn+3XWmmK6H9vWjH+Mk0p+N9rnS\nXgEhKQpcKidjyNNaVf62JHlFT031rMq3kkE6DY4omypTKegNbX7BOKCGncw0Wsd+\n/RupIZOL/UMgxYs7wcFpx+herEpfTLDtItbOJAPm0I4Hj/RL0WlzFJT6d3sWL1A=\n=0+3w\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:29:56Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAAtpvA2X2ncC9NPCldlBC3ym7p0i0cQIWFNw75NXCk+ebS\nENpVLcpYxR7Vs9jcHV/7hvDUKw/G56IKvAUa158+jruSA4XdwPOQ4d5AwBMqa6MU\nQNShO4b8EjHLCEiWQTbl6EEuL6SHXoNSbrD63SF6stlgpAAJKBJIj21IDPUVERJh\nfkK5plyhv0vnuyL3/Ot/CCQ71ShEnVb4ebzsXGSXq1oktzzmxRIFkzJMiGfvdl+5\nm8OEge/hP3BL2l8GsVnUftC2tjd3WNwVUvD4zXTa31vHVHdrEj5UaDgySmLL0LJG\nOXuRncXaBFK9yeakrQHB7mxnzz9SSf42RGP4JXIOB6f8f+2TzPcuMF9EPDuzoxEv\nL4DDoWl7rtZ5DY+lHV73243QpExwLhanksUfTA7zMpMPi0vP0j7ZZ9emMJ9Q7/22\nxKnTKiTdrUUZHfaUa5UsEz1tqV0M+A5lU4oZ6Djk5j1ny+CKYKq6bH8qoRpGSQGp\nYlq+aZiganOCxXcvGPS4zf1U5HUEP+f64TNs0i2zLUeRd3zssM8rV/CJj3hLYryn\n3SGyrtwDHIj2nEktEDXUTgn42YH6fdlh99nCfx6L/AhLS0Lp2bj32VnjUgBwfY+4\nB0C6Jm7XZvaWhlMmE/KaoOY3RffuibPZo26wCKub3iendzdLcYiC/zlNVlirsJvS\nXgGUhxwvAbpSHLurcEcXQWhr8JHtmIotucHQ4iaEkZDU73+udL9FMf2K9M1JklgV\njCu/2m7EXFTg5XbsQU/++GX4gGWDzmpSNWSwRBhtdKH1qJZftD2ROg27odP0VCA=\n=GPkM\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-calibre-key b/systems/palatine-hill/keys/zfs-calibre-key
deleted file mode 100644
index 039fe84..0000000
--- a/systems/palatine-hill/keys/zfs-calibre-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:ENcfyj4fd8zfTbXWvMSJ0xa5wRmJzplr7bDsfce5eQk=,iv:DLDA6nJGvE+TatE2aO1zGnAc0lZmpE0oQD7ggzJC8PA=,tag:vunvPA3J/Zy73q51wW049Q==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0S0syeVdzcUxLSE5tRy9r\neG81QmpQWFJZNkVid3JmMHc2T3RYNUdSa2lJCkdFbnd1cHdzVzdjY0lhQ2oxNUxo\nMTh1STJEYWlyMEtCZ0dXWWtHZUtWTm8KLS0tIHpDZmYwT3cvWmZMclhxUXVUSHph\nR2F4Ty9kQnNwUkNYNXErSGQwMmhMek0KYwORT5ZfQbvyuMupijK4neUgql1cYLri\nPGbKWMeUNXcXrOtTGoMpXoXcwqirSB0+5baIII0cxmWSnSvchmiZgQ==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:tqQfihnPZgB6jn2VXoRxrjcWGnIy7BpRWQVnAGoP1UvfcWsS5H0D5tB3zIHvLqe/yTIPE5iUUuBfeDOybexjl16es1SZr0qyOf+9vf489TOd02LW/33tv+jDfw8qIwuMGlfr94ZEh910SWOrFbYQbvWEH7nymKUkEANCnlu8KpY=,iv:y/kd67yhHcSJFXFN0MAx+10QXtpVz+g4O+PYNsoSwYc=,tag:muhrK1jpcTDapSPTnSBfGw==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:29:57Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nARAAsN8UTiNCUeoggyeiPKGTeAmOjqxn6zk4HD1Y9WIIBivO\nsCCpUmxMuyuWsmYgwZXSJhx8ognDBU5YS2/SzoD2Cs4k01kgZqACVJQEmc5w8YYS\npczeG15SjxKVLgi8zan6u9FuJLnhkiiGAHt7byRz5RKUpSQ+KOjyFCLnN5qwbZsr\nKqdDCBiLvba02D+oXRqBjpBQe1mSdRXRrufFqdNZ2QEP/Ws3H1t5qgFZgeAmKnhU\n3tFDvN6Kad27VtPFcspHetf81c0UeAMtO5inzu/9kdCwD95IoAtU56+WS/5RTLEi\n+qglLz3A9kHO5hLigw2ywH+epyDpxAW9dd93XObtlRUggoOynQSLtNkFOXm5bJGe\no9p1LjpB19vdk2mpVt/J/+IQhYS2OZuFtIlBz4hRPe0XsHhY0jHtB2WT+CKsiUxz\nQyVcLmMiVhaJDXS6ixGmSTlfb+pmfo0JIUsiBTUeyi6J9CIHWHRQi29c3B+HAHG5\ncrkzdVcvOnNMu4M/QbxJuQswTpmA+TNLgYa2Ap7DzWIMKdtazwPDL+Dfr5VQ9UCw\nJJqIuTCtOcBNeX7oyzMKSKPad7g8SG4AuZyaC1bE+dRP/FQaD6Rnubh19C6MIBVT\nUlObImcW+03/cKddMthyepja2gzpkMhJ89EdavgFDBd+BrVuYc/eMDkFZSU/QZvS\nXgEnVaLeYquJAMmZkfXme7RNBIrlD9OY/vzdvXXmGm983RAVpSk8HLCoJirQAc+B\nfJZiwlnxZKj1KMwCBytCTrN4yCwCF9kH7D1QW0Z6IME6I45naDLo6l/fdl5s9nQ=\n=tGYu\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:29:57Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOAQ/+O5+c2BeGAmeiI1JQbfWeLNA3bvniHgQ3tyhcYYmyADIP\nlMIxjbzYQRR7dxixHP9Eh7d4cAq8+i2JbxsZmm6xP2YTckNH+MAA1tzFmwiLMc6l\nABwmU8fSRMef00f533yqPYWSjvt0dtvOch8ILa1Yjy/hHiCACZhHUiz28ra7uUGJ\n12XaiKgUNPWD+ImHMwfEExPQTXc4/vMWnCydmLA73SizyzvRzn0GRnhtK3ydq8jo\nDK6BTIFCOKPHdcbgm/dN2HHFyj2xLwm6ciy8+Q0BmPYP1xFLWztl5ypLqNEiOEgO\n9akgwZyA4l1dzPhWNFgETL0MsdNuSaxVmU/QsgHBn9LTeAfpTPazFxZGiuNUlJdU\nLO3HJWLwVTv/9UuLSRB6wfOmIWVGIISFPFv4TbGoBdbo/41yYVtnXaPH4eEW/vZK\nlon0HhkJtG3emOWj/Urwz0lhLA1Svp2aqVC0ebpeNnsYfFEPcRemRnCf8phXzjaP\nqlSVrEp+fveIU9SOzZMELiOD2LdLmj+a/pQLmTtAFq/e2x34wSdfebwxYpzn0r3f\nz0Zl9hAOvM/dB+sU1sNMv9pS4wksVoLlMDbjaT11VeA5Kkgz2KpZCgyt/duWF0PV\nFMHIww6uvldW21GDD9S4z/feZpaotC7x4OwwxPXolOact9t3uZt23Ct08/8l1LrS\nXgE3dY6kzMOXpEyalNgEprF2P3r0Kh/av6mGtuMw71YWvvNEzC9QUHP9EzEgtfuG\nDAzDGii8BeoA/vjw8u89ffqEK839ULCg3SYdjnCtXpmyVgConLshia3b2iyTwcs=\n=VRVx\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-db-key b/systems/palatine-hill/keys/zfs-db-key
deleted file mode 100644
index a0f0a5e..0000000
--- a/systems/palatine-hill/keys/zfs-db-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:yV9jh7yJlXhPApTiY6ktREqVUebyYuQiVWkzf3J/Oww=,iv:U1DM2CTxjV4h31BdXpTKyFnY5bepqsCYzUDGW8k/G8s=,tag:MZQzI5Acy8XGTIyCrUwtCA==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVYjlCVTVZanEzVnl3QjFS\nOUZFcGt1TzJpa2lMN1ZBYlZHT0xKQW1ZdXlvCmhTRjVHTCtER0tSQXNDYlhJM0Vv\nQ3VheXg1WWl0NmkrZUYwWm1YaHpzVXMKLS0tIE4yK0NXOFF3dDJ3YUdHbE5OcS9z\nUVFFLzhYMGV2c29VMityNEVJNVl0bUUKNyquKj+Ufk5l6gQ2UYcqHFsqjjNpfbW+\nROpTpKjmI4EuOyAV4VwLaO1EQfLDyWMbBgBXOq+HgsrWA7AGXDwA2g==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:Dq+wdw3yP7dnvNJz+JfwqZosfRpKrfuWF/q6EdTsGeVsM+zPI/6Snl/sV6N8oShv5nDKWFV/My+WJiOW4CwdsSwvXOKtBfB3P7tAPfDI8Snba2v2hGyaxg7PVVLb6G7M+PXY9UNmIM1MyHcce9Bk2i++7fP8cGdx0szggeTduNo=,iv:qIoZBHm3WPn7Q0S4uE9a7+AI0kKLc54yig4++srb7UI=,tag:UpeF3yToPj5Yu1sQ6i3Waw==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:29:59Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ//cyWCmjseIDy93aDPEseKQL/m/q3yf8ZJTaxUMS3YNNTc\n5Xqhx4G3ns2oRF5x3aTi/XN3w//CVxvsMHyXFjtp3kj6Qas8/sUE1Zk7oMQiyPNC\nXjGgAT+QBGI9E60kYA3Bj7uU/0DwRmUqBORntMreChCHhThkEYCTO4Whg616GzbM\nU41Y7uFdBVB/1+cN+jJbZvkDGoKmN/NawNumVZeFNAQA8NEAoemrl4FvPK6ap6dM\nT8Zp50pa7MPPKWfLICMQXOE6+7diayOMHgmD6cJALcakdi0KG4d8vKDfecrqojR9\nF+LS2/QyBKhbWMH5ydc0MkbviVbnwz3DOQ6UOi+1aUdd3XgxwS4bauIAjsqyYJwy\nKLAhbd388Y77EhCq7LquH9WDyKgpE4y+2tA1Gykutr9h6wuGLDCNcTE7ftoTnpRF\nuBtEpvtrSIdlo/ssBcH8DfWmDCvFonJlNv+3W9QgWdHKRfIOvX43LknJmVkfw+FR\nehUEszKxR5QmSf4iIQu4+Bv+iDdOHe/U8jS3Ma3V0mPPk7u8vkknE6jz85fKIjII\nGbzacQnNBWnKXg+A7bWjZi2fFxxiyEb3rtocAo7Ya2ApBQ7KLf8qTnLcuHkUYa24\nW2FRLbcqs2s/1pi/xqf4plD7pAqy+QEE5SdLyXJs/163cImcLOEOx0Y2gI5wUdHS\nUQEXI1+L8KrDWS1fMzhiFm6UQ36BvmW0A0tbLfN6QPI4Giq18onc0VPPX6Ro4SA3\nB9PpEkr0+DHVPcysLjgrPfal/NHeD+12C3bx5/WuLMb2qg==\n=rTsu\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:29:59Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAAo9rHyIZiD809kZIPDKnuJO82BQ2njhpH/vsK4T1ZI0oj\noU1+B4IGBhtZxozluZCvXDNa0UN6w9AFsl+//lVG8PByw2tGDBCW25TiVueSq17g\n4xW7dZLnMJwxleK8wPhMcmyruDJJ8alrHnhHNX26KxP6W9jnVP3OcttN8eAam2n5\n2K6GdSqsEAEJfDGtA6an8b+e5TMAhfHVrMnkvvovMpA+WQnO9RPyIz/81HcsNaVx\nNBDMyIi6WzMHI4cN8x9wxN/cGX4dhvG3gSqGwhxLDL9XqAj/YMYt8uMxyfQ2W8S7\nkK0tjmEteQNnwGy8+JPW//WhscmHaUC/u2HvfhS9LQYaqImve0X4qSQbz4vZmiZX\nHVBTZQPFmYMOMPr2zyWqOlXtxNa05E4X+IMnEPT2QbiFE5uEWMHB+7W7u6QIaUPr\n4SN7im5oEJl+ztj4m1rEysb08xIFMdsvzg+BWR5LvvaISllOSyr510dWMt7anakR\nol9Pf5mnnRuQbjPOJxRkIfcZHUhiEloPJQbTZSOjqpdPVw6fVPNZ0ffdtB9FNrLz\ncXJDaWL2ytl1EVoLs11IatXdpucJs2o2Yu4Ifdws8Hg46/bXuxcj1/Vzhw8jVPcN\nTn3qUhqPytt4mAxt7w9LuIgOBsCSXUV1JH7mRUqJ84Nrx9S4fbkdVt7CkammGD7S\nUQE+hC9aYbHKJRHClWoIEkIxjRmDjRGAGbM+KN0i4yRcfYRT2bgKYrtODDtBrz9W\nQO3vB77EDMExtrEUt7ojSzmQGY47ydycPqPmh/8WvEXLow==\n=PSVh\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-docker-key b/systems/palatine-hill/keys/zfs-docker-key
deleted file mode 100644
index 32f8f87..0000000
--- a/systems/palatine-hill/keys/zfs-docker-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:HTOTPrSNnEbjiNJ2bQa51ugJJAfWwNciFS49PuvmEtI=,iv:Z+hlvZ0YuXDDfrE8UyLin/xL+CKVrkj5trReox95oGE=,tag:Opx9PL2GxTUOCmeAOK4bgQ==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzVytGMmFsby9pRXI5SlBW\nNWJnanphcGVwcHRXWTNyY2Rjd0dsMkJUV2pvClZNY2dDUmxjYSswNGZjYkRyN1Ur\neGdudGlQN0o2Sk1jL1Zsc0N5Q2FnNlUKLS0tIFlCN0I0dUxQWHRDTHBDVGVwaVRG\nZkRPWG5pV084bG5hdm1pL2w2Mi81ZTAKWfIHu1sPLzucNGsudu/MP2nn9YAPkk5l\nxZNfK1+a4dQaEI6YaurqoVgZ8tes3ZFy4XWCtw8AjcoI3WTPJEFYmQ==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:ZvXM90ik5qjK8QnNRUZex5yQ7EUxk0WyDfNAKLqu4fFZuS9O+V7KX5ShaFMrilHIQt/Ab2G/s5zwbgxE6Pi9mi91g8MA5y4vtEQr8V07xEgPmKWCu+rIcQdp0ssUbiapo29XRmlwvaRFiHJaESYpYzjsNL37TLpTpIfIUp9YC0o=,iv:dXI4YUSh8yhLYLWdek73bzHFhgj0J1K4Wql0CLedepw=,tag:WZwhN5H9o3S5zZqENQ7N9w==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:29:59Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nARAAmpJUl5LDm8K2KeKLxgpPFCCo4kal64ZPy7iBx2xV7jzo\n6+S7yFqoVNcA5Xz5iIQD9eokh2mj2HBfoJwrLHxXKzzPST70yk/eAU7ggAM3IPVy\nPeTSSXNQLOB3Htp6zcBdMJpudwtx7hJ6NF0zRfA5GEODPwC1Tq6QXGMg6YhnbS6y\ngXj02Cyi/AS3PyFAfCdlMZ8v5KJcQF80Mdqoqi9oEt9J8kgKmMg7weQsUar9kkv4\n72FnKCadAPnmCOP7So0Ijtz530IKKwwy89CUQJ8Zyw3QEDU/cO8pp2qlel+uU8cC\nRscV1eV5UUHrRNhffjwmd9PG27ixXduGvUKx3IQBvVUpPQ8CKNuuXCgYfD063czI\nSa/YvdKWwGk3moNmGgXxLrCckt6aD6zbjqLPARYKypdiw4Gk4XkOx5X/9oth3H4M\nIor/hJgY+6feXENJwqkEM8ovjWchQwG8PMRgdRZPDJUgv38Dsd6SEvcAxaXS3cHB\n0hG6CueUj+kTLgyEekq8HITJ1figZpdf6Xe24Rxu5bpKH5m5yHb/dZrW7i3J4W9u\n2NPaTotnALgfs75JXbfYPtXbkgILsFcixw5Gqa8M44yjs4TrdwLVgjMEcIjnIFuD\nP5Qq6z7TTpq2r+W7/XafdSK5KZ+ptE2TASKdJNzOeep7iGE/6ILjaOr+M/6XbDjS\nXAE6prh+v/qx6U/tiTLCY0+1E44CtMc+5ECUr/5QN1mbAyEV+zV0tk6BHyPhK1st\nZRSigQV5r6ui417ObecvNNSvk+7UQVyO3KOCcO8aMWFS7g5BGtQuCQZaT8YK\n=bxEL\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:29:59Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAAgYWvxwpxPfQfGaJb/MWoDnZ3SUI85C8mOFv0FnWNyuMN\n3k9tiQIejplecxdIjs9+DEG9VIkS8l2HR18fWFsoZQmVTgJJiPSBdQuIhTc3j+8V\nIdA5VMKW4DSuOYbpDUlDTaOHfg6ah2NXOuOZbgiaGSn0ikw6RU/QYreKKGKiZ4Ya\niFpftA1jRI/tQuJRn68/O9WoytEK3c7tXM9nNZyU1FnBmyPuOqKypn9nWdNFqrIJ\nWA5ktQvaX1PW0c8F07G5YwnATN9haH6u0dDUmho51p/1PNGCFRyj5HazOV3Eueep\nRPwncz69Kb+Cu5gubUfKZTTogAVqmvzR4fqycIVwsTXY5K7Pmy5PEYuT08Kr+jQZ\nMaIrEJctWxOSAoAqwsHzVVPrrEkSyv57XXyMCYYR0gVPxKMqcUvZ+npb3JM+XY4V\nptWK6KCC3wZPaVjkhjfxIGwQttVmz9wWOD/jKjmhGhHYZRdoGNyWOIFiUnRF/cV9\n2PMhc9z40L712sud3fMe+TnUgzBe2WTOjZ+VYKkYqcfVs0qKxQiNMXRuesg7J4gV\nM4QE8YqMx0bVf9rV2uusPY72uGTcUkFLklFbx/VFFxRjX7sUeV+VedR6xKUcJIYu\n1wsrL4xQClwWvvqKZJmKr+wTImifI4RWFIu5/mJrkcFFJ5ox9sBdnPmwtnUosDrS\nXAEQ1mAZ4+U4G7jyJYLsEANQCo2bjdqKSuY28LlVh6HKcsodWlawMWmWKWQW6v8s\nt3k591+Q4Kdr1YCXC+tFf/VCFLYx/yJhoDS1erwmz498SNWxCmkbAWmuoPCZ\n=tNv2\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-games-key b/systems/palatine-hill/keys/zfs-games-key
deleted file mode 100644
index 01bc81f..0000000
--- a/systems/palatine-hill/keys/zfs-games-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:BjADYlVY1GEGULf1p07IJPdXoxrUk4+ILv4ZST0UFLY=,iv:tw0Tbq1gXREHtPcWzSrSbP6vct41qi8LxYRqaPGO4zA=,tag:cazaZkhebxTIiBthWKWWYQ==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWdlU3WlJWeWFSWHcrRGh2\nUHAwNWdBSE14YTRDYkc0TTZVQnpFWGp3WFFnCk5RUm9hTDJPSVl6cE9ud0tzeHE4\nUkhKS3o5UUlDaFpTVnRycGovc3MrZkUKLS0tIEx6d3lkUHdjQ080L1hzUE41S3Zx\nL1ZPbE95SUZuZ0xHVTJHN01SR0tmZXcKIdPA9UPq9+ZUjncwjIgEuBJlQk5iOjsv\nq7U4ebqdqeioiDyDl6cJE9gaBOIClhKYe1yy4mHYvOJ49HtWnEjanQ==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:8Y6goZP1qpuj+JBSfqNFkyZFMdZxnaE+ifOQjAOmkPL9cY3gVkXOoDUftsQSWyNyqbMwjYXYqar2/jtaOwAs0P557rcQp2736gVulzGi3VMJJXegEgsmg7DV+Rrfys77ZkaArbyT5sbkWAHS4xyWsS7j5sjjIs2Yngcxt+2TCaw=,iv:GubeHP/WhsUg25LwNyZvOJrsf8wSwDZK/fmmkyIHWL4=,tag:s3ojA55TMVO183kdzj89WA==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:00Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nARAAjlz7eeBGESXrW9f1xEUrhI3z27Q2T32cGRxgecrRcrv5\ns0VQj1TAgAQbTJ+GQh6CF8K0wZMb0TQkO+A//A+suEaSeIpW2vPFAcnysvikoekJ\nOR8Y6xG0BV+PQ074J3n/VxyL/PqcztpNHdUS4QEcXO1lBvfEeTBq+FyFRrUUusAu\nZm7U8kUKXT1/l3Q5kRiEkjAWLfJCtfNl9vh+tTWoXUKP4Xa7X7Z8aWfcKT3jxOcz\nIBPh9fRHwZGr3jHRoiqZs/QnER2xJgRgAch91aPwbEnx69QRUuSECHHKnT5N60Di\ngarN2GZrI5PSlUJ/hFz8+NE1m8/0B/WPnOJc6oRMblCftOc0E+ESHoxVuxsaE1qf\n7/gPS3A+9D0NgclnPnV8SJNcSNZzLJb/a/gmC4cmEmvceS+vAPWy2op8U1mJCbEz\nzIEADtp+m65x5Fxwtj9GbR3MRScd2dOJMeEj72qxkfdlY1fxV1g/08Mg8eE45Bcc\nIUg06IW6/TeJQsB3oWEngGTlWJKHWmZS+TL8jCBVSqJ/yvjrLwb8fm0lLvZUYLky\n6HAsswLVfcMQV4s4RGbSgOmSjxLoEmxOleES2r/9G5vPFMwYsGLnqnD8YG5fGCH6\nPpHu/pav2QGW/tOIGclieJXB8Kc4DrGgR4FQKqk/s0OU5KJqLvxKu7oE0R+gqFvS\nXgFklhtMvK9cnOqFpecermG6LUNsm0KfzpdehmFWFNkOLWpBP3I36kvLdZRiSTUA\nFgApol/tAuB8JXX+OiJ0/c1dr9czKI4vI4X3YYgKqysLcmGCSGtZ79NS4OLPI7Q=\n=JXLW\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:00Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAAlzr+nEfpGy5g5GuOjzSTubqouSrN1GuFMeEp8NMkkTrX\n397QqCQs78ekWaRMVFTtWMWfDmAvaf21p/vBkLkdtZTJEtjnPdpbrWt5b5q+3/Yy\nUkq8pcKXhd+mBHFrEy810GRsPEvCR3gDS3agsfxZyTy2te//St87rsuqwagdhzZN\ntqzc3gB3AtZZq++RNuHofvWtFb6B9aAQ84pL1gduTBQaQiQuw7F6BhhgBIozKRfa\n3p5F+et4beilMzyWMAZgWSg1S8WUU5dHp2FyQg5o/FlPJPFXzODQsMrJ1TIatKje\nJDO7C33pC7CSfxNXAAMzBbjNW2SrU296Lu0sYnkNNx55KEW2MjNRTJ8/NssuuGWC\nrUxx3rdGWb0zetZF17Sm+555Yn8Ro6fhWyDdzDYkoYOMwkcHR+mG605kCmohRad2\n8dm+ghcuwSkNhA9QmFtV7dLXJYDrH4FLaQVIbHicVhiN1vaIBKCgCu1cXTpCrVa0\nWRowf8WOl8rlmo/kQbEqAktrc09YhBS/EhRd0izD8/YHiK89RCaA+d//tfN8eh/D\nCTsca/flHxIuqYWitzbXrFmCmxTtTRWBpQMCgEpBlHDLke2/ctvJPDFcpaG9+jl6\nIoWE3/XGU71AL7u5u1Vfg1O4jM9W5V9mkd13wAxzeod5pFssMDvJJji6WEC2eQPS\nXgHK48pLy6lGzaRcLTOwSRugItj2KMHVRYpo3CG1QE+vCXwsz7DQcjzAwBALWotw\nKtVMgowaLWyJ8ulIOeN2SezKuObPZwBgAviYz1yYX0OFfX+KlBTFmH4Dv73Y6Xo=\n=Xu0R\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-hydra-key b/systems/palatine-hill/keys/zfs-hydra-key
deleted file mode 100644
index 370943f..0000000
--- a/systems/palatine-hill/keys/zfs-hydra-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:/SvY3GhriSgW/nFjDcCXq3pkVYOZwBwO37P73CL9Uv4=,iv:nS27ev29GRCDcAhMkBqb58O+JeYz5IT1UFDMWDaRW/I=,tag:c8MsgCoamwH6If3XZ8OchQ==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6THR2a2NvcVZVajhxWDVv\nN2NEV0crUjRtVnNGL2U1YUhPbDFUVmQ3UVNvCnphRm5KRnp3RDdoczM2L3dDSWM4\nb09aSUc0RWMxY0ZaampHRnQ1dnBFUzAKLS0tIDJKeHJ4RnpCNzZpN2RKK3Z5Q2x0\nRWlIdEtMbXJDb01hQmNmWklCQjM4QXcKOHu7SUn+9wujSwlpLFzvpqYycLj5LXCX\nN/WSW7udTs7lS0250MpY3JQBhfs5kcx4CL65YdlSUagR17zP5OA33w==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:VtRQXx0skfx8/x+2o5O25JC5xwgdEpjN+Q4YJ+/n30N4Hqi2qD7xslWzANtE87YEa1KvjDosHMjPNcAf7AHL8Tj6Ue0AaexqWBfYh8sDSIJBkCVMLIebAFs/Vv3NG/eiUbWOQwS27mV6kM+z/UTudWSEuQaDOfZLjlYkIwl78l0=,iv:xbzt98QY0CraJr3yA9OS5v+SGGMOtsfnpMu3gr4gkp4=,tag:txzNe1DHdbCky+td+XQ6gA==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:01Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ//dVWN6XugkTMxu6xqGCnKWs9qnxWnTc0dm0Cy4t8KkM+R\nB4PfXNwyPFyiE7ftxhxvvbSl5GrxdTvUY2uCxeI14e2VmmbPOxSzoRQoNL3VADrS\n4NqRT1YCnwsN30vMdN71NKzk1wdcOxl2Kxb70T0xYRbn/SubBDIEW7f0CgyONAEI\nL/LEzLtUcms/Hc5WCZzOCHHPwefuyy7ggiEOHyDKWQWD6AnDKCdEtboF7bGmTaqy\nJoZXopix+zBAKx2JNfZRsi5zJ60jTj5ask8rCThhgJxh3+GGxqpPoT3Mrv0r2IwM\nv0pePeqiMit93+hWexNlsefQhFwcgtCVwqWL1taESxHS8bt6ShrrXSoZJZDhHDC9\nSJLdg274end4XtUGeEUEGUnRCmeke+w5QFVUgJP9YjDguFAZqtSFHP/DG+1sv38a\nT3dZ1DGjPYoa7APjdSHxpJfG913oAhrVsYn0nVDRfTygzl8JjsGydp0azHqbhI27\nWwd1CuyCyswd1h46mvP1HkGmeIGEFcASu5cFrrBQkochWSBn1yasJ/1qbM5zetOF\n12RsYCeyyr7IrBJ5QU0fNhZMqDRVh4Bo5G2H4EP1AjFiDtt13tDH8fUirlmF9s9S\nyRsG/mV/TJkPcayMUlJMRdoAvIY6KBCXcruS/brYtxfToH5qSGwt158MGlhYgHnS\nXgEJf4RwzqgMcvvKI5q5OAZdFIk6cFcoRZVfbihb77yGeXmLHS8aLD6yiC4kidm1\niIp7uZFSPqmguQB8+bj2Q8ZpHfqD5iWGhUEea4BThr1MyCHbhosSsB6LkV1WbzA=\n=7tpx\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:01Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOAQ/9H6DtFfWX3yxcIZxWGqYOJNIpR6THeTw6yFhlgXtX3LHx\n+exbLPTJzST3sgTJRtCdUnCkiD83D7rS+rWE2hGog7O2i82S5ciLW6v7AsbQIXzR\nFbS03hJKJ+QzXERT+dEqAT3PkKe9cWlQ0EiIQb6iNMFmgbTo8GdEZkQpW5A3Jggd\nhmBvQwIrMHh8ViTxHptVsWRUNrL+bdqyGsnutlngRPP9yt1mSEujLcob1Ha21RuS\nJcclcg93zTLfTZ8dp3KebVx61PYtcNIzJxJO4/7TCuoOa7qIvLu85nO0w/hEk9dS\nU8iJ8Lj2c4Yv9hKXaul/3tS491qWzOHVN+bu4Z0bAnOioCcRS7mb+Y6cZYITB7+r\ny3lsyUJMyzpQUmgm9zvOTdK+t002rnjGtiyT/Jf9BMtBsl6UN3x5m8DtFFeMpr6/\nQXg14tvvaXHVfRM41xTACDQmu35hE8MPJxB/MIg7q8FXQb/ll+Qu4yE2kEfwPio4\nc3+5uOiTrHNe5LFIL3u2HRqPuIXZq0UnChkY79WH5OBr/6upcXOhm4gFZzqKAlHt\nZqRXArKMqJFxe5DglOCCuLYSxtZUcdQbdJQLgyrq62yzeMhUJoBo5lxVH7v82/ZA\nUh3KOCrCCEQyjvaJ0LkopkUEPTEhtw1Z+NhPZBMYdM5tajbiPmMdg3D1zHiKRX/S\nXgEexql78jtc2gLNF+5/wX1nJRkVVSuxuoluFcdO+jEzYG8cDldVKhigNJ078EPs\nS7tPft7EtpMm2MB6DWrkfNjejj4fQ67SDlDJ1xER40WrKWYpvnCL2la3BCpkxvU=\n=b+Bf\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-libvirt-key b/systems/palatine-hill/keys/zfs-libvirt-key
deleted file mode 100644
index ab2979a..0000000
--- a/systems/palatine-hill/keys/zfs-libvirt-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:dBSXePTzwsVsWBylfht3q2MWf9tP1IK5PeOIK3BStWo=,iv:x7R9qhOEcNeA9Gq1WF0qkQpUOAo03/nPQRqcXuy0PnQ=,tag:1nQZlFRUiueJqfFEQj2kvw==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzaWsvU1ZVY3U2MXJRaDFY\nKzNqOEtIWWlyd3JuMjM3ZDlSVHZnbFVXZ2lNCkpvY3E3aTVRdTY1SERGNHZHb0NC\nSk1abCtNZzNpYThzdTZqNmYycTJRbDQKLS0tIFQ5OEVQcnltUmpRaXV1UWlEQUpj\nZjVCRG5ZRW1kVTZvdG9ySmt1N1paOXcK7+H5ndruGiFg8ECF7BWgKoC4zb1zUCcX\njN6wMHl7mPhy4x3QU4mpSqdPeC74bbd8yilUyf+ttGC8JfbdBvmcqA==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:rg6j+TfDftrBJ5ZoIybMTEkL4X2IyXe1MctENCUEBhj5sjUHecOcF7ZVHsFUU37rcgfL+7zZKtlRvZWws7FCaMayBSbsUsesfM8NrehoOT/eXKHj7BmsIDeGVaVOknXcNyF0o/snbCHdgLIshkNEPI2HTTfBmF62RViWZaRjLkQ=,iv:Y1prLF9n2Tl7aMRW2aXsG1adns0PAoSQQlRIci37Fns=,tag:PsDeq1r5Bs7CryBShaQhbQ==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:02Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ//WZs3SywuWraaxwJRA0pf12uZhKp/IFPxXDvnDW74r5sT\nhrL2BOo06FRNYuChuoUMdu3E3ahdGAKdW8IxmXDcvl7b+cQchZ23ZRpdMwT5fsI6\nZTaoYN1X08KYqgWZMMJg07KYDoZTFYyoXkNr0KchqaE3SOPJmuXTiKQHoMDpTQqs\nL7y2iiXCUQRyiaG8pZJF16mkVRTiyOnUgAvOeGBe+rh88NrwX92E8IvRxfDdiq/0\ni+GpovaKUW7a4NKTLkYyCQrX1aulq/DbASfkVU/NYlsSvUlMk27LSe2di4Hkg/cz\nN1NhzN/UNd1P0HfBDHLBa8S1CfJU8t/XY1atfyBWGkZ03L3N7HaezX/3SXpty1R/\n722gu7XiN17qYbkNl8uheaGGa3Z/c3fdmd+P4Bt+j9zkXRQFGriNfqBR2cJ2bprK\nLGg7xIzHDW/TO/ilR/HUoNYX6dKgyal5HK8laESNjvjSXh+LZwHBWAddPVzuc739\nKsRTZSWjADx+IiwQHACla4Epl1rgUemG/nEIbLiZYIiQGH1XM9e4lgySTbB/0bup\nCDUoZDtE0GLJefeWbWPGwQs+WnzvAKGOpO/aYS4f2sBNmKVpHVUiuX/0+ubkU8ab\ndI7q1+k1t5SMl3UqNQ+N7o5Ah88tSWNWbRXUa/iQPUYCJwrDHqaKoCSoGJo3rBXS\nXAEtxJ/ZhBlwMDb8VbqFnltaVeKbzAWvPLhYo99ofZVV2HdkszMHU4otvyQFBpnR\nH/qF/LbFc4UbXSlFjNJYgOCGlVEQK/TYboIQEanBY0d0/zwQHrGJI1wXHSN5\n=lg9L\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:02Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAAwDW18irq2aB9gcSpg4RbSZY4iHoN9+SvDoX12Z6cO5KU\nb8nPJbExfrOqI+lANfbdln/sDoHUYImG8SF8fdsfkKHb047K/rrnrSzOrACbpEsk\nGds1VQfB/IG5WKW3HlNnQS4wKuegGgZOUWTa923lizWT4E8S4o3K6R/z/LRz4Rd2\nNNMvyInVyuGVEQG6GjZipTjj7MQtHGjXQSVDdzl9xJ3PIui803H4X9pSWMkWrf/D\n2r0C2BEJQxssKQ7rgMSSA+08lE31ZPLJ/wBcoa8yDbEmCvYZWXO5ibqANn2Xnh4L\noVa+1TAErZZ7a0xozmDbDo6ABhjMzoh1QZ/TYS1zxOV8e9tfi49XDCBSC+lHUEhc\nPCgERsZDTJf5xbStuK2jL5LNDSeRvoYkoEMDCGULaept8wftc7mfwwrd9zmfJ4rm\n4K6I68m0NGo6BvwGnSb8phGs5QLus4n5c9gcd/V1Ky/3tQ7HJCTX4IguA2YNKGx2\nAm+EDJn6MGVdJmWnfCo2WL+baXhEK5lXGA3w2VJ9HrwwFjKwQE3afpYukaH/ckCA\nt/gCQoKTVszB5pIpRzrF98W3+zrxLlrUeQEuBBBt3ZxhlUaVPS15lx8B1FXh8HPp\n8o5DFNW8CiybeIn8LZYes5c/FBBjcfHqlfJ0TkPaFUIg7wDExgx+DJDQkCA/zr3S\nXAEHgHGLfE9TNMcXlQVADHsQZICaAqmtNicXyoHvSCNpJj2+HlB8nD7Ptuvtzz1g\nac0sd90GeRdfpOz1XRDFXS9F+J6+g8LRpT2ZZEH6Nw/nqUVADp1V51qBr/dd\n=VKRn\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-main-key b/systems/palatine-hill/keys/zfs-main-key
deleted file mode 100644
index ed4ac80..0000000
--- a/systems/palatine-hill/keys/zfs-main-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:sv6mzmqfecjwqSwRBELFx0sGD1rVJDydFTHG3NItNuM=,iv:Wl+PiYmV8UoAKA8d+AZhR1xR6EV9gJSA3dBsshNE7bA=,tag:46Ejkd/Ne5bRuRbnDNZeKw==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzcjVZYmxwNFpPdlhXOTJN\nZjJ2VkNRMVBGMGdPQ09mb1g0ekR6MS9hdFJrCmp0QVdFSmlwN3lCWTAxSVVnM21q\nY2J0c2ZWL3Fmd1FhL1M3YmgyUTVtR0UKLS0tIG4wVStNT0lGTUplUC8rOGxLT3Fj\nRVBkZTFwRXg0TnpMTUF5MDEyclBLZ00KebvF9q/bPQnbSjgfbMNJ+qZwFu4M1BrA\n7jImUpxIrFw8wqoF9XiDdZER72+wFzxgTX9MeUiVjt7C93u8iRVObg==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:26Z",
- "mac": "ENC[AES256_GCM,data:XJjbpp3QI7/ecRgtFlh9DN/4FQcT+1H0NqPEANCzKDpYBAQkCy46+DMVlQZvlEbUDGpfgT8ZXdQezWJHypeuu7a6h+51Lv2PFr75LXtp35LjOy7luutTknOq2d7BOK2Ki5ZiXZDq9ixQ1aFJHsKDuYz/djrG90ZTOgw4AYctB1o=,iv:u5n3YrZ6tU08Ahz4T/gnJOd2G53nGXp5KKWBxV+UnLA=,tag:pqKexgsFnKTBtHbOMJyPyQ==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:03Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nARAAgmxze3jr3KEophEQnNerXjW9SblQ8bSqbn335Wy5hsRY\nPQF9cExZiVbAxyfCpmFxikSMDfxcnCdbdHMcUFKveY8bLCk822c2yl5xRecxmeWc\n4jmzWLpPymrjTA9xbcZKxjlTKUDKDgXUBJ6I/+X1kCHCNqDx+wrRj3sgXPybeFLk\n1BhnXglDYicAAn/8c50vFLnYJvHggmPI3/dJJpL1ayIXtnId1smG3SnpNMyl1h/d\nBU6ss42evPqlFod5Km/q9p/ld2oHg224WrKBwKxqRm+SEIjVfi1HQ4/SXVqnOMdV\nHxEVKbfqQwRJf0ToOa82oNyP28ZRdveXp6TZmd88Q/hwaGo7soLXx4l9wA4p3mk5\nd2/UVnhpFkOvkdBBdijfYWh8hwyHlovzuTv5eRimVW9RWdHHTLScsANTBfPHC5Qd\nZg7/J6+iKIjZWfInOpYH/IlNtRuhXqOM7cyApbx1hzhUB4j4eTSQxeLGjV2f/EWm\nZcANKDfzz1wwQdT6MJm1z2F62Gp7TH/k2YKwEAksUIpuUxTG86wvPmdOxpgp5K3b\nGzn3TQPDXvSr0ejdS2sEcfewBCVxZyfNTCGGxnh+xQ804PnkVK6U5MggHNTMaJ0M\ndfDUacz1MN+6ST/vAlqM3rlzPgz6nZHlVCzw0BSbCOibpvTXpS+34LlSwl2wEg/S\nXgHDWu94k1NXAFSg5SqzRQtfWujAsXnRDpOlbSMIjzM0UtI0rvGsgzKP3Wfi7lZw\nM+XOZq7KKXhEpcge9pFGIsNM65NZnnCqj/R8kI/KyQt4Sbn84ms7814Z1xyKLhc=\n=n9vs\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:03Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAAqgAXb/ohCDW1KPgWOxjC/apQT/OUToWmf7sd9LLLyhXe\nLlYF+RKhC3/ECxjc0EJQI6/lrrvpqMhksZ2If9z8LMpTAuAUHai7gqW8DGCxqWJO\ndB93Lnls+Gr9HahnsM7YazejK6FPEQZgMIM4u7t0kyhiuedcOZgZiB0iXDfYnue6\nZz1mEokmzzgGGi2xD+EMp5PVE4vR1Gd+i+b94QX/bG8EUl3wvVVeyjb3I7b7JaIn\n3s3ZEbIg1HSRzNHN2KnlMk/LYl/lPO3a7i1mA+z+tNbCKc8lNDa8WCCCwsx1Yg9E\n0ApxVSIfMwQtVCLBhv6A3DMwSoIHUb8MP2Eku2kV0ugMcUMnefF8hR2gzBTGOBiH\nmBGRTSvX880aJzwOFo2xO/SkDl8vR4G9VBacRKT0OYb3XzvoM3ESGXof8lzG5+c+\nTv0OIFdLDMWEwSi5lreuG7Tg6dInrW83cguOJfXQ35rMGTmG0IVmszbEU3p+dAoy\n7Jp2ujPKwN9bsLHMV5ufRaYXkoXSOWEZLXeL3T0lQ7/8FCCIKP1VgMth36phz8iJ\nYqmXGMBKrZigA55hEYsj9vL7ujFcALgzyXpqrGeJkK30sPqASfhuOO41t32waKse\nXe8QWDFBt7hKEcGX+9Fa/DzeVwele723m2hro7uKaofORxtEfkAbOgCg+I9i1PrS\nXgEAtRIMg2ZJnjQpDenqf6KrHWKWx9EzUAMc9TlGesOaAegXb9FjNKmB7qQp7Obj\nV8dWedC2wTbwjmF9E2DOEk4VHFxct1ezGgLBXrQUH5EY0n/LPSejsysyIn6hGuk=\n=9akX\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-nxtcld-key b/systems/palatine-hill/keys/zfs-nxtcld-key
deleted file mode 100644
index 05c0450..0000000
--- a/systems/palatine-hill/keys/zfs-nxtcld-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:MXw/3UwBlYqr4vKvfSYUvC1EGPAQVXV31VSv94B310Q=,iv:mnVUKs3AE6qwtJtnWcNfpQ46hkq4xduvNrOeOkGrVF4=,tag:SrlfFUvQamllD6Jp3zCMMQ==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwcTlIaTNDQ21YZ1Y2Y1pW\nVkhPUDNqdFhRYk1maDBaY0xCVnBkMDAwd1gwCnhNTjVvQ3VuUGQ5WTE1eXd4NktH\nSVBab3ZQUzFVQ1phWThsTkcvUTFxMncKLS0tIHF2Zyt2OFhpeElHUFdpSVZuS3Qy\nN2hIb3F1Y3Q1d25jb2dpTm80N3JJZ0EKc9RfRBoYNj8EDJYbbPQ9Nm5eXqDvXJUE\nAgoZAR/2i+v8M2xqvyVAib/BM7FxGhHOZzo/yJYZuE4Uv2hnRwW0Dg==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:27Z",
- "mac": "ENC[AES256_GCM,data:NT0uO66v5lvkH60CfZYpw3xPy/x4AHzHEd5nTI/IBHJmQJlT83Zp6Q9PveBfv3qxn8+7mBZoE720B4mYG9zjT3W1kjFV9uzpQx92UuLGJHrbEZ/VNTJiewhHB22lLq8wbaJ6I8DvwA+Ig6xJ0KViEbywQCwxlmYSG5vS2Miu8M0=,iv:dxwtH5VNs4WguiLXChx9JgXrTRCiW4Z1Gd5fJlr75AU=,tag:A5Sx7cDFOo/aSHY06JfsiQ==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:03Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ//SLsvAWVXl1XyoKgS36czZh4Oy0doCHJ3NVgM7Cath9iK\nxJywK2AKPmaUT8PPyebL5ejf+p3Fy3ZdoNvEYEoLuFjKaVLzZHRY+g6psoCuHE07\nW6mJ2YQPA29TRmOr9EgHv7sJhN962jl6R28GtA6eYYXyADAGdzWpZTKbjHJojJ4F\n54Ai8GyRjv9CaYcWKh7tw5DvKXMo/uWIDLox1PqfkCzkVvwcQAfg4BooGEtcPfXs\n4HvgLntmuo/6bmiGY90yHHaDKkX110E+nmQzCm840ikpZmYQx0fu2mif08VjaTEZ\n1mspK++049wPP1DfgwCtvqF6xaZHIhsseuCaaMGzGLCyRyvjtd5BWZWUXKnybIAl\n4X52ZNERo3p8begm7gx0ZiH5FBB0mxmg0TJMM5BZzfqtJPgPewO7NfJdVi6TYS3m\nCywyygA2bl0TfjVVmoeaYwmP/TQNpUjn6G5akXyhm58AoihAX4INS8PSecSE65ie\nwzTfODdSK0e+Hm0ZkbPTEMEsICK/AAlz/zls0F4GDn+VTxyOsvYk0YhAjW8rjiSt\n9KT5lvVeZAint8msmeWhqpeexVJ9gtpVaLo7q4GyfzIudy4OrqraX5x399fdOJ0D\nt82cSsP2VnIeV9OiWbE/9XdBr3n7iJW0a/uGKpPn7mxlCAbTFw9eJ1VK2Nvk7+TS\nXgEQEtFvPvca9Uz6mjH9PY5kh1iru/351KSZ6fj4nbHMAg/OI8V3DXnvfrXcUUPt\nuSgIt2RLuUgiyNhXkcuu9qFz9dB5Lp38a0dAczAcudyK6y2zkL/QKdtnNWdvOHg=\n=1mZu\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:03Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOAQ/+L9EBljfcWvSi8Z3xo+iqPSuDWcArBswAFUwbJPaAU/Ou\nTWvBChUyxvlMZq3hLGMscT7MtoSz1NLHOkc1kaSXL/5O8bjAYl0H80UUghBvtxFJ\n5bjXt3XTs7xnCdsz6BwxrbgjGva8nkcSpkBBLyyPG514OYr4Eakakbq9gIRbHrsf\n+R52BJDGjuccahF6sx6yhM+wZBlEz6pBmen7EuUBiOYGzGFNyl1U7kAiarUZL7+F\n3yF9nb8tLG+kVcmJQbjOLtxguB/V4yfTit0r7NimAufhp4XLCXnZQrOw2oime0vO\nIgrziC4+RsDuGLrAaMV19qonXp+RzaZEgztiujIY0CcHk6XOwKtABQHGMiVgS/1m\nCi2iZKtJ6f3g/v/Q6Zt33ItoJ9MNAFgQwOdiWCvXlTKLHLErKXs/hrSrTzAAQvkt\nrA8QDBQIWz29Xmv7WOQ6dgsV7c/VrDKLuOJNHprimcYMI1lp4QKtt25Avly3APQA\nVq7MLIx+XfY1QOTTCgRGjPA5NlxVfs0IE4L+Ap9rrtVd6zMW/2oVRrbNJL5Trcgz\nNuEs88SKGQdF6W2Fb9ed3fZGX4EPsSET46oAr+qJaGKHC2otrh3Qa3p+M6kkMB+E\nVm/pN+47pz844/JDnieQ4dPTIJ3tgBd3MqkcV3onCH422jYYb63C4/EJFEJq6nHS\nXgEXTv8S0UnePWLwwFGzlPsUTzRaQIG5Bx9ROydkC0Nw7KtuaZ8Yy5/XhCKftxDg\nZ8a/Vvy0n+icrl4vDypuHuPVQ5oF71ia6zZewWj3Iu1TaEJXV1Sst9oW8kEEFTA=\n=Bs2C\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-torr-key b/systems/palatine-hill/keys/zfs-torr-key
deleted file mode 100644
index e8a35d0..0000000
--- a/systems/palatine-hill/keys/zfs-torr-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:4kEKyga4w14ZEJODrGRLYE3/QNXdfwE5waX3XCacGyI=,iv:MdkharxcHgKIqY3PuxidrCfgilr3krERTzZ5AP0k4GA=,tag:IRu+J4uKmoFwUK9h03cmLg==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXM2tWV2FacS9KbkZwQ3JH\nZ3RyL0ZhTVBkeGkwYm5pTTVZeGY3dXRBdnlRClVxQ3krOC9SZ2V5MkQybFVteWZ4\nSG1wM2NaOXo0Q2FQd3EzNVVYUTdURDAKLS0tIHhQYlBKTDVXZXFlZStwWUJKTkhN\nWENYMUp6emdNdDVUdjJXVGdVMkNMTWcK1yhjh3bKjg5B6FhqzeeJ4u7IMxctUgLb\n8GRJDg1d7PALxu0+pmN7gxYRXaNu11b3UXciNh8i/EBJydxrsGV0pQ==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:27Z",
- "mac": "ENC[AES256_GCM,data:+jEfFy/TYSIPjEtBlx3YuRG+g6zNQq2CBGb/4sQO98lQuY+0fWjGhj0KxYwJmzclwvu89YS7q/dFBD9pbCRcwYk+W+v7LcA2CQuPmmrJC0WzlfZLx9RiSeXW44Xzl04MdMPyVW6i4p8+oxrmyNanV+T/uXNOH9Baz3vfvzfSy7M=,iv:7RWvMp5hTawt3+TTx+rf7E4Bc6KErxae5BGVPr2hsq4=,tag:cCK2CuBWKVpPY7gvdboaKA==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:04Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nARAAm32EsBGEgvvnjAVKnD+PQIE1BUNBkxbw6Tr5Ac+chanu\nxvNbvZsCvWjMl0CyU9p3nkmAMXCJQ0dEwEXJRctLJefNX4ZXefBWMhOOKpsN6o68\npwUYpHCtEdT4mJHGG6y/3ZH6HGmQ/eSH/I0YigimNBuqlJuKY2cXxlEvdpy/12tc\nFAnIBh5RcjMEwR9s+vC5DZsTyUuLdAbsBJ2bUn25SK5fYe83LPYRFrJ9vpFijdYu\nn/dqbb9PlIydkBwPpuD50GZEtpfQJKQDFwAhrw5A8J5snyeJVnEijFmQsM7n2DZl\n9l8t/Qm1Yl0cHBtRjKPXwMYL5FTXn2MUTK7rgSA2+h8OxNxikWKv8DqtB3ZHaEnV\nRotm4Q6HS4QdaGIjC3wq1PoDD9lQQ/b5G0zfD8UsOXmG4UwAAtgYCTnGpNYtFAt5\noOJbS4n5teJ+nr2bYHMrWNHQxXD6MQj2xeP2BYBnK+zBQQuXEjFmCExdpo6aq2Tt\nVc44Co7+/F0Ct8lJw0HyQa96RMmHGZV5R3go7HeRhwDGJQsaGKLDuK9fvZPGJ7yD\nS0bUox1rK0bRqaMHa7TWPktN5rqvyYa+cCZKSu/WiToyfjFKsWz58DyxbSXoNewJ\nfppDrILA7SRLU9IO0irdlRktuhYiWZXVinb+Qe2VgMZ3U/50de4klyCPocrrBRrS\nXAEQe4oG2cd6T0lDpQFwjz5oO+9u3p9ulfWpRupighhICSP6c2OO838ZLJ3F8zJZ\nRxvX5JGxrh33orViJugjKauiYLxgf4E9dn2svY3ICEk9391LNTsTL785lvK4\n=ddWM\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:04Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOARAA20lKyRAc5dLXSxzsS1nNUAWnsy3hNcsQWtR93Sgglh8g\n3PJy68lw9ADkWmVP6H3hwhsyUofmVqbDnb3MRel9QlDGTgcj0gW+5g8IyeYmzDjZ\ncEgZ3g6Q1ZpJOcfFB3DrcC5qTcaMyGMP2Kl/8JYpXbDJ18i8FSrnNuxc7kGif6oq\nP/XnZnh3wPHS9KimcTmtBRg1ZzqYbIz+wrsYxvkZF4GCj5SS02kkvFNMwkAElpq8\nsVSYENMIyD+vYCTBMDaed0btUyMtzOyCk33mGStmXf3oV8z5gUJCIoFJ9K9YRY2j\n0PVxBxf76Bp1kSemNvsi3d2/7oZyYn2vMz8Qbi7rLKZZCQV66jxSQB536D86KJlh\nb1tLwtsSIMdY+IiCM1EJ6zAVys/MHUxXXi8kLqa94m90C5ocFa2XOWIA7JsIdV91\nNzXcDMeF4jDgCDNXiuI5wZzfI5lufJOhi6oanPzjM3ueFZKlY84StQxcAFSu3CA1\nRYGWTn7ybBQQ4fvaYqQf9IGTnibZ4/w/hATOL+xGsutok7vm00B6B2q9/JtBdAsW\n3uqC+ZBiOPCSUzIDQA2K1nm6BrGnNbEKpxYp8itfO73mSGBfHA22gRElXlEE6r1N\nt05OekpzR17WKtnCFytP++2GMX0IlInznaBeKdUlqwMcAHtSxGUIV8YtFN1Lu+zS\nXAHNWs7ARPeL2ORhDNQV0O+JMxMx08hkwb8ZLzemtqqy8FB6Z95HGKjxXNtOzl4w\nqletmbAYwjK+rTaEt/DqO2LaVHQENLzZSb+sJceQkT+PIcQqt4LxU7ukzhdY\n=Vx1G\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/keys/zfs-var-docker-key b/systems/palatine-hill/keys/zfs-var-docker-key
deleted file mode 100644
index b6cac78..0000000
--- a/systems/palatine-hill/keys/zfs-var-docker-key
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "data": "ENC[AES256_GCM,data:enImcuxScby8hnET/8031kdP27BhZwWHKjpYvWsyVc0=,iv:RZ+Etysb0QTQpOmuFULaOFTi1o+v8zOldI36DNNQcEI=,tag:tqtC7fkKbY8nnoUlkqFgAA==,type:str]",
- "sops": {
- "kms": null,
- "gcp_kms": null,
- "azure_kv": null,
- "hc_vault": null,
- "age": [
- {
- "recipient": "age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej",
- "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCVHpybzFCYVlnSjRTWEtY\nUzJpcStjM0U5Mktld3dVeEpYRExKQ2hGbkVFClRoL3hycWhURXJiUmsxckVMdlMx\nbDZ1S3JhWTZwdEdYWGdVbndmaDluN2cKLS0tIFRqZGo0WTFUUmxCNEczbysrNEcr\ncWczYWNHdmZxMnJPOGNRZUNZbnNZaDQKW3qh1qk1nVmytZv0SrZHfAXc9lw3CXrh\ni7b7O/jrODlgjb5Ji6qquLkTS1PFr61tl735U9Aao5uY62ZAC7Fdag==\n-----END AGE ENCRYPTED FILE-----\n"
- }
- ],
- "lastmodified": "2024-04-13T21:15:27Z",
- "mac": "ENC[AES256_GCM,data:aDxxjyyupxK0P3/ZpkEkfCVoFJQcjDNV0w5xe9P97hJvqJlf3zgOvdcTkcMvcQiZv2P0jY0NpR8z2jX9VhrZn4OXKxlcPnEmXA81lJkpjsZkRj55Lygm+/9su3eJpjcVOoFyikK74qs/NMcR5yjslcgpJxt2/3cIHXD8SFyBjbA=,iv:6nGCEOQhWAQdjQAR8AaF9huHhIx8WyCO57hvwx8VjVs=,tag:LWcQkNZMu/8tGTEmkxjdMA==,type:str]",
- "pgp": [
- {
- "created_at": "2024-06-19T16:30:04Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA84hNUGIgI/nAQ/+P5IweGMw2kjASZtbYI6l0jMbtuP3m4JpQ9fsbOCNEb6G\nqjVS/qgQS8QHzwkCR9en40FOIY1aqrd8BbGiUh+Zdghse3Ovdo3oeXD93I69nWS/\nzPSepCZkWjK8cmj+99uYwprmjz/bPWXrc/rOlLcZ7SB5Cdfmc0c9qRtZvj0R/zO9\nlR6Z0f2y3ZOx/pCsMb6Iie17GbDhBGXbi2v3IpVLo7uuxPRzXiWajiz1wRDeZOAd\nDMLYUmmvyGlDewZVJ5+6qE+JM8tNuV4NmIg76dFq2x/k63w9Ju7uFotY5jdOf8gJ\n6xlFnSb75xepbzujQhKzEXqVZxYpNiBIZJsHfC7wwiFYaBRFZ2G8nnshrlOMRBmP\nrihVG3pxNEF+CcMMkoSnD3mewHt94G3DP1+Ym69YrYOtqmP3J2xBUMXFnx6ZjRTR\nbvL1JFFNnmtXzITRQKLxwm07hwYKUzEV4GBlh1Q4QNsHR7hloufT2NJQYoA6lmYG\nO2IkJk5xgKDieD5GCfbZXcPIf5wymRMrWECqOUe4c1yF72XLmLDVvqvfGKRbHIea\n78+nsSlJqeHIJL1rHM8ufYs7nQ0M7prJVIHOruZFCxNKTN1fkuRBWEwX2xtSnTle\n3he6La1K9qvKsZSjI19xLiNuNgPR6IadSDnYiXXS1oJogHi5pFbLbUysp30aqtbS\nXAFudzN0Igd0Emfkn/UcpHd4Ixda5KQAXnW4grcvva1xiWyyTjTdtCbMMeMsZMvG\nVDvHbT9vjQdHOhcJp9kgGI8hd1Y5PNnuig+GZgekhCf2o3adZg/ojvWAsDTn\n=eyl2\n-----END PGP MESSAGE-----",
- "fp": "F63832C3080D6E1AC77EECF80B4245FFE305BC82"
- },
- {
- "created_at": "2024-06-19T16:30:04Z",
- "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA29thaGx06tOAQ//XsDBTXGCR3Tq/0gorXDc33ZF7M3J4tQQzK1MpkAhIEKr\nWcn5FOuYEPqJ/hgyCN8xHvd8TVS7B3XjesL/CouQVXlUH2fgY/kP5nhza+hALirj\nbeN5qDm7KThz/KWM/pZus2DEQ8Lf+So1iUvR6Fe30hgkmqzDpklRWqDPpcmE6iEU\nkiu9/pweivYOhgqZgeyaJRIDRXRYyAKKfgqQcKY7xH563TkqoIoQvqaayZ43kf57\nvFytIHdzUBFhesOvK+T1kCGO+Jby8MAhnNPCysOGYYIxEQzCzpq47SqfhTadd467\nYOl0pNHP4+8Ve049WpTfwQUs5LXk0/isbVGpwbA2/zt+9YW9kJfBW78jZZZXWtp/\n4h7N5BvABGyEaupGSWzYITJdOW+t1+IFalJGBEcjCs87FU6d2/QWg80Wat8YabhY\nkocOZzLNupXREV1BKxynOnYtT974/pjtbpIptthQ3x4aN/DHBj58mioPdxkWW+5i\n37OFndG35OCyGBvin19AZjzSAXgy3w1d2H/Qif+LLwd3OCS2PsEQWL22KIqP+Zbe\nA4nB0movV4YqyN1aWLEpLGlKwLYnNSOIvalCFOUBel09W2obhLE9eiUGyOA5U3BU\nT2s0Idfkletz9jz8vkNq4JVQ+ENv8ooFFwHMoya9gHvYRfrcT7m9VM/8ellOaZbS\nXAGo7Ob3GuweaH4AFS2iu4eKBnAyEdkZg20Hr4PJ6sNuHwO5KTXiyPBMuRsRmpkh\nlhTIAhqR+xGAS4klowlLUKaDr2UnqB6d2Ktm4AFHTbRPgfsAtL6BkaitTv9v\n=JRy4\n-----END PGP MESSAGE-----",
- "fp": "29F5017C95D9E60B1B1E8407072B0E0B8312DFE3"
- }
- ],
- "unencrypted_suffix": "_unencrypted",
- "version": "3.8.1"
- }
-}
\ No newline at end of file
diff --git a/systems/palatine-hill/secrets.yaml b/systems/palatine-hill/secrets.yaml
index 178b81b..2b86309 100644
--- a/systems/palatine-hill/secrets.yaml
+++ b/systems/palatine-hill/secrets.yaml
@@ -23,54 +23,34 @@ sops:
- recipient: age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPWmM1Q0NMQytCaW5vZWhT
- M0JQajhHc1Z0RXBoSnBBMlZGZ3dhajNkcEY0CjBMeDNIS0RhUUxxUDY0ZXNyb0Rj
- NHhUNFVPSjVScC96Tnl2R1FmWGNQa1EKLS0tIE5iRUpPUEtWMW9nUllzT1ZEZDE1
- bTdhU1VVMWdWVzBkTDB4MkxFcWtQSTQKsASNOoF5NjJLIedaBUWCMx1uJziEZZSx
- AlaF0gp4bNP4G58rndIe8XtsM10BseGvM512kMGWd3XbQPz3firk5w==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBZzhuWkE1czhNdm1zMjRK
+ cTVhZWlmZnVqRG5RQ2FxSEpyVTdEWHdvUFRzCkJOVFJ4eTk4bUpVVlVoUnZSRTdw
+ SVdhc29UQktlb2lEN3VQcVZhVjFsRlUKLS0tIFpHWXZRSk1leWpIeGxub3hXOUU4
+ bDRzTzhIa1N2Q1lHcG54akdOV2RyQ0EKHM4aD6KEyn8+JglVSGui3ROHyStDdAgh
+ BXXeg6BRwANFzxfUrpAZLoVh/pc1q9rmaxBUQ4NOM3mw+gKuv2NFrA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-07-07T23:09:33Z"
mac: ENC[AES256_GCM,data:nr1JAEr2FGrYtiUhrQFsBPbiR+toxzYRZVPqq7zYBMeNy70a5jMgw6qm37M8Hmt7omO/KePE+Ol27FI9Aqn8OP3CQZoSWZbul+TTItV5UWC84G3MebaesnIiFQwbpM9hz08VoQ1zxUiUFnUY4bBr6okNSyJeqq/QmkkyqhK4Wlo=,iv:0MR7AiQEX2Cl7FUtRlxaY+R2oqSbanIhwaXAN/UnHH0=,tag:RpQCtsuelu3VQVB9HzJE+g==,type:str]
pgp:
- - created_at: "2024-06-19T16:27:11Z"
+ - created_at: "2024-08-21T00:13:00Z"
enc: |-
-----BEGIN PGP MESSAGE-----
- hQILA84hNUGIgI/nAQ/3dupmdOAwhgOEF7K5s8+KxlXlmz7POXkO3zDXbFQrZrKR
- JNncfi22Nri57Jlud5ku2W/0jJ5B812/1oIpClHFkdWqg4b3ZIrOpg1239IJX7Gg
- rvacIsgejrAMA/aT4F7a8QAwWdBy33aB8AgquGRYo6STn9fLssQ78Q1P3ps1oT7R
- 639EF7Sb+I47yO9rq6YDA1391rHrkS5PvW3ztW485f3nKJ5o7gD1fK4ghZPuoyy9
- VppgkzpaaMXUBSJNglsBy6uReq/aupgRnhcmZu+vFdgxY2R4Ff6M/AhpJLOz9B6G
- 4QGb9uj3nBKT/D9PFqbSCn/oreSJzxd6DTOdM7NOMu+CgPsdJ5FoivH1Um990vfB
- V7y3eWvJ4HMHHIr0QdWYUpr7Wd48m+fhWFI6SQB1kRWCY9rgb1SOmsvDKDmzGd78
- H2tdweS9Bjdvwedn24IpPJh90do50HOnFVa5zlGj8AA43IOOhXwxvEhelgY+xoNK
- kTLmARqLAHYqq9MwjBZhiIGwuLemyXP7TU2U9jXUIsXPMejdaInrCt2gHkjkI9Wy
- FollcgzeBG3WqNAGZ+rnfmNN1rAela7P7MCUqroVsXIDi+4C1nbnMlRnQTu6e5nn
- VLP9VEJqYobLwm+kZVHG6SJM+yOmyAU14YKOYGWsZkjnNPeNb6tUCs/Ml4Ob6NJe
- ARVQKVwy0wP/sCkeYjWTRrWcITpEOzwn/SVbiDMlnh05/jLtKXzm0FVXtutiYQZ/
- SjBYpYARV6pZhbjA4DjnPba6uwFca0UnWk4coM+i2doFsJKQJe0iHwzgyyy+/Q==
- =XzRR
+ hQIMA/3GV3g+HEdPAQ//dEHZoDJ9BWiaZQVE8CTsKz6nvngBoAJZ/t9FH8RSaSo2
+ 8K/Ix9VwpxZt5T7SDh6w6gAHPmb4gjvMFZU85DiNTumrK6zDecl3XVlcb1FaI6AY
+ vxIpAbHhvv6on6Yp3rst1fTvm7FQfxwPkRhR/IwQsehaXbXHw03HBpah/KAAhac/
+ KVyqy8BfT0iK1YU1CEMroIAKEJi2jwBY5K0ur7u4He9IYZmJzp8kI3N/GQo9fj0R
+ lnGov/Q139dwA7Xi+nf0pwGeWMJ4DfJXRzEwqD0PfhYeS8qXxnMjNESojTttrOgD
+ 3yZ5D1Z+SHUeOEwmgyinFx5ls04TYl/XoQFnt1YwOvs8FVrnRTDKPrZ72CcGYNAG
+ 8Wj5SzGMlL969q/luslqyVMvRf9sxAOApjPu0be4tYoL5WfDPs1aDdSAvK/3nW8x
+ VTBtQu4uIqmdfP5KAbt/HyIIKQ+93dkxYVd0vOODR6fbM97cN7TCzgqnSUUhA3e8
+ sIBx98SbvDbfsXVSlkPM6dLSQhvdisvlI0FkPnmDk1xFlxlOqN7Yo5iO0pk2yNDw
+ tW0BY2CiRNZCRshSCbQXF6yJGl76WgfIZ69NgoACB5FjXdG5t+6CHqKGIpaybowj
+ zb/w4wiGCxDw0GmHTfN16etKEn+GkxPR6jOzMzBc3fgwF4eyd5/+daUcU67SpTPS
+ XgHkZPTOPP9f2AvGDjvK6pc58LE2SzVB+eGdg8W7wc5MYpLlwsCjpH9RJUiVjj40
+ 0P3V5BbGFFHHMRrpE8F8Lc2iUHRTeWHQtzv2ks2ywqmKA4bu5/tT+R6GxvRNBl0=
+ =MxRN
-----END PGP MESSAGE-----
fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
- - created_at: "2024-06-19T16:27:11Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA29thaGx06tOAQ//Thyg4cyx5/r+wrU0TVspF3zVRLNHcwHmuaaXGebOUMxd
- UuL3usmi5lC1/otK9XshTg9ODRsTtZ8qjoj2oHOYgZHhRZRsWMNMnZGY2P9iVC6p
- ZwzIcDaBwDqaw6nEjXqR6eSB+P7XzHGMVqa/EhmwBrEwa4qtv8R4huUl9G2CY2RM
- eWuTSgD5MEb3mPveemkvVvE+gquBseZ8wfkMA5eBZZYvEBhb2nKlSoqWRKv0Sp/a
- V5MQSWZrkFfbA92g9S8AJZcwMuNJHf//N5Z9UofK4yfC+dC5PnL52iU0/M58HeXu
- w7X+cvcYfEHlQF4b1v/W4C3YnMhaEoKDuSAE+PdM5TeZfZYnGglVDxNogYAAfdIP
- l5gkSWhl5Dzu+lNg+k+kIVngHr0XDZ4IrTgXqrl/wtWtBf+xrjnlnhPMoRfTvUD5
- 2TRRyr9gwu6t+bIW1kSjcpouYhnSXtiCGb/5DN8W8Nw7sdOXQyeMfTI3oGhUKKrU
- Qa4ogWFIS9GN1wYo18CfdXiBtfVnRIH485iu7d0bdvbkCXyweAoNTmIbBLNfzg2R
- m4eN5Z8sXWjSpFOGiWf82IlF86xvulDxeuUy+synoHsD+WQg5rB5MZfhCwXoB0Cn
- c+yCr6Ocv/KjoNDn3TdI6hkW5Inv0eYqx5sVRKbita3eAY60VRz5BqAC6MeKGHrS
- XgH3doi5V8HoZOMfHtxhYk9/wUQO6ABB0Z3N05DlugtaRER6DdNLw9zrIqWQhFA8
- YyR50KJPlC7+3PFxfWVg3iWCZ1gvyXMyC/HoTmC5uYY3avUZ43QqsnepXJgBBz4=
- =+84s
- -----END PGP MESSAGE-----
- fp: 29F5017C95D9E60B1B1E8407072B0E0B8312DFE3
unencrypted_suffix: _unencrypted
version: 3.8.1
diff --git a/users/alice/secrets.yaml b/users/alice/secrets.yaml
index 6a7b6c9..50ac581 100644
--- a/users/alice/secrets.yaml
+++ b/users/alice/secrets.yaml
@@ -13,69 +13,51 @@ sops:
- recipient: age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0Y2tHVVRBZXdjSVpQSTZa
- Sm9aMitGSXYwakRKRGgyeHM1bE9RTnRnblc4ClhNV3NoUTlmZ0NNYXF1a2dqbi9E
- NjFtbXFUS3VYSW5waFR2L2QraW0yd2cKLS0tIEsxNTArMlVKcGN5K3V2OVpsWHhu
- MTNjb2UrWlQ4bHFOT0hkYTd5eUNXOE0KLA9Lp7jnjJkEksOPTOmJ4BK4aF1vKwIp
- Smz5rz0aIlK8PyYxWgye1Pe3/pHSgmQBN//r59h+G0Y+MuNUhQoCWg==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age128ehc0ssgwnuv4r8ayfyu7r80e82xrkmv63g7h9y9q4mhk4w9dyqfymc2w
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSdEpLTGN2Y1d0RnpxL2wz
- VWZjcHo5Q1JJbVlPbU9NOW9pVjZMWEVUajBJCndnbVp3Uk9TVm9oUlhhdjJhNkUz
- QVpUYmpUZnYxYStYbXRVZWFVTExwS0EKLS0tIGNYK0lHb0dndXBnczJiMW9pdTV5
- SDBncjNVaWIxOExPemdqTGF6OXZqeEEKZz3TuV/Hh6DzwU2Ln3HGv7q88XRTwi+D
- Yji5RmjUm/1xUqfHwnQBrHhFuDlg/N3daYBjjihgM6znYrgpYV0m3Q==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age1lffr5f5nz0nrenv3ekgy27e8sztsx4gfp3hfymkz77mqaa5a4gts0ncrrh
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwMmpqUk1BV1pKN3JNODBi
- UmNYTkV5STNWMWxsTVZpcXRSWGhpbC8wU2pnCm10S25iNm1RYlZYV0pTQmJHSnhG
- NHVUSXB1eUNBalAwU055ZUp4ZDkvcFUKLS0tIHViL3liRFdjS1U0VElZUlAvTkdK
- SFRvTC90L3QvL0YyRXp3QmFxRkt6aHMKs1ZSLYmRjoJiDJMbzA9nY7YM1jCfwlH8
- qK1/cedXWGRdoreKSoHwQhU/6NRhU+gszUos+ol2f5xRqCaHXf5mnQ==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMS3FUUUxLVDBWeEw3eGNW
+ anowRVpiVjJ6OWM0ZHVFdXY0R0Z2aGRicmxBClFFK3RhLzg1MVBxcHFjQ05IOS9m
+ cDhTeVRibEhIRXFvbWR2THRFS3daWHcKLS0tIGdKajh0LzJIemo2d3U1TkgrZTdn
+ YXh5SzE1L2F1aUpMQXF3RGhja3h2ZXMKnMA+Ctvat+FHjLJVE77vLCiFLT12E9G3
+ H+h61DkKf8huLpQOXlqhhyDVzuBXL/zdfHfD+MwYyJ9qDV7NICQx4Q==
-----END AGE ENCRYPTED FILE-----
- recipient: age1jd2dcpykagz20kpk2kkchte3augqncwfn6nywursx0dkfyze6feqdzxkq2
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0cC9sUzVqekRsYW5pd2hk
- bitqZHZJM3pUbkYzenlvdkdFKytMN2kyUkZjCndmZ01jRnJTeGxYUnI2MlA3c2ZZ
- M3RyQ1FXM3djQ09raU1haXBtSkxhMkEKLS0tIHlnQUpzeUE1S0pMYU5tSmV2TnZm
- MmVwc0dWbzhTalFpcVlaMEM5Wno2S1EKz5lsEy/OvJoZxQdUzRoqkoIyvW7/tnrn
- TDQlbkYGoVKd27d8CkohGIXtdmVBtf+Q4W/eGQ0y0aNPzOZ3EY2xRg==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYN1FCUmU3c2dudjVoWUQx
+ YkZRTEZiYVlBOURNemVXelhFeXBjTXBsMkR3CkF6b1AzaTdqalgzNnBDS0dySmRZ
+ QkhKSUNtY09xZklIdzNLRHV2dHRtT3cKLS0tIEdTN3JRbHQ1clhDOXA5THQyS3Za
+ bUJIR2NnelBIUHZLT3lxRnZBLytMajQK9jD4Vp/Ezqw+X0RCQUSzrUN8VdpDJEnQ
+ jDu3xNLIgV0e28O/gPIeQQG1VVM05e+1v9CJheXLNmzyqv5SWVyoLg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1t29a6z6cfy8m3cnc8uva0ey833vhcppue8psyumts7mtyf0zufcqvfshuc
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoWnkzSWd0aTkxSTFBd0hH
- YVRXMWhnWlRINFpNV2hlaFlsMTdSbGhOM1VzCjh0QzM3T0ovY0o2RUZCUHJ4b0VM
- VTNmbllyQzdJNWNwOHpidGNtaWJRbnMKLS0tIEp3VVBHZE4wR1NZVWljNTVPQzJv
- cGtqTDlOYzhpTEFuZlpvL0c2QmpWWGcKbTQUBfg4yEtTPx8srahWcJyZ3C2w9qZV
- Jd9406qhXOXDKS/zlNXofYC00TWRFBR85gbZIqBq/VQd0lD93Xue6A==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHNGQ0SitVVjdDb0VjU0ZZ
+ QnVYTG1TSDI2RE5qUmh4ZlFmSE9RSjJ2eEVZCm5XY2NrNjdZK0FXaFB1MllBL2lM
+ ZUUvelNtNk8rVmhEVjVRbEhvTFZaWkEKLS0tIE5vRmp4NTk5a3lyd0FneUZYVHJq
+ enFCZXpLRVo2cEVnVkRLQVJSSjc0WDAKBc1Pn6xYLRzA85Brw8Kv/8gvH6W3pg1h
+ nnQk3T7wKQ/uG/rlTGEEVV+maQ8g+nhLI/kzeyTNnkGBiLDUrlaUmg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-08-20T23:15:03Z"
mac: ENC[AES256_GCM,data:VnLd4N2l7JTKA7f4eh9EKilW2f8mmEmLc06WbHASOn6N+MIGPHwyLjLbPVECuXiVl95cs0+uWsFOPEbLiS6XTB/gZE1OZMYqk0x7FVkQNxMdWwcVAQnncC6i/cdBTAx+GW1iF6Cf2eLY1wNNiASk/Bz8u3r4UJ4QFXuMovPsfxw=,iv:Cr1bAYrwlK+ClRFDsiUdEIqXDU7onubthDEQDlTM3S4=,tag:EyfcNB0xKrFRjbp517akpg==,type:str]
pgp:
- - created_at: "2024-05-26T22:56:17Z"
+ - created_at: "2024-08-21T00:11:50Z"
enc: |-
-----BEGIN PGP MESSAGE-----
- hQIMA84hNUGIgI/nAQ/8CHUIO/T7MGRtbkJ/GLRd7wm99g2gQmurGTQd+eQY4YEa
- mGdR/UKfvXTHVwrHRlmOb2GqtuNBBX5R2I4JTA9Yg/sWk8KNTIW4lJRHahQaxZte
- bTWwsMleXriJhshf61NjX7kHpi79vFiRqr/M8jQpC+bgxpk9yXV7CdCHtU1RUCdf
- xG3Nb509/E7LhBqwkfmPqmDQGaoRuMtZNwjgq8VoCtcEf6vnLuiSSxi9ASoqdmgL
- CiVNcDNGyWDZvYkS6Pd07TnE3ldNnfjJeZoWtCRoBafKaMYJ6CCeKBq+whVCwPm4
- K2phOZ6i1v2XBTjmC5jpCyERNsFr4EKoNrQRQwt0jXpQ5T1kUG5O0ek/KYondEzY
- cso3MqPlQgOJTLyeYLg8xd6ECGDMh4E7UhtEEcIxByT7E5othIJT11Eao2LukNYq
- MWAaYcl2gVc4S8ervN5BdU1/+wEMRu57py8DwWw9Cw8VqUJFbuxWSx86bTaRIaqs
- UV0dxmH9bJ00/g0f9wWau1wgzshvzj6nHGOQArjTxLJvgulMmBhlWt4MrHEeYuRI
- Gj7N9QV7Nu1e6vn+M2/2qVXAbyyrQDPG7PhHS1A4wJEEs3zjmMTnHK0zo5yBw+Qo
- t8cUEN4L95p4A2tKHtJZCHS42D05aP1koHWcXxf/6b+ZFtgL8pqBelWo/ddEImTS
- XgEK6oUHm3FzRGMfDeyn3sowy2IpBriYZjKASEo/Z7lt3A6esSESxrVV0x7Oc/Mr
- qNhLsDbcL2yQKHhfQw7tIvTgVO1HNISQ2cKnXqAJsSZnFwwA2iRjgfulsyFV3uc=
- =luT0
+ hQIMA/3GV3g+HEdPAQ//Swqj1mjfLI4ZbGkiFSRVM6LrJWT7aVhKiw9/w7TISHA/
+ w1AK7uiBI1uJqjx/B1z9Vi+8ASauB9BPDYwB5D/m8vfRXXG5mN3Z3othTNlV3wqX
+ lkADSe3gDCrHd575esNBiYgzdEns7nBbve4wN/rIjlOonQzkiqZpmTXXP2zVmxmZ
+ SMYWInqEjhlU1Jlzj4iPBsiTy1NG/llQC61mk8lyILjkSq6NzZh2qZIdYDsM8S5c
+ Q86aleiMRsNSMJb7sI7VoqEkQa/IBc+kA8UAwl1E5OkJ44bJPCnV03/XBqHtY4mk
+ M+3wnzM5TuFDAAtAkml+5+etDFQi7FeBlursvX7x0tgGOix+1xC4CmSO1HjFp/Yf
+ /qIuGXFHXTXmPOJ/bP/i5UB6H1G7tLi/tRfadoaz7wXJ6OFox3mtJn0kngW2qEP0
+ GdJ1bL81rV2zaMG6QaupCZaqYbdHtgCEAYsrSAuV8kIO/5Ws/pRtXGBjBwIuIvVU
+ rE8u7KYVlifoiIPGJHVNcmTLLYivlp3AZi8RFRNA4feYpyjC/njbOqrT42GH5GR3
+ yFiID9PQXH4S4AFGOYZqWOj62AZzTJji/trhns63iY4CQSvjjxUlDm3hJpkOxTo7
+ 7LbvnDwyAMI6+qINyRPoH1l5gSofEzCcADaz3+YlppWwkboC6gburwjnoSrs+V7S
+ XgG/T52nzYf6sClT7ixoCouRviQs+JSSUGLRv7ON10x/A4NdRDG1xbszaaaNikzC
+ o/+ybpz463WkQkUAMhDKs4WD0TIJ8RxjWXN+fP+2hRpjv9Q2l+l7XGlNDH0IVHw=
+ =aq7X
-----END PGP MESSAGE-----
fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
unencrypted_suffix: _unencrypted
diff --git a/users/richie/default.nix b/users/richie/default.nix
deleted file mode 100644
index 24a1ab9..0000000
--- a/users/richie/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- pkgs,
- lib,
- config,
- name,
- ...
-}:
-import ../default.nix {
- inherit
- pkgs
- lib
- config
- name
- ;
- publicKeys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtRuAqeERMet9sFh1NEkG+pHLq/JRAAGDtv29flXF59 Richie@tmmworkshop.com Desktop" # cspell:disable-line
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHJSlv8ujrMpr8qjpX2V+UBXSP5FGhM1l+/5aGnfb2MV Richie@tmmworkshop.com Laptop" # cspell:disable-line
- ];
-}
diff --git a/users/richie/global/desktop.nix b/users/richie/global/desktop.nix
deleted file mode 100644
index 6b14bbb..0000000
--- a/users/richie/global/desktop.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- services = {
- desktopManager.plasma6.enable = true;
- xserver = {
- enable = true;
- xkb = {
- layout = "us";
- variant = "";
- };
- };
- };
-}
diff --git a/users/richie/global/docker_templates/file_server/sites/000-default.conf b/users/richie/global/docker_templates/file_server/sites/000-default.conf
deleted file mode 100644
index 06c715a..0000000
--- a/users/richie/global/docker_templates/file_server/sites/000-default.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<VirtualHost *:80>
- ServerAdmin admin@domain.com
-
- DocumentRoot /data/
- <Directory /data/>
- Options Indexes FollowSymLinks
- AllowOverride All
- Require all granted
- </Directory>
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit, alert, emerg.
- LogLevel warn
-
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>
\ No newline at end of file
diff --git a/users/richie/global/ssh.nix b/users/richie/global/ssh.nix
deleted file mode 100644
index 9d38997..0000000
--- a/users/richie/global/ssh.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ services.openssh.settings.AllowTcpForwarding = "yes"; }
diff --git a/users/richie/global/syncthing_base.nix b/users/richie/global/syncthing_base.nix
deleted file mode 100644
index bd1e78e..0000000
--- a/users/richie/global/syncthing_base.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- services.syncthing = {
- enable = true;
- user = "richie";
- overrideDevices = true;
- overrideFolders = true;
- dataDir = "/home/richie/Syncthing";
- configDir = "/home/richie/.config/syncthing";
- settings = {
- devices = {
- phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
- jeeves.id = "7YQ4UEW-OPQEBH4-6YKJH4B-ZCE3SAX-5EIK5JL-WJDIWUA-WA2N3D5-MNK6GAV"; # cspell:disable-line
- rhapsody-in-green.id = "INKUNKN-KILXGL5-2TQ5JTH-ORJOLOM-WYD2PYO-YRDLQIX-3AKZFWT-ZN7OJAE"; # cspell:disable-line
- bob.id = "YP6UYKF-KFZ3FG3-5XM3XM3-5Q24AZS-LZK67PN-LAERKU2-K4WMYBH-N57ZBA5"; # cspell:disable-line
- };
- };
- };
-}
diff --git a/users/richie/global/zerotier.nix b/users/richie/global/zerotier.nix
deleted file mode 100644
index dabac6b..0000000
--- a/users/richie/global/zerotier.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- services.zerotierone = {
- enable = true;
- joinNetworks = [ "e4da7455b2ae64ca" ];
- };
-}
diff --git a/users/richie/home.nix b/users/richie/home.nix
deleted file mode 100644
index adf3196..0000000
--- a/users/richie/home.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, machineConfig, ... }:
-{
- imports = [
- ./home/programs.nix
- ./home/sshconfig.nix
- ./home/cli
- ] ++ lib.optionals (!machineConfig.server) [ ./home/gui ];
-
- nixpkgs.config.allowUnfree = true;
-
- home = {
- username = "richie";
- homeDirectory = "/home/richie";
- };
-
- home.stateVersion = "23.11";
-}
diff --git a/users/richie/home/cli/default.nix b/users/richie/home/cli/default.nix
deleted file mode 100644
index fe4bda2..0000000
--- a/users/richie/home/cli/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- imports = [
- ./git.nix
- ./zsh.nix
- ./direnv.nix
- ];
-
- programs.starship.enable = true;
-}
diff --git a/users/richie/home/cli/direnv.nix b/users/richie/home/cli/direnv.nix
deleted file mode 100644
index 75129d9..0000000
--- a/users/richie/home/cli/direnv.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-
- programs.direnv = {
- enable = true;
- enableZshIntegration = true;
- nix-direnv.enable = true;
- };
-}
diff --git a/users/richie/home/cli/git.nix b/users/richie/home/cli/git.nix
deleted file mode 100644
index 405f1c9..0000000
--- a/users/richie/home/cli/git.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- programs.git = {
- enable = true;
- userEmail = "Richie@tmmworkshop.com";
- userName = "Richie Cahill";
- };
-}
diff --git a/users/richie/home/cli/zsh.nix b/users/richie/home/cli/zsh.nix
deleted file mode 100644
index 810d00b..0000000
--- a/users/richie/home/cli/zsh.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- programs.zsh = {
- enable = true;
- syntaxHighlighting.enable = true;
- history.size = 10000;
- oh-my-zsh = {
- enable = true;
- plugins = [
- "git"
- "docker"
- "docker-compose"
- "colored-man-pages"
- "rust"
- "systemd"
- "tmux"
- "ufw"
- "z"
- ];
- };
- shellAliases = {
- "sgc" = "sudo git -C /root/dotfiles";
-
- ## Utilities
- "lrt" = "eza --icons -lsnew";
- "ls" = "eza";
- "ll" = "eza --long --group";
- "la" = "eza --all";
-
- "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'";
- "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/projects/nix-dotfiles#$HOST";
- };
- };
-}
diff --git a/users/richie/home/gui/default.nix b/users/richie/home/gui/default.nix
deleted file mode 100644
index f980bf2..0000000
--- a/users/richie/home/gui/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
- imports = [
- ./firefox.nix
- ./vscode
- ];
-
- home.packages = with pkgs; [
- beeper
- candy-icons
- nemo
- nemo-fileroller
- discord-canary
- gimp
- gparted
- mediainfo
- obs-studio
- obsidian
- proxychains
- sweet-nova
- util-linux
- vlc
- zoom-us
- prusa-slicer
- ];
-}
diff --git a/users/richie/home/gui/firefox.nix b/users/richie/home/gui/firefox.nix
deleted file mode 100644
index 201631b..0000000
--- a/users/richie/home/gui/firefox.nix
+++ /dev/null
@@ -1,297 +0,0 @@
-{
- pkgs,
- inputs,
- machineConfig,
- ...
-}:
-{
- programs.firefox = {
- enable = true;
- profiles.richie = {
- extensions = with inputs.firefox-addons.packages.${machineConfig.system}; [
- bitwarden
- darkreader
- dearrow
- fastforwardteam
- return-youtube-dislikes
- sponsorblock
- ublock-origin
- ];
- search.engines = {
- "Nix Options" = {
- urls = [
- {
- template = "https://search.nixos.org/options";
- params = [
- {
- name = "type";
- value = "packages";
- }
- {
- name = "channel";
- value = "unstable";
- }
- {
- name = "query";
- value = "{searchTerms}";
- }
- ];
- }
- ];
- icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
- definedAliases = [ "@o" ];
- };
- "Nix Packages" = {
- urls = [
- {
- template = "https://search.nixos.org/packages";
- params = [
- {
- name = "type";
- value = "packages";
- }
- {
- name = "channel";
- value = "unstable";
- }
- {
- name = "query";
- value = "{searchTerms}";
- }
- ];
- }
- ];
- icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
- definedAliases = [ "@n" ];
- };
- };
- search.force = true;
- settings = {
- # SECTION: FASTFOX
- # GENERAL
- "content.notify.interval" = 100000;
-
- # GFX
- "gfx.canvas.accelerated.cache-items" = 4096;
- "gfx.canvas.accelerated.cache-size" = 512;
- "gfx.content.skia-font-cache-size" = 20;
-
- # DISK CACHE
- "browser.cache.jsbc_compression_level" = 3;
-
- # MEDIA CACHE
- "media.memory_cache_max_size" = 65536;
- "media.cache_readahead_limit" = 7200;
- "media.cache_resume_threshold" = 3600;
-
- # IMAGE CACHE
- "image.mem.decode_bytes_at_a_time" = 32768;
-
- # NETWORK
- "network.buffer.cache.size" = 262144;
- "network.buffer.cache.count" = 128;
- "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.dnsCacheExpiration" = 3600;
- "network.dns.max_high_priority_threads" = 8;
- "network.ssl_tokens_cache_capacity" = 10240;
-
- # SPECULATIVE LOADING
- "network.dns.disablePrefetch" = true;
- "network.prefetch-next" = false;
- "network.predictor.enabled" = false;
-
- # EXPERIMENTAL
- "layout.css.grid-template-masonry-value.enabled" = true;
- "dom.enable_web_task_scheduling" = true;
- "layout.css.has-selector.enabled" = true;
- "dom.security.sanitizer.enabled" = true;
-
- # SECTION: SECUREFOX
- # TRACKING PROTECTION
- "browser.contentblocking.category" = "strict";
- "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
- "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
- "network.cookie.sameSite.noneRequiresSecure" = true;
- "browser.download.start_downloads_in_tmp_dir" = true;
- "browser.helperApps.deleteTempFileOnExit" = true;
- "browser.uitour.enabled" = false;
- "privacy.globalprivacycontrol.enabled" = true;
-
- # OCSP & CERTS / HPKP
- "security.OCSP.enabled" = 0;
- "security.remote_settings.crlite_filters.enabled" = true;
- "security.pki.crlite_mode" = 2;
-
- # SSL / TLS
- "security.ssl.treat_unsafe_negotiation_as_broken" = true;
- "browser.xul.error_pages.expert_bad_cert" = true;
- "security.tls.enable_0rtt_data" = false;
-
- # DISK AVOIDANCE
- "browser.privatebrowsing.forceMediaMemoryCache" = true;
- "browser.sessionstore.interval" = 60000;
-
- # SHUTDOWN & SANITIZING
- "privacy.history.custom" = true;
-
- # SEARCH / URL BAR
- "browser.search.separatePrivateDefault.ui.enabled" = true;
- "browser.urlbar.update2.engineAliasRefresh" = true;
- # PREF: restore search engine suggestions
- "browser.search.suggest.enabled" = true;
- "browser.urlbar.suggest.quicksuggest.sponsored" = false;
- "browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
- "browser.formfill.enable" = false;
- "security.insecure_connection_text.enabled" = true;
- "security.insecure_connection_text.pbmode.enabled" = true;
- "network.IDN_show_punycode" = true;
-
- # HTTPS-FIRST POLICY
- "dom.security.https_first" = true;
- "dom.security.https_first_schemeless" = true;
-
- # PASSWORDS
- "signon.formlessCapture.enabled" = false;
- "signon.rememberSignons" = false;
- "signon.privateBrowsingCapture.enabled" = false;
- "network.auth.subresource-http-auth-allow" = 1;
- "editor.truncate_user_pastes" = false;
-
- # MIXED CONTENT + CROSS-SITE
- "security.mixed_content.block_display_content" = true;
- "security.mixed_content.upgrade_display_content" = true;
- "security.mixed_content.upgrade_display_content.image" = true;
- "pdfjs.enableScripting" = false;
- "extensions.postDownloadThirdPartyPrompt" = false;
-
- # HEADERS / REFERERS
- "network.http.referer.XOriginTrimmingPolicy" = 2;
-
- # CONTAINERS
- "privacy.userContext.ui.enabled" = true;
-
- # WEBRTC
- "media.peerconnection.ice.proxy_only_if_behind_proxy" = true;
- "media.peerconnection.ice.default_address_only" = true;
-
- # SAFE BROWSING
- "browser.safebrowsing.downloads.remote.enabled" = false;
-
- # MOZILLA
- # PREF: allow websites to ask you to receive site notifications
- "permissions.default.desktop-notification" = 0; # allow websites to ask
- # PREF: allow websites to ask you for your location
- "permissions.default.geo" = 0;
- "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
- "permissions.manager.defaultsUrl" = "";
- "webchannel.allowObject.urlWhitelist" = "";
-
- # TELEMETRY
- "datareporting.policy.dataSubmissionEnabled" = false;
- "datareporting.healthreport.uploadEnabled" = false;
- "toolkit.telemetry.unified" = false;
- "toolkit.telemetry.enabled" = false;
- "toolkit.telemetry.server" = "data:,";
- "toolkit.telemetry.archive.enabled" = false;
- "toolkit.telemetry.newProfilePing.enabled" = false;
- "toolkit.telemetry.shutdownPingSender.enabled" = false;
- "toolkit.telemetry.updatePing.enabled" = false;
- "toolkit.telemetry.bhrPing.enabled" = false;
- "toolkit.telemetry.firstShutdownPing.enabled" = false;
- "toolkit.telemetry.coverage.opt-out" = true;
- "toolkit.coverage.opt-out" = true;
- "toolkit.coverage.endpoint.base" = "";
- "browser.ping-centre.telemetry" = false;
- "browser.newtabpage.activity-stream.feeds.telemetry" = false;
- "browser.newtabpage.activity-stream.telemetry" = false;
-
- # EXPERIMENTS
- "app.shield.optoutstudies.enabled" = false;
- "app.normandy.enabled" = false;
- "app.normandy.api_url" = "";
-
- # CRASH REPORTS
- "breakpad.reportURL" = "";
- "browser.tabs.crashReporting.sendReport" = false;
- "browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
-
- # DETECTION
- "captivedetect.canonicalURL" = "";
- "network.captive-portal-service.enabled" = false;
- "network.connectivity-service.enabled" = false;
-
- # SECTION: PESKYFOX
- # MOZILLA UI
- "browser.privatebrowsing.vpnpromourl" = "";
- "extensions.getAddons.showPane" = false;
- "extensions.htmlaboutaddons.recommendations.enabled" = false;
- "browser.discovery.enabled" = false;
- "browser.shell.checkDefaultBrowser" = false;
- "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false;
- "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false;
- "browser.preferences.moreFromMozilla" = false;
- "browser.tabs.tabmanager.enabled" = false;
- "browser.aboutConfig.showWarning" = false;
- "browser.aboutwelcome.enabled" = false;
-
- # THEME ADJUSTMENTS
- "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
- "browser.compactmode.show" = true;
- "browser.display.focus_ring_on_anything" = true;
- "browser.display.focus_ring_style" = 0;
- "browser.display.focus_ring_width" = 0;
- "layout.css.prefers-color-scheme.content-override" = 2;
-
- # COOKIE BANNER HANDLING
- "cookiebanners.service.mode" = 1;
- "cookiebanners.service.mode.privateBrowsing" = 1;
-
- # FULLSCREEN NOTICE
- "full-screen-api.transition-duration.enter" = "0 0";
- "full-screen-api.transition-duration.leave" = "0 0";
- "full-screen-api.warning.delay" = -1;
- "full-screen-api.warning.timeout" = 0;
-
- # URL BAR
- "browser.urlbar.suggest.calculator" = true;
- "browser.urlbar.unitConversion.enabled" = true;
- "browser.urlbar.trending.featureGate" = false;
-
- # NEW TAB PAGE
- "browser.newtabpage.activity-stream.feeds.topsites" = false;
- "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-
- # POCKET
- "extensions.pocket.enabled" = false;
-
- # DOWNLOADS
- "browser.download.always_ask_before_handling_new_types" = true;
- "browser.download.manager.addToRecentDocs" = false;
-
- # PDF
- "browser.download.open_pdf_attachments_inline" = true;
-
- # TAB BEHAVIOR
- "browser.bookmarks.openInTabClosesMenu" = false;
- "browser.menu.showViewImageInfo" = true;
- "findbar.highlightAll" = true;
- "layout.word_select.eat_space_to_next_word" = false;
-
- # SECTION: MY OVERRIDES
- "browser.startup.homepage" = "https://google.com";
- "identity.fxaccounts.enabled" = false;
-
- # SECTION SMOOTHFOX
- # OPTION: SHARPEN SCROLLING *
- "apz.overscroll.enabled" = true; # DEFAULT NON-LINUX
- "mousewheel.min_line_scroll_amount" = 10; # 10-40; adjust this number to your liking; default=5
- "general.smoothScroll.mouseWheel.durationMinMS" = 80; # default=50
- "general.smoothScroll.currentVelocityWeighting" = "0.15"; # default=.25
- "general.smoothScroll.stopDecelerationWeighting" = "0.6"; # default=.4
- };
- };
- };
-}
diff --git a/users/richie/home/gui/vscode/default.nix b/users/richie/home/gui/vscode/default.nix
deleted file mode 100644
index 68b71b7..0000000
--- a/users/richie/home/gui/vscode/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-let
- vscode_dir = "/home/richie/projects/nix-dotfiles/users/richie/home/gui/vscode";
-in
-{
- # mutable symlinks to key binds and settings
- xdg.configFile."Code/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/settings.json";
- xdg.configFile."Code/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/keybindings.json";
-
- home.packages = with pkgs; [ nil ];
-
- programs.vscode = {
- enable = true;
- package = pkgs.vscode;
- mutableExtensionsDir = true;
- };
-}
diff --git a/users/richie/home/gui/vscode/extension_manager.py b/users/richie/home/gui/vscode/extension_manager.py
deleted file mode 100644
index 8a4162c..0000000
--- a/users/richie/home/gui/vscode/extension_manager.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from subprocess import run
-
-
-def get_installed_extensions():
- process = run("code --list-extensions".split(), check=True, capture_output=True)
- return set(process.stdout.decode("utf-8").strip().split("\n"))
-
-
-def main():
- print("starting vscode extension manager")
-
- extensions = {
- # vscode
- "ms-azuretools.vscode-docker",
- "ms-vscode-remote.remote-containers",
- "ms-vscode-remote.remote-ssh-edit",
- "ms-vscode-remote.remote-ssh",
- "ms-vscode.hexeditor",
- "ms-vscode.remote-explorer",
- "ms-vsliveshare.vsliveshare",
- "oderwat.indent-rainbow",
- "usernamehw.errorlens",
- # git
- "codezombiech.gitignore",
- "eamodio.gitlens",
- "gitHub.vscode-github-actions",
- # python
- "charliermarsh.ruff",
- "ms-python.python",
- "ms-python.vscode-pylance",
- "ms-python.debugpy",
- # rust
- "rust-lang.rust-analyzer",
- # MD
- "davidanson.vscode-markdownlint",
- "yzhang.markdown-all-in-one",
- # configs
- "redhat.vscode-yaml",
- "tamasfe.even-better-toml",
- # shell
- "timonwong.shellcheck",
- "foxundermoon.shell-format",
- # nix
- "jnoortheen.nix-ide",
- # database
- "mtxr.sqltools-driver-pg",
- "mtxr.sqltools",
- # other
- "esbenp.prettier-vscode",
- "mechatroner.rainbow-csv",
- "streetsidesoftware.code-spell-checker",
- "supermaven.supermaven",
- }
-
- installed_extensions = get_installed_extensions()
-
- missing_extensions = extensions.difference(installed_extensions)
- for extension in missing_extensions:
- run(f"code --install-extension {extension} --force".split(), check=True)
-
- if extra_extensions := installed_extensions.difference(extensions):
- print(f"Extra extensions installed: {extra_extensions}")
-
- print("vscode extension manager finished")
-
-
-if __name__ == "__main__":
- main()
diff --git a/users/richie/home/gui/vscode/keybindings.json b/users/richie/home/gui/vscode/keybindings.json
deleted file mode 100644
index 091d316..0000000
--- a/users/richie/home/gui/vscode/keybindings.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
- "key": "shift+alt+f",
- "command": "editor.action.formatDocument",
- "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor"
- },
- {
- "key": "alt+a d",
- "command": "cSpell.addWordToWorkspaceSettings"
- },
- {
- "key": "ctrl+shift+`",
- "command": "workbench.action.createTerminalEditor"
- },
- {
- "key": "ctrl+shift+`",
- "command": "-workbench.action.terminal.new",
- "when": "terminalProcessSupported || terminalWebExtensionContributedProfile"
- }
-]
diff --git a/users/richie/home/gui/vscode/settings.json b/users/richie/home/gui/vscode/settings.json
deleted file mode 100644
index 1591c55..0000000
--- a/users/richie/home/gui/vscode/settings.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- // vscode settings
- "diffEditor.ignoreTrimWhitespace": false,
- "editor.formatOnSave": true,
- "editor.minimap.renderCharacters": false,
- "editor.minimap.showSlider": "always",
- "explorer.confirmDelete": false,
- "explorer.confirmDragAndDrop": false,
- "explorer.confirmPasteNative": false,
- "files.autoSave": "afterDelay",
- "git.autofetch": true,
- "git.confirmSync": false,
- "git.fetchOnPull": true,
- "git.pruneOnFetch": true,
- "terminal.integrated.scrollback": 10000,
- "update.mode": "none",
- "workbench.colorTheme": "Default Dark+",
-
- // turns off all sounds and announcements
- "accessibility.signals.terminalCommandFailed": {
- "sound": "off",
- "announcement": "off"
- },
- "accessibility.signals.terminalQuickFix": {
- "sound": "off",
- "announcement": "off"
- },
- "accessibility.signals.terminalBell": {
- "sound": "off",
- "announcement": "off"
- },
-
- // formatters
- "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
- "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
- "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
- "[nix]": { "editor.defaultFormatter": "jnoortheen.nix-ide" },
- "[python]": { "editor.defaultFormatter": "charliermarsh.ruff" },
- "[yaml]": { "editor.defaultFormatter": "redhat.vscode-yaml" },
-
- // spell check
- "cSpell.enabled": true,
- "cSpell.language": "en,en-US",
- "cSpell.enableFiletypes": ["bat", "csv", "nix", "toml"],
- "cSpell.userWords": ["Cahill", "syncthing"],
-
- // nix
- "nix.enableLanguageServer": true,
- "nix.serverPath": "nil",
-
- // force the use of rust-analyzer from dev shell
- "rust-analyzer.server.path": "rust-analyzer",
- "redhat.telemetry.enabled": true,
- "gitlens.plusFeatures.enabled": false,
- // new
- "hediet.vscode-drawio.resizeImages": null
-}
diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix
deleted file mode 100644
index 07461f5..0000000
--- a/users/richie/home/programs.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, inputs, ... }:
-{
- home.packages = with pkgs; [
- # cli
- bat
- btop
- eza
- git
- gnupg
- ncdu
- neofetch
- rar
- ripgrep
- sops
- starship
- tmux
- zoxide
- # system info
- hwloc
- lynis
- pciutils
- smartmontools
- usbutils
- # networking
- iperf3
- nmap
- wget
- # python
- poetry
- python312
- ruff
- # Rust packages
- topgrade
- trunk
- wasm-pack
- cargo-watch
- cargo-generate
- cargo-audit
- cargo-update
- # nix
- nix-init
- nix-output-monitor
- nix-prefetch
- nix-tree
- nixpkgs-fmt
- inputs.system_tools.packages.x86_64-linux.default
- ];
-}
diff --git a/users/richie/home/sshconfig.nix b/users/richie/home/sshconfig.nix
deleted file mode 100644
index 53d407f..0000000
--- a/users/richie/home/sshconfig.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- programs.ssh = {
- enable = true;
-
- matchBlocks = {
- jeeves = {
- hostname = "192.168.90.40";
- user = "richie";
- identityFile = "~/.ssh/id_ed25519";
- port = 629;
- dynamicForwards = [ { port = 9050; } ];
- };
- jeevesjr = {
- hostname = "192.168.90.35";
- user = "richie";
- identityFile = "~/.ssh/id_ed25519";
- port = 352;
- dynamicForwards = [ { port = 9050; } ];
- };
- bob = {
- hostname = "192.168.90.25";
- user = "richie";
- identityFile = "~/.ssh/id_ed25519";
- port = 262;
- dynamicForwards = [ { port = 9050; } ];
- };
- rhapsody-in-green = {
- hostname = "192.168.90.221";
- user = "richie";
- identityFile = "~/.ssh/id_ed25519";
- port = 922;
- };
- palatine-hill = {
- hostname = "192.168.76.2";
- user = "richie";
- identityFile = "~/.ssh/id_ed25519";
- port = 666;
- };
- };
- };
-}
diff --git a/users/richie/secrets.yaml b/users/richie/secrets.yaml
deleted file mode 100644
index 0870c25..0000000
--- a/users/richie/secrets.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-richie:
- user-password: ENC[AES256_GCM,data:l1WF7bwzEDKoDh3lv60H2A35ndPmTSsBQeso8YksZO4UstOjtSKFF5IZJYlE6Amonl9ZFUsQFtgVN+Rg2Yh/rmlI1TBL7CZDadlYIueQh8Si1Xr6qJJMBxqT/dV7G9tH24auUVdWc7tfoEYh6qZ+n9JR47H73A==,iv:d/Xe6qxaNSWo//gPES4h1XqWPGjALQ2316LPPZZyM68=,tag:2lJEc7UrpdmeAVfNXxy7Kw==,type:str]
-syncthing:
- password: ENC[AES256_GCM,data:iITyXH47YLdbD4t7k27SFpfN,iv:jzBh69brKJSxLNCd/ntY7O/GcpjmGc1Gli7yuxwwe2E=,tag:6fglnQjYXCnilgy8p+KWuw==,type:str]
-sops:
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
- age:
- - recipient: age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4VGsycE1JQUFXbmZOQ3dP
- VlMzVllzemN3WWd2dFc4UEdKSnVmcHhNaFZNCmVLZG54RWIybVl3dXNpQ2NLVnBh
- dUdKWlJ1dXZ3MFZ1Y2tQVzNJR3pYcjAKLS0tIFFiRHIzZEpjNml3Mm1GOUhRWjBy
- UVMwemZIY1RTWkVmQXE3allUNzdLWlkKPBVTtbgPXXnbclANx4nysXeTWmSoIuAg
- NfCnCPPgYqe+zW3XL9czEjxyTyH25lnkAWckUhCch3g2uA/7uV1xlg==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age128ehc0ssgwnuv4r8ayfyu7r80e82xrkmv63g7h9y9q4mhk4w9dyqfymc2w
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2blVUSngvekRPMFRmanhy
- c08rZ05TdGtLMVZIdjRrY3Nmclo1eVhqNDFzCnhLQlg5YURCUzR3dStva0llN0Z0
- ZzJxVDdRK3pER0RTTVZRS0dhZkkxTEUKLS0tIExNd0ptYm9PY3FnelZmcmgyc3l4
- SE1hU1hzOFVhTThBTmg3LzlvMUljdEUKCwkZlOduNCrNZ7S/aDJfVkUny6uCIdQu
- 3sVk5mtz5hwWtycfMNC8+y67S+VzSZPY3GeBN3f9ShWEFT+sM6k3Dg==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age1lffr5f5nz0nrenv3ekgy27e8sztsx4gfp3hfymkz77mqaa5a4gts0ncrrh
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0RE9lK0xUTXhTQWtJL2V5
- SURFZ0Q4R3FiVkFnbUVEeE0yWUNsRjh6WjFzCjdHVnBNTDVVTk0zOWtuWTdMbXZQ
- eVpmNE90RzkyTWN4eWs2SUdubFZ2ek0KLS0tIEZaQis2Z1R6SURhT3g3ZHVTQU1R
- M1h3dFZXQStBSGtveENQTi9jeGVSRGcKFoTwIJFF4gMX9854JaGt1M8lcKDWijk0
- LU22l0GOL9h4EFlIFE3keahXO+47Cjr92uMrlAnsX+xdnH0uPdxrNA==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age1c7adjulcrma0m7l5ur8efxdjzyskrqcwssfkt77a9rmma7gzss5q02pgmy
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzWUhhS0RjcVQvMnRYZDl4
- eFRZbjNDN1ZlRS9neURWdW9tMmV5RiszSGkwCm91b3dWQXVxRlEzMEVnd1lkT3hI
- U2oxK1psMHZROTRNd2gremxmS1l1WXcKLS0tIHlsTy9qcUlySlZ4dHo2czBiaVlE
- REg4THhDRmdZOHJGVmxZcmIxUThTMUkKeyTq4ibHWukJx+9ApBSt9y3sfy9895Sf
- pa2Kkw1VsnQhvEW0+IeRoQnxeQB6rAXlftNhtEodc6d3w+ny/tI3kA==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age13jg97cvy63fzd2ccthcwvfyyxzw5vmwun8s0afq5l4xm0mhl6pjqhne063
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2bU5OTWFBNkRRdEFzblhk
- VDE1cUdUTHNVUmkzdDFkWHBXL0gxMHVjMjFjCjVLQXROWWErTFhVckorSHZJWG9D
- a1BobEorVXdNTC8xcGpvdUZKem04R2cKLS0tIG1TU2ViWTJ2SUxVMG9jOE41bGVk
- QWVIUEJxV1diZG0xaUNNMmJaUUhIRHcKlAweCd38TNHdyIhzXIdjgEBj10bn6KK/
- 0e0qgyWNfkJtBYF2PhaBcr7l58dHSbQXXomgG2npGxPGVYMtoLPTsg==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-04-13T17:27:06Z"
- mac: ENC[AES256_GCM,data:xzVCCVSfQz7fH+z3veZI5uJA6eBDRMT5kPT2Qq/KlESKJC4MVn6ErTbdDEFEnfa7vmqnBArPIEWdkSSbPTAvZbCMzuQTUVsjKbHnnvZsVypl0ScVgupGYq/+UhVoW8vKukXMAZ2dZfMWGn3Sso+DpWhR83Pf8FF8Xey4YcJzpIs=,iv:5oDREhX2gxypLurd0lyINklrf2DU/1SyD4sXiO/THUI=,tag:MvlitzHGiRCHJszLn5zoWg==,type:str]
- pgp:
- - created_at: "2024-06-09T00:29:47Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQIMA29thaGx06tOAQ//RvcNg6H6CeLvrdLSb7ohPkZGPwgxkIyn8a384ybg5nX3
- TiV1aDlg4RNyvQY371ixYVIO4ddjC2OMyt43ghHIUvH2Lp6dn2anPuqlMXXOTeYL
- nEH09fsuZ3Mkg6F30MQH3tBOHvkroKPQCA9Y2JSQhkfO1GsAAm1PhCUgqJDKDK38
- /fwWSPvrOQDhdRDhTVmAHKRpH6XvSN8d5QUWqwaII+34JkQRFNNhqJZCu04QP0Yy
- CaceNJg9IoBy2n2nJZ3zQfzOvxujPEnsXnuQ67Oa2GCwwNEsxfjjeFApi97zOeQA
- 0LwM6iZGz/d5hdb7HVCVUuU2H9QPNuYWYNEIFJTJjOUY0osaBe+a7xPY4dm5YNsS
- Y5VMup6SQINoXQcabkwU2zjbEEEEFWjDrszweLn/YBEdkT1vkJ/Gnrl8j3udYZs4
- /xC/xIbIFjOhXmIi+I4WbeQK8bspS+EbEGT/t+iE2mf3zEjZsjVppGtX1rVoGE1x
- 1H3P2IK6CBiT9d8A7ocLFYdGRoXreQyDNJqd4u0XRMjbTgC2rWbOsaBJDzjyQKXV
- oAR8o04wwB0wZZaAYYwb6bIqa/UFO2ZKUvQVu8wDVMt0NBwHSMVivu5ArqZwl+pj
- Fyy+t6+JVdvATsBfWEyejJ3Y4jjGUCJPkbAdkAxACdmfikye0A+Je4QGOBctMOzS
- XgE9V6KGRqKrr2aZBCMgg4H2hoqQLGpQAEKadJ8RvU7PM6C0wbF/5XNPce8rUqOw
- 87Bn3wdcQcxCtWHSOj1o0SKRrQ9PlxfnvnVcCGW/vyKbWGvs5JNYMs3IfQ6xXnA=
- =OVS5
- -----END PGP MESSAGE-----
- fp: 29F5017C95D9E60B1B1E8407072B0E0B8312DFE3
- unencrypted_suffix: _unencrypted
- version: 3.8.1