diff --git a/flake.nix b/flake.nix index 50a8b20..185826d 100644 --- a/flake.nix +++ b/flake.nix @@ -109,30 +109,29 @@ default = colmena.packages.${system}.colmena; - iso = nixos-generators.nixosGenerate { - inherit system pkgs; - format = "iso"; - modules = [ (import ./nixos/templates/iso.nix) ]; - }; + # iso = nixos-generators.nixosGenerate { + # inherit system pkgs; + # format = "iso"; + # modules = [ (import ./nixos/templates/iso.nix) ]; + # }; - iso-graphical = nixos-generators.nixosGenerate { - inherit system pkgs; - format = "iso"; - modules = [ (import ./nixos/templates/iso-graphical.nix) ]; - }; + # iso-graphical = nixos-generators.nixosGenerate { + # inherit system pkgs; + # format = "iso"; + # modules = [ (import ./nixos/templates/iso-graphical.nix) ]; + # }; - proxmox-lxc = nixos-generators.nixosGenerate { - inherit pkgs; - format = "proxmox-lxc"; - modules = [ (import ./nixos/templates/proxmox-lxc.nix) ]; - }; + # proxmox-lxc = nixos-generators.nixosGenerate { + # inherit pkgs; + # format = "proxmox-lxc"; + # modules = [ (import ./nixos/templates/proxmox-lxc.nix) ]; + # }; - # Currently broken as it assumes `local-lvm` exists - proxmox-vm = nixos-generators.nixosGenerate { - inherit system pkgs; - format = "proxmox"; - modules = [ (import ./nixos/templates/proxmox-vm.nix) ]; - }; + # proxmox-vm = nixos-generators.nixosGenerate { + # inherit system pkgs; + # format = "proxmox"; + # modules = [ (import ./nixos/templates/proxmox-vm.nix) ]; + # }; }; # Use by running `nix develop` diff --git a/flux/olympus/apps/services/renovate/config.yaml b/flux/olympus/apps/services/renovate/config.yaml index a7d49df..8094233 100644 --- a/flux/olympus/apps/services/renovate/config.yaml +++ b/flux/olympus/apps/services/renovate/config.yaml @@ -1,58 +1,65 @@ apiVersion: v1 kind: ConfigMap metadata: - name: renovate - namespace: services + name: renovate + namespace: services data: - config.js: |- - module.exports = { - "binarySource": "install", - "repositories": ["v/infrastructure"], - "flux": { - "fileMatch": ["flux/.+\\.ya?ml$"] - }, - "helm-values": { - "fileMatch": ["flux/.+\\.ya?ml$"] - }, - "kubernetes": { - "fileMatch": ["flux/.+\\.ya?ml$"] - }, - "nix": { - "enabled": true - }, - "lockFileMaintenance": { - "enabled": true, - "automerge": true, - "automergeType": "branch", - "schedule": ["weekly"], - }, - "hostRules": [ - { - "hostType": "docker", - "matchHost": "ghcr.io", - "username": "NULLx76", - "password": process.env.GITHUB_COM_TOKEN - } - ], - "packageRules": [ - { - "automerge": true, - "automergeType": "branch", - "matchPackageNames": [ - "renovate/renovate" + config.js: |- + module.exports = { + "binarySource": "install", + "repositories": ["v/infrastructure"], + "flux": { + "fileMatch": ["flux/.+\\.ya?ml$"] + }, + "helm-values": { + "fileMatch": ["flux/.+\\.ya?ml$"] + }, + "kubernetes": { + "fileMatch": ["flux/.+\\.ya?ml$"] + }, + "nix": { + "enabled": true + }, + "lockFileMaintenance": { + "enabled": true, + "automerge": true, + "automergeType": "branch", + "schedule": ["weekly"], + }, + "hostRules": [ + { + "hostType": "docker", + "matchHost": "ghcr.io", + "username": "NULLx76", + "password": process.env.GITHUB_COM_TOKEN + } ], - "matchPackagePrefixes": [ - "git.0x76.dev" + "packageRules": [ + { + "automerge": true, + "automergeType": "branch", + "matchPackageNames": [ + "renovate/renovate" + ], + "matchPackagePrefixes": [ + "git.0x76.dev" + ] + } + ], + // ignore individual fluxcd images + "ignoreDeps": [ + "ghcr.io/fluxcd/helm-controller", + "ghcr.io/fluxcd/image-automation-controller", + "ghcr.io/fluxcd/image-reflector-controller", + "ghcr.io/fluxcd/kustomize-controller", + "ghcr.io/fluxcd/notification-controller", + "ghcr.io/fluxcd/source-controller" + ], + "regexManagers": [ + { + "fileMatch": [".+\\.nix"], + "matchStrings": ["image\\s*=\\s*"(?.*?):(?.*?)"\\s*;\\s*"], + "datasourceTemplate": "docker" + } ] - } - ], - // ignore individual fluxcd images - "ignoreDeps": [ - "ghcr.io/fluxcd/helm-controller", - "ghcr.io/fluxcd/image-automation-controller", - "ghcr.io/fluxcd/image-reflector-controller", - "ghcr.io/fluxcd/kustomize-controller", - "ghcr.io/fluxcd/notification-controller", - "ghcr.io/fluxcd/source-controller" - ] - }; + }; diff --git a/nixos/hosts/hades/overseerr/configuration.nix b/nixos/hosts/hades/overseerr/configuration.nix index 8004810..d192b2e 100644 --- a/nixos/hosts/hades/overseerr/configuration.nix +++ b/nixos/hosts/hades/overseerr/configuration.nix @@ -26,8 +26,7 @@ backend = "podman"; containers = { overseerr = { - # TODO: Add regex so that renovate catches this - image = "ghcr.io/sct/overseerr:1.32.5"; + image = "ghcr.io/sct/overseerr:1.32.4"; environment = { # LOG_LEVEL = "debug"; TZ = "Europe/Amsterdam";