server: enable redlib and searxng containers

Signed-off-by: Myned <dev@bjork.tech>

flake.in.nix

@@ -109,29 +109,37 @@
               #!! Avoid globally importing modules that are not guarded by .enable
               # https://github.com/NixOS/nixpkgs/issues/137168
               (
-                {inputs, ...}: {
+                {
-                  imports = [
+                  inputs,
-                    inputs."aagl-gtk-on-nix-${branch}".nixosModules.default
+                  lib,
-                    inputs."home-manager-${branch}".nixosModules.home-manager
+                  ...
-                    inputs."nix-index-database-${branch}".nixosModules.nix-index
+                }:
-                    inputs."stylix-${branch}".nixosModules.stylix
+                  with lib; {
-                    inputs.agenix.nixosModules.default
+                    imports =
-                    inputs.arion.nixosModules.arion
+                      [
-                    inputs.disko.nixosModules.disko
+                        inputs."aagl-gtk-on-nix-${branch}".nixosModules.default
-                    inputs.fw-fanctrl.nixosModules.default
+                        inputs."home-manager-${branch}".nixosModules.home-manager
-                    inputs.jovian-nixos.nixosModules.default
+                        inputs."nix-index-database-${branch}".nixosModules.nix-index
-                    inputs.niri-flake.nixosModules.niri
+                        inputs."stylix-${branch}".nixosModules.stylix
-                  ];
+                        inputs.agenix.nixosModules.default
+                        inputs.arion.nixosModules.arion
+                        inputs.disko.nixosModules.disko
+                        inputs.fw-fanctrl.nixosModules.default
+                        inputs.niri-flake.nixosModules.niri
+                      ]
+                      ++ optionals (versionAtLeast version "25.05") [
+                        inputs.jovian-nixos.nixosModules.default
+                      ];
 
-                  # TODO: Use home-manager.sharedModules for all options
+                    # TODO: Use home-manager.sharedModules for all options
-                  home-manager.sharedModules = [
+                    home-manager.sharedModules = [
-                    inputs."nix-index-database-${branch}".hmModules.nix-index
+                      inputs."nix-index-database-${branch}".hmModules.nix-index
-                    inputs.ags.homeManagerModules.default
+                      inputs.ags.homeManagerModules.default
-                    inputs.anyrun.homeManagerModules.default
+                      inputs.anyrun.homeManagerModules.default
-                    inputs.nix-flatpak.homeManagerModules.nix-flatpak
+                      inputs.nix-flatpak.homeManagerModules.nix-flatpak
-                    inputs.walker.homeManagerModules.default
+                      inputs.walker.homeManagerModules.default
-                  ];
+                    ];
-                }
+                  }
               )
             ];
         };

options/custom/containers/redlib.nix

@@ -13,6 +13,7 @@ in {
     environment.shellAliases.arion-redlib = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.redlib.settings.out.dockerComposeYaml}";
 
     virtualisation.arion.projects.redlib.settings.services = {
+      # https://github.com/redlib-org/redlib
       redlib.service = {
         container_name = "redlib";
         image = "quay.io/redlib/redlib:latest";

options/custom/containers/vaultwarden.nix

@@ -30,7 +30,7 @@ in {
       vaultwarden.service = {
         container_name = "vaultwarden";
         env_file = [config.age.secrets."${config.custom.profile}/vaultwarden/.env".path];
-        image = "vaultwarden/server:1.33.1";
+        image = "vaultwarden/server:1.33.2";
         ports = ["8008:80"];
         restart = "unless-stopped";
         volumes = ["${config.custom.containers.directory}/vaultwarden/data:/data"];

options/custom/services/caddy.nix

@@ -34,7 +34,7 @@ in {
         # https://github.com/NixOS/nixpkgs/pull/358586
         package = pkgs.unstable.caddy.withPlugins {
           #?? Copy from failed build
-          hash = "sha256-jCcSzenewQiW897GFHF9WAcVkGaS/oUu63crJu7AyyQ=";
+          hash = "sha256-JVkUkDKdat4aALJHQCq1zorJivVCdyBT+7UhqTvaFLw=";
 
           #?? REPO@TAG
           plugins = [

profiles/server/default.nix

@@ -22,8 +22,8 @@
       #// nextcloud.enable = true;
       oryx.enable = true;
       #// owncast.enable = true;
-      #// redlib.enable = true;
+      redlib.enable = true;
-      #// searxng.enable = true;
+      searxng.enable = true;
       vaultwarden.enable = true;
     };