From fb45b77e27f7b7e2ed3fa226990d158617f53b49 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 22 Jul 2024 13:58:55 -0500
Subject: [PATCH] Remove several genesis services

Remove Nginx proxy
Remove mounting of LUN
---
 hosts/genesis/networking.nix | 40 ------------------------------------
 overlays/default.nix         |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/hosts/genesis/networking.nix b/hosts/genesis/networking.nix
index 6366008..86fcf34 100644
--- a/hosts/genesis/networking.nix
+++ b/hosts/genesis/networking.nix
@@ -75,10 +75,6 @@ in {
 			fsType = "nfs";
 			options = [ "ro" ];
 		};
-		"/proxy" = {
-			device = "/dev/vdb1";
-			fsType = "btrfs";
-		};
 	};
 
 	services = {
@@ -187,42 +183,6 @@ in {
 		"jellyfin.home".target = "http://localhost:8096/";
 	};
 
-	services = {
-		nginx.virtualHosts."nixcache.thehellings.lan" = {
-			serverName = "nixcache.thehellings.lan";
-			serverAliases = [ "nixcache" "nixcache.home" ];
-			root = "/proxy";
-			locations = {
-				"~ ^/nix-cache-info" = {
-					proxyPass = "https://cache.nixos.org";
-					root = "/proxy/nixpkgs/nix-cache-info/store";
-					recommendedProxySettings = false;
-					extraConfig = ''
-						error_log /var/log/nginx/proxy.log debug;
-						proxy_store on;
-						proxy_store_access user:rw group:rw all:r;
-						proxy_temp_path /proxy/nixpkgs/nix-cache-info/temp;
-						proxy_pass_request_headers on;
-						proxy_set_header Host "cache.nixos.org";
-					'';
-				};
-				"~^/nar/.+$" = {
-					proxyPass = "https://cache.nixos.org";
-					root = "/proxy/nixpkgs/nar/store";
-					recommendedProxySettings = false;
-					extraConfig = ''
-						proxy_store on;
-						proxy_store_access user:rw group:rw all:r;
-						proxy_temp_path /proxy/nixpkgs/nar/temp;
-						proxy_pass_request_headers on;
-						proxy_set_header Host "cache.nixos.org";
-					'';
-				};
-			};
-		};
-	};
-	systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/proxy" ];
-
 	environment.systemPackages = with pkgs; [
 		bind
 		curl  # Used by dnsmasq fetching
diff --git a/overlays/default.nix b/overlays/default.nix
index ce58c26..926b646 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -83,7 +83,7 @@ in rec {
 	};
 	pipenv-ivr = prev.callPackage ./pipenv.nix { };
 
-	myxonsh = (prev.xonsh-unwrapped.passthru.wrapper.override {
+	myxonsh = (prev.unstable.xonsh-unwrapped.passthru.wrapper.override {
 		extraPackages = (ps: with ps; [
 			xonsh-apipenv
 			xonsh-direnv