From a48cb3515beec99cbf8351a55880323ae206736c Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Wed, 1 Jan 2025 13:50:43 -0500
Subject: [PATCH] nginx error, committing to search the forgejo

---
 hosts/kitty/boot/default.nix                  | 10 ++++++++++
 hosts/kitty/default.nix                       | 20 +++++++++++--------
 hosts/kitty/hardware/default.nix              |  8 --------
 hosts/kitty/users/default.nix                 |  4 ++++
 hosts/kitty/users/jimbo/default.nix           |  9 +++++++++
 .../minecraft/servers/johnside/default.nix    |  2 +-
 .../minecraft/servers/roguecraft/default.nix  |  6 +++---
 .../server/transmission/nginx/default.nix     |  2 +-
 8 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 hosts/kitty/boot/default.nix
 create mode 100644 hosts/kitty/users/default.nix
 create mode 100644 hosts/kitty/users/jimbo/default.nix

diff --git a/hosts/kitty/boot/default.nix b/hosts/kitty/boot/default.nix
new file mode 100644
index 0000000..f3de27d
--- /dev/null
+++ b/hosts/kitty/boot/default.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, modulesPath, ... }:
+{
+  boot = {
+    kernelPackages = pkgs.linuxPackages_hardened;
+    swraid = {
+      enable = true;
+      mdadmConf = "MAILADDR contact@${config.domains.p2}";
+    };
+  };
+}
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index 04149ce..f09c3bd 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -1,18 +1,22 @@
 { ... }:
 {
   imports = [
-    ./disko
+    ./boot
     ./firewall
     ./hardware
+    ./users
     ../../modules/system
   ];
 
-  system.desktop.enable = false;
-  system.server.enable = true;
-  #system.lanzaboote.enable = true;
-  system.wireless.enable = false;
+  networking = {
+    hostName = "kitty";
+    hostId = "38ba3f57";
+  };
 
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  networking.hostName = "tower";
+  system = {
+    desktop.enable = false;
+    server.enable = true;
+    wireless.enable = false;
+    stateVersion = "24.05";
+  };
 }
diff --git a/hosts/kitty/hardware/default.nix b/hosts/kitty/hardware/default.nix
index d0e1617..8b41111 100644
--- a/hosts/kitty/hardware/default.nix
+++ b/hosts/kitty/hardware/default.nix
@@ -1,9 +1,6 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
   boot = {
-    blacklistedKernelModules = [
-      "pcspkr"
-    ];
     initrd = {
       availableKernelModules = [
         "xhci_pci"
@@ -18,10 +15,6 @@
         "kvm-intel"
       ];
     };
-    swraid = {
-      enable = true;
-      mdadmConf = "MAILADDR contact@${config.domains.jim2}";
-    };
   };
 
   # Main root
@@ -89,7 +82,6 @@
     };
   };
 
-
   swapDevices = [
     { device = "/dev/server/root/swap"; }
   ];
diff --git a/hosts/kitty/users/default.nix b/hosts/kitty/users/default.nix
new file mode 100644
index 0000000..a0f4778
--- /dev/null
+++ b/hosts/kitty/users/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./jimbo ];
+}
diff --git a/hosts/kitty/users/jimbo/default.nix b/hosts/kitty/users/jimbo/default.nix
new file mode 100644
index 0000000..7171da3
--- /dev/null
+++ b/hosts/kitty/users/jimbo/default.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+{
+  home-manager.users.jimbo = {
+    home = {
+      desktop.enable = false;
+      stateVersion = lib.mkForce "24.05";
+    };
+  };
+}
diff --git a/modules/system/services/server/minecraft/servers/johnside/default.nix b/modules/system/services/server/minecraft/servers/johnside/default.nix
index c866ad8..c38fbb6 100644
--- a/modules/system/services/server/minecraft/servers/johnside/default.nix
+++ b/modules/system/services/server/minecraft/servers/johnside/default.nix
@@ -42,7 +42,7 @@ in {
     };
 
     # BlueMap webhost
-    nginx.virtualHosts."john.${config.domains.jim1}" = {
+    nginx.virtualHosts."john.${config.domains.p1}" = {
       enableACME = true;
       forceSSL = true;
       locations."/" = {
diff --git a/modules/system/services/server/minecraft/servers/roguecraft/default.nix b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
index 3e46fff..3081365 100644
--- a/modules/system/services/server/minecraft/servers/roguecraft/default.nix
+++ b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
@@ -11,19 +11,19 @@ in {
         server-port = 30014;
         motd = "\\u00A7l\\u00A7bJimbo's \\u00A7cRoguecraft \\u00A7bserver.";
         require-resource-pack = true;
-        resource-pack = "https://${config.domains.jim1}/roguecraftresourcepackredir";
+        resource-pack = "https://${config.domains.p1}/roguecraftresourcepackredir";
         resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
       };
       whitelist = common.whitelist;
       symlinks = common.paperSymlinks;
       files = common.configFiles // {
         "world/datapacks/roguecraft.zip" = builtins.fetchurl {
-          url = "https://${config.domains.jim1}/roguecraftdatapackredir";
+          url = "https://${config.domains.p1}/roguecraftdatapackredir";
           sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
         };
       };
     };
-    nginx.virtualHosts."${config.domains.jim1}".locations = {
+    nginx.virtualHosts."${config.domains.p1}".locations = {
       "/roguecraftdatapackredir" = {
         return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
       };
diff --git a/modules/system/services/server/transmission/nginx/default.nix b/modules/system/services/server/transmission/nginx/default.nix
index a42c5d9..cb3978b 100644
--- a/modules/system/services/server/transmission/nginx/default.nix
+++ b/modules/system/services/server/transmission/nginx/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  services.nginx.virtualHosts."torrent.${config.domains.p1}" = config.services.transmission.enable {
+  services.nginx.virtualHosts."torrent.${config.domains.p1}" = lib.mkIf config.services.transmission.enable {
     enableACME = true;
     forceSSL = true;
     locations."/" = {