diff --git a/collect.sh b/collect.sh
index 179fec0..617e1a2 100755
--- a/collect.sh
+++ b/collect.sh
@@ -38,6 +38,7 @@ cp -r ~/.config/kitty ./general/configs/
 cp -r ~/.config/terminator ./general/configs/
 cp -r ~/.config/Thunar ./general/configs/
 cp -r ~/.config/yazi ./general/configs/
+cp -r ~/.config/mpv ./general/configs/
 rm -rf ./pc/configs/hypr/hyprland/
 cp -r ~/.config/hypr/hyprland/* ./general/hyprland/
 
diff --git a/general/configs/fish/config.fish b/general/configs/fish/config.fish
index 6cd6a7b..337c06c 100755
--- a/general/configs/fish/config.fish
+++ b/general/configs/fish/config.fish
@@ -15,7 +15,10 @@ alias cfh='nvim ~/.config/hypr/'
 alias cfn='nvim ~/.config/nvim/'
 alias cff='nvim ~/.config/fish/config.fish'
 alias cfw='nvim ~/.config/waybar/'
+alias cf='nvim ~/.config/'
 alias g='lazygit'
+alias open-webui='sudo systemctl start docker && sudo docker start -i open-webui'
+alias ai='ollama serve'
 
 function y
 	set tmp (mktemp -t "yazi-cwd.XXXXXX")
diff --git a/laptop/configs/hypr/hypridle.conf b/laptop/configs/hypr/hypridle.conf
index c39dccf..b2add3a 100644
--- a/laptop/configs/hypr/hypridle.conf
+++ b/laptop/configs/hypr/hypridle.conf
@@ -23,7 +23,12 @@ listener {
 
 listener {
     timeout = 200
-    on-timeout = notify-send "100s to screen off" && sleep 5 && hyprlock
+    on-timeout = notify-send "100s to screen off"
+}
+
+listener {
+    timeout = 210
+    on-timeout = hyprlock
 }
 
 listener {
@@ -36,4 +41,4 @@ listener {
     timeout = 600
     on-timeout = systemctl suspend
     on-resume = hyprctl dispatch dpms on
-}
\ No newline at end of file
+}
diff --git a/pc/configs/hypr/hypridle.conf b/pc/configs/hypr/hypridle.conf
index c39dccf..b2add3a 100644
--- a/pc/configs/hypr/hypridle.conf
+++ b/pc/configs/hypr/hypridle.conf
@@ -23,7 +23,12 @@ listener {
 
 listener {
     timeout = 200
-    on-timeout = notify-send "100s to screen off" && sleep 5 && hyprlock
+    on-timeout = notify-send "100s to screen off"
+}
+
+listener {
+    timeout = 210
+    on-timeout = hyprlock
 }
 
 listener {
@@ -36,4 +41,4 @@ listener {
     timeout = 600
     on-timeout = systemctl suspend
     on-resume = hyprctl dispatch dpms on
-}
\ No newline at end of file
+}
diff --git a/pc/installedPackages.txt b/pc/installedPackages.txt
index d07ad81..eac08b0 100644
--- a/pc/installedPackages.txt
+++ b/pc/installedPackages.txt
@@ -744,6 +744,7 @@ l-smash
 ladspa
 lame
 lapack
+lazygit
 lcms2
 ldb
 ldns
diff --git a/setup.sh b/setup.sh
index ba9c13c..e6e19f4 100755
--- a/setup.sh
+++ b/setup.sh
@@ -7,12 +7,7 @@ cp -r ./general/configs/VSCodium/* ~/.config/VSCodium/
 # copy other config files
 cp -r ./pc/configs/hypr ~/.config/
 cp -r ./pc/configs/waybar ~/.config/
-cp -r ./general/configs/fish ~/.config/
-cp -r ./general/configs/dunst ~/.config/
-cp -r ./general/configs/rofi ~/.config/
-cp -r ./general/configs/wlogout ~/.config/
-cp -r ./general/configs/yazi ~/.config/
-cp -r ./general/configs/Thunar ~/.config/
-cp -r ./general/configs/terminator ~/.config/
-cp -r ./general/configs/kitty ~/.config/
+cp -r ./general/configs/* ~/.config/
+
+# Copy hyprland general config
 cp -r ./general/hyprland ~/.config/hypr/
diff --git a/setupLaptop.sh b/setupLaptop.sh
index ad10581..fd9a0f8 100755
--- a/setupLaptop.sh
+++ b/setupLaptop.sh
@@ -7,14 +7,9 @@ cp -r ./general/configs/VSCodium/* ~/.config/VSCodium/
 # copy other config files
 cp -r ./laptop/configs/hypr ~/.config/
 cp -r ./laptop/configs/waybar ~/.config/
-cp -r ./general/configs/fish ~/.config/
-cp -r ./general/configs/dunst ~/.config/
-cp -r ./general/configs/rofi ~/.config/
-cp -r ./general/configs/wlogout ~/.config/
-cp -r ./general/configs/yazi ~/.config/
-cp -r ./general/configs/Thunar ~/.config/
-cp -r ./general/configs/terminator ~/.config/
-cp -r ./general/configs/kitty ~/.config/
+cp -r ./general/configs/* ~/.config/
+
+# Copy hyprland general config
 cp -r ./general/hyprland ~/.config/hypr/
 
 echo '=> Installed all laptop config files successfully'