diff --git a/bert/configuration.nix b/bert/configuration.nix index fba849c..bb3f5cd 100644 --- a/bert/configuration.nix +++ b/bert/configuration.nix @@ -109,7 +109,6 @@ networking.firewall.allowedTCPPorts = [ 80 # Caddy 443 # Caddy - 25565 # minecraft server ]; # This value determines the NixOS release from which the default diff --git a/bert/hardware-configuration.nix b/bert/hardware-configuration.nix index 1d01430..bd11bff 100644 --- a/bert/hardware-configuration.nix +++ b/bert/hardware-configuration.nix @@ -18,10 +18,7 @@ fsType = "ext4"; }; - boot.initrd.luks.devices."luks-da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc" = { - device = "/dev/disk/by-uuid/da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc"; - allowDiscards = true; - }; + boot.initrd.luks.devices."luks-da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc".device = "/dev/disk/by-uuid/da40f6d2-49d7-4a55-8a2e-94fa5f28dbbc"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/B684-07FB"; diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix index b71fa13..14747ff 100644 --- a/bert/services/factorio.nix +++ b/bert/services/factorio.nix @@ -4,6 +4,9 @@ ]; services.factorio = { enable = true; + package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/348ec8c846cce39c467cac90ddbbc9ce9bf61bd8.tar.gz") { + config.allowUnfree = true; + }).factorio-headless; openFirewall = true; nonBlockingSaving = true; game-name = "Chandler's Factorio Server"; diff --git a/bert/services/http/bible.chandlerswift.com.html b/bert/services/http/bible.chandlerswift.com.html index ef81177..34aae28 100644 --- a/bert/services/http/bible.chandlerswift.com.html +++ b/bert/services/http/bible.chandlerswift.com.html @@ -16,7 +16,7 @@

https://berean.bible/terms.htm

You can fetch JSON files under the /api/ path. For example:

diff --git a/bert/services/http/bible.chandlerswift.com.nix b/bert/services/http/bible.chandlerswift.com.nix index cafc362..cd34d80 100644 --- a/bert/services/http/bible.chandlerswift.com.nix +++ b/bert/services/http/bible.chandlerswift.com.nix @@ -14,8 +14,8 @@ let dontBuild = true; installPhase = '' - mkdir -p $out/ - mv * $out/ + mkdir -p $out/api + mv * $out/api/ ''; }; in { diff --git a/bert/services/http/photos.chandlerswift.com.nix b/bert/services/http/photos.chandlerswift.com.nix index 844f309..9429147 100644 --- a/bert/services/http/photos.chandlerswift.com.nix +++ b/bert/services/http/photos.chandlerswift.com.nix @@ -1,5 +1,6 @@ {config, ...}: { 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.caddy.virtualHosts."photos.chandlerswift.com".extraConfig = '' diff --git a/bert/services/http/svsindustries.org.nix b/bert/services/http/svsindustries.org.nix index c15966a..d9ad3c9 100644 --- a/bert/services/http/svsindustries.org.nix +++ b/bert/services/http/svsindustries.org.nix @@ -1,63 +1,20 @@ -{ 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" = { + # serverAliases = ["*.svsindustries.org"]; + extraConfig = '' + encode zstd gzip + file_server + root * /srv/www/svsindustries.org + + handle_errors { + respond "{err.status_code} {err.status_text}" + } + ''; + }; + systemd.tmpfiles.settings."10-svsindustries-org" = { + "/srv/www/svsindustries.org" = { + d = {}; }; }; - - services.caddy.virtualHosts."svsindustries.org" = { - serverAliases = [ "www.svsindustries.org" ]; - extraConfig = '' - encode zstd gzip - root * ${svsLanding} - file_server - - handle_errors { - respond "{err.status_code} {err.status_text}" - } - ''; - }; - - services.caddy.virtualHosts."*.svsindustries.org" = { - 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}" - } - ''; - }; } diff --git a/oscar/configuration.nix b/oscar/configuration.nix index e0d8a4f..b86f202 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -133,7 +133,6 @@ musescore prusa-slicer qgis - solvespace supersonic tenacity @@ -162,7 +161,7 @@ wl-clipboard # ✨ AI ✨ - llama-cpp-vulkan + llama-cpp # compilers/language utils cargo diff --git a/oscar/hardware-configuration.nix b/oscar/hardware-configuration.nix index 4ab4ac4..a950bd3 100644 --- a/oscar/hardware-configuration.nix +++ b/oscar/hardware-configuration.nix @@ -32,10 +32,7 @@ fsType = "ext4"; }; - boot.initrd.luks.devices."luks-8ecd33f4-36cf-44f2-b215-5e67887418b9" = { - device = "/dev/disk/by-uuid/8ecd33f4-36cf-44f2-b215-5e67887418b9"; - allowDiscards = true; - }; + boot.initrd.luks.devices."luks-8ecd33f4-36cf-44f2-b215-5e67887418b9".device = "/dev/disk/by-uuid/8ecd33f4-36cf-44f2-b215-5e67887418b9"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/24AC-733A";