From 95407aa42040a19d4224c2f950cfb92d7038e05f Mon Sep 17 00:00:00 2001 From: Lily Anderson Date: Sun, 10 May 2026 20:56:52 -0500 Subject: [PATCH] update, adding sillytavern, early remote unlock not working --- flake.lock | 36 ++++++++++++------------- modules/hosts/desktop/configuration.nix | 2 +- modules/hosts/desktop/desktop.nix | 2 +- modules/nixosModules/ai/llama.nix | 23 +++++++++++++++- modules/nixosModules/early-remote.nix | 6 ++--- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 608d407..3607574 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1776454077, - "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", + "lastModified": 1777780644, + "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=", "owner": "nix-community", "repo": "home-manager", - "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", + "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1777338324, + "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", "type": "github" }, "original": { @@ -149,11 +149,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1776505856, - "narHash": "sha256-VbnOijrn4EdYYJwiNQFxQNXECKBa60U66UPxUQAGkBE=", + "lastModified": 1777405024, + "narHash": "sha256-aFlRAeukwsJXd4b/0uLUTQaKo5wroOfVnoxTxi9sPVA=", "owner": "Lassulus", "repo": "wrappers", - "rev": "738d4bf81cbf306f6917c540a5b798110e3cf1e8", + "rev": "cac6a55af3e4ebcabec478348ddd0fe032650834", "type": "github" }, "original": { diff --git a/modules/hosts/desktop/configuration.nix b/modules/hosts/desktop/configuration.nix index 2d0bc03..e7f706e 100644 --- a/modules/hosts/desktop/configuration.nix +++ b/modules/hosts/desktop/configuration.nix @@ -62,7 +62,7 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{ # Enable the OpenSSH daemon. services.openssh.enable = true; - networking.firewall.allowedTCPPorts = [ 22 ]; + networking.firewall.allowedTCPPorts = [ 22 80 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Copy the NixOS configuration file and link it from the resulting system diff --git a/modules/hosts/desktop/desktop.nix b/modules/hosts/desktop/desktop.nix index 925c862..7993c8b 100644 --- a/modules/hosts/desktop/desktop.nix +++ b/modules/hosts/desktop/desktop.nix @@ -8,7 +8,7 @@ self.nixosModules.localization self.nixosModules.applications self.nixosModules.utilities - self.nixosModules.early + #self.nixosModules.early ]; }; } diff --git a/modules/nixosModules/ai/llama.nix b/modules/nixosModules/ai/llama.nix index dac0e6b..be1bf96 100644 --- a/modules/nixosModules/ai/llama.nix +++ b/modules/nixosModules/ai/llama.nix @@ -13,13 +13,20 @@ in { }; }) ]; + services.sillytavern = { + enable = true; + port = 9002; + listen = true; + listenAddressIPv4 = "127.0.0.1"; + whitelist = false; + }; services.llama-swap = { enable = true; port = 9001; openFirewall = true; listenAddress = "0.0.0.0"; settings = { - models = { + models = { #Language Models "angelic_eclipse-12b" = { ttl = 3600; @@ -95,6 +102,20 @@ in { }; }; }; + + services.nginx = { + enable = true; + virtualHosts."192.168.0.101" = { + locations."/" = { + proxyPass = "http://localhost:9002"; + extraConfig = '' + auth_basic "Password Required"; + auth_basic_user_file /etc/htpasswd; + ''; + }; + }; + }; + environment.systemPackages = with pkgs; [ llama-cpp-cuda stable-diffusion-cpp-cuda diff --git a/modules/nixosModules/early-remote.nix b/modules/nixosModules/early-remote.nix index 37bceba..b8bf09a 100644 --- a/modules/nixosModules/early-remote.nix +++ b/modules/nixosModules/early-remote.nix @@ -8,15 +8,15 @@ availableKernelModules = [ "r8169" "e1000e" ]; network = { enable = true; - udhcpc.enable = true; + #udhcpc.enable = true; ssh = { enable = true; port = 222; hostKeys = [ /etc/secrets/initrd/ssh_host_key ]; authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/zH272jRjJf120mqr6EpKB346Nufq5lKFzFTd0ckAC lily@lily-desktop" ]; - shell = "/bin/cryptsetup-askpass"; + #shell = "/bin/cryptsetup-askpass"; }; - postCommands = ''ip addr''; + #postCommands = ''ip addr''; }; };