From 6537ced392dd1690ada9085210d94cff159cc2bd Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Fri, 3 Jun 2022 15:46:47 +0200
Subject: [PATCH] renovate automerge branch

---
 flake.lock                                    | 30 +++++++++----------
 flake.nix                                     |  2 +-
 .../renovate/renovate-infrastructure.yaml     |  2 +-
 nixos/hosts/hedgedoc/configuration.nix        |  6 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 115f9d2..2969a7e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1653210933,
-        "narHash": "sha256-n6Hk/zPHcjloi0E/miKGnXrWROha90uan2CFQV7oaqI=",
+        "lastModified": 1654213409,
+        "narHash": "sha256-9mgH75wnd78zHOzBeFEwWyHXltaNRNr7v7p8Lr6vA1U=",
         "owner": "zhaofengli",
         "repo": "colmena",
-        "rev": "429a0f5aa1d1bac06234e2f0c02d5b63a850d940",
+        "rev": "7c1e91a09f1e9eebbf46806a3b349559c36808a2",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
         "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1653700859,
-        "narHash": "sha256-R1zR4U6s0ZpRkI/bAkWWyMaUVTvUnF/R7LydzGvLuHM=",
+        "lastModified": 1654218788,
+        "narHash": "sha256-0xsD029/xPLWMMa5QKU2SjHikPcFISHYb//dxCoUvWw=",
         "owner": "jyooru",
         "repo": "nix-minecraft-servers",
-        "rev": "27d4153324679e45a34f8c68dd740b50379cac69",
+        "rev": "5a5704cf74ffb0d35139d3f625d1a628dd5206d4",
         "type": "github"
       },
       "original": {
@@ -257,16 +257,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653850161,
-        "narHash": "sha256-r9jwqAX3wG0XMOs2RNNXK66pjz5b2+veXDSyp1m5QGU=",
-        "owner": "nixos",
+        "lastModified": 1654258420,
+        "narHash": "sha256-H6oJnoRzsQIwpNfMFnqGex+6dZ1YL6TGFQfRzyEO5R8=",
+        "owner": "NULLx76",
         "repo": "nixpkgs",
-        "rev": "757046a257a8569de866aaf39a7e615551c7cfab",
+        "rev": "5506d60e56272eee4a1b111cf05dfa585a91f68d",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "master",
+        "owner": "NULLx76",
+        "ref": "0x76",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -325,11 +325,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653431509,
-        "narHash": "sha256-4PUKylYuWy0Wlaz8lmbuKq7ok3biV/P6GeLKyO1opEk=",
+        "lastModified": 1654167282,
+        "narHash": "sha256-A/9JJRBIPJVFypPhpgOUxBExy/8evpEg8G75BVdZrLg=",
         "owner": "serokell",
         "repo": "serokell.nix",
-        "rev": "b69317c1304a9c51d7a20ec36ab31f853887e96d",
+        "rev": "da787295c6af0a650ee2c811ab8ef136a596d4ce",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9f40b94..810bdbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
   # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/master";
+    nixpkgs.url = "github:NULLx76/nixpkgs/0x76";
     
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml b/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml
index 8963277..144e35b 100644
--- a/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml
+++ b/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml
@@ -74,7 +74,7 @@ data:
       "packageRules": [
         {
           "automerge": true,
-          "automergeType": "pr",
+          "automergeType": "branch",
           "matchPackageNames": [
             "renovate/renovate"
           ]
diff --git a/nixos/hosts/hedgedoc/configuration.nix b/nixos/hosts/hedgedoc/configuration.nix
index c3d0429..dbb8dd3 100644
--- a/nixos/hosts/hedgedoc/configuration.nix
+++ b/nixos/hosts/hedgedoc/configuration.nix
@@ -26,7 +26,7 @@ in
 
   environment.noXlibs = lib.mkForce false;
 
-  networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.configuration.port ];
+  networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.settings.port ];
 
   vault-secrets.secrets.hedgedoc = { };
 
@@ -46,7 +46,7 @@ in
   services.hedgedoc = {
     enable = true;
     environmentFile = "${vs.hedgedoc}/environment";
-    configuration = {
+    settings = {
       host = "0.0.0.0";
       port = 3000;
       sessionSecret = "$SESSION_SECRET";
@@ -54,7 +54,7 @@ in
       protocolUseSSL = true;
       hsts.enable = true;
       allowOrigin = [
-        config.services.hedgedoc.configuration.domain
+        config.services.hedgedoc.settings.domain
         "hedgedoc"
       ];
       allowAnonymous = false;