From 274512810c0de6ac4336c295510bc69047baa23e Mon Sep 17 00:00:00 2001
From: nyxerinys <nyxerinys5@gmail.com>
Date: Thu, 1 Oct 2026 22:21:06 -0500
Subject: [PATCH 1/2] revert changes, coming back later

---
 hosts/apollo/boot.nix | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/hosts/apollo/boot.nix b/hosts/apollo/boot.nix
index a6d9d33..2560f94 100644
--- a/hosts/apollo/boot.nix
+++ b/hosts/apollo/boot.nix
@@ -1,10 +1,9 @@
 { pkgs, lib, inputs, ... }:
 
 {
-  boot.kernelParams = [ "rd.luks.options=timeout=0,tries=1" ];
   boot.initrd = {
     supportedFilesystems = [ "ext4" "zfs" ];
-    availableKernelModules = [ "hid_apple" "igc" ];
+    availableKernelModules = [ "hid_apple" ];
     systemd = {
       enable = true;
       fido2.enable = true;
@@ -25,33 +24,11 @@
       crypttabExtraOpts = [ "fido2-device=auto" ];
     };
 
-    systemd.services."systemd-cryptsetup@" = {
-      overrideStrategy = "asDropin";
-      serviceConfig = {
-        Restart = "no";
-        OnFailureJobMode = "fail";
-      };
-    };
-
     systemd.services."zfs-import-nix-root" = {
       wants = [ "keys.mount" ];
       after = [ "keys.mount" ];
     };
 
-    network = {
-      enable = true;
-      ssh = {
-        enable = true;
-        port = 2222;
-        hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ];
-        
-        # Use an inline string to prepend the forced systemd command to your key
-        authorizedKeys = [
-          ''command="${pkgs.systemd}/bin/systemd-tty-ask-password-agent --watch" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjed9TzAaS6afEilS6CQAyz7DRJUNeLWGeboB3Ma3Rb remote-fido-unlock''
-        ];
-      };
-    };
-
   };
 
   systemd.services."zfs-import-nix-main" = {

From 8b9f8347c371c261b3587a163d8aac11562a32d8 Mon Sep 17 00:00:00 2001
From: nyxerinys <nyxerinys5@gmail.com>
Date: Thu, 1 Oct 2026 22:21:15 -0500
Subject: [PATCH 2/2] enable hyprland

---
 hosts/apollo/default.nix | 16 ++++++++++++++++
 hosts/base.nix           |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/hosts/apollo/default.nix b/hosts/apollo/default.nix
index 7f05f9a..053b185 100644
--- a/hosts/apollo/default.nix
+++ b/hosts/apollo/default.nix
@@ -9,4 +9,20 @@
   networking.hostName = "apollo";
   networking.hostId = "40ced703";
   networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
+
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    xwayland.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    kitty
+  ];
+
+  programs.zsh.loginShellInit = ''
+    if [[ $(tty) == "/dev/tty1" ] && uwsm check may-start; then 
+      exec uwsm start hyprland-uwsm.desktop
+    fi
+  '';
 }
\ No newline at end of file
diff --git a/hosts/base.nix b/hosts/base.nix
index 1d15c54..4eaedcb 100644
--- a/hosts/base.nix
+++ b/hosts/base.nix
@@ -61,6 +61,9 @@
     variant = "";
   };
 
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+
   users.users.nyxerinys = {
     isNormalUser = true;
     description = "Nyx";