update how website is served

hosts/desktop/default.nix

@@ -3,25 +3,25 @@
 {
   imports = [
     ./hardware-configuration.nix
+
 	../../modules/network.nix
 	../../modules/ssh.nix
 	../../modules/wireguard.nix
+	../../modules/site.nix
 	../../modules/gitea.nix
   ];
 
-  boot.kernel.sysctl = {
-    "net.ipv4.ip_forward" = 1;
-  };
   network.node = "desktop";
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking.hostName = "desktop";
-  networking.networkmanager.enable = true;
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+
+    users.root = import ../../home/root.nix;
+  };
+  programs.zsh.enable = true;
+  users.users.root.shell = pkgs.zsh;
 
   time.timeZone = "America/Toronto";
 
@@ -55,9 +55,7 @@
     pulse.enable = true;
   };
 
-  programs.git.enable = true;
-  programs.zsh.enable = true;
-
   nixpkgs.config.allowUnfree = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   system.stateVersion = "26.05";
 }

hosts/desktop/hardware-configuration.nix

@@ -12,6 +12,9 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/d7450680-7d53-4842-83c5-7fc32526dff1";

hosts/vps/default.nix

@@ -2,29 +2,26 @@
 
 {
   imports = [
-	./hardware-configuration.nix
-	../../modules/network.nix
-	../../modules/ssh.nix
-	../../modules/wireguard.nix
-	../../modules/http-forwarding.nix
+    ./hardware-configuration.nix
+
+    ../../modules/network.nix
+    ../../modules/ssh.nix
+    ../../modules/wireguard.nix
+    ../../modules/http-forwarding.nix
   ];
 
-	network.node = "vps";
-
+  network.node = "vps";
   networking.hostName = "vps";
 
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
 
-  environment.systemPackages = with pkgs; [
-    git
-    wireguard-tools
-    nftables
-    vim
-  ];
+    users.root = import ../../home/root.nix;
+  };
+  programs.zsh.enable = true;
+  users.users.root.shell = pkgs.zsh;
 
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   system.stateVersion = "26.05";
 }