diff --git a/hosts/fwbook/hardware.nix b/hosts/fwbook/hardware.nix index 358aa7a..ac12b53 100644 --- a/hosts/fwbook/hardware.nix +++ b/hosts/fwbook/hardware.nix @@ -7,6 +7,19 @@ boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + # Reserve RAM for pstore/ramoops so a panic/oops backtrace survives a hard + # reset even if the disk/journal never gets a chance to sync. Archived to + # /var/lib/systemd/pstore on next boot by systemd-pstore.service. + boot.kernelParams = [ + "reserve_mem=8M:4096:ramoops" + "ramoops.mem_name=ramoops" + "ramoops.console_size=0x400000" + "ramoops.record_size=0x200000" + "ramoops.dump_oops=1" + "ramoops.ftrace_size=0" + "ramoops.pmsg_size=0" + ]; + services.fprintd.enable = true; services.libinput.enable = true; services.yubikey-agent.enable = true; diff --git a/hosts/fwbook/packages.nix b/hosts/fwbook/packages.nix index eddea6c..34e85a6 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, unstablePkgs, ai-usagebar, ... }: +{ pkgs, unstablePkgs, ai-usagebar, hermes-agent, ... }: { environment.systemPackages = let @@ -70,6 +70,7 @@ betterdiscordctl discord signal-desktop + telegram-desktop python313 python314 @@ -119,6 +120,7 @@ herdr superset-desktop ai-usagebar.packages.${pkgs.stdenv.hostPlatform.system}.default + hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default skygqts hermenix diff --git a/hosts/fwbook/services.nix b/hosts/fwbook/services.nix index 95bbf8d..06b9148 100644 --- a/hosts/fwbook/services.nix +++ b/hosts/fwbook/services.nix @@ -53,9 +53,4 @@ "modesetting" "fbdev" ]; - - services.hermes-agent = { - enable = true; - addToSystemPackages = true; - }; } diff --git a/hosts/hl-bigbox1/services/jellyfin.nix b/hosts/hl-bigbox1/services/jellyfin.nix index d5f93b1..145aa13 100644 --- a/hosts/hl-bigbox1/services/jellyfin.nix +++ b/hosts/hl-bigbox1/services/jellyfin.nix @@ -6,9 +6,6 @@ in skyg.nixos.common.container-services.jellyfin = { enable = true; autoUpdate.enable = true; - # networks = { - # lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose; - # }; services.jellyfin = { image = "jellyfin/jellyfin"; deploy.resources.reservations.devices = [ @@ -23,11 +20,6 @@ in "torrents:/torrents" "family-videos:/family-videos" ]; - # networks = { - # lan = { - # ipv4_address = app.ip; - # }; - # }; devices = [ "/dev/dri:/dev/dri" ]; restart = "always"; healthcheck = { diff --git a/hosts/hl-fwdesk/services/hermenix.nix b/hosts/hl-fwdesk/services/hermenix.nix index 6af9e9a..40d5bab 100644 --- a/hosts/hl-fwdesk/services/hermenix.nix +++ b/hosts/hl-fwdesk/services/hermenix.nix @@ -11,6 +11,7 @@ in { services.hermenix = { enable = true; + devices.video.enable = true; disk.baseDir = "/var/lib/hermes-vm"; disk.stateSize = "60G"; network = { @@ -20,8 +21,8 @@ in hostLanAddress = "10.0.10.11"; lanGateway = "10.0.0.1"; }; - vcpu = 3; - mem = 5000; + vcpu = 2; + mem = 8000; hermesHome = "/var/lib/hermes/.hermes"; hostCache.port = ports.hermesCache; hostAccess = [ diff --git a/hosts/hl-minipc3/default.nix b/hosts/hl-minipc3/default.nix index d6a3b40..2508b92 100644 --- a/hosts/hl-minipc3/default.nix +++ b/hosts/hl-minipc3/default.nix @@ -4,6 +4,7 @@ ./hardware-configuration ./hardware.nix ./systemd.nix + ./services ]; skyg.user.enable = true; diff --git a/hosts/hl-minipc3/services/caddy.nix b/hosts/hl-minipc3/services/caddy.nix index 45f2992..f8e3dd5 100644 --- a/hosts/hl-minipc3/services/caddy.nix +++ b/hosts/hl-minipc3/services/caddy.nix @@ -17,11 +17,11 @@ in files."/etc/caddy/Caddyfile" = '' nvr.home.sosnovsky.ca { tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem - reverse_proxy ${nvr.ip}:80 + reverse_proxy ${nvr.ip}:11080 } jellyfin.home.sosnovsky.ca { tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem - reverse_proxy http://bigbox1.lab.internal:8096 + reverse_proxy bigbox1.lab.internal:8096 } portainer.home.sosnovsky.ca { tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem diff --git a/secrets/buzz-env.age b/secrets/buzz-env.age index dbd46ee..0518881 100644 Binary files a/secrets/buzz-env.age and b/secrets/buzz-env.age differ diff --git a/secrets/buzz-tls-key.age b/secrets/buzz-tls-key.age index a8ba896..bd0fa1b 100644 Binary files a/secrets/buzz-tls-key.age and b/secrets/buzz-tls-key.age differ diff --git a/secrets/cloudflare-dns.age b/secrets/cloudflare-dns.age index e693c87..c11986e 100644 Binary files a/secrets/cloudflare-dns.age and b/secrets/cloudflare-dns.age differ diff --git a/secrets/dns-addresses.conf.age b/secrets/dns-addresses.conf.age index e9c28df..81e9cf3 100644 Binary files a/secrets/dns-addresses.conf.age and b/secrets/dns-addresses.conf.age differ diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index bb0c322..d6d8f81 100644 Binary files a/secrets/glmain.json.age and b/secrets/glmain.json.age differ diff --git a/secrets/hermes-env.age b/secrets/hermes-env.age index c2520b0..7a656d8 100644 Binary files a/secrets/hermes-env.age and b/secrets/hermes-env.age differ diff --git a/secrets/iu-project.age b/secrets/iu-project.age index db834dd..3c0e3fa 100644 --- a/secrets/iu-project.age +++ b/secrets/iu-project.age @@ -1,8 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA RyS/sxPxXWdb6q5asrgqNlF6Bsc4vUsXlgvuowHcDUk -egUa2BN2Beqj0wo/tTWV61BmWqesX4W8IGiIUWvRcwY --> ssh-ed25519 LuJNQA MPx6UOrVyrJjbuxYARFGp0OFXD5iMFypCsDtjXTJYUc -UCXdNZU2YqjkROdmHdiAhja0eo3DEorhgWjsumxgbww ---- FHjBtaqTnM8QZmyOuxMLzFc2P0WpePbyhmrXTxXcdgo -g Ç`Ú¶E«ôm´Î#cô5¤+BÞüÝwi›îcšŽd5Œ´®- {®:•¤sÈ`æN–xý‚É•×Ìšvteöa¨ -ÇX!ºn2kA™ÿϨ6·Ükxü©¿"FýØHxÛœÉpâÒâãªÐ�¤Û£&ô¨Ò±8ƒ{ Ðú‹Ç� \ No newline at end of file +-> ssh-ed25519 CIR0mA o9ka1yEC7NjpbmXsR+rq79jodpCn9ZZdy4oGF5NhlwU +Mb4TjMN9fU2CQ8wu0zMDOriqBdKELbzDrwrmEClzAg8 +-> ssh-ed25519 LuJNQA 8etjA16EFsTGf7gAzrjHVyD1E5TRKlmxix009bTG5Ag +72ZdCyxzcLdrZNpA0rA7fQ3vkMorYjMrOQtaNh+i3EY +--- EFjwhO6GeYui32hDIfAKGZ57KAzn9cV8zqg7is0XoIQ + f~UGz¶L\ݪ0 +¡ZtSyû6%µã/M¯/ص¾, ^"¹ÏA6OïzÛ�»µOê‹bÓ�Žz˜ÊF—2@‹“wÙKõîÕ›fÙ;UûÛ ÇÝÏM¹¯'.[¹£Ù8T×4âªáê4ç!²èu;v +F \ No newline at end of file diff --git a/secrets/lab-ca-key.age b/secrets/lab-ca-key.age index 7334cbc..0657f57 100644 Binary files a/secrets/lab-ca-key.age and b/secrets/lab-ca-key.age differ diff --git a/secrets/portainer-agent-bigbox1.age b/secrets/portainer-agent-bigbox1.age index cabf41c..ba8e7aa 100644 Binary files a/secrets/portainer-agent-bigbox1.age and b/secrets/portainer-agent-bigbox1.age differ diff --git a/secrets/portainer-agent-minipc1.age b/secrets/portainer-agent-minipc1.age index 0405c00..aaeee83 100644 Binary files a/secrets/portainer-agent-minipc1.age and b/secrets/portainer-agent-minipc1.age differ diff --git a/secrets/portainer-agent-minipc3.age b/secrets/portainer-agent-minipc3.age index d43f888..1144a9b 100644 Binary files a/secrets/portainer-agent-minipc3.age and b/secrets/portainer-agent-minipc3.age differ diff --git a/secrets/portainer-tls-key.age b/secrets/portainer-tls-key.age index 6966ad4..9472322 100644 Binary files a/secrets/portainer-tls-key.age and b/secrets/portainer-tls-key.age differ diff --git a/secrets/stack1.age b/secrets/stack1.age index ce525f3..02b274b 100644 Binary files a/secrets/stack1.age and b/secrets/stack1.age differ diff --git a/secrets/stack2.age b/secrets/stack2.age index 18ebaf4..9b8403e 100644 Binary files a/secrets/stack2.age and b/secrets/stack2.age differ