diff --git a/flake.lock b/flake.lock
index ecfb2ac..556e167 100644
--- a/flake.lock
+++ b/flake.lock
@@ -83,22 +83,6 @@
         "type": "github"
       }
     },
-    "hardware": {
-      "locked": {
-        "lastModified": 1724067415,
-        "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -120,23 +104,6 @@
         "type": "github"
       }
     },
-    "home-manager-unstable": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
-        "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/master.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/master.tar.gz"
-      }
-    },
     "jovian-nixos": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -185,11 +152,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1724982042,
-        "narHash": "sha256-IwHIZYo1fyloQxvBy15QVzMALNEa7Jo6tzXVJj7U9Ws=",
+        "lastModified": 1725414050,
+        "narHash": "sha256-apEL1vA8A8skxokuNoaH1Jfx32XybeQpOo8uJDKPcjY=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "32b632e29b141cc4c441b6e5504d33a9564dc3e6",
+        "rev": "55a9a8faee81d758e09f28ad395f9a4f29273c39",
         "type": "github"
       },
       "original": {
@@ -198,6 +165,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1725477728,
+        "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
@@ -252,11 +235,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1725103162,
+        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
         "type": "github"
       },
       "original": {
@@ -315,11 +298,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1724242322,
-        "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
+        "lastModified": 1725407940,
+        "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "224042e9a3039291f22f4f2ded12af95a616cca0",
+        "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
         "type": "github"
       },
       "original": {
@@ -331,11 +314,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1724395746,
-        "narHash": "sha256-kutXBf+8Rd9KxLMe/W/lN8RlqItCrQIyqyXH37mMsZc=",
+        "lastModified": 1725529639,
+        "narHash": "sha256-dRQHGPv6a5sFkIpjhZ1cXLrHG5rfXnVJVE3ETVq1ilY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f77e6626a93ab9670675bd495187a4aba8587dae",
+        "rev": "72cd6b31e8256c9b28939fd02b9f87efafd2375c",
         "type": "github"
       },
       "original": {
@@ -347,11 +330,10 @@
     "root": {
       "inputs": {
         "blender-bin": "blender-bin",
-        "hardware": "hardware",
         "home-manager": "home-manager",
-        "home-manager-unstable": "home-manager-unstable",
         "jovian-nixos": "jovian-nixos",
         "nix-minecraft": "nix-minecraft",
+        "nixos-hardware": "nixos-hardware",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index d24b6e3..9dd01d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,19 +10,13 @@
     blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS";
-    hardware.url = "github:nixos/nixos-hardware/master";
+    nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     # Home manager
     home-manager = {
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    # Home manager unstable
-    home-manager-unstable = {
-      url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
@@ -34,7 +28,6 @@
     blender-bin,
     jovian-nixos,
     home-manager,
-    home-manager-unstable,
     ...
   } @inputs: let
     inherit (self) outputs;
diff --git a/nixos/desktop/misc.nix b/nixos/desktop/misc.nix
index b7b5b6a..34cc267 100644
--- a/nixos/desktop/misc.nix
+++ b/nixos/desktop/misc.nix
@@ -9,7 +9,6 @@
   services = {
     gvfs.enable = true;
     udisks2.enable = true;
-    tlp.enable = true;
   };
 
   # Security that only makes sense with a GUI
diff --git a/nixos/desktop/wayland.nix b/nixos/desktop/wayland.nix
index ceb211f..12798ad 100644
--- a/nixos/desktop/wayland.nix
+++ b/nixos/desktop/wayland.nix
@@ -5,7 +5,11 @@
     xwayland.enable = true;
   };
 
-  services.dbus.enable = true;
+  # Battery saver and dbus
+  services = {
+    tlp.enable = true;
+    dbus.enable = true;
+  };
 
   environment.systemPackages = with pkgs; [
     wl-clipboard