Merge branch 'main' of https://git.lilyanderson.xyz/lily/LiNix

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

modules/hosts/desktop/desktop.nix

@@ -8,7 +8,7 @@
 			self.nixosModules.localization
 			self.nixosModules.applications
 			self.nixosModules.utilities
-			self.nixosModules.early
+			#self.nixosModules.early
 		];
 	};
 }

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

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

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'';
 			};
 		};