diff --git a/agenix/hosts/mediaserver/config.nix b/agenix/hosts/mediaserver/config.nix index 3799c39..6714fdf 100644 --- a/agenix/hosts/mediaserver/config.nix +++ b/agenix/hosts/mediaserver/config.nix @@ -36,6 +36,14 @@ group = "media_group"; }; + recyclarr-config = { + file = ./recyclarr/config.age; + symlink = false; + path = "/var/lib/recyclarr/recyclarr.yml"; + owner = "1000"; + group = "1000"; + }; + unpackerr-config = { file = ./unpackerr/config.age; owner = "media_user"; diff --git a/agenix/hosts/mediaserver/recyclarr/config.age b/agenix/hosts/mediaserver/recyclarr/config.age new file mode 100644 index 0000000..9a9c512 Binary files /dev/null and b/agenix/hosts/mediaserver/recyclarr/config.age differ diff --git a/flake.lock b/flake.lock index 373663b..4c9d836 100644 --- a/flake.lock +++ b/flake.lock @@ -417,11 +417,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696577711, - "narHash": "sha256-94VRjvClIKDym1QRqPkX5LTQoAwZ1E6QE/3dWtOXSIQ=", + "lastModified": 1696630667, + "narHash": "sha256-kO67pYOeT/6m9BnPO+zNHWnC4eGiW87gIAJ+e8f3gwU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a2eb207f45e4a14a1e3019d9e3863d1e208e2295", + "rev": "b604023e0a5549b65da3040a07d2beb29ac9fc63", "type": "github" }, "original": { diff --git a/home/config/wezterm/config.fnl b/home/config/wezterm/config.fnl index 0a40598..2752594 100644 --- a/home/config/wezterm/config.fnl +++ b/home/config/wezterm/config.fnl @@ -126,7 +126,7 @@ "Noto Sans Symbols2" :Unifont]) :font_size 13 - :line_height 0.9 + :line_height 0.95 :freetype_load_target :Light ;:freetype_render_target :HorizontalLcd :allow_square_glyphs_to_overflow_width :WhenFollowedBySpace diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 92c10d7..0f69f6f 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -351,12 +351,12 @@ in }; nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-09-23"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "de4f7138a68d5d5063170f2182fd27faf06b0b54"; - sha256 = "0ppip04x0z98aq7b0zpg1yyy2cgqr94jgf5dy2dr1wvgrjh9lxhd"; + rev = "748e72c05495a3d30e88a6ef04b21697019a9aa9"; + sha256 = "11hf5j4khafg1gddkd98xb94077vswlwxdm077gyrwa4pifc7cnw"; fetchSubmodules = false; }; }; @@ -384,12 +384,12 @@ in }; nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-10-06"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "4724694bc03ce1148860a46d9d77c3664d8188ab"; - sha256 = "0ndd08a1s8cifw0w9gg26r8nvzfrky746ip70zg9x4qzg99915vb"; + rev = "a7a9ba714bcc31f5453a60d48598186b6487b75c"; + sha256 = "0js809mbbv80i5jvii9qf0190f3r9lb5b6rxg8y7jvaap5kq76bs"; fetchSubmodules = false; }; }; diff --git a/secrets.nix b/secrets.nix index c3cb965..1ace413 100644 --- a/secrets.nix +++ b/secrets.nix @@ -88,6 +88,8 @@ in "agenix/hosts/mediaserver/aria2/config.age".publicKeys = mediaserver; + "agenix/hosts/mediaserver/recyclarr/config.age".publicKeys = mediaserver; + "agenix/hosts/mediaserver/unpackerr/config.age".publicKeys = mediaserver; # argon diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix index 7f20bef..beb2b16 100644 --- a/system/hosts/mediaserver.nix +++ b/system/hosts/mediaserver.nix @@ -37,6 +37,7 @@ in ../nixos/unpackerr.nix ../nixos/sonarr.nix ../nixos/radarr.nix + ../nixos/recyclarr.nix ../nixos/sabnzbd.nix ../nixos/qbittorrent.nix ../nixos/flaresolverr.nix diff --git a/system/nixos/recyclarr.nix b/system/nixos/recyclarr.nix new file mode 100644 index 0000000..60c725d --- /dev/null +++ b/system/nixos/recyclarr.nix @@ -0,0 +1,32 @@ +{ lib, config, ... }: + +let + data-dir = "/var/lib/recyclarr"; +in +{ + virtualisation.oci-containers.containers.recyclarr = { + image = "ghcr.io/recyclarr/recyclarr:latest"; + environment = { + "TZ" = "Etc/UTC"; + }; + volumes = [ + "${data-dir}:/config" + ]; + extraOptions = [ + "--network=ns:/var/run/netns/wg" + "--label=com.centurylinklabs.watchtower.enable=true" + "--label=io.containers.autoupdate=registry" + ]; + }; + + systemd.services.podman-recyclarr = { + bindsTo = [ "wg.service" ]; + after = lib.mkForce [ "wg.service" ]; + + restartTriggers = [ "${config.age.secrets.recyclarr-config.file}" ]; + }; + + systemd.tmpfiles.rules = [ + "d ${data-dir} 0755 1000 1000" + ]; +} diff --git a/system/nixos/sonarr.nix b/system/nixos/sonarr.nix index 53cfe2e..f4bdda1 100644 --- a/system/nixos/sonarr.nix +++ b/system/nixos/sonarr.nix @@ -2,7 +2,7 @@ { virtualisation.oci-containers.containers.sonarr = { - image = "lscr.io/linuxserver/sonarr:latest"; + image = "lscr.io/linuxserver/sonarr:develop"; ports = [ "192.168.42.2:8989:8989" ]; environment = { "PUID" = "1001";