Compare commits
9 commits
ff4f0a88fa
...
132257fb73
| Author | SHA1 | Date | |
|---|---|---|---|
| 132257fb73 | |||
| 873f552d8b | |||
| 6ece0febe7 | |||
| a59df88a44 | |||
| 9acc79ce8a | |||
| 0ae0946f7a | |||
| 36df179501 | |||
| 8685dece56 | |||
| 4859a250fd |
9 changed files with 63 additions and 16 deletions
|
|
@ -109,6 +109,7 @@
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
80 # Caddy
|
80 # Caddy
|
||||||
443 # Caddy
|
443 # Caddy
|
||||||
|
25565 # minecraft server
|
||||||
];
|
];
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,10 @@
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc".device = "/dev/disk/by-uuid/da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc";
|
boot.initrd.luks.devices."luks-da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc" = {
|
||||||
|
device = "/dev/disk/by-uuid/da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc";
|
||||||
|
allowDiscards = true;
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/B684-07FB";
|
{ device = "/dev/disk/by-uuid/B684-07FB";
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,6 @@
|
||||||
];
|
];
|
||||||
services.factorio = {
|
services.factorio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/348ec8c846cce39c467cac90ddbbc9ce9bf61bd8.tar.gz") {
|
|
||||||
config.allowUnfree = true;
|
|
||||||
}).factorio-headless;
|
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
nonBlockingSaving = true;
|
nonBlockingSaving = true;
|
||||||
game-name = "Chandler's Factorio Server";
|
game-name = "Chandler's Factorio Server";
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
<p><a href="https://berean.bible/terms.htm">https://berean.bible/terms.htm</a></p>
|
<p><a href="https://berean.bible/terms.htm">https://berean.bible/terms.htm</a></p>
|
||||||
<p>You can fetch JSON files under the <code>/api/</code> path. For example:</p>
|
<p>You can fetch JSON files under the <code>/api/</code> path. For example:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li><code><a href="/api/BSB/books.json">/api/available_translations.json</a></code>: A list of available translations</li>
|
<li><code><a href="/api/available_translations.json">/api/available_translations.json</a></code>: A list of available translations</li>
|
||||||
<li><code><a href="/api/BSB/books.json">/api/BSB/books.json</a></code>: All books of the Berean Standard Bible</li>
|
<li><code><a href="/api/BSB/books.json">/api/BSB/books.json</a></code>: All books of the Berean Standard Bible</li>
|
||||||
<li><code><a href="/api/BSB/GEN.json">/api/BSB/GEN/1.json</a></code>: Genesis 1, Berean Standard Bible</li>
|
<li><code><a href="/api/BSB/GEN.json">/api/BSB/GEN/1.json</a></code>: Genesis 1, Berean Standard Bible</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ let
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/api
|
mkdir -p $out/
|
||||||
mv * $out/api/
|
mv * $out/
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
{config, ...}: {
|
{config, ...}: {
|
||||||
services.immich.enable = true;
|
services.immich.enable = true;
|
||||||
services.immich.package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/328115af930e90649f97a3675a6b88d87c7e6920.tar.gz") {}).immich;
|
|
||||||
services.immich.mediaLocation = "/srv/immich";
|
services.immich.mediaLocation = "/srv/immich";
|
||||||
|
|
||||||
services.caddy.virtualHosts."photos.chandlerswift.com".extraConfig = ''
|
services.caddy.virtualHosts."photos.chandlerswift.com".extraConfig = ''
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,63 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
let
|
||||||
|
svsServicesSrc = pkgs.fetchgit {
|
||||||
|
url = "https://git.chandlerswift.com/chandlerswift/svs-services-server";
|
||||||
|
rev = "ac0b8d427395e8b9ba51857a80256ceaf550b0a6";
|
||||||
|
sha256 = "sha256-wxGpc1YarF55buP1CMrZwEVBFLwLtkc8swdciNjijvw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
svsServicesServer = pkgs.buildGoModule {
|
||||||
|
pname = "svs-services-server";
|
||||||
|
version = "2025-12-28";
|
||||||
|
src = svsServicesSrc;
|
||||||
|
vendorHash = "sha256-MmVwi5VZlw63LUG52i7wrb8OYHJDmHb9bXvsGilU5nY=";
|
||||||
|
subPackages = [ "." ];
|
||||||
|
};
|
||||||
|
|
||||||
|
svsLanding = pkgs.runCommand "svsindustries-landing" { } ''
|
||||||
|
mkdir -p "$out"
|
||||||
|
cp ${svsServicesSrc}/landing-page.html "$out/index.html"
|
||||||
|
'';
|
||||||
|
in
|
||||||
{
|
{
|
||||||
|
systemd.services.svs-services-server = {
|
||||||
|
enable = true;
|
||||||
|
description = "SVS Industries services server";
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${svsServicesServer}/bin/svs-services-server -database %S/svs-services-server/svs-services.db -completion-provider openrouter";
|
||||||
|
Restart = "on-failure";
|
||||||
|
DynamicUser = true;
|
||||||
|
StateDirectory = "svs-services-server";
|
||||||
|
WorkingDirectory = "%S/svs-services-server";
|
||||||
|
EnvironmentFile = "/root/svs-services-server-env";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services.caddy.virtualHosts."svsindustries.org" = {
|
services.caddy.virtualHosts."svsindustries.org" = {
|
||||||
# serverAliases = ["*.svsindustries.org"];
|
serverAliases = [ "www.svsindustries.org" ];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
encode zstd gzip
|
encode zstd gzip
|
||||||
|
root * ${svsLanding}
|
||||||
file_server
|
file_server
|
||||||
root * /srv/www/svsindustries.org
|
|
||||||
|
|
||||||
handle_errors {
|
handle_errors {
|
||||||
respond "{err.status_code} {err.status_text}"
|
respond "{err.status_code} {err.status_text}"
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
systemd.tmpfiles.settings."10-svsindustries-org" = {
|
|
||||||
"/srv/www/svsindustries.org" = {
|
services.caddy.virtualHosts."*.svsindustries.org" = {
|
||||||
d = {};
|
extraConfig = ''
|
||||||
};
|
tls /srv/svsindustries.org-ssl-bundle/domain.cert.pem /srv/svsindustries.org-ssl-bundle/private.key.pem
|
||||||
|
encode zstd gzip
|
||||||
|
reverse_proxy localhost:64434
|
||||||
|
|
||||||
|
handle_errors {
|
||||||
|
respond "{err.status_code} {err.status_text}"
|
||||||
|
}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,7 @@
|
||||||
musescore
|
musescore
|
||||||
prusa-slicer
|
prusa-slicer
|
||||||
qgis
|
qgis
|
||||||
|
solvespace
|
||||||
supersonic
|
supersonic
|
||||||
tenacity
|
tenacity
|
||||||
|
|
||||||
|
|
@ -161,7 +162,7 @@
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
|
||||||
# ✨ AI ✨
|
# ✨ AI ✨
|
||||||
llama-cpp
|
llama-cpp-vulkan
|
||||||
|
|
||||||
# compilers/language utils
|
# compilers/language utils
|
||||||
cargo
|
cargo
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,10 @@
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-8ecd33f4-36cf-44f2-b215-5e67887418b9".device = "/dev/disk/by-uuid/8ecd33f4-36cf-44f2-b215-5e67887418b9";
|
boot.initrd.luks.devices."luks-8ecd33f4-36cf-44f2-b215-5e67887418b9" = {
|
||||||
|
device = "/dev/disk/by-uuid/8ecd33f4-36cf-44f2-b215-5e67887418b9";
|
||||||
|
allowDiscards = true;
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/24AC-733A";
|
{ device = "/dev/disk/by-uuid/24AC-733A";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue