From 95407aa42040a19d4224c2f950cfb92d7038e05f Mon Sep 17 00:00:00 2001 From: Lily Anderson Date: Sun, 10 May 2026 20:56:52 -0500 Subject: [PATCH 1/3] 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''; }; }; From 78ebdbc25033522374be64f291ad1bfc7b36dd18 Mon Sep 17 00:00:00 2001 From: Lily Anderson Date: Sun, 10 May 2026 20:59:30 -0500 Subject: [PATCH 2/3] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3607574..69d4cdc 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777678872, - "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1777780644, - "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=", + "lastModified": 1778444552, + "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d", + "rev": "dcebe66f958673729896eec2de4abfd86ef22d21", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1777338324, - "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -149,11 +149,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1777405024, - "narHash": "sha256-aFlRAeukwsJXd4b/0uLUTQaKo5wroOfVnoxTxi9sPVA=", + "lastModified": 1778090892, + "narHash": "sha256-g2axsVNpjeIBMdMQz+mDFGNlhDkjdufZVhfaL0CfhEI=", "owner": "Lassulus", "repo": "wrappers", - "rev": "cac6a55af3e4ebcabec478348ddd0fe032650834", + "rev": "5d7c8ca68aa845d07c2e7dd2e168b6a8f02570c3", "type": "github" }, "original": { From 44f3d52cde1a18b432b2741a25161d18cb1fa826 Mon Sep 17 00:00:00 2001 From: Lily Anderson Date: Wed, 27 May 2026 15:02:12 -0500 Subject: [PATCH 3/3] update, remove early remote for server --- flake.lock | 30 +++++++++++++++--------------- modules/hosts/server/server.nix | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 69d4cdc..e411424 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1778444552, - "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=", + "lastModified": 1779726696, + "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "owner": "nix-community", "repo": "home-manager", - "rev": "dcebe66f958673729896eec2de4abfd86ef22d21", + "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "import-tree": { "locked": { - "lastModified": 1773693634, - "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=", + "lastModified": 1778781969, + "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", "owner": "vic", "repo": "import-tree", - "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1", + "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -149,11 +149,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1778090892, - "narHash": "sha256-g2axsVNpjeIBMdMQz+mDFGNlhDkjdufZVhfaL0CfhEI=", + "lastModified": 1779447529, + "narHash": "sha256-iLPDE+Y94InNZvt92On6gWWvFOavfOzkKyEwraHUzGc=", "owner": "Lassulus", "repo": "wrappers", - "rev": "5d7c8ca68aa845d07c2e7dd2e168b6a8f02570c3", + "rev": "c27eb498c21c45ec33fce35a8572ddf96f072d48", "type": "github" }, "original": { diff --git a/modules/hosts/server/server.nix b/modules/hosts/server/server.nix index b41b820..fe62d56 100644 --- a/modules/hosts/server/server.nix +++ b/modules/hosts/server/server.nix @@ -6,7 +6,7 @@ self.nixosModules.nginx self.nixosModules.rtl_sdr self.nixosModules.utilities - self.nixosModules.early + #self.nixosModules.early self.nixosModules.lily self.nixosModules.localization