diff --git a/hosts/nixos-laptop/home-manager/default.nix b/hosts/nixos-laptop/home-manager/default.nix
index 5af43447..8e01b199 100644
--- a/hosts/nixos-laptop/home-manager/default.nix
+++ b/hosts/nixos-laptop/home-manager/default.nix
@@ -1,10 +1,13 @@
 { config, pkgs, hostname, ... }: {
   imports = [ 
+    # Hyprland
     # ./hyprland-conf.nix
     # ./waybar-conf.nix
     # ./rofi-conf.nix
     # ./mako-conf.nix
     # ./swaylock-conf.nix
+
+    # Gnome
     ./gnome-dconf.nix
   ];
 }
\ No newline at end of file
diff --git a/hosts/nixos-laptop/nixos/configuration.nix b/hosts/nixos-laptop/nixos/configuration.nix
index e7d2e954..8bccd860 100644
--- a/hosts/nixos-laptop/nixos/configuration.nix
+++ b/hosts/nixos-laptop/nixos/configuration.nix
@@ -9,6 +9,7 @@
       ../../../modules/powertop.nix
   ];
 
+  # https://nixos.wiki/wiki/Gamemode
   programs.gamemode = {
     enable = true;
     settings = {
@@ -57,13 +58,14 @@
       open = false;
       dynamicBoost.enable = true;
       nvidiaPersistenced = false;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      package = config.boot.kernelPackages.nvidiaPackages.latest;
       powerManagement.finegrained = true;
       powerManagement.enable = true;
       nvidiaSettings = true;
       modesetting.enable = true;
       prime = {
-        reverseSync.enable = true;
+        reverseSync.enable = false;
+        sync.enable = false;
         offload = {
           enable = true;
           enableOffloadCmd = true;
@@ -74,13 +76,6 @@
     };
   };
 
-   # environment.variables = {
-   #   GBM_BACKEND = "nvidia-drm";
-   #   LIBVA_DRIVER_NAME = "nvidia";
-   #   __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-   # };
-
-
   environment.systemPackages = with pkgs; [ 
     # Fingerprint software
     fprintd 
@@ -90,16 +85,10 @@
     vulkan-tools
     gwe
     nvtop-nvidia
-  
     # Game related things
     gamemode
-    # support both 32- and 64-bit applications
     wineWowPackages.stable
-    # wine-staging (version with experimental features)
-    # wineWowPackages.staging
-    # winetricks (all versions)
     winetricks
-    # native wayland support (unstable)
     wineWowPackages.waylandFull
   ];
 }
diff --git a/hosts/nixos-laptop/nixos/default.nix b/hosts/nixos-laptop/nixos/default.nix
index 0a0dcb43..6662490d 100644
--- a/hosts/nixos-laptop/nixos/default.nix
+++ b/hosts/nixos-laptop/nixos/default.nix
@@ -1,8 +1,6 @@
 { config, pkgs, hostname, ... }: {
   imports = [ 
     ./hardware-configuration.nix
-    ./configuration.nix
-    ./networking.nix
-    
+    ./configuration.nix    
   ];
 }
\ No newline at end of file
diff --git a/hosts/nixos-laptop/nixos/hardware-configuration.nix b/hosts/nixos-laptop/nixos/hardware-configuration.nix
index 80d6743b..dc4635a6 100644
--- a/hosts/nixos-laptop/nixos/hardware-configuration.nix
+++ b/hosts/nixos-laptop/nixos/hardware-configuration.nix
@@ -2,9 +2,9 @@
   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 = [ ];
+  boot.initrd.kernelModules = [ "acpi_backlight=native" ];
+  boot.kernelModules = [ "kvm-intel" "acpi_call" ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/ROOT";
@@ -34,6 +34,6 @@
 
   networking.useDHCP = lib.mkDefault true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
\ No newline at end of file
diff --git a/hosts/nixos-laptop/nixos/networking.nix b/hosts/nixos-laptop/nixos/networking.nix
deleted file mode 100644
index 806779ae..00000000
--- a/hosts/nixos-laptop/nixos/networking.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ config, pkgs, ... }: {
-  
-}
\ No newline at end of file
diff --git a/modules/networking.nix b/modules/networking.nix
index 5d871e9c..b5dba826 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,9 +1,5 @@
 {pkgs, config, hostname, ...}:  {
-  # Enable networking
-  # Imports for host-specific configs:
-  imports = [
-    ../hosts/${hostname}/nixos/networking.nix
-  ];
+  # Enable networking with NM and automatically allow port 22 over Tailscale
 
   networking = {
     networkmanager = { 
diff --git a/modules/nixos.nix b/modules/nixos.nix
index 0f3d09be..702dda62 100644
--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -7,9 +7,9 @@
     autoUpgrade = {
       enable = true;
       allowReboot = false;
-      # channel = https://channels.nixos.org/nixos-23.05;
-      # https://search.nixos.org/options?channel=unstable&show=system.autoUpgrade.flake&from=0&size=50&sort=relevance&type=packages&query=Autoupgrade
-      flake = "path:/etc/nixos/flake.nix"; # Should be /etc/nixos/flake.nix
+      dates = "daily";
+      flake = "path:/etc/nixos/flake.nix";
+      option = "switch";
     };
   };