home: nix: configure GC

nixos: system: nix: configure GC
flake: bump inputs
2024-10-28 10:44:20 +00:00 · 2024-10-28 10:44:20 +00:00 · 2024-10-28 10:44:20 +00:00 · 2024-10-28 10:44:19 +00:00 · 2024-10-28 10:42:37 +00:00
7 changed files with 49 additions and 51 deletions
--- a/flake.lock
+++ b/flake.lock
@ -136,11 +136,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729551526,
-        "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
+        "lastModified": 1729864948,
+        "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
+        "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0",
        "type": "github"
      },
      "original": {
@ -152,11 +152,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1729665710,
+        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
        "type": "github"
      },
      "original": {
@ -168,11 +168,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1729688743,
-        "narHash": "sha256-Oe1PRxUAXSwRUcRIH+saPgMsIEEm7PfL81+M5IDCqvg=",
+        "lastModified": 1729868220,
+        "narHash": "sha256-OxHE1U+FIIaQ50nZpt/VxLH0bokiqsEqAshehlHhOFs=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "2680c1d6af171ee32198c8f2f5dc07ce1d5bd2ea",
+        "rev": "70b30d23d33ca2acfb267430b08ddf82ff7116b2",
        "type": "github"
      },
      "original": {
--- a/hosts/nixos/porthos/secrets/matrix/sliding-sync-secret.age
+++ b/hosts/nixos/porthos/secrets/matrix/sliding-sync-secret.age
@ -1,8 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 cKojmg xRtF3XVc7yPicAV/E4U7mn0itvD0h1BWBTjwunuoe2E
-OkB9sjGB3ulH4Feuyj3Ed0DBG4+mghW/Qpum9oXL/8c
-> ssh-ed25519 jPowng 1r8drqhz1yZdTq0Kvqya+ArU1C2fkN7Gg9LiWWfeUFg
-cjbxntVwHvqLaJpiKs/Y8ojeb6e3/cLFcsoeuoobfFg
--- B1qA2PylJBrdZxZtCzlU2kRPvxLM+IrXTvR+ERxVtTY
-"W9<57>Äbg¸©~Ì/áÕb4ãÕ†ú³ÜÔIÊ
-Û}ð
§ËÅË-³²ªNó±”ÑC7vWœbºØ?¦8=œÉwÆBÃUpJClï²OÈ™³œnOÁ\
--- a/hosts/nixos/porthos/secrets/secrets.nix
+++ b/hosts/nixos/porthos/secrets/secrets.nix
@ -48,9 +48,6 @@ in
    owner = "matrix-synapse";
    publicKeys = all;
  };
-  "matrix/sliding-sync-secret.age" = {
-    publicKeys = all;
-  };

  "mealie/mail.age" = {
    publicKeys = all;
--- a/hosts/nixos/porthos/services.nix
+++ b/hosts/nixos/porthos/services.nix
@ -69,9 +69,6 @@ in
      mailConfigFile = secrets."matrix/mail".path;
      # Only necessary when doing the initial registration
      secretFile = secrets."matrix/secret".path;
-      slidingSync = {
-        secretFile = secrets."matrix/sliding-sync-secret".path;
-      };
    };
    mealie = {
      enable = true;
--- a/modules/home/nix/default.nix
+++ b/modules/home/nix/default.nix
@ -22,6 +22,10 @@ in
  options.my.home.nix = with lib; {
    enable = my.mkDisableOption "nix configuration";

+    gc = {
+      enable = my.mkDisableOption "nix GC configuration";
+    };
+
    cache = {
      selfHosted = my.mkDisableOption "self-hosted cache";
    };
@ -60,6 +64,22 @@ in
      };
    }

+    (lib.mkIf cfg.gc.enable {
+      nix.gc = {
+        automatic = true;
+
+        # Every week, with some wiggle room
+        frequency = "weekly";
+        randomizedDelaySec = "10min";
+
+        # Use a persistent timer for e.g: laptops
+        persistent = true;
+
+        # Delete old profiles automatically after 15 days
+        options = "--delete-older-than 15d";
+      };
+    })
+
    (lib.mkIf cfg.cache.selfHosted {
      nix = {
        settings = {
--- a/modules/nixos/services/matrix/default.nix
+++ b/modules/nixos/services/matrix/default.nix
@ -26,21 +26,6 @@ in
      description = "Shared secret to register users";
    };

-    slidingSync = {
-      port = mkOption {
-        type = types.port;
-        default = 8009;
-        example = 8084;
-        description = "Port used by sliding sync server";
-      };
-
-      secretFile = mkOption {
-        type = types.str;
-        example = "/var/lib/matrix/sliding-sync-secret-file.env";
-        description = "Secret file which contains SYNCV3_SECRET definition";
-      };
-    };
-
    mailConfigFile = mkOption {
      type = types.str;
      example = "/var/lib/matrix/email-config.yaml";
@ -130,9 +115,6 @@ in
              "m.identity_server" = {
                "base_url" = "https://vector.im";
              };
-              "org.matrix.msc3575.proxy" = {
-                "url" = "https://matrix-sync.${domain}";
-              };
            };
            showLabsSettings = true;
            defaultCountryCode = "FR"; # cocorico
@ -152,10 +134,6 @@ in
      matrix-client = {
        port = clientPort.private;
      };
-      # Sliding sync
-      matrix-sync = {
-        inherit (cfg.slidingSync) port;
-      };
    };

    # Those are too complicated to use my wrapper...
@ -178,11 +156,6 @@ in

            "/_matrix" = proxyToClientPort;
            "/_synapse/client" = proxyToClientPort;
-
-            # Sliding sync
-            "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = {
-              proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
-            };
          };

        listen = [
@ -228,7 +201,6 @@ in
            client = {
              "m.homeserver" = { "base_url" = "https://${matrixDomain}"; };
              "m.identity_server" = { "base_url" = "https://vector.im"; };
-              "org.matrix.msc3575.proxy" = { "url" = "https://matrix-sync.${domain}"; };
            };
            # ACAO required to allow element-web on any URL to request this json file
          in
--- a/modules/nixos/system/nix/default.nix
+++ b/modules/nixos/system/nix/default.nix
@ -22,6 +22,10 @@ in
  options.my.system.nix = with lib; {
    enable = my.mkDisableOption "nix configuration";

+    gc = {
+      enable = my.mkDisableOption "nix GC configuration";
+    };
+
    cache = {
      selfHosted = my.mkDisableOption "self-hosted cache";
    };
@ -62,6 +66,22 @@ in
      };
    }

+    (lib.mkIf cfg.gc.enable {
+      nix.gc = {
+        automatic = true;
+
+        # Every week, with some wiggle room
+        dates = "weekly";
+        randomizedDelaySec = "10min";
+
+        # Use a persistent timer for e.g: laptops
+        persistent = true;
+
+        # Delete old profiles automatically after 15 days
+        options = "--delete-older-than 15d";
+      };
+    })
+
    (lib.mkIf cfg.cache.selfHosted {
      nix = {
        settings = {
Author	SHA1	Message	Date
Bruno BELANYI	9a0f86baa4	home: nix: configure GC Some checks failed ci/woodpecker/push/check Pipeline failed Details	2024-10-28 10:44:20 +00:00
Bruno BELANYI	df6e5a44c4	nixos: system: nix: configure GC	2024-10-28 10:44:20 +00:00
Bruno BELANYI	21418eeae5	flake: bump inputs	2024-10-28 10:44:20 +00:00
Bruno BELANYI	b6fdc00c53	hosts: nixos: porthos: secrets: add matrix sync Remove the secret, as it not used anymore. This reverts commit `52413dcaf7`.	2024-10-28 10:44:19 +00:00
Bruno BELANYI	2d05d4c049	modules: services: matrix: remove sliding sync The functionality has been folded into `synapse` itself, and the module has been removed from the unstable branch. This reverts commit `b4c2cc581b`.	2024-10-28 10:42:37 +00:00