diff --git a/systems/BASED.nix b/systems/BASED.nix
index 745d252..e235ac4 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -104,14 +104,14 @@
     LC_ALL = "en_US.UTF-8";
   };
 
-  boot.loader.systemd-boot.enable = lib.mkDefault true;
-  boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
-  boot.loader.timeout = lib.mkForce 1;
-  boot.supportedFilesystems = ["ntfs" "btrfs"];
   systemd.extraConfig = ''
     DefaultTimeoutStopSec=15s
   '';
 
+  boot.loader.systemd-boot.enable = lib.mkDefault true;
+  boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
+  boot.loader.timeout = lib.mkForce 1;
+  boot.supportedFilesystems = ["ntfs" "btrfs"];
   hardware.enableAllFirmware = true;
   hardware.bluetooth.enable = lib.mkDefault true;
 
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index 06e5092..571099d 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -1,14 +1,47 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     # prescurve
+    libinput
     powertop
     fw-ectool
   ];
 
-  powerManagement.powertop.enable = true;
   services.fwupd.enable = true;
   services.fprintd.enable = true;
 
+  powerManagement.powertop.enable = false;
+  systemd.services.powertop = {
+    wantedBy = ["multi-user.target"];
+    after = ["multi-user.target"];
+    path = [pkgs.kmod];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = "yes";
+      ExecStart = "${pkgs.powertop}/bin/powertop --auto-tune";
+      ExecStartPost = "
+          /bin/sh -c 'for f in $(grep -l 'Keyboard' /sys/bus/usb/devices/*/product | sed \"s/product\\\\power/control/\"); do echo on >| '$f'; done'
+        ";
+    };
+  };
+
+  environment.etc = {
+    "libinput/local-overrides.quirks".text = "
+      # MatchUdevType=touchpad
+      # MatchDMIModalias=dmi:*svnFramework:pnLaptop*
+      # AttrEventCode=-BTN_RIGHT
+
+      [Framework Laptop 16 Keyboard Module]
+      MatchName=Framework Laptop 16 Keyboard Module*
+      MatchUdevType=keyboard
+      MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
+      AttrKeyboardIntegration=internal
+    ";
+  };
+  # services.xserver.libinput = {
+  #   enable = true;
+  #   # touchpad.disableWhileTyping = true;
+  # };
+
   services.xserver.displayManager.defaultSession = "plasma";
   services.xserver.displayManager.sddm.wayland.enable = true;
 
@@ -45,7 +78,7 @@
   ];
   boot.kernelParams = [
     # "mem_sleep_default=deep"
-    "nvme.noacpi=1"
+    # "nvme.noacpi=1"
   ];
   boot.kernelModules = ["kvm-amd"];
   powerManagement.cpuFreqGovernor = "powersave";
diff --git a/users/tao.nix b/users/tao.nix
index a42a97e..5b3548d 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -37,10 +37,10 @@
     jellyfin-mpv-shim
     keepassxc
     leetcode-cli
-    libsForQt5.kcharselect
-    libsForQt5.kdeconnect-kde
-    libsForQt5.plasma-integration
-    libsForQt5.plasma-vault
+    # libsForQt5.kcharselect
+    # libsForQt5.kdeconnect-kde
+    # libsForQt5.plasma-integration
+    plasma-vault
     miniserve
     mpv
     nushell
diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix
index cfb2dc9..ec1d3a8 100644
--- a/users/tao/HOME.nix
+++ b/users/tao/HOME.nix
@@ -8,7 +8,7 @@
 in {
   imports = [
     (import ./helix.nix {inherit pkgs inputs;})
-    ./plasma.nix
+    # ./plasma.nix
   ];
 
   home.file.".cargo/config.toml".text = cargoConfig;