diff --git a/configuration.nix b/configuration.nix
index 04dfa13..10e35cb 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,6 +17,15 @@
         copyKernels = false;
       };
     };
+    #kernelPackages = pkgs.linuxPackages_4_2;
+    kernel = {
+      sysctl = {
+        "kernel.nmi_watchdog" = 0; # Disable watchdog
+        "vm.swappiness" = 0; # Avoid swapping as much as possible
+        "vm.laptop_mode" = 5; # Use laptop mode (Knob at 5)
+        "vm.dirty_writeback_centisecs" = 6000; # Aggregate disk IO
+      };
+    };
     extraModprobeConfig = ''
       options libata.force=noncq
       options resume=/dev/sda5
@@ -34,7 +43,10 @@
   fileSystems."/".options = "discard,noatime";
   fileSystems."/boot".options = "discard,noatime,defaults";
 
-  powerManagement.enable = true;
+  powerManagement = {
+    enable = true;
+    resumeCommands = "i3lock -u -c 1d1f21 -i /home/fazo/Pictures/background.jpg";
+  };
 
   time.timeZone = "Europe/Rome";
   virtualisation.virtualbox.host.enable = true;
@@ -116,6 +128,7 @@
       windowManager.bspwm.enable = true;
       desktopManager.xterm.enable = false;
       desktopManager.default = "none";
+      displayManager.desktopManagerHandlesLidAndPower = false;
       windowManager.default = "bspwm";
       multitouch = {
         enable = true;
@@ -126,9 +139,18 @@
       };
     };
 
-    logind.extraConfig = "handleLidSwitch=suspend";
+    logind.extraConfig = ''
+      handlePowerKey=ignore
+    '';
     upower.enable = true;
-    tlp.enable = true;
+
+    tlp = {
+      enable = true;
+      extraConfig = ''
+        CPU_SCALING_GOVERNOR_ON_AC=performance
+        CPU_SCALING_GOVERNOR_ON_BAT=powersave
+      '';
+    };
 
     mpd = {
       enable = true;
@@ -182,6 +204,7 @@
     enable = true;
     shellInit = "export ZDOTDIR=~/.config/zsh";
   };
+  programs.kbdlight.enable = true;
 
   users.extraUsers.fazo = {
     isNormalUser = true;
diff --git a/sxhkdrc b/sxhkdrc
index 859934f..2d02ed0 100755
--- a/sxhkdrc
+++ b/sxhkdrc
@@ -90,9 +90,17 @@ super + space
 
 # media
 XF86MonBrightnessUp
-  xbacklight -inc 20
+  xbacklight -inc 10
 XF86MonBrightnessDown
-  xbacklight -dec 20
+  xbacklight -dec 10
+XF86KbdBrightnessUp
+  kbdlight up 10
+XF86KbdBrightnessDown
+  kbdlight down 10
+XF86AudioNext
+  mpc next
+XF86AudioPrev
+  mpc prev
 XF86AudioRaiseVolume
 	amixer set Master 3+ unmute
 XF86AudioLowerVolume
@@ -111,7 +119,8 @@ XF86Mail
 # lock
 
 XF86Sleep
-  i3lock -u -c 1d1f21 -i ~/Pictures/background.png
+XF86LaunchB
+  i3lock -u -c 1d1f21 -i ~/Pictures/background.*
 
 # screenshots
 Print