diff --git a/flake.lock b/flake.lock index af25bbf..667141c 100644 --- a/flake.lock +++ b/flake.lock @@ -455,11 +455,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1674260789, - "narHash": "sha256-qNbiugXVGrhCXnkToNs7jiCSb3m3pW3SBLMiYmiPOKk=", + "lastModified": 1674296335, + "narHash": "sha256-jUvjOqKGuEk1XfZNPXU3hcPtIJKkSNzwUm5yN1EFYZA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e8113946038f59be9b6762ac428c9f648cdd38c5", + "rev": "fcbfd193930dd146b141531a9cf5301d55f26907", "type": "github" }, "original": { @@ -786,11 +786,11 @@ }, "nixpkgs_22-11": { "locked": { - "lastModified": 1673957332, - "narHash": "sha256-njH7Szk1BLVWGMw7IRibgGejSlxXHj9saZHfH20gHdk=", + "lastModified": 1674242456, + "narHash": "sha256-yBy7rCH7EiBe9+CHZm9YB5ii5GRa+MOxeW0oDEBO8SE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b83e7f5a04a3acc8e92228b0c4bae68933d504eb", + "rev": "cdead16a444a3e5de7bc9b0af8e198b11bb01804", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0dc0574..8ae64e6 100644 --- a/flake.nix +++ b/flake.nix @@ -173,6 +173,7 @@ terraform nixfmt nixUnstable + nil vault (vault-push-approle-envs self { }) (vault-push-approles self { }) diff --git a/flux/olympus/apps/services/renovate/config.yaml b/flux/olympus/apps/services/renovate/config.yaml index 86df57c..f8e2876 100644 --- a/flux/olympus/apps/services/renovate/config.yaml +++ b/flux/olympus/apps/services/renovate/config.yaml @@ -22,6 +22,9 @@ data: }, "lockFileMaintenance": { "enabled": true, + "automerge": true, + "automergeType": "pr", + "platformAutomerge": true, "schedule": ["hourly"], }, "hostRules": [