diff --git a/install.sh b/install.sh
index 7a619cf..43fd887 100755
--- a/install.sh
+++ b/install.sh
@@ -21,6 +21,7 @@ ln -sf "$(pwd)/alacritty/alacritty.toml" ~/.config/alacritty/alacritty.toml
 echo "==> Installing scripts"
 mkdir -p ~/.local/bin
 ln -sf "$(pwd)/scripts/powermenu.sh" ~/.local/bin/powermenu
+ln -sf "$(pwd)/scripts/clipboard.sh" ~/.local/bin/clipboard-picker
 
 echo "==> Enabling systemd user services"
 mkdir -p ~/.config/systemd/user
diff --git a/niri/config.kdl b/niri/config.kdl
index ec2152b..dfa0bbd 100644
--- a/niri/config.kdl
+++ b/niri/config.kdl
@@ -17,7 +17,13 @@ spawn-at-startup "mako"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "nm-applet" "--indicator"
 spawn-at-startup "polkit-gnome-authentication-agent-1"
-spawn-at-startup "swayidle" "-w" "before-sleep" "swaylock -f -c 000000"
+spawn-at-startup "swayidle" "-w"
+    "timeout" "300" "niri msg action power-off-monitors"
+    "timeout" "600" "swaylock -f -c 000000"
+    "before-sleep" "swaylock -f -c 000000"
+spawn-at-startup "wl-paste" "--watch" "cliphist" "store"
+spawn-at-startup "blueman-applet"
+spawn-at-startup "wlsunset" "-l" "49.2" "-L" "-123.1"
 
 binds {
     Mod+Q repeat=false { close-window; }
@@ -41,6 +47,7 @@ binds {
 
     Mod+Shift+E { spawn "swaylock" "-f" "-c" "000000"; }
     Mod+Shift+P { spawn "powermenu"; }
+    Mod+Shift+C { spawn "clipboard-picker"; }
     Mod+Shift+X { quit; }
 
     XF86AudioRaiseVolume allow-when-locked=true { spawn "pamixer" "-i" "5"; }
diff --git a/scripts/clipboard.sh b/scripts/clipboard.sh
new file mode 100755
index 0000000..3365fed
--- /dev/null
+++ b/scripts/clipboard.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+cliphist list | wofi --dmenu --prompt "Clipboard:" --width 600 --height 400 | cliphist decode | wl-copy
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 2b8542c..a1a16c2 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -13,7 +13,17 @@
 
   "battery": {
     "format": "{capacity}% {icon}",
-    "format-icons": ["","","","",""]
+    "format-charging": "{capacity}%  ",
+    "format-plugged": "{capacity}%  ",
+    "format-icons": ["","","","",""],
+    "states": {
+      "warning": 30,
+      "critical": 15
+    }
+  },
+
+  "tray": {
+    "spacing": 8
   },
 
   "network": {
diff --git a/waybar/style.css b/waybar/style.css
index d9b4071..edad14b 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -20,3 +20,11 @@ window#waybar {
 #clock, #battery, #network, #pulseaudio {
   padding: 0 12px;
 }
+
+#battery.warning {
+  color: #f0c674;
+}
+
+#battery.critical {
+  color: #cc6666;
+}