diff --git a/hosts/nixos-laptop/configuration.nix b/hosts/nixos-laptop/configuration.nix
index 945cc2a5..b1c9dec9 100644
--- a/hosts/nixos-laptop/configuration.nix
+++ b/hosts/nixos-laptop/configuration.nix
@@ -34,9 +34,11 @@
     # https://nixpk.gs/pr-tracker.html?pr=244060
     nvidia = {
       open = false;
+      dynamicBoost.enable = true;
       package = config.boot.kernelPackages.nvidiaPackages.stable;
       # powerManagement.finegrained = true;
       powerManagement.enable = true;
+      nvidiaSettings = true;
       modesetting.enable = true;
       prime = {
         offload = {
@@ -75,7 +77,7 @@
     # support both 32- and 64-bit applications
     wineWowPackages.stable
     # support 32-bit only
-    wine
+    # wine
     # support 64-bit only
     # (wine.override { wineBuild = "wine64"; })
     # wine-staging (version with experimental features)
diff --git a/hosts/nixos-laptop/hardware-configuration.nix b/hosts/nixos-laptop/hardware-configuration.nix
index 820f05db..59b9d0d6 100644
--- a/hosts/nixos-laptop/hardware-configuration.nix
+++ b/hosts/nixos-laptop/hardware-configuration.nix
@@ -1,56 +1,39 @@
-# 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, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+{ config, lib, pkgs, modulesPath, ... }: {
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9f637cc8-7db5-437b-b9f8-8975f0a1b7ca";
-      fsType = "ext4";
-    };
-
-  boot.initrd.luks.devices."luks-f76019f6-1aba-4720-93e6-d4bd45029c9f".device = "/dev/disk/by-uuid/f76019f6-1aba-4720-93e6-d4bd45029c9f";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/248C-D662";
-      fsType = "vfat";
-    };
-
-
-  # Enable swap on luks
-  boot.initrd.luks.devices."luks-9704447e-6bd0-4a35-9c24-20cbab81c431".device = "/dev/disk/by-uuid/9704447e-6bd0-4a35-9c24-20cbab81c431";
-  boot.initrd.luks.devices."luks-9704447e-6bd0-4a35-9c24-20cbab81c431".keyFile = "/crypto_keyfile.bin";
-
-  # Setup keyfile
-  boot.initrd.secrets = {
-    "/crypto_keyfile.bin" = null;
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/ROOT";
+    fsType = "btrfs";
+    options = [ "subvol=@" ];
   };
 
-  # Hibernation resume device:
-  boot.resumeDevice = "/dev/disk/by-uuid/67600fc1-6d26-4d2f-b2d3-a99174654058";
+  boot.initrd.luks.devices."DISK".device = "/dev/nvme0n1p1";
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/67600fc1-6d26-4d2f-b2d3-a99174654058"; }
-    ];
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/BOOT";
+    fsType = "vfat";
+  };
+
+  # Enable Swap on LUKS
+  boot.initrd.luks.devices."SWAP" = {
+    device = "/dev/nvme0n1p2";
+    keyFile = "/crypto_keyfile.bin";
+  };
+
+  # Set up the keyfile
+  boot.initrd.secrets."/crypto_keyfile.bin" = null;
+  # Hibernation resume device
+  boot.resumeDevice = "/dev/disk/by-label/SWAP";
+  # Confirm the swap devices
+  swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ];
 
-  # 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
-  # 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.tailscale0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  # powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
\ No newline at end of file
diff --git a/hosts/nixos-laptop/desktops/gnome-dconf.nix b/hosts/nixos-laptop/home-manager/gnome-dconf.nix
similarity index 100%
rename from hosts/nixos-laptop/desktops/gnome-dconf.nix
rename to hosts/nixos-laptop/home-manager/gnome-dconf.nix
diff --git a/hosts/nixos-laptop/desktops/hyprland-conf.nix b/hosts/nixos-laptop/home-manager/hyprland-conf.nix
similarity index 100%
rename from hosts/nixos-laptop/desktops/hyprland-conf.nix
rename to hosts/nixos-laptop/home-manager/hyprland-conf.nix
diff --git a/desktops/hyprland/waybar/gruvbox.nix b/hosts/nixos-laptop/home-manager/waybar-config.nix
similarity index 100%
rename from desktops/hyprland/waybar/gruvbox.nix
rename to hosts/nixos-laptop/home-manager/waybar-config.nix
diff --git a/users/albert/home.nix b/users/albert/home.nix
index 0da126a6..48f21fbe 100644
--- a/users/albert/home.nix
+++ b/users/albert/home.nix
@@ -1,8 +1,11 @@
 { config, pkgs, hostname, ... }: {
   home.stateVersion = "23.05";
   imports = [ 
-    # ../../hosts/${hostname}/desktops/gnome-dconf.nix
-    ../../hosts/${hostname}/desktops/hyprland-conf.nix
+    # Host specific Configs:
+    # ../../hosts/${hostname}/home-manager/gnome-dconf.nix
+    ../../hosts/${hostname}/home-manager/hyprland-conf.nix
+
+    # Universal Configs:
     ../../home-manager/git.nix
     ../../home-manager/neovim.nix
     ../../home-manager/bash.nix