Merge branch 'master' into laptop

dunst/dunstrc

@@ -7,6 +7,6 @@ font = "Ubuntu 10.5"
 width = (0, 600)
 padding = 15
 origin = top-right
-offset = 20x45
+offset = 10x10
 horizontal_padding = 20
 gap_size = 15

hypr/hyprland.conf

@@ -3,6 +3,8 @@ env = WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1
 monitor=,preferred,auto,1
 exec-once=sudo wg-quick up wg0
 exec-once=sleep 0.7 && swaylock
+exec-once=wl-paste --type text --watch cliphist store
+exec-once=wl-paste --type image --watch cliphist store
 
 workspace=eDP-1,1
 workspace=HDMI-A-1,11
@@ -41,7 +43,7 @@ binds {
 input {
     kb_layout = us
     follow_mouse = 1
-    kb_options = compose:rctrl
+    kb_options = compose:rctrl, caps:super
     numlock_by_default = true
 }
 
@@ -111,7 +113,7 @@ bind = $mainMod, F11, fullscreen
 bind = $mainMod, F, togglefloating,
 bind = $mainMod, SPACE, togglesplit, # dwindle
 bind = CONTROL_L ALT_L, L, exec, swaylock
-bind = $mainMod, C, exec, CM_LAUNCHER=rofi-script rofi -modi "clipmenu:/usr/bin/clipmenu" -show clipmenu
+bind = $mainMod, C, exec, cliphist list | awk '{print $0, "\0icon\x1fcom.github.davidmhewitt.clipped"}' | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy
 bind = $mainMod, Y, exec, /home/user/.config/rofi/rofi-ykman.sh
 bind = Super_L Control_L, Q, exec, systemctl suspend
 bind = $mainMod, Escape, exec, rofi -show power-menu -modi power-menu:/home/user/.config/scripts/rofi-power-menu