diff --git a/configuration.nix b/configuration.nix
index b2d408c..cf6e90e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,29 +8,36 @@
 
   # System
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sdd";
-
-  hardware.opengl.driSupport32Bit = true;
+  boot = {
+    loader = {
+      grub.enable = false;
+      gummiboot.enable = true;
+      generationsDir = {
+        enable = false;
+        copyKernels = false;
+      };
+    };
+    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
+      };
+    };
+  };
 
   # SSD
   boot.tmpOnTmpfs = true; # save some writes
   fileSystems."/".options = "discard,noatime";
 
-  # Mount Data disk
-  fileSystems."/mnt/Dati" = {
-    device = "/dev/sdd3";
-    options = "nofail,relatime,defaults";
-  };
-
   time.timeZone = "Europe/Rome";
 
   virtualisation.virtualbox.host.enable = true;
 
   # Networking
 
-  networking.hostName = "ape";
+  networking.hostName = "warren";
   networking.hostId = "6bc261fc";
   networking.firewall.enable = false;
   networking.wireless.enable = true;
@@ -71,14 +78,14 @@
     # Applications
     neovim ranger weechat bc w3m gnupg zathura go14Packages.ipfs.bin
     tmux htop rxvt_unicode pandoc mosh ncdu cv pv tree screenfetch
-    scrot iotop iftop
+    scrot iotop iftop unzip zip p7zip
     # Desktop Applications
     chromium libreoffice gparted
     # Media
     beets mpd mpc_cli ncmpcpp popcorntime mpv
     # Drivers, file systems and other compatibility-aimed packages
-    ntfs3g exfat utillinuxCurses gptfdisk encfs
-    # Other stuff
+    ntfs3g exfat utillinuxCurses gptfdisk encfs xlibs.xbacklight
+    acpi powertop
   ];
 
   fonts = {
@@ -103,7 +110,6 @@
     # Desktop Environment
     xserver = {
       enable = true;
-      videoDrivers = [ "nvidia" ];
       layout = "it";
       windowManager.bspwm.enable = true;
       desktopManager.xterm.enable = false;
@@ -113,6 +119,10 @@
         url    = "https://github.com/rnhmjoj/nix-slim/archive/0.2.0.tar.gz";
         sha256 = "08m6ks6crdyr02ll50gy3vpn3rzq6rp5jm2bli526r432xacdmj1";
       };
+      displayManager.desktopManagerHandlesLidAndPower = false;
+      synaptics = {
+        enable = true;
+      };
     };
 
     mpd = {
@@ -130,7 +140,7 @@
         }
         audio_output {
           type "alsa"
-          name "Fazo-PC"
+          name "warren"
           mixer_type "software"
         }
       '';
@@ -159,6 +169,7 @@
   # Custom Services
 
   systemd.services.ipfs = {
+    enable = false;
     after = [ "network.target" ];
     wantedBy = [ "multi-user.target" ];
     path = [ pkgs.bash pkgs.fuse ];
diff --git a/lemonbar.sh b/lemonbar.sh
index 1119788..73d44d4 100755
--- a/lemonbar.sh
+++ b/lemonbar.sh
@@ -88,7 +88,7 @@ buildBar () {
   while true
   do
     echo " $(getMPD) %{c}$(buildClock) %{r} $(getLOAD) $(separator) $(getMEM) $(separator) $(getDISK) $(separator) $(getNET) $(separator) $(getVolume) "
-    sleep 1
+    sleep 5
   done
 }