From cdc4c4e38bf9e0abbe6a53e459f7dc247035cb69 Mon Sep 17 00:00:00 2001 From: Romain Paquet Date: Sun, 25 May 2025 23:10:16 +0200 Subject: [PATCH] remove impermanence on genepi --- machines/genepi/configuration.nix | 2 - machines/genepi/disko.nix | 11 ------ machines/genepi/persistence.nix | 64 ------------------------------- machines/genepi/taskchampion.nix | 6 +-- 4 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 machines/genepi/persistence.nix diff --git a/machines/genepi/configuration.nix b/machines/genepi/configuration.nix index e86c027..1c684c3 100644 --- a/machines/genepi/configuration.nix +++ b/machines/genepi/configuration.nix @@ -5,7 +5,6 @@ { imports = [ inputs.agenix.nixosModules.default - inputs.impermanence.nixosModules.impermanence ./acme.nix ./boot.nix ./builder.nix @@ -18,7 +17,6 @@ ./mpd.nix ./network.nix ./nginx.nix - ./persistence.nix ./syncthing.nix ./taskchampion.nix diff --git a/machines/genepi/disko.nix b/machines/genepi/disko.nix index 3fd4480..0c1659c 100644 --- a/machines/genepi/disko.nix +++ b/machines/genepi/disko.nix @@ -52,14 +52,6 @@ "noatime" ]; }; - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ - "subvol=persist" - "compress=zstd" - "noatime" - ]; - }; "/log" = { mountpoint = "/var/log"; mountOptions = [ @@ -80,7 +72,4 @@ }; }; }; - - fileSystems."/persist".neededForBoot = true; - fileSystems."/var/log".neededForBoot = true; } diff --git a/machines/genepi/persistence.nix b/machines/genepi/persistence.nix deleted file mode 100644 index bca3d3e..0000000 --- a/machines/genepi/persistence.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, ... }: -{ - environment.persistence."/persist" = { - enable = true; - directories = [ - "/var/lib/nixos" - "/var/lib/acme" - "/var/lib/prometheus2" - "/var/lib/immich" - "/var/lib/redis-immich" - "/var/lib/postgresql" - "/var/lib/grafana" - "/var/lib/freshrss" - "/var/lib/tailscale" - ]; - files = [ - # so that systemd doesn't think each boot is the first - "/etc/machine-id" - # ssh host keys - "/etc/ssh/ssh_host_rsa_key" - "/etc/ssh/ssh_host_rsa_key.pub" - "/etc/ssh/ssh_host_ed25519_key" - "/etc/ssh/ssh_host_ed25519_key.pub" - ]; - users.rpqt = { - directories = [ ]; - files = [ ]; - home = "/home/rpqt"; - }; - }; - - # Empty root and remove snapshots older than 30 days - # boot.initrd.postDeviceCommands = lib.mkAfter '' - # mkdir /btrfs_tmp - # mount /dev/disk/by-label/nixos /btrfs_tmp - # if [[ -e /btrfs_tmp/root ]]; then - # mkdir -p /btrfs_tmp/old_roots - # timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") - # mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - # fi - - # delete_subvolume_recursively() { - # IFS=$'\n' - # for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - # delete_subvolume_recursively "/btrfs_tmp/$i" - # done - # btrfs subvolume delete "$1" - # } - - # for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - # delete_subvolume_recursively "$i" - # done - - # btrfs subvolume create /btrfs_tmp/root - # umount /btrfs_tmp - # rmdir /btrfs_tmp - # ''; - - # Give agenix persistent paths so it can load secrets before the mount - age.identityPaths = [ - "/persist/etc/ssh/ssh_host_ed25519_key" - "/persist/etc/ssh/ssh_host_rsa_key" - ]; -} diff --git a/machines/genepi/taskchampion.nix b/machines/genepi/taskchampion.nix index b06dbc5..5108dcd 100644 --- a/machines/genepi/taskchampion.nix +++ b/machines/genepi/taskchampion.nix @@ -1,15 +1,11 @@ -{ config, lib, ... }: +{ config, ... }: let domain = "home.rpqt.fr"; subdomain = "tw.${domain}"; - hasImpermanence = config.environment.persistence."/persist".enable; in { services.taskchampion-sync-server.enable = true; - services.taskchampion-sync-server.dataDir = - (lib.optionalString hasImpermanence "/persist") + "/var/lib/taskchampion-sync-server"; - services.nginx.virtualHosts.${subdomain} = { forceSSL = true; useACMEHost = "${domain}";