Compare commits
5 commits
9d0ef5853d
...
4529d8ff12
Author | SHA1 | Date | |
---|---|---|---|
4529d8ff12 | |||
ec76859a62 | |||
8778df98fb | |||
4c16f3e550 | |||
4501768728 |
5 changed files with 35 additions and 26 deletions
14
flake.in.nix
14
flake.in.nix
|
@ -109,8 +109,14 @@
|
|||
#!! Avoid globally importing modules that are not guarded by .enable
|
||||
# https://github.com/NixOS/nixpkgs/issues/137168
|
||||
(
|
||||
{inputs, ...}: {
|
||||
imports = [
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
imports =
|
||||
[
|
||||
inputs."aagl-gtk-on-nix-${branch}".nixosModules.default
|
||||
inputs."home-manager-${branch}".nixosModules.home-manager
|
||||
inputs."nix-index-database-${branch}".nixosModules.nix-index
|
||||
|
@ -119,8 +125,10 @@
|
|||
inputs.arion.nixosModules.arion
|
||||
inputs.disko.nixosModules.disko
|
||||
inputs.fw-fanctrl.nixosModules.default
|
||||
inputs.jovian-nixos.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
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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"];
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
#// nextcloud.enable = true;
|
||||
oryx.enable = true;
|
||||
#// owncast.enable = true;
|
||||
#// redlib.enable = true;
|
||||
#// searxng.enable = true;
|
||||
redlib.enable = true;
|
||||
searxng.enable = true;
|
||||
vaultwarden.enable = true;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue