diff --git a/lock.sh b/lock.sh
index cfcd197b..36b1725e 100755
--- a/lock.sh
+++ b/lock.sh
@@ -1,11 +1,15 @@
 #!/usr/bin/env bash
 
+set -e
+set -o pipefail
+
 export PRIMARY_DISPLAY="$(xrandr | awk '/ primary/{print $1}')"
 
+xset s off
+xset -dpms
 xidlehook \
     --not-when-fullscreen \
     --not-when-audio \
     --timer normal 180 'xrandr --output "$PRIMARY_DISPLAY" --brightness .1' 'xrandr --output "$PRIMARY_DISPLAY" --brightness 1' \
-    --timer primary 10 'xrandr --output "$PRIMARY_DISPLAY" --brightness 1; physlock -d' '' \
     --timer normal 600 'systemctl suspend' ''
 
diff --git a/nixos/common.nix b/nixos/common.nix
index 3cd89e1b..0559bed5 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -27,14 +27,14 @@ in
       };
 
       environment.systemPackages = with pkgs; [
-        wget git gnupg curl tmux python36Packages.glances vim htop atop firefox home-manager alacritty pciutils
+        wget git gnupg curl tmux python36Packages.glances vim htop atop firefox home-manager alacritty pciutils powertop
       ];
 
       i18n.defaultLocale = "en_GB.UTF-8";
 
       users.users.cyryl = {
         isNormalUser = true;
-        extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers"];
+        extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" ];
         packages = with pkgs; [
           unstable.pypi2nix etesync-dav unstable.hopper
         ];
@@ -42,6 +42,7 @@ in
       };
 
       programs.light.enable = true;
+      programs.adb.enable = true;
 
       virtualisation.docker = {
         enable = true;
diff --git a/nixos/home.nix b/nixos/home.nix
index 89585eaa..a1a6afcc 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -18,7 +18,7 @@ in
       keepass fontconfig nodejs rustup gcc gdb
       binutils xclip pkgconfig veracrypt gitAndTools.diff-so-fancy
       openjdk11 gimp restic glxinfo discord
-      unstable.notable
+      unstable.notable jq
       nodejs-10_x hugo mercurial terraform libreoffice
       unzip tor-browser-bundle-bin aria vlc
       jetbrains.goland jetbrains.clion