diff --git a/config.nix b/config.nix
index 0ed20d6..119e678 100644
--- a/config.nix
+++ b/config.nix
@@ -46,13 +46,14 @@
     my-apps = pkgs:
       with pkgs; [
         jellyfin-media-player
+        mangohud
       ];
   };
 
   hyprconf = {
     monitor = [
       "DP-1,highres@165,0x1080,auto"
-      "HDMI-A-4,highres@highrr,0x0,auto"
+      "DP-2,highres@highrr,0x0,auto"
     ];
   };
 
diff --git a/pkgs/heroic/default.nix b/pkgs/heroic/default.nix
index 3353d0a..4d6b7aa 100644
--- a/pkgs/heroic/default.nix
+++ b/pkgs/heroic/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home.packages = [
-    pkgs.heroic
+  environment.systemPackages = with pkgs; [
+    heroic
   ];
 }
diff --git a/pkgs/hypridle/default.nix b/pkgs/hypridle/default.nix
index 84fb945..27f8489 100644
--- a/pkgs/hypridle/default.nix
+++ b/pkgs/hypridle/default.nix
@@ -9,27 +9,27 @@
       };
 
       listener = [
-        # {
-        #   timeout = 150;
-        #   on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
-        #   on-resume = "brightnessctl -r"; # restore monitor backlight.
-        # }
-        # {
-        #   timeout = 150;
-        #   on-timeout = "brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight.
-        #   on-resume = "brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight.
-        # }
-        # {
-        #   timeout = 300;
-        #   on-timeout = "loginctl lock-session"; # lock screen when timeout has passed.
-        # }
-        # {
-        #   timeout = 330;
-        #   on-timeout = "hyprctl dispatch dpms off"; # screen off after 5.5min.
-        #   on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on and restore brightness on resume.
-        # }
+        {
+          timeout = 150;
+          on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
+          on-resume = "brightnessctl -r"; # restore monitor backlight.
+        }
+        {
+          timeout = 150;
+          on-timeout = "brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight.
+          on-resume = "brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight.
+        }
         {
           timeout = 300;
+          on-timeout = "loginctl lock-session"; # lock screen when timeout has passed.
+        }
+        {
+          timeout = 330;
+          on-timeout = "hyprctl dispatch dpms off"; # screen off after 5.5min.
+          on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on and restore brightness on resume.
+        }
+        {
+          timeout = 500;
           on-timeout = "systemctl suspend"; # suspend PC after 30min.
         }
       ];
diff --git a/pkgs/hyprland/default.nix b/pkgs/hyprland/default.nix
index 6017d13..69a3532 100644
--- a/pkgs/hyprland/default.nix
+++ b/pkgs/hyprland/default.nix
@@ -21,6 +21,7 @@
         "pkill gjs & ags run"
         # "matugen image /home/${username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png"
         "hyprctl setcursor Bibata-Original-Classic 24"
+        "solaar -w hide"
       ];
 
       general = {
@@ -113,7 +114,7 @@
       input = {
         kb_layout = "us";
         follow_mouse = 1;
-        sensitivity = -0.5;
+        sensitivity = 0;
         force_no_accel = true;
         repeat_delay = 250;
         repeat_rate = 35;
diff --git a/system/default.nix b/system/default.nix
index 1ddaa10..f2afc53 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -9,11 +9,7 @@
 }: {
   environment.systemPackages = with pkgs;
     [
-      python3
-      python3Packages.pip
-      python3Packages.pygobject3
-      python3Packages.setuptools
-      python3Packages.wheel
+      python313Full
 
       gobject-introspection
       gtk3
@@ -36,6 +32,11 @@
 
       jq
       lm_sensors
+      gparted
+
+      notify
+
+      mangohud
     ]
     ++ [
       inputs.matugen.packages.${pkgs.system}.default
@@ -43,8 +44,18 @@
     ++ lib.optionals (logitech-hardware.enable == true) [
       solaar
     ];
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader = {
+    systemd-boot = {
+      enable = false;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+    grub = {
+      enable = true;
+      device = "nodev";
+    };
+  };
 
   hardware = {
     logitech.wireless.enable = logitech-hardware.enable;
@@ -66,7 +77,13 @@
   time.timeZone = "${timezone}";
 
   services = {
-    openssh.enable = true;
+    openssh = {
+      enable = true;
+      ports = [22];
+      settings = {
+        PasswordAuthentication = true;
+      };
+    };
     libinput.enable = touchpadSupport;
     blueman.enable = true;
   };
diff --git a/system/desktop/wayland.nix b/system/desktop/wayland.nix
index de04502..b53457d 100644
--- a/system/desktop/wayland.nix
+++ b/system/desktop/wayland.nix
@@ -7,6 +7,7 @@
     wl-clipboard
     hypridle
     hyprlock
+    brightnessctl
   ];
   programs.hyprland = {
     enable = true;