feat: Disabled website and enabled cgitHEADmaster

2 files changed, 25 insertions, 50 deletions

diff --git a/computers/nixnode.nix b/computers/nixnode.nix
index baeadcb..40d99b1 100644
--- a/computers/nixnode.nix
+++ b/computers/nixnode.nix
@@ -7,11 +7,12 @@
 {
     imports =
         [ # Include the results of the hardware scan.
-            ../modules/nix.nix
             inputs.STK.nixosModules.default
             inputs.sops.nixosModules.sops
         ];
 
+    teh-nix.nix.enable = true;
+
     # Use the GRUB 2 boot loader.
     boot.loader.grub.enable = true;
     # boot.loader.grub.efiSupport = true;
@@ -20,7 +21,7 @@
     # Define on which hard drive you want to install Grub.
     # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
 
-    networking.hostName = "nixos"; # Define your hostname.
+    networking.hostName = "nixnode"; # Define your hostname.
     # Pick only one of the below networking options.
     # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
     networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
@@ -92,11 +93,18 @@ ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j
         };
     };
 
-    services.httpd = {
+    # services.nginx = {
+    #     enable = true;
+    #     virtualHosts."172.105.172.191" = {
+    #         documentRoot = "${inputs.self.packages.x86_64-linux.teh-website}/srv/www";
+    #     };
+    # };
+
+    teh-nix.services.cgit = {
         enable = true;
-        virtualHosts."172.105.172.191" = {
-            documentRoot = "/srv/httpd";
-        };
+        authorizedKeys = config.users.users.boss.openssh.authorizedKeys.keys;
+        authorizedUsers = [ "boss" ];
+        domain = "172.105.172.191";
     };
     
     services.openssh = {
@@ -119,7 +127,7 @@ ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j
 
     users.users.boss = {
         isNormalUser = true;
-        extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
+        extraGroups = [ "wheel" "networkmanager"]; # Enable ‘sudo’ for the user.
         home = "/home/boss";
         openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOukEKExoF6vr3vciQN8pBdd4FtZtRzqIGFJrUvllOY boss@nixy" ];
     };
@@ -131,6 +139,7 @@ ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j
         mtr
         sysstat
         git
+        inputs.self.packages.x86_64-linux.teh-website
     ];
     
 
diff --git a/computers/nixy.nix b/computers/nixy.nix
index fd79b47..50e4f22 100644
--- a/computers/nixy.nix
+++ b/computers/nixy.nix
@@ -6,12 +6,11 @@
 {
     imports =
 	    [
-            ../modules/nix.nix
-            ../modules/nvidia.nix
-            inputs.YATwm.nixosModules.default
             inputs.sops.nixosModules.sops
             #inputs.spicetify-nix.nixosModules.default
 	    ];
+
+    teh-nix.nix.enable = true;
     
     # Use the systemd-boot EFI boot loader.
     boot = {
@@ -109,56 +108,23 @@
 	    #useXkbConfig = true; # use xkbOptions in tty.
     };
 
-    # Enable the X11 windowing system.
-    services.xserver = {
-	    enable = true;
-
-	    desktopManager = {
-		    xterm.enable = false;
-            #default = "none";
-	    };
-        
-        deviceSection = ''
-                      Option "DRI" "2"
-                      Option "TearFree" "true"
-                      '';
-
-	    windowManager.i3 = {
-		    enable = true;
-		    package = pkgs.i3-gaps;
-	    };
-
-        windowManager.YATwm = {
-            enable = true;
-            package = inputs.YATwm.packages.x86_64-linux.YATwm;
-        };
-	};
-    programs.i3lock.enable = true;
+    teh-nix.xorg = {
+        enable = true;
+    };
+    
     programs.hyprland = {
         enable = true;
         #package = inputs.hyprland.packages.${pkgs.system}.hyprland;
         #portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
     };
-    services.displayManager = {
-		#defaultSession = "none+i3";
-		sddm.enable = true;
-        #sddm.theme = "catppuccin-macchiato";
-        # ly.enable = true;
-	};
-	# services.xserver.displayManager = {
-    #     lightdm.enable = true;
-    # };
-
-	# Configure keymap in X11
-	services.xserver.xkb.layout = "us";
-	services.xserver.xkb.options = "caps:super";
-
 
     security.pam.services.swaylock = {};
 
 	# Enable CUPS to print documents.
 	services.printing.enable = true;
-    services.printing.drivers = [ pkgs.hplip ];
+    services.printing.drivers = with pkgs;[
+        hplip
+    ];
     services.avahi = {
         enable = true;
         nssmdns4 = true;