diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig
index 0bc0c38..7179a46 160000
--- a/.config/nvim/pack/plugins/opt/lspconfig
+++ b/.config/nvim/pack/plugins/opt/lspconfig
@@ -1 +1 @@
-Subproject commit 0bc0c38e1b11dfb6b5f1794d53869f89ccf9e78f
+Subproject commit 7179a46c2345050783d14397e672e7b152a7af4f
diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
index 871f566..411e771 160000
--- a/.config/nvim/pack/plugins/opt/treesitter
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -1 +1 @@
-Subproject commit 871f5665d92d59a369cf916e9aa4d321d466f1e3
+Subproject commit 411e771d511442ab81670701f5c830f6c74aadd7
diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh
index 8d23fbd..25c2c3a 160000
--- a/.config/zsh/ohmyzsh
+++ b/.config/zsh/ohmyzsh
@@ -1 +1 @@
-Subproject commit 8d23fbd6964b8446bbc73ff04507362d1fd49eb5
+Subproject commit 25c2c3a4683be60c3526858be960ee6ce1249245
diff --git a/.xinitrc b/.xinitrc
index 5445763..1782da4 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -17,6 +17,13 @@ redshift                                                        &
 dunst                                                           &
 sbar                                                            &
 
-xset dpms 300 # lock 5m
+xss-lock -- lock &
+if ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1; then
+    xset dpms 300 300 300 # Turn of the screen after 5 min
+    xset s    315         # Lock Screen after 15 secs later
+else
+    xset dpms 1800 1800 1800 # Turn of the screen after 30 min
+    xset s    1815           # Lock Screen 15 sec later
+fi
 
 exec dbus-launch dwm