servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Try to use auth as a caddy import

Browse Source
This commit is contained in:
uttarayan21
2025-08-02 03:17:37 +05:30
parent 773a6aaa63
commit 1a5d5a24da
5 changed files with 139 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
home/apps/orcaslicer.nix
View File

@@ -1,6 +1,17 @@
{pkgs, ...}: {
home.packages = with pkgs;
lib.optionals pkgs.stdenv.isLinux [
(pkgs.callPackage ./orcaslicer/package.nix {})
];
{
inputs,
pkgs,
device,
...
}: let
pkgs' = pkgs.applyPatches {
name = "nixpkgs-orcaslicer-430171";
src = inputs.nixpkgs;
patches = [../../patches/430171.patch];
};
pkgsPatched = import pkgs' {system = device.system;};
in {
home.packages = [
pkgsPatched.orca-slicer
];
}

76
nixos/ryu/services/minecraft.nix
View File

@@ -27,47 +27,47 @@
openFirewall = true;
environmentFile = config.sops.templates."craftmine.env".path;
servers = {
fabric = {
inherit whitelist;
enable = true;
# enable-rcon = true;
jvmOpts = "-Xmx4G -Xms4G";
package = pkgs.fabricServers.fabric-1_21_1;
serverProperties = {
motd = "Servius's Fabric Minecraft Server";
server-port = 25567;
level-seed = "4504535438041489910";
view-distance = 24;
white-list = true;
};
};
craftmine = {
inherit whitelist;
enable = true;
jvmOpts = "-Xmx4G -Xms4G";
package = let
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
in
pkgs.minecraft-server.override {
url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
version = "25w14craftmine";
jre_headless = getJavaVersion 21;
};
serverProperties = {
enable-rcon = true;
"rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
motd = "Servius's Craftmine Server";
server-port = 25570;
white-list = true;
view-distance = 32;
};
};
# fabric = {
# inherit whitelist;
# enable = true;
# # enable-rcon = true;
# jvmOpts = "-Xmx4G -Xms4G";
# package = pkgs.fabricServers.fabric-1_21_1;
# serverProperties = {
# motd = "Servius's Fabric Minecraft Server";
# server-port = 25567;
# level-seed = "4504535438041489910";
# view-distance = 24;
# white-list = true;
# };
# };
# craftmine = {
# inherit whitelist;
# enable = true;
# jvmOpts = "-Xmx4G -Xms4G";
# package = let
# getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
# in
# pkgs.minecraft-server.override {
# url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
# sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
# version = "25w14craftmine";
# jre_headless = getJavaVersion 21;
# };
#
# serverProperties = {
# enable-rcon = true;
# "rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
# motd = "Servius's Craftmine Server";
# server-port = 25570;
# white-list = true;
# view-distance = 32;
# };
# };
craftmine-v2 = {
inherit whitelist;
enable = true;
jvmOpts = "-Xmx4G -Xms4G";
jvmOpts = "-Xmx16G -Xms4G";
package = let
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
in

6
nixos/tsuba/services/caddy.nix
View File

@@ -23,6 +23,12 @@
resolvers 1.1.1.1
}
}
(auth) {
forward_auth auth.darksailor.dev {
uri /api/authz/forward_auth?rd=https://auth.darksailor.dev
copy_headers Remote-User Remote-Groups Remote-Name Remote-Email
}
}
'';
package = pkgs.caddy.withPlugins {
plugins = ["github.com/caddy-dns/hetzner@v1.0.0"];

19
nixos/tsuba/services/servarr.nix
View File

@@ -35,37 +35,30 @@
package = unstablePkgs.bazarr;
group = "media";
};
caddy.virtualHosts = let
auth = ''
forward_auth mirai:5555 {
uri /api/authz/forward-auth
copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
}
'';
in {
caddy.virtualHosts = {
"sonarr.tsuba.darksailor.dev".extraConfig = ''
import hetzner
${auth}
import auth
reverse_proxy localhost:${builtins.toString config.services.sonarr.settings.server.port}
'';
"radarr.tsuba.darksailor.dev".extraConfig = ''
import hetzner
${auth}
import auth
reverse_proxy localhost:${builtins.toString config.services.radarr.settings.server.port}
'';
"lidarr.tsuba.darksailor.dev".extraConfig = ''
import hetzner
${auth}
import auth
reverse_proxy localhost:${builtins.toString config.services.lidarr.settings.server.port}
'';
"bazarr.tsuba.darksailor.dev".extraConfig = ''
import hetzner
${auth}
import auth
reverse_proxy localhost:${builtins.toString config.services.bazarr.listenPort}
'';
"prowlarr.tsuba.darksailor.dev".extraConfig = ''
import hetzner
${auth}
import auth
reverse_proxy mirai.darksailor.dev:9696
'';
};

73
patches/430171.patch Normal file
View File

@@ -0,0 +1,73 @@
From 3f49f2d9783151520ac0b9a588581454b60fd2ad Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Sat, 2 Aug 2025 01:15:23 +0800
Subject: [PATCH] orca-slicer: remove dependency on libsoup2
---
pkgs/by-name/or/orca-slicer/package.nix | 13 +++++++++++--
...stream-CMakeLists-Link-against-webkit2gtk-.patch | 7 +++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 7e817859988acd..e1376110dcd38e 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -35,7 +35,7 @@
pcre,
systemd,
tbb_2021,
- webkitgtk_4_0,
+ webkitgtk_4_1,
wxGTK31,
xorg,
libnoise,
@@ -47,8 +47,17 @@ let
withCurl = true;
withPrivateFonts = true;
withWebKit = true;
+ webkitgtk_4_0 = webkitgtk_4_1;
}).overrideAttrs
(old: {
+ src = fetchFromGitHub {
+ owner = "SoftFever";
+ repo = "Orca-deps-wxWidgets";
+ rev = "acdc6db5064274405c323c3823eedf559bbe0474";
+ hash = "sha256-Rt03VK0AzZyROkya0zRKpckS/OSa74pLTNbZoJiitfo=";
+ fetchSubmodules = true;
+ };
+
configureFlags = old.configureFlags ++ [
# Disable noisy debug dialogs
"--enable-debug=no"
@@ -112,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
openvdb
pcre
tbb_2021
- webkitgtk_4_0
+ webkitgtk_4_1
wxGTK'
xorg.libX11
opencv.cxxdev
diff --git a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
index 15f1bf8f0b59e1..8cf3345131449f 100644
--- a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
+++ b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
@@ -20,15 +20,14 @@ index 9c5cb96..e92a0e3 100644
@@ -175,6 +175,11 @@ if (WIN32)
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
endif ()
-
+
+# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0")
++ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.1")
+endif ()
+
# Link the resources dir to where Slic3r GUI expects it
set(output_dlls_Release "")
set(output_dlls_Debug "")
---
+--
2.38.1
-