flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/786965e1b1ed3fd2018d78399984f461e2a44689' (2024-07-11)
  → 'github:nix-community/disko/e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47' (2024-07-18)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/0c6b5c8ab796f6dfb2aef1133f5b7bb25ce57cb9' (2024-07-10)
  → 'github:nix-community/dream2nix/4e9fd61a1201f4b3800d6946810a6b4c2ecdcde8' (2024-07-18)
• Updated input 'homeManager':
    'github:nix-community/home-manager/c085b984ff2808bf322f375b10fea5a415a9c43d' (2024-07-10)
  → 'github:nix-community/home-manager/afd2021bedff2de92dfce0e257a3d03ae65c603d' (2024-07-16)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=014410cbf0bda9c0fcdaf5f894120883cdc805ce' (2024-07-10)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=aba5f19680b2f4c29d7ce2ff5e2a89128c1cb26d' (2024-07-19)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=5d9d94089fb1ca96222a34bfe245ef5c5ebefd37' (2024-06-25)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=d70318fb946a0e720dfdd1fb10b0645c14e2a02a' (2024-07-11)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/31704f8a55f5773c9b4e7adb7408a142d142e1f2' (2024-07-11)
  → 'github:NixOS/mobile-nixos/472073a51745cca03257cf625582252cdd04ec21' (2024-07-17)
• Updated input 'nix-on-droid':
    'github:nix-community/nix-on-droid/8bcadcef69dcb5ca177bfb6ea3dc6b092cda2b06' (2024-07-10)
  → 'github:nix-community/nix-on-droid/c00333ee42aa2b4d4825e0388a1049fdeeded6c6' (2024-07-14)
• Updated input 'nix-on-droid/nix-formatter-pack/nmd':
    'gitlab:rycee/nmd/b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169' (2022-10-19)
  → follows 'nix-on-droid/nmd'
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/cf297a8d248db6a455b60133f6c0029c04ebe50e' (2024-07-10)
  → 'github:LnL7/nix-darwin/a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec' (2024-07-18)
• Updated input 'nixd':
    'github:nix-community/nixd/60a925008bc353136ba5babce437f42819c1645c' (2024-06-26)
  → 'github:nix-community/nixd/334da32238a641c24ca7bff59d7a7d38c48fea06' (2024-07-16)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/a111ce6b537df12a39874aa9672caa87f8677eda' (2024-07-09)
  → 'github:NixOS/nixos-hardware/bb90787ea034c8b9035dfcfc9b4dc23898d414be' (2024-07-18)
• Updated input 'nixpkgsStable':
    'github:NixOS/nixpkgs/7144d6241f02d171d25fba3edeaf15e0f2592105' (2024-07-02)
  → 'github:NixOS/nixpkgs/205fd4226592cc83fd4c0885a3e4c9c400efabb5' (2024-07-09)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1' (2024-07-09)
  → 'github:cachix/pre-commit-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd' (2024-07-15)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/750dfb555b5abdab4d3266b3f9a05dec6d205c04' (2024-07-10)
  → 'github:numtide/treefmt-nix/50104496fb55c9140501ea80d183f3223d13ff65' (2024-07-19)

flake.lock

@@ -104,11 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721417620,
+        "lastModified": 1721266288,
-        "narHash": "sha256-6q9b1h8fI3hXg2DG6/vrKWCeG8c5Wj2Kvv22RCgedzg=",
+        "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bec6e3cde912b8acb915fecdc509eda7c973fb42",
+        "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47",
         "type": "github"
       },
       "original": {
@@ -818,11 +818,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721534365,
+        "lastModified": 1721135958,
-        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
+        "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
+        "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
         "type": "github"
       },
       "original": {
@@ -852,21 +852,6 @@
         "type": "github"
       }
     },
-    "impermanence": {
-      "locked": {
-        "lastModified": 1719091691,
-        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "type": "github"
-      }
-    },
     "kernel-src": {
       "flake": false,
       "locked": {
@@ -887,11 +872,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1721513673,
+        "lastModified": 1721371213,
-        "narHash": "sha256-Tgdh7f1AB4D8aDw4obBwh0VYgZEcFBbjKZmMyolmnhw=",
+        "narHash": "sha256-7SdrlNe5DBlK5uLBhPPxVRWI50N1PFz3zMBeDYiX0Qs=",
         "ref": "refs/heads/main",
-        "rev": "1917e6c765b0b0012ed85a7a927db0bf83fb27ca",
+        "rev": "aba5f19680b2f4c29d7ce2ff5e2a89128c1cb26d",
-        "revCount": 15996,
+        "revCount": 15985,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -1019,11 +1004,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721550066,
+        "lastModified": 1721270582,
-        "narHash": "sha256-wr6sSb+VpXy8HCvBqU6xvhpaARzWUbEK7uN5tLnqYDg=",
+        "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "33bf7df5bbfcbbb49e6559b0c96c9e3b26d14e58",
+        "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1048,11 @@
         "nixpkgs": "nixpkgs_10"
       },
       "locked": {
-        "lastModified": 1721541664,
+        "lastModified": 1721140729,
-        "narHash": "sha256-hk9g7kuGqDz8TYAbX9R6IvLUDnE5UpxwLR41MZ5uTDU=",
+        "narHash": "sha256-f+RjBJ4BZ8Uv6QuQ/TEaA8crKP+Uw6DZXdtRY2EvwlQ=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "963dd36863e18f942e90c66b2c76e7c161b61ff9",
+        "rev": "334da32238a641c24ca7bff59d7a7d38c48fea06",
         "type": "github"
       },
       "original": {
@@ -1078,11 +1063,11 @@
     },
     "nixosHardware": {
       "locked": {
-        "lastModified": 1721413321,
+        "lastModified": 1721331912,
-        "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
+        "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
+        "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be",
         "type": "github"
       },
       "original": {
@@ -1655,7 +1640,6 @@
         "hercules-ci-effects": "hercules-ci-effects_3",
         "homeManager": "homeManager",
         "homeManagerGitWorkspace": "homeManagerGitWorkspace",
-        "impermanence": "impermanence",
         "lix": "lix",
         "lix-module": "lix-module",
         "mobile-nixos": "mobile-nixos",
@@ -1823,11 +1807,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721458737,
+        "lastModified": 1721382922,
-        "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=",
+        "narHash": "sha256-GYpibTC0YYKRpFR9aftym9jjRdUk67ejw1IWiaQkaiU=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97",
+        "rev": "50104496fb55c9140501ea80d183f3223d13ff65",
         "type": "github"
       },
       "original": {

flake.nix

@@ -68,7 +68,6 @@
       flake = false;
     };
     arion.url = "github:hercules-ci/arion";
-    impermanence.url = "github:nix-community/impermanence";
   };
 
   outputs = inputs @ {flakeParts, ...}:

hosts/default.nix

@@ -160,7 +160,6 @@
         extraModules = with inputs; [
           disko.nixosModules.disko
           arion.nixosModules.arion
-          impermanence.nixosModules.impermanence
           # lix-module.nixosModules.default
           # inputs.hercules-ci-agent.nixosModules.agent-service;
           # rock5b.nixosModules.default
@@ -174,8 +173,8 @@
           "home-planimetry".owner = "hass";
           "cloudflare-dyndns-api-token" = {};
           "restic-hetzner-password" = {};
-          # "minio-credentials".owner = "minio";
+          "minio-credentials".owner = "minio";
-          # "aws-credentials".owner = "hercules-ci-agent";
+          "aws-credentials".owner = "hercules-ci-agent";
           "hass-ssh-key".owner = "hass";
           # "matrix-registration-shared-secret".owner = "matrix-synapse";
           # "matrix-sliding-sync-secret".owner = "matrix-synapse";

hosts/picard/default.nix

@@ -32,7 +32,7 @@
       "restic"
       "binfmt"
       "greetd"
-      # "syncthing"
+      "syncthing"
       "hass-poweroff"
       "forgejo-runners"
       "teamviewer"

hosts/sisko/default.nix

@@ -13,7 +13,7 @@
       "wireguard-server"
       "mediatomb"
       "transmission"
-      # "hercules-ci"
+      "hercules-ci"
       "home-assistant"
       "adguard-home"
       "cloudflare-dyndns"
@@ -21,13 +21,13 @@
       "invidious"
       "searx"
       "rock5b-samba"
-      # "paperless"
+      "paperless"
-      # "restic"
+      "restic"
-      # "syncthing"
+      "syncthing"
-      # "minio"
+      "minio"
-      # # "matrix"
+      # "matrix"
       "forgejo"
-      # # "jellyfin"
+      # "jellyfin"
       # "immich"
     ]
     ++ [
@@ -62,6 +62,8 @@
 
   ccr.enable = true;
 
+  # services.rock5b-fan-control.enable = true;
+
   nixpkgs.hostPlatform = "aarch64-linux";
 
   swapDevices = [];
@@ -82,35 +84,26 @@
     "console=ttyS0,1500000"
   ];
 
-  environment.persistence."/persist" = {
+  # fileSystems."/mnt/film" = {
-    hideMounts = true;
+  #   device = "//ccr.ydns.eu/film";
-    directories = [
+  #   fsType = "cifs";
-      "/etc/NetworkManager/system-connections"
+  #   options = let
-      "/var/db/dhcpcd/"
+  #     credentials = pkgs.writeText "credentials" ''
-      "/var/lib/NetworkManager/"
+  #       username=guest
-      "/var/lib/nixos"
+  #       password=
-      "/var/lib/systemd"
+  #     '';
-      "/var/lib/systemd/coredump"
+  #   in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"];
-      "/var/log"
+  # };
-      "/var/lib/containers"
+  # fileSystems."/mnt/archivio" = {
-      "/var/lib/postgresql"
+  #   device = "//ccr.ydns.eu/archivio";
-    ];
+  #   fsType = "cifs";
-    files = [
+  #   options = let
-      "/etc/machine-id"
+  #     credentials = pkgs.writeText "credentials" ''
-      "/etc/ssh/ssh_host_ed25519_key"
+  #       username=guest
-      "/etc/ssh/ssh_host_ed25519_key.pub"
+  #       password=
-      "/etc/ssh/ssh_host_rsa_key"
+  #     '';
-      "/etc/ssh/ssh_host_rsa_key.pub"
+  #   in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"];
-    ];
+  # };
-  };
-
-  age.identityPaths = [
-    "/persist/etc/ssh/ssh_host_ed25519_key"
-    "/persist/etc/ssh/ssh_host_rsa_key"
-  ];
-
-  fileSystems."/persist".neededForBoot = true;
-  boot.tmp.cleanOnBoot = true;
 
   fileSystems."/mnt/hd" = {
     device = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550-part1";

hosts/sisko/disko.nix

@@ -7,10 +7,6 @@ let
   # old_hd = "/dev/disk/by-id/ata-WDC_WD5000AAKX-08U6AA0_WD-WCC2E5TR40FU";
 in {
   disko.devices = {
-    nodev."/" = {
-      fsType = "tmpfs";
-      mountOptions = ["size=1024M" "defaults" "mode=755"];
-    };
     disk = {
       ssd = {
         device = ssd;
@@ -21,35 +17,20 @@ in {
             ESP = {
               label = "ESP";
               type = "EF00";
-              size = "1024M";
+              size = "1G";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
               };
             };
-            nixroot = {
+            root = {
-              size = "100G";
+              label = "root";
+              size = "100%";
               content = {
                 type = "filesystem";
                 format = "ext4";
-                mountpoint = "/nix";
+                mountpoint = "/";
-              };
-            };
-            persist = {
-              size = "100G";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/persist";
-              };
-            };
-            tmp = {
-              end = "0";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/tmp";
               };
             };
           };

modules/forgejo/default.nix

@@ -29,11 +29,15 @@
         SHOW_FOOTER_VERSION = false;
       };
     };
-    secrets.mailer.PASSWD = config.age.secrets.autistici-password.path;
+    mailerPasswordFile = config.age.secrets.autistici-password.path;
     dump.enable = true;
   };
 
-  environment.persistence."/persist".directories = [
+  systemd.tmpfiles.rules = [
+    "d ${config.services.forgejo.stateDir} 770 forgejo forgejo"
+  ];
+
+  backup.paths = [
     config.services.forgejo.stateDir
   ];
 

modules/home-assistant/default.nix

@@ -210,8 +210,8 @@ in {
     };
   };
 
-  environment.persistence."/persist".directories = [
+  backup.paths = [
-    config.services.home-assistant.configDir
+    "/var/lib/hass"
   ];
 
   # virtualisation.oci-containers = {

modules/nginx-base/default.nix

@@ -16,8 +16,4 @@
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
   };
-
-  environment.persistence."/persist".directories = [
-    "/var/lib/acme"
-  ];
 }