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

@@ -66,9 +66,20 @@ 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/
 
-# Regenerate initramfs
+# Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)
+if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
+  LIMINE_DROP_IN="/etc/limine-entry-tool.d/rtc-alarm.conf"
+  if [[ ! -f "$LIMINE_DROP_IN" ]]; then
+    echo "Enabling ACPI RTC alarm for s2idle suspend"
+    sudo mkdir -p /etc/limine-entry-tool.d
+    echo 'KERNEL_CMDLINE[default]+="rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
+  fi
+fi
+
+# Regenerate initramfs and boot entry
 echo "Regenerating initramfs..."
 sudo limine-mkinitcpio
+sudo limine-update
 
 echo
 

bin/omarchy-refresh-walker

@@ -5,9 +5,17 @@
 # Ensure walker is set to autostart
 mkdir -p ~/.config/autostart/
 cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
+
+# And restarts if it crashes or is killed
+mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
+cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
+
 systemctl --user daemon-reload
 
+# Refresh configs
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml
+
+# Restart service
 omarchy-restart-walker

bin/omarchy-remove-all

@@ -10,6 +10,7 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
   omarchy-tui-remove-all
 
   omarchy-pkg-drop \
+    aether \
     typora \
     spotify \
     libreoffice-fresh \

bin/omarchy-restart-opencode

@@ -2,4 +2,6 @@
 
 # Reload opencode configuration (used by the Omarchy theme switching).
 
-killall -SIGUSR2 opencode
+if pgrep -x opencode >/dev/null; then
+  killall -SIGUSR2 opencode
+fi

bin/omarchy-snapshot

@@ -31,4 +31,6 @@ create)
 restore)
   sudo limine-snapper-restore
   ;;
+delete)
+  sudo snapper -c "$config" delete 0
 esac

bin/omarchy-theme-refresh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Refresh the current theme from its templates.
+
+THEME_NAME_PATH="$HOME/.config/omarchy/current/theme.name"
+
+if [[ -f $THEME_NAME_PATH ]]; then
+  omarchy-theme-set "$(cat $THEME_NAME_PATH)"
+fi

bin/omarchy-update

@@ -2,7 +2,7 @@
 
 set -e
 
-trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
+trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m";omarchy-snapshot delete' ERR
 
 if [[ $1 == "-y" ]] || omarchy-update-confirm; then
   omarchy-snapshot create || [ $? -eq 127 ]

config/tmux/tmux.conf

@@ -0,0 +1,52 @@
+# Theme
+source-file ~/.config/omarchy/current/theme/tmux.conf
+
+# General
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",*:RGB"
+set -g mouse on
+set -g base-index 1
+setw -g pane-base-index 1
+set -g renumber-windows on
+set -g history-limit 50000
+set -g escape-time 0
+set -g focus-events on
+set -g set-clipboard on
+setw -g aggressive-resize on
+set -g detach-on-destroy off
+
+# Status bar
+set -g status-position top
+set -g status-interval 5
+set -g status-left-length 30
+set -g status-right-length 50
+set -g window-status-separator ""
+
+# Reload config
+bind M-r source-file ~/.config/tmux/tmux.conf
+
+# Rename window / session
+bind r command-prompt -I "#W" "rename-window -- '%%'"
+bind R command-prompt -I "#S" "rename-session -- '%%'"
+
+# Vi mode for copy
+setw -g mode-keys vi
+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 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}"
+bind - split-window -v -c "#{pane_current_path}"
+
+# New windows in same directory
+bind c new-window -c "#{pane_current_path}"
+
+# Sessions
+bind C new-session
+bind X kill-session

default/bash/aliases

@@ -34,6 +34,7 @@ alias ....='cd ../../..'
 alias c='opencode'
 alias d='docker'
 alias r='rails'
+alias t='tmux attach || tmux new -s Work'
 n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }
 
 # Git

default/bashrc

@@ -9,3 +9,4 @@ source ~/.local/share/omarchy/default/bash/rc
 #
 # Make an alias for invoking commands you use constantly
 # alias p='python'
+# alias cx="claude --permission-mode=plan --allow-dangerously-skip-permissions"

default/systemd/hibernate.conf

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

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 }}"

default/walker/restart.conf

@@ -0,0 +1,3 @@
+[Service]
+Restart=always
+RestartSec=2

install/config/all.sh

@@ -39,3 +39,4 @@ run_logged $OMARCHY_INSTALL/config/hardware/fix-surface-keyboard.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-asus-rog-audio-mixer.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-asus-rog-mic.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-yt6801-ethernet-adapter.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-synaptic-touchpad.sh

install/config/hardware/fix-synaptic-touchpad.sh

@@ -0,0 +1,6 @@
+# Enable Synaptics InterTouch for confirmed touchpads if not already loaded
+
+if grep -qi synaptics /proc/bus/input/devices \
+   && ! lsmod | grep -q '^psmouse'; then
+    modprobe psmouse synaptics_intertouch=1
+fi

install/config/walker-elephant.sh

@@ -4,6 +4,10 @@
 mkdir -p ~/.config/autostart/
 cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
 
+# And is restarted if it crashes or is killed
+mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
+cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
+
 # Create pacman hook to restart walker after updates
 sudo mkdir -p /etc/pacman.d/hooks
 sudo tee /etc/pacman.d/hooks/walker-restart.hook > /dev/null << EOF

install/omarchy-base.packages

@@ -120,6 +120,7 @@ swayosd
 system-config-printer
 tldr
 tree-sitter-cli
+tmux
 tobi-try
 ttf-cascadia-mono-nerd
 ttf-ia-writer

migrations/1770375817.sh

@@ -0,0 +1,6 @@
+echo "Ensure walker service is restarted if it's killed or crashes"
+
+mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
+cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
+systemctl --user daemon-reload
+

migrations/1770638893.sh

@@ -0,0 +1,9 @@
+echo "Add Tmux as an option with themed styling"
+
+omarchy-pkg-add tmux
+
+if [[ ! -f ~/.config/tmux/tmux.conf ]]; then
+  mkdir -p ~/.config/tmux
+  cp $OMARCHY_PATH/config/tmux/tmux.conf ~/.config/tmux/tmux.conf
+  omarchy-theme-refresh
+fi

themes/vantablack/neovim.lua

@@ -1,9 +1,4 @@
 return {
-  -- required for the vantablack nvim theme
-  {
-    "bjarneo/aether.nvim",
-    branch = "v2",
-  },
   {
     "bjarneo/vantablack.nvim",
     priority = 1000,