From ea28a3852c451ac5a942ff40d9b95b9eb5ff4ee2 Mon Sep 17 00:00:00 2001
From: cartierf89 <cartierer0eduardo@hotmail.com>
Date: Wed, 20 Aug 2025 03:55:26 -0400
Subject: [PATCH] Added desktop monitor configs and removed battery from bar

---
 hosts/desktop/default.nix                | 10 ++++
 hosts/desktop/hardware-configuration.nix | 66 ++++++------------------
 modules/home/hyprland/hyprpanel.nix      |  2 +-
 modules/system/display-manager/sddm.nix  |  2 +-
 4 files changed, 29 insertions(+), 51 deletions(-)
 mode change 100755 => 100644 hosts/desktop/hardware-configuration.nix

diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 141fe8d..74a5ca3 100755
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -13,6 +13,16 @@
     ../../modules/system/device-management/logitech.nix
     ./hardware-configuration.nix
   ];
+  
+  # Desktop Specific Hyprland Monitor Config
+   home-manager.users.${config.users.users.cartier.name or "cartier"} = {
+    wayland.windowManager.hyprland.settings.monitor = [
+      # Main monitor (HP OMEN, right side, horizontal, 1440p @ 240Hz)
+      "DP-2, 2560x1440@240, 1080x0, 1"
+      # Secondary monitor (Samsung, left side, vertical, 1080p @ 239.76Hz)
+      "DP-1, 1920x1080@239.76, 0x0, 1, transform, 1"
+    ];
+   };
 
   # Mount second hard drive
   boot = {
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
old mode 100755
new mode 100644
index 077a87b..05ea34b
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -1,63 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/8f492948-4572-44d4-9da9-9394894320f4";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/8be29434-1adc-4c93-9f4b-a3aeba2f0cb9";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/EAA9-478C";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/565A-67E0";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/0237c531-0818-4753-a08c-08bb6307476a"; }
     ];
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/6646d409-6417-4410-b3a0-fe6bafb2b9f3";
-    fsType = "ext4";
-  };
-
-  fileSystems."/tmp" = {
-    device = "/dev/disk/by-uuid/9fe1009a-f604-40ff-a13d-e78d9041397f";
-    fsType = "ext4";
-  };
-
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/9d39eb6d-09ab-4d66-8864-c19f9d59f620";
-    fsType = "ext4";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/6fa52bf4-b1d9-468f-bc3a-f0c740e80c86"; }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -65,7 +34,6 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/modules/home/hyprland/hyprpanel.nix b/modules/home/hyprland/hyprpanel.nix
index 08f632b..a88ccde 100755
--- a/modules/home/hyprland/hyprpanel.nix
+++ b/modules/home/hyprland/hyprpanel.nix
@@ -22,7 +22,7 @@
               "volume"
               "network"
               "notifications"
-              "battery"
+
             ];
           };
         };
diff --git a/modules/system/display-manager/sddm.nix b/modules/system/display-manager/sddm.nix
index 7f65bdf..0fb573e 100755
--- a/modules/system/display-manager/sddm.nix
+++ b/modules/system/display-manager/sddm.nix
@@ -26,7 +26,7 @@ in
       (sddm-chili-theme.override {
         themeConfig = {
           background = "/etc/sddm-wallpaper.png";
-          ScreenWidth = "3440";
+          ScreenWidth = "2560";
           ScreenHeight = "1440";
           recursiveBlurLoops = 1;
           recursiveBlurRadius = 10;