From 8e643956f0abf8011101771b956d994a2d052ae7 Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Tue, 12 Mar 2024 15:57:38 -0500
Subject: [PATCH] Updating from my desktop

---
 config/home/waybar.nix |  3 ++-
 hardware.nix           | 18 +++++-------------
 options.nix            |  6 +++---
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/config/home/waybar.nix b/config/home/waybar.nix
index fac49fe..8513fb7 100644
--- a/config/home/waybar.nix
+++ b/config/home/waybar.nix
@@ -35,7 +35,8 @@ in with lib; {
       };
       "hyprland/window" = {
       	max-length = 25;
-      	separate-outputs = false;
+        separate-outputs = false;
+        rewrite = { "" = " 🙈 No Windows? "; };
       };
       "memory" = {
       	interval = 5;
diff --git a/hardware.nix b/hardware.nix
index cc09fef..48e5fd2 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -8,27 +8,20 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8f47c564-523f-4eca-9644-69d2bed92f0a";
+    { device = "/dev/disk/by-uuid/b6d7783f-dd7c-493f-af02-923ca3394157";
       fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."luks-4f3ec042-9a98-4e10-84b3-3e081b030d6e".device = "/dev/disk/by-uuid/4f3ec042-9a98-4e10-84b3-3e081b030d6e";
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/cb501f9a-6814-477f-b8d5-1a8aaba243a9";
-      fsType = "ext4";
-    };
-
-  boot.initrd.luks.devices."luks-9b120c21-77b6-4291-bee0-185c5a1e3682".device = "/dev/disk/by-uuid/9b120c21-77b6-4291-bee0-185c5a1e3682";
+  boot.initrd.luks.devices."luks-0e0fc3ab-a29c-4a80-997a-9803ab509da7".device = "/dev/disk/by-uuid/0e0fc3ab-a29c-4a80-997a-9803ab509da7";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3B15-2EB6";
+    { device = "/dev/disk/by-uuid/76A0-C7B3";
       fsType = "vfat";
     };
 
@@ -39,8 +32,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp61s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp62s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/options.nix b/options.nix
index c88fe5b..69013a2 100644
--- a/options.nix
+++ b/options.nix
@@ -5,14 +5,14 @@
 let
   # THINGS YOU NEED TO CHANGE
   username = "zaney";
-  hostname = "hyprbook";
+  hostname = "hyprnix";
   userHome = "/home/${username}";
   flakeDir = "${userHome}/zaneyos";
   waybarStyle = "simplebar"; # simplebar, slickbar, or default
 in {
   # User Variables
   username = "zaney";
-  hostname = "hyprbook";
+  hostname = "hyprnix";
   gitUsername = "Tyler Kelley";
   gitEmail = "tylerzanekelley@gmail.com";
   theme = "atelier-cave";
@@ -44,7 +44,7 @@ in {
   # For Hybrid Systems intel-nvidia
   # Should Be Used As gpuType
   cpuType = "intel";
-  gpuType = "intel-nvidia";
+  gpuType = "amd";
 
   # Nvidia Hybrid Devices
   # ONLY NEEDED FOR HYBRID