diff --git a/flake.lock b/flake.lock
index e59230a..862d89c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716773194,
-        "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=",
+        "lastModified": 1718242063,
+        "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "10986091e47fb1180620b78438512b294b7e8f67",
+        "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716736833,
-        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
+        "lastModified": 1717527182,
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1716987116,
-        "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=",
+        "lastModified": 1718349360,
+        "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "8251761f93d6f5b91cee45ac09edb6e382641009",
+        "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "lastModified": 1718208800,
+        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
+        "lastModified": 1718160348,
+        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
+        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c1d60cb..93f5b08 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,6 +70,10 @@
               # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
             }
           disko.nixosModules.disko
+          nixos-hardware.nixosModules.common-cpu-amd
+          nixos-hardware.nixosModules.common-cpu-amd-pstate
+          nixos-hardware.nixosModules.common-cpu-amd-zenpower
+          nixos-hardware.nixosModules.common-gpu-amd
           ./hosts
           ./users/willifan
         ];
diff --git a/hosts/Puenktchen/amd.nix b/hosts/Puenktchen/amd.nix
deleted file mode 100644
index 508a2d5..0000000
--- a/hosts/Puenktchen/amd.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  boot.initrd.kernelModules = [ "amdgpu" ];
-}
\ No newline at end of file
diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix
index 8a8195f..36963cd 100644
--- a/hosts/Puenktchen/default.nix
+++ b/hosts/Puenktchen/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   imports = [
-    ./amd.nix
     ./hardware-configuration.nix
     ./disko.nix
   ];
diff --git a/hosts/common/printers.nix b/hosts/common/printers.nix
index 2b13ad7..c699a37 100644
--- a/hosts/common/printers.nix
+++ b/hosts/common/printers.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
-  services.printing.enable = true;
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.canon-cups-ufr2 ];
+  };
 
   services.avahi = {
     enable = true;
diff --git a/users/willifan/graphical/default.nix b/users/willifan/graphical/default.nix
index 4861497..3761c7e 100644
--- a/users/willifan/graphical/default.nix
+++ b/users/willifan/graphical/default.nix
@@ -9,6 +9,7 @@
 
     ./firefox.nix
     ./kitty.nix
+    ./minecraft.nix
     ./steam.nix
     ./thunar.nix
     ./thunderbird.nix
diff --git a/users/willifan/graphical/minecraft.nix b/users/willifan/graphical/minecraft.nix
new file mode 100644
index 0000000..54126e4
--- /dev/null
+++ b/users/willifan/graphical/minecraft.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    prismlauncher
+  ];
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/steam.nix
index 106f8c8..7f11bc9 100644
--- a/users/willifan/graphical/steam.nix
+++ b/users/willifan/graphical/steam.nix
@@ -7,6 +7,10 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    mangohud
+  ];
+
   hardware.steam-hardware.enable = true;
 
   services.udev.extraRules = ''