Update https://github.com/cachix/install-nix-action action to v31

2025-03-23 15:00:12 +00:00
8 changed files with 36 additions and 79 deletions
--- a/flake.lock
+++ b/flake.lock
@ -45,11 +45,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742985972,
-        "narHash": "sha256-RQ283gaz2bxCNaY+8CJZURYL0gJSLT+da7wSYmxYR10=",
+        "lastModified": 1742633756,
+        "narHash": "sha256-sZW/LHBFev9b2BZljlAKKb88JsDx0ebtd+hSZHCxY+4=",
        "owner": "accentor",
        "repo": "api",
-        "rev": "37f102a1a7792aaf3b61165ca169e8a16792c7c1",
+        "rev": "12844b427f1c2f8a1b92adba51bae84530b7fcd0",
        "type": "github"
      },
      "original": {
@ -74,11 +74,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742986115,
-        "narHash": "sha256-zOijWG+HRfg4okuwvgulTgqS6OosD/jqmqmQOfLGou0=",
+        "lastModified": 1742633842,
+        "narHash": "sha256-0LjEDL0HMgZ0vwqL0JEwPX1lTVVenzEsbBEr5oCbz7s=",
        "owner": "accentor",
        "repo": "web",
-        "rev": "204b53502032355dbdea0adbc3ddb601863fe3c5",
+        "rev": "3c63be693318dff9a2e0d9bdf686b604e9160d43",
        "type": "github"
      },
      "original": {
@ -139,11 +139,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742869675,
-        "narHash": "sha256-rgwUZJZVztaNYPTsf6MIqirPL5r2JTMMyHuzk1ezyYk=",
+        "lastModified": 1742595055,
+        "narHash": "sha256-cEetDber6LF8W4ThmRc4rwKs/o8y2GH0pUdX7e6CnAQ=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "bb81755a3674951724d79b8cba6bbff01409d44d",
+        "rev": "e9f41de2a81f04390afd106959adf352a207628f",
        "type": "github"
      },
      "original": {
@ -184,11 +184,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1743063724,
-        "narHash": "sha256-Rc0+3NxNeVcU1uOppQa5lGuVQQNPSKEqGN051iILccc=",
+        "lastModified": 1742721191,
+        "narHash": "sha256-TPIHB+dW1SXBkL/KBVdgzOWz59CGYcX/yKk1/tEmxdE=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "616ec6ce6e0df878a95ad6884452fd728e8e9386",
+        "rev": "f42d70c2f52e2e1da8e6cdd0fb1a5a1485e51a5e",
        "type": "github"
      },
      "original": {
@ -276,11 +276,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742996658,
-        "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
+        "lastModified": 1742740113,
+        "narHash": "sha256-0FpSJtQ6rlBg/5ywpXw4CFzE+27rlZWj3GSx8QvyONM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "693840c01b9bef9e54100239cef937e53d4661bf",
+        "rev": "b61ae3b677a07c30cf6be5233e772b97a3a8b2fb",
        "type": "github"
      },
      "original": {
@ -361,24 +361,25 @@
      "locked": {
        "lastModified": 1742413977,
        "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
-        "owner": "simple-nixos-mailserver",
+        "owner": "yu-re-ka",
        "repo": "nixos-mailserver",
        "rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
        "type": "gitlab"
      },
      "original": {
-        "owner": "simple-nixos-mailserver",
+        "owner": "yu-re-ka",
+        "ref": "dovecot2-modules",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1742889210,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "lastModified": 1742422364,
+        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
        "type": "github"
      },
      "original": {
@ -421,11 +422,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1742937945,
-        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
+        "lastModified": 1742512142,
+        "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
+        "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
        "type": "github"
      },
      "original": {
@ -444,11 +445,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1743058919,
-        "narHash": "sha256-o8Uh5+5DbEuwoaYo1d9G0mLyIQ6LcN4GcWpOvdoZIMY=",
+        "lastModified": 1742740271,
+        "narHash": "sha256-lvHGAYLICWYt7yLTZYtN7zXsanTYl8G/npxcwe3UPNw=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "28d3daa92d92a61134fba2cddcd85e80d83fc0ad",
+        "rev": "d5e510e8b40bc20a1082a1f419161310bead3238",
        "type": "github"
      },
      "original": {
@ -507,11 +508,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742985818,
-        "narHash": "sha256-32n52OiAuf40VtjqKAUtWlIkE6O7zMVMiCJRFu1QXi4=",
+        "lastModified": 1742523106,
+        "narHash": "sha256-MC2qdq9wp+MKNzIJ+wc3w6dhFZ1CWV8oo1FArjcb9TQ=",
        "owner": "chvp",
        "repo": "tetris",
-        "rev": "e7ab5cd51385ad09807fbc44f519d6045b7ec76c",
+        "rev": "5d3ef8c91cd1dc8bf5e33f8ed47c7f75c05b2548",
        "type": "github"
      },
      "original": {
@ -557,11 +558,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742985351,
-        "narHash": "sha256-Fgy7qd1QxVL2nse9WUvhTgLmtDdsT25lGVntsrQ+YCo=",
+        "lastModified": 1742520959,
+        "narHash": "sha256-XI8tnbuFR+ZHGcqBQxyerb/M4pzoXgtp4Qoc2RXSUzg=",
        "ref": "refs/heads/main",
-        "rev": "0ba0f88a6e3613c7dd776ab31bd62dc107dc3a0e",
-        "revCount": 100,
+        "rev": "e209c92e435232e3d6e23917df17ffb9cbd2492b",
+        "revCount": 98,
        "type": "git",
        "url": "https://git.chvp.be/chvp/www.chvp.be"
      },
--- a/flake.nix
+++ b/flake.nix
@ -69,7 +69,7 @@
      };
    };
    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
+      url = "gitlab:yu-re-ka/nixos-mailserver/dovecot2-modules";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@ -129,7 +129,7 @@
        www-chvp-be.overlays.default
      ];
      commonModules = [
-        lix-module.nixosModules.lixFromNixpkgs # Even though it's a "nixosModule" it's actually compatible with Darwin as well
+        lix-module.nixosModules.default # Even though it's a "nixosModule" it's actually compatible with Darwin as well
        ./modules/shared
      ];
      nixosModules = [
--- a/machines/marabethia/default.nix
+++ b/machines/marabethia/default.nix
@ -91,7 +91,6 @@
      git.enable = true;
      mail.enable = true;
      matrix.enable = true;
-      mumble.enable = true;
      nextcloud.enable = true;
      nginx.hosts = [
        {
--- a/machines/marabethia/hardware.nix
+++ b/machines/marabethia/hardware.nix
@ -65,10 +65,6 @@
      device = "zroot/safe/services/forgejo";
      fsType = "zfs";
    };
-    "/var/lib/murmur" = {
-      device = "zroot/local/services/murmur";
-      fsType = "zfs";
-    };
    "/var/vmail" = {
      device = "zroot/safe/services/mail";
      fsType = "zfs";
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@ -8,7 +8,6 @@
    ./git
    ./mail
    ./matrix
-    ./mumble
    ./nextcloud
    ./nginx
    ./torrents
--- a/modules/nixos/services/mumble/default.nix
+++ b/modules/nixos/services/mumble/default.nix
@ -1,26 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  options.chvp.services.mumble.enable = lib.mkOption {
-    default = false;
-    example = true;
-  };
-
-
-  config = lib.mkIf config.chvp.services.mumble.enable {
-    services.murmur = {
-      enable = true;
-      environmentFile = config.age.secrets."passwords/services/murmur".path;
-      openFirewall = true;
-      password = "$MURMURD_PASSWORD";
-      sslKey = "${config.security.acme.certs."vanpetegem.me".directory}/key.pem";
-      sslCert = "${config.security.acme.certs."vanpetegem.me".directory}/cert.pem";
-      sslCa = "${config.security.acme.certs."vanpetegem.me".directory}/chain.pem";
-    };
-    users.users.murmur.extraGroups = [ "acme" ];
-    age.secrets."passwords/services/murmur" = {
-      file = ../../../../secrets/passwords/services/murmur.age;
-      owner = "murmur";
-    };
-  };
-}
--- a/secrets.nix
+++ b/secrets.nix
@ -66,8 +66,6 @@ in
  "secrets/passwords/services/git/mail-password.age".publicKeys = [ marabethia ] ++ users;
  "secrets/passwords/services/git/token-file.age".publicKeys = [ elendel ] ++ users;

-  "secrets/passwords/services/murmur.age".publicKeys = [ marabethia ] ++ users;
-
  "secrets/passwords/services/nextcloud-admin.age".publicKeys = [ marabethia ] ++ users;

  "secrets/passwords/services/data-basic-auth.age".publicKeys = [ elendel ] ++ users;
--- a/secrets/passwords/services/murmur.age
+++ b/secrets/passwords/services/murmur.age
@ -1,10 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 9+Fe5A XyJjsUUO2h7f++xRBDG49iHLxFxuR9acUOwa9+/1DBU
-RRgrX0Vzyvah+bZXIvyYJizEx6YoAn2IahJlTqRjCYc
-> ssh-ed25519 s9rb8g D9Pms7pInTp1a2XzkjnxM1YX9hM+yDfHGfn2vrbIPDs
-SLG08eiFDMSO2hegu/aSrWdUW6FfIp3AIY3i0oy9CBE
-> ssh-ed25519 +xxExQ MziN/GpIcgNK8kI8ZXvmLBY7kEhG/JJu9zxv1Aj/mx4
-qgwxeoeXNTvTXiJ9niZg6xbbZ2GspyCZTgTYpN7zkL0
--- v9mX4yRYWvCIj/tIfM6i3gLmZUWpm+Yj+ks1ecasgDM
-eGO*æ<>äˆÎKÑ^Ë£¼)t1Îðfï‚
-<>þÕ’ñï¾RVDR*nò6|«E¥®E4ü“‚)IYÐáÐ