Gabe/nix-config
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

fix for https://github.com/NixOS/nixpkgs/issues/398172

Browse source
This commit is contained in:
Gabe Venberg 2025-04-13 22:05:58 +02:00
parent 48c60629ab
commit 9177a84b5c
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configs/nixos/minecraft-docker.nix
View file

@ -34,9 +34,8 @@ in {
EULA = "TRUE"; EULA = "TRUE";
TYPE = "FORGE"; TYPE = "FORGE";
VERSION = "1.20.1"; VERSION = "1.20.1";
# GENERIC_PACK="https://static.venberg.xyz/minecraft/create-post-production/modpack.zip";
# REMOVE_OLD_MODS="TRUE"; # REMOVE_OLD_MODS="TRUE";
PACKWIZ_URL = "https://static.venberg.xyz/minecraft/less-than-compact-2/pack.toml"; # PACKWIZ_URL = "https://static.venberg.xyz/minecraft/less-than-compact-2/pack.toml";
MEMORY = "16G"; MEMORY = "16G";
USE_AIKAR_FLAGS = "true"; USE_AIKAR_FLAGS = "true";
UID = "1000"; UID = "1000";

2
hosts/cirrostratus/restic.nix
View file

@ -11,6 +11,8 @@ in {
secrets.restic-server-credentials = { secrets.restic-server-credentials = {
sopsFile = "${inputs.nix-secrets}/restic-server"; sopsFile = "${inputs.nix-secrets}/restic-server";
format = "binary"; format = "binary";
# TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to remove this.
path = "/backup/restic/.htpasswd";
owner = "restic"; owner = "restic";
}; };
secrets.restic-url = { secrets.restic-url = {

3
modules/nixos/restic.nix
View file

@ -91,7 +91,8 @@
appendOnly = true; appendOnly = true;
dataDir = cfg.server.repositoryPath; dataDir = cfg.server.repositoryPath;
listenAddress = "127.0.0.1:${cfg.server.port}"; listenAddress = "127.0.0.1:${cfg.server.port}";
extraFlags = ["--htpasswd-file '${cfg.server.htpasswdPath}'"]; # TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to enable this.
# extraFlags = ["--htpasswd-file='${cfg.server.htpasswdPath}'"];
}; };
services.nginx.virtualHosts = services.nginx.virtualHosts =