Merge branch 'dev' into tmux

Being able to use a unified terminal setup between local and remote
hosts has some real advantages.

bin/omarchy-hibernation-setup

@@ -59,7 +59,11 @@ sudo mkdir -p /etc/mkinitcpio.conf.d
 echo "Adding resume hook to $MKINITCPIO_CONF"
 echo "HOOKS+=(resume)" | sudo tee "$MKINITCPIO_CONF" >/dev/null
 
-# Ensure keyboard backlight doesn't prevent sleep
+# Configure suspend-then-hibernate
+echo "Configuring suspend-then-hibernate"
+sudo mkdir -p /etc/systemd/logind.conf.d /etc/systemd/sleep.conf.d /usr/lib/systemd/system-sleep
+sudo cp "$OMARCHY_PATH/default/systemd/lid.conf" /etc/systemd/logind.conf.d/
+sudo cp "$OMARCHY_PATH/default/systemd/hibernate.conf" /etc/systemd/sleep.conf.d/
 sudo cp -p "$OMARCHY_PATH/default/systemd/system-sleep/keyboard-backlight" /usr/lib/systemd/system-sleep/
 
 # Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)

bin/omarchy-refresh-tmux

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Overwrite the user tmux config with the Omarchy default and reload tmux.
-
-omarchy-refresh-config tmux/tmux.conf

config/hypr/bindings.conf

@@ -25,9 +25,6 @@ bindd = SUPER SHIFT, P, Google Photos, exec, omarchy-launch-or-focus-webapp "Goo
 bindd = SUPER SHIFT, X, X, exec, omarchy-launch-webapp "https://x.com/"
 bindd = SUPER SHIFT ALT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
 
-# Add extra bindings
-# bind = SUPER SHIFT, R, exec, alacritty -e ssh your-server
-
 # Overwrite existing bindings, like putting Omarchy Menu on Super + Space
 # unbind = SUPER, SPACE
 # bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu

config/tmux/tmux.conf

@@ -1,7 +1,5 @@
-# Prefix
-set -g prefix C-Space
-set -g prefix2 C-b
-bind C-Space send-prefix
+# Theme
+source-file ~/.config/omarchy/current/theme/tmux.conf
 
 # General
 set -g default-terminal "tmux-256color"
@@ -24,19 +22,6 @@ set -g status-left-length 30
 set -g status-right-length 50
 set -g window-status-separator ""
 
-# Theme
-set -g status-style "bg=default,fg=default"
-set -g status-left "#[fg=black,bg=blue,bold] #S #[bg=default] "
-set -g status-right "#[fg=blue]#{?client_prefix,PREFIX ,}#[fg=brightblack]#h "
-set -g window-status-format "#[fg=brightblack] #I:#W "
-set -g window-status-current-format "#[fg=blue,bold] #I:#W "
-set -g pane-border-style "fg=brightblack"
-set -g pane-active-border-style "fg=blue"
-set -g message-style "bg=default,fg=blue"
-set -g message-command-style "bg=default,fg=blue"
-set -g mode-style "bg=blue,fg=black"
-setw -g clock-mode-colour blue
-
 # Reload config
 bind M-r source-file ~/.config/tmux/tmux.conf
 
@@ -50,10 +35,10 @@ bind -T copy-mode-vi v send -X begin-selection
 bind -T copy-mode-vi y send -X copy-selection-and-cancel
 
 # Pane resizing
-bind -r S-Left resize-pane -L 1
-bind -r S-Down resize-pane -D 1
-bind -r S-Up resize-pane -U 1
-bind -r S-Right resize-pane -R 1
+bind -r S-Left resize-pane -L 10
+bind -r S-Down resize-pane -D 10
+bind -r S-Up resize-pane -U 10
+bind -r S-Right resize-pane -R 10
 
 # Saner splits that open in the same directory
 bind | split-window -h -c "#{pane_current_path}"

default/bash/functions

@@ -87,24 +87,3 @@ img2png() {
     -define png:exclude-chunk=all \
     "${img%.*}-optimized.png"
 }
-
-# SSH Port Forwarding Functions
-fip() {
-  [[ $# -lt 2 ]] && echo "Usage: fip <host> <port1> [port2] ..." && return 1
-  local host="$1"
-  shift
-  for port in "$@"; do
-    ssh -f -N -L "$port:localhost:$port" "$host" && echo "Forwarding localhost:$port -> $host:$port"
-  done
-}
-
-dip() {
-  [[ $# -eq 0 ]] && echo "Usage: dip <port1> [port2] ..." && return 1
-  for port in "$@"; do
-    pkill -f "ssh.*-L $port:localhost:$port" && echo "Stopped forwarding port $port" || echo "No forwarding on port $port"
-  done
-}
-
-lip() {
-  pgrep -af "ssh.*-L [0-9]+:localhost:[0-9]+" || echo "No active forwards"
-}

default/hypr/bindings/clipboard.conf

@@ -3,8 +3,3 @@ bindd = SUPER, C, Universal copy, sendshortcut, CTRL, Insert,
 bindd = SUPER, V, Universal paste, sendshortcut, SHIFT, Insert,
 bindd = SUPER, X, Universal cut, sendshortcut, CTRL, X,
 bindd = SUPER CTRL, V, Clipboard manager, exec, omarchy-launch-walker -m clipboard
-
-# Nautilus compatibility
-bindd = SUPER, C, Nautilus Copy, sendshortcut, CTRL,c, active, class:^(org.gnome.Nautilus)$
-bindd = SUPER, V, Nautilus Paste, sendshortcut, CTRL,v, active, class:^(org.gnome.Nautilus)$
-bindd = SUPER, X, Nautilus Cut, sendshortcut, CTRL,x, active, class:^(org.gnome.Nautilus)$

default/systemd/hibernate.conf

@@ -0,0 +1,3 @@
+[Sleep]
+HibernateDelaySec=90min
+SuspendEstimationSec=0

default/systemd/lid.conf

@@ -0,0 +1,2 @@
+[Login]
+HandleLidSwitch=suspend-then-hibernate

default/themed/tmux.conf.tpl

@@ -0,0 +1,11 @@
+set -g status-style "bg={{ background }},fg={{ foreground }}"
+set -g status-left "#[fg={{ background }},bg={{ accent }},bold] #S #[bg={{ background }}] "
+set -g status-right "#[fg={{ accent }}]#{?client_prefix,PREFIX ,}#[fg={{ color8 }}]#h "
+set -g window-status-format "#[fg={{ color8 }}] #I:#W "
+set -g window-status-current-format "#[fg={{ accent }},bold] #I:#W "
+set -g pane-border-style "fg={{ color8 }}"
+set -g pane-active-border-style "fg={{ accent }}"
+set -g message-style "bg={{ background }},fg={{ accent }}"
+set -g message-command-style "bg={{ background }},fg={{ accent }}"
+set -g mode-style "bg={{ accent }},fg={{ background }}"
+setw -g clock-mode-colour "{{ accent }}"