diff --git a/Makefile b/Makefile
index e81ef3a..42db6c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 pull:
 	nix-shell -p git --run "git pull"
-rebuild: pull
+update-channels:
+	sudo nix-channel --update
+rebuild: pull update-channels
 	sudo nixos-rebuild switch -I nixos-config=machines/$(shell hostname -s)/configuration.nix
+	sudo nix-collect-garbage -d
 boot: pull
 	sudo nixos-rebuild boot -I nixos-config=machines/$(shell hostname -s)/configuration.nix
\ No newline at end of file
diff --git a/common.nix b/common.nix
index 92431e9..e8a04c4 100644
--- a/common.nix
+++ b/common.nix
@@ -50,7 +50,6 @@
         git.enable = true;
         zsh.enable = true;
         ssh.startAgent = true;
-        gpg.agent.enable = true;
     };
 
     environment.systemPackages = with pkgs; [
@@ -68,4 +67,4 @@
             };
         };
     };
-}
\ No newline at end of file
+}
diff --git a/hardware/p8-laptop.nix b/hardware/p8-laptop.nix
index 4753b15..24ab965 100644
--- a/hardware/p8-laptop.nix
+++ b/hardware/p8-laptop.nix
@@ -16,7 +16,10 @@
         "video=DSI-1:panel_orientation=right_side_up"
         "fbcon=rotate:1"
     ];
-    boot.kernelPackages = pkgs.linuxPackages_latest;
+    boot.extraModprobeConfig = ''
+       options intel_hid enable_sw_tablet_mode=2
+    '';
+    boot.kernelPackages = pkgs.linuxPackages_testing;
 
     # Fix the font rendering
 	fonts.fontconfig = {