Compare commits

...
63 Commits
Author SHA1 Message Date
David Heinemeier HanssonandGitHub d757dc3a89 Merge pull request #4924 from basecamp/rc
Omarchy 3.4.2
2026-03-08 17:04:51 +01:00
David Heinemeier Hansson bb26e9113c Merge branch 'dev' into rc 2026-03-08 17:04:28 +01:00
David Heinemeier Hansson ef93f6356c Move to git update to ensure it's not lost 2026-03-08 17:04:12 +01:00
David Heinemeier Hansson e0bd449c71 Presentation 2026-03-08 17:03:06 +01:00
David Heinemeier Hansson 07f4e53701 Better output 2026-03-08 17:02:31 +01:00
David Heinemeier Hansson 169ef6ec9e Time has to be updated before git repo is pulled
Or SSL certificate will complain
2026-03-08 17:01:33 +01:00
David Heinemeier Hansson e1107ed165 Merge branch 'dev' into rc 2026-03-08 16:35:53 +01:00
David Heinemeier Hansson 5663fae835 Explain how to have changes take affect 2026-03-08 16:35:49 +01:00
David Heinemeier Hansson 5e6ea17f5d Merge branch 'dev' into rc 2026-03-08 16:34:46 +01:00
David Heinemeier Hansson bc56a8bbad Add omarchy-restart-makima
For when you change keymappings
2026-03-08 16:30:50 +01:00
David Heinemeier Hansson fdd13b52ab Merge branch 'dev' into rc 2026-03-08 15:56:29 +01:00
David Heinemeier Hansson dfc270f79a Install Intel GPU hardware acceleration drivers if missing 2026-03-08 15:56:24 +01:00
David Heinemeier Hansson 595f5f668f Merge branch 'dev' into rc 2026-03-08 15:53:47 +01:00
David Heinemeier Hansson 9746370b62 Default to full screen capture for hyprland preview picker 2026-03-08 15:53:42 +01:00
David Heinemeier Hansson 549cd59e48 Style 2026-03-08 15:52:35 +01:00
David Heinemeier Hansson c4f57beba2 Show better with a preview notification that'll open recording on invocation 2026-03-08 15:52:31 +01:00
David Heinemeier Hansson 8e7a4ce61d Merge branch 'dev' into rc 2026-03-08 15:42:12 +01:00
David Heinemeier Hansson b982e1c986 Ensure we also catch the uhd graphics on the Framework 12 2026-03-08 15:41:00 +01:00
David Heinemeier Hansson e4acb3e8a9 Merge branch 'dev' into rc 2026-03-08 15:16:29 +01:00
David Heinemeier Hansson 462575c880 Fix worktree removal 2026-03-08 13:25:46 +01:00
David Heinemeier Hansson 631bdec159 Prevent extra CR 2026-03-08 13:25:46 +01:00
David Heinemeier Hansson 681540490e Fix regexp 2026-03-08 13:25:46 +01:00
David Heinemeier Hansson 3306c428dd Spelling 2026-03-08 13:25:46 +01:00
David Heinemeier Hansson e58ac44a0d Don't leak local var into global space 2026-03-08 13:25:46 +01:00
Alex BudkarandGitHub 5f2d12f9e7 Update jetbrains.conf to capture find windows with singular space title (#4909)
Some find windows like "find everywhere" has initial title that consists of a singular space. Update title matching expression to capture that case as well.
2026-03-08 13:12:54 +01:00
David Heinemeier Hansson c900478aba Merge branch 'dev' into rc 2026-03-08 11:12:21 +01:00
David Heinemeier Hansson 3aff0017a1 Only update plocate db on power to prevent hangs after sleep 2026-03-08 11:09:57 +01:00
71be883338 Update default/bash/fns/worktrees
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-03-07 22:32:37 +01:00
David Heinemeier Hansson fd03d57110 Fix the makima installation 2026-03-07 22:01:21 +01:00
David Heinemeier Hansson c9592e15fd Version bump coming 2026-03-07 20:00:44 +01:00
5a7008c01b Install intel-media-driver for Arc 130T/140T (intel 255H) (#4922)
* Install intel-media-driver for 130T/140T (intel 255H)

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: David Heinemeier Hansson <david@hey.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-03-07 19:53:35 +01:00
Jorge ManrubiaandGitHub 3da14f892f Fix nvim transparency to preserve foreground colors (#4844)
* Fix nvim transparency to preserve foreground colors

The old approach used `vim.api.nvim_set_hl(0, name, { bg = "none" })`
which replaces the entire highlight definition, wiping out foreground
and other attributes. This breaks snacks.nvim's GitHub integration
(gh_pr/gh_issue pickers) which reads the foreground color from Normal
and NormalFloat at module load time, gets nil, and crashes in
Snacks.util.blend().

The fix uses nvim_get_hl to fetch existing attributes first, removes
only bg, then sets the highlight back — preserving all other attributes.

* Drop fallback that reintroduces the highlight-wiping bug

If nvim_get_hl fails for a group, skip it rather than falling back to
the old { bg = "none" } approach that clears all attributes.
2026-03-07 19:46:17 +01:00
Miguel PandGitHub 2d859e25b5 add animation to the scratchpad (#4900) 2026-03-07 19:28:39 +01:00
justinandGitHub 04054c9569 fix: small localsend window (#4923)
* feat(hypr): add window size rule for LocalSend

* chore(hypr): remove Share class from localsend window rule
2026-03-07 19:21:05 +01:00
David Heinemeier Hansson 8f804bcba4 Add automatic-rename settings to tmux configuration 2026-03-07 19:16:34 +01:00
a261819a9b Use tmux native method of renaming windows (#4910)
* Use tmux native method of renaming windows

This uses tmux's built in method of renaming windows, and it even works
with pane switching rather than relying on cd to change the window name

* Update config/tmux/tmux.conf

I agree with the copilot suggestion

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Jadon Brutcher <jadon.brutcher@deltamobile.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-03-07 19:13:18 +01:00
Timo HuboisandGitHub df0109369c Prevent LM Studio install from downgrading to legacy package (#4915)
Use lmstudio-bin in the AI install menu so installs and reinstalls stay on the current LM Studio package stream instead of reverting to legacy lmstudio.
2026-03-07 19:11:26 +01:00
David Heinemeier Hansson 2a2e9086e1 We weren't running this for some reason! 2026-03-06 21:58:04 +01:00
David Heinemeier Hansson fc79da14bb Fix panther lake adjustments 2026-03-06 20:51:58 +01:00
David Heinemeier Hansson 6ad5d225f8 Remap Copilot key to Omarchy Menu key 2026-03-05 18:25:48 -04:00
David Heinemeier Hansson b50ec21442 Toggle existing omarchy menu if already open 2026-03-05 14:16:50 -04:00
David Heinemeier Hansson d3285f6b00 Can't do shim activation here without overwriting the ./bin path addition
But not necessary since uwsm/env handles the underlying problem
2026-03-05 13:42:55 -04:00
David Heinemeier Hansson 725054a478 Make it clear when you've zoomed in on a pane 2026-03-05 11:57:36 -04:00
David Heinemeier Hansson 2efc43762a Make tmux window named after cwd 2026-03-05 11:50:32 -04:00
David Heinemeier Hansson 7e69c87f75 Ensure mise activates the shims
To make sure mise shims are right for the tmux layout commands
2026-03-05 11:44:55 -04:00
David Heinemeier Hansson 7fbbc66cac Merge branch 'master' into dev 2026-03-04 09:49:04 -04:00
David Heinemeier Hansson 20b2be248e Ensure wayfreeze-git is also removed if it's still there
Closes #4859
2026-03-04 09:46:30 -04:00
9b8eee7372 add aur notice for nordvpn (#4888)
Co-authored-by: Mrid22 <mridulaga@outlook.com>
2026-03-03 20:28:38 -05:00
Arcangelo MassariandGitHub 14765466fb Fix White theme name mismatch for VS Code/Codium (#4858)
The White theme's vscode.json specified "White Omarchy" as the theme
name, but the Bjarne.white-theme extension registers the theme as
"White". This mismatch caused omarchy-theme-set-vscode to set
workbench.colorTheme to a non-existent theme name.
2026-03-03 20:28:09 -05:00
e648902683 Fix try interactive selector appearing on bashrc re-source (#4877)
`try init` defines a shell function named `try`. On subsequent
`source ~/.bashrc`, `try init` calls the function (interactive
selector) instead of the binary. Adding `command` bypasses the
function and always calls the binary.

Fixes #4876

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-03 20:24:43 -05:00
David Heinemeier Hansson e1ee8e8561 Fix smushing 2026-03-03 15:12:20 -05:00
David Heinemeier Hansson 546290e3de Fix Panther Lake GPU display issues by turning off power saving features until they're fixed 2026-03-03 15:12:10 -05:00
David Heinemeier Hansson 5e516be544 Even better 2026-03-02 14:15:46 +01:00
David Heinemeier Hansson 758e9d442f Fuller battery stats 2026-03-02 14:02:42 +01:00
David Heinemeier Hansson d9e3993d0c Match the t alias 2026-03-02 13:21:57 +01:00
David Heinemeier Hansson 1c8d7a7487 Add worktrees functions 2026-03-01 17:39:12 +01:00
David Heinemeier Hansson 149bf44763 Add Alt+Shift+Arrow keybindings for swapping tmux windows 2026-03-01 16:33:04 +01:00
David Heinemeier HanssonandGitHub 80224cb954 Merge pull request #4825 from Cammisuli/cammisuli/respect-refresh-rate
Apply already configured resolution and refresh rate when toggling scale
2026-03-01 09:18:23 +01:00
Jonathan Cammisuli 39f1ca77d8 Apply already configured resolution and refresh rate when toggling scale
Closes #4824
2026-02-28 17:22:53 -05:00
David Heinemeier Hansson a6bf23a592 Suggest scrolling layout swiping 2026-02-28 21:14:34 +01:00
David Heinemeier Hansson 8805586247 Hide omarchy themes menu from elephant provider list
Closes #4820
2026-02-28 21:05:15 +01:00
David Heinemeier Hansson da990e0c9f Include Shift + Return as default for browser 2026-02-28 20:45:08 +01:00
David Heinemeier Hansson a8f3251e9b Include Shift + Return as default for browser 2026-02-28 20:44:54 +01:00
45 changed files with 359 additions and 51 deletions
+11
View File
@@ -0,0 +1,11 @@
#!/bin/bash
# Returns the battery full capacity in Wh (rounded to whole number).
# Used by omarchy-battery-status for displaying battery capacity.
battery_info=$(upower -i $(upower -e | grep BAT))
echo "$battery_info" | awk '/energy-full:/ {
printf "%d", $2
exit
}'
+16
View File
@@ -0,0 +1,16 @@
#!/bin/bash
# Returns the battery time remaining (to empty or full) in a compact format.
battery_info=$(upower -i $(upower -e | grep BAT))
echo "$battery_info" | awk '/time to (empty|full)/ {
hours = int($4)
minutes = int(($4 - hours) * 60)
if (minutes > 0) {
printf "%dh %dm", hours, minutes
} else {
printf "%dh", hours
}
exit
}'
+28
View File
@@ -0,0 +1,28 @@
#!/bin/bash
# Returns a formatted battery status string with percentage and power draw/charge.
# Used by the battery notification hotkey (Ctrl + Shift + Super + B).
battery_info=$(upower -i $(upower -e | grep BAT))
percentage=$(echo "$battery_info" | awk '/percentage/ {
print int($2)
exit
}')
power_rate=$(echo "$battery_info" | awk '/energy-rate/ {
rounded = sprintf("%.1f", $2)
sub(/\.0$/, "", rounded)
print rounded
exit
}')
state=$(echo "$battery_info" | awk '/state/ { print $2; exit }')
time_remaining=$(omarchy-battery-remaining-time)
capacity=$(omarchy-battery-capacity)
if [[ $state == "charging" ]]; then
echo "󰁹 Battery ${percentage}% · ${time_remaining} to full ·  ${power_rate}W / ${capacity}Wh"
else
echo "󰁹 Battery ${percentage}% · ${time_remaining} left ·  ${power_rate}W / ${capacity}Wh"
fi
+11 -1
View File
@@ -135,7 +135,17 @@ stop_screenrecording() {
notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
else
trim_first_frame
notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
local filename=$(cat "$RECORDING_FILE" 2>/dev/null)
local preview="${filename%.mp4}-preview.png"
# Generate a preview thumbnail from the first frame
ffmpeg -y -i "$filename" -ss 00:00:00.1 -vframes 1 -q:v 2 "$preview" -loglevel quiet 2>/dev/null
(
ACTION=$(notify-send "Screen recording saved" "Open with Super + Alt + , (or click this)" -t 10000 -i "${preview:-$filename}" -A "default=open")
[[ $ACTION == "default" ]] && mpv "$filename"
rm -f "$preview"
) &
fi
rm -f "$RECORDING_FILE"
+24 -21
View File
@@ -65,27 +65,30 @@ get_rectangles() {
# Select based on mode
case "$MODE" in
region)
hyprpicker -r -z >/dev/null 2>&1 & PID=$!
sleep .1
SELECTION=$(slurp 2>/dev/null)
kill $PID 2>/dev/null
;;
windows)
hyprpicker -r -z >/dev/null 2>&1 & PID=$!
sleep .1
SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
kill $PID 2>/dev/null
;;
fullscreen)
SELECTION=$(hyprctl monitors -j | jq -r "${JQ_MONITOR_GEO} .[] | select(.focused == true) | format_geo")
;;
smart|*)
RECTS=$(get_rectangles)
hyprpicker -r -z >/dev/null 2>&1 & PID=$!
sleep .1
SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
kill $PID 2>/dev/null
region)
hyprpicker -r -z >/dev/null 2>&1 &
PID=$!
sleep .1
SELECTION=$(slurp 2>/dev/null)
kill $PID 2>/dev/null
;;
windows)
hyprpicker -r -z >/dev/null 2>&1 &
PID=$!
sleep .1
SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
kill $PID 2>/dev/null
;;
fullscreen)
SELECTION=$(hyprctl monitors -j | jq -r "${JQ_MONITOR_GEO} .[] | select(.focused == true) | format_geo")
;;
smart | *)
RECTS=$(get_rectangles)
hyprpicker -r -z >/dev/null 2>&1 &
PID=$!
sleep .1
SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
kill $PID 2>/dev/null
# If the selection area is L * W < 20, we'll assume you were trying to select whichever
# window or output it was inside of to prevent accidental 2px snapshots
+2 -2
View File
@@ -75,7 +75,7 @@ if [[ ! -f $RESUME_DROP_IN ]]; then
RESUME_DEVICE=$(findmnt -no SOURCE -T "$SWAP_FILE" | sed 's/\[.*\]//')
RESUME_OFFSET=$(btrfs inspect-internal map-swapfile -r "$SWAP_FILE")
sudo mkdir -p /etc/limine-entry-tool.d
echo "KERNEL_CMDLINE[default]+=\"resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
echo "KERNEL_CMDLINE[default]+=\" resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
fi
# Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)
@@ -84,7 +84,7 @@ if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
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
echo 'KERNEL_CMDLINE[default]+=" rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
fi
fi
+4 -1
View File
@@ -4,6 +4,9 @@
MONITOR_INFO=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)')
ACTIVE_MONITOR=$(echo "$MONITOR_INFO" | jq -r '.name')
CURRENT_SCALE=$(echo "$MONITOR_INFO" | jq -r '.scale')
WIDTH=$(echo "$MONITOR_INFO" | jq -r '.width')
HEIGHT=$(echo "$MONITOR_INFO" | jq -r '.height')
REFRESH_RATE=$(echo "$MONITOR_INFO" | jq -r '.refreshRate')
# Cycle through scales: 1 → 1.6 → 2 → 3 → 1
CURRENT_INT=$(awk -v s="$CURRENT_SCALE" 'BEGIN { printf "%.0f", s * 10 }')
@@ -16,6 +19,6 @@ case "$CURRENT_INT" in
esac
hyprctl keyword misc:disable_scale_notification true
hyprctl keyword monitor "$ACTIVE_MONITOR,preferred,auto,$NEW_SCALE"
hyprctl keyword monitor "$ACTIVE_MONITOR,${WIDTH}x${HEIGHT}@${REFRESH_RATE},auto,$NEW_SCALE"
hyprctl keyword misc:disable_scale_notification false
notify-send "󰍹 Display scaling set to ${NEW_SCALE}x"
+11 -2
View File
@@ -19,6 +19,13 @@ back_to() {
fi
}
toggle_existing_menu() {
if pgrep -f "walker.*--dmenu" > /dev/null; then
walker --close > /dev/null 2>&1
exit 0
fi
}
menu() {
local prompt="$1"
local options="$2"
@@ -308,7 +315,7 @@ show_install_menu() {
}
show_install_service_menu() {
case $(menu "Install" " Dropbox\n Tailscale\n󱇱 NordVPN\n󰟵 Bitwarden\n Chromium Account") in
case $(menu "Install" " Dropbox\n Tailscale\n󱇱 NordVPN [AUR]\n󰟵 Bitwarden\n Chromium Account") in
*Dropbox*) present_terminal omarchy-install-dropbox ;;
*Tailscale*) present_terminal omarchy-install-tailscale ;;
*NordVPN*) present_terminal omarchy-install-nordvpn ;;
@@ -353,7 +360,7 @@ show_install_ai_menu() {
*Gemini*) install "Gemini CLI" "gemini-cli" ;;
*Copilot*) install "Copilot CLI" "github-copilot-cli" ;;
*Cursor*) install "Cursor CLI" "cursor-cli" ;;
*Studio*) install "LM Studio" "lmstudio" ;;
*Studio*) install "LM Studio" "lmstudio-bin" ;;
*Ollama*) install "Ollama" $ollama_pkg ;;
*Crush*) install "Crush" "crush-bin" ;;
*) show_install_menu ;;
@@ -619,6 +626,8 @@ go_to_menu() {
USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
[[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"
toggle_existing_menu
if [[ -n $1 ]]; then
BACK_TO_EXIT=true
go_to_menu "$1"
+5
View File
@@ -0,0 +1,5 @@
#!/bin/bash
# Restart makima - key remapping service for remapping Copilot key to Omarchy Menu
sudo systemctl restart makima
+1 -1
View File
@@ -5,7 +5,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
if [[ $1 == "-y" ]] || omarchy-update-confirm; then
omarchy-snapshot create || (( $? == 127 ))
omarchy-snapshot create || (($? == 127))
omarchy-update-git
omarchy-update-perform
fi
+2
View File
@@ -4,5 +4,7 @@ set -e
echo -e "\e[32mUpdate Omarchy\e[0m"
omarchy-update-time
git -C $OMARCHY_PATH pull --autostash
git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge
+2 -3
View File
@@ -3,14 +3,13 @@
set -e
# Ensure screensaver/sleep doesn't set in during updates
hyprctl dispatch tagwindow +noidle &> /dev/null || true
hyprctl dispatch tagwindow +noidle &>/dev/null || true
# Capture update logs (CLICOLOR_FORCE keeps gum styled when stdout is piped through tee)
export CLICOLOR_FORCE=1
exec > >(tee "/tmp/omarchy-update.log") 2>&1
# Perform all update steps
omarchy-update-time
omarchy-update-keyring
omarchy-update-available-reset
omarchy-update-system-pkgs
@@ -24,4 +23,4 @@ omarchy-update-analyze-logs
omarchy-update-restart
# Re-enable screensaver/sleep after updates
hyprctl dispatch tagwindow -- -noidle &> /dev/null || true
hyprctl dispatch tagwindow -- -noidle &>/dev/null || true
+2 -1
View File
@@ -1,6 +1,7 @@
# Application bindings
bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
bindd = SUPER ALT, RETURN, Tmux, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)" tmux new
bindd = SUPER ALT, RETURN, Tmux, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)" bash -c "tmux attach || tmux new -s Work"
bindd = SUPER SHIFT, RETURN, Browser, exec, omarchy-launch-browser
bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"
bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
+5 -1
View File
@@ -18,7 +18,7 @@ input {
# Increase sensitivity for mouse/trackpad (default: 0)
# sensitivity = 0.35
# Turn off mouse acceleration (default: false)
# force_no_accel = true
@@ -47,3 +47,7 @@ windowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2
# Enable touchpad gestures for changing workspaces
# See https://wiki.hyprland.org/Configuring/Gestures/
# gesture = 3, horizontal, workspace
# Enable touchpad gestures for moving focus (helpful on scrolling layout)
# gesture = 3, left, dispatcher, movefocus, l
# gesture = 3, right, dispatcher, movefocus, r
@@ -3,7 +3,7 @@
# relative paths are resolved relative to the location of the config file
stylesheets: ["../omarchy/current/theme/hyprland-preview-share-picker.css"]
# default page selected when the picker is opened
default_page: windows
default_page: outputs
window:
# height of the application window
+5 -1
View File
@@ -43,6 +43,8 @@ bind -n M-9 select-window -t 9
bind -n M-Left select-window -t -1
bind -n M-Right select-window -t +1
bind -n M-S-Left swap-window -t -1 \; select-window -t -1
bind -n M-S-Right swap-window -t +1 \; select-window -t +1
# Session controls
bind R command-prompt -I "#S" "rename-session -- '%%'"
@@ -75,11 +77,13 @@ set -g status-interval 5
set -g status-left-length 30
set -g status-right-length 50
set -g window-status-separator ""
set -gw automatic-rename on
set -gw automatic-rename-format '#{b:pane_current_path}'
# 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 status-right "#[fg=blue]#{?client_prefix,PREFIX ,}#{?window_zoomed_flag,ZOOM ,}#[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"
+1 -1
View File
@@ -8,4 +8,4 @@ export PATH=$OMARCHY_PATH/bin:$PATH
source ~/.config/uwsm/default
# Activate mise if present on the system
omarchy-cmd-present mise && eval "$(mise activate bash)"
omarchy-cmd-present mise && eval "$(mise activate bash --shims)"
+11 -5
View File
@@ -12,12 +12,18 @@ alias eff='$EDITOR "$(ff)"'
if command -v zoxide &> /dev/null; then
alias cd="zd"
zd() {
if [ $# -eq 0 ]; then
builtin cd ~ && return
elif [ -d "$1" ]; then
builtin cd "$1"
if (( $# == 0 )); then
builtin cd ~ || return
elif [[ -d $1 ]]; then
builtin cd "$1" || return
else
z "$@" && printf "\U000F17A9 " && pwd || echo "Error: Directory not found"
if ! z "$@"; then
echo "Error: Directory not found"
return 1
fi
printf "\U000F17A9 "
pwd
fi
}
fi
+36
View File
@@ -0,0 +1,36 @@
# Create a new worktree and branch from within current git directory.
ga() {
if [[ -z "$1" ]]; then
echo "Usage: ga [branch name]"
return 1
fi
local branch="$1"
local base="$(basename "$PWD")"
local path="../${base}--${branch}"
git worktree add -b "$branch" "$path"
mise trust "$path"
cd "$path"
}
# Remove worktree and branch from within active worktree directory.
gd() {
if gum confirm "Remove worktree and branch?"; then
local cwd base branch root worktree
cwd="$(pwd)"
worktree="$(basename "$cwd")"
# split on first `--`
root="${worktree%%--*}"
branch="${worktree#*--}"
# Protect against accidentally nuking a non-worktree directory
if [[ "$root" != "$worktree" ]]; then
cd "../$root"
git worktree remove "$cwd" --force || return 1
git branch -D "$branch"
fi
fi
}
+1 -1
View File
@@ -11,7 +11,7 @@ if command -v zoxide &> /dev/null; then
fi
if command -v try &> /dev/null; then
eval "$(SHELL=/bin/bash try init ~/Work/tries)"
eval "$(SHELL=/bin/bash command try init ~/Work/tries)"
fi
if command -v fzf &> /dev/null; then
+1 -1
View File
@@ -3,6 +3,7 @@
--
Name = "omarchythemes"
NamePretty = "Omarchy Themes"
HideFromProviderlist = true
-- Check if file exists using Lua (no subprocess)
local function file_exists(path)
@@ -93,4 +94,3 @@ function GetEntries()
return entries
end
+1 -1
View File
@@ -14,7 +14,7 @@ windowrule {
windowrule {
name = jetbrains-popup
match:class = ^(jetbrains-.*)
match:title = ^()$
match:title = ^(| )$
match:float = 1
tag = +jetbrains
center = on
+1
View File
@@ -1,3 +1,4 @@
# Float LocalSend and fzf file picker
windowrule = float on, match:class (Share|localsend)
windowrule = center on, match:class (Share|localsend)
windowrule = size 1100 700, match:class localsend
+1 -1
View File
@@ -43,7 +43,7 @@ bindd = SUPER CTRL, S, Share, exec, omarchy-menu share
# Waybar-less information
bindd = SUPER CTRL ALT, T, Show time, exec, notify-send " $(date +"%A %H:%M — %d %B W%V %Y")"
bindd = SUPER CTRL ALT, B, Show battery remaining, exec, notify-send "󰁹 Battery is at $(omarchy-battery-remaining)%"
bindd = SUPER CTRL ALT, B, Show battery remaining, exec, notify-send "$(omarchy-battery-status)"
# Control panels
bindd = SUPER CTRL, A, Audio controls, exec, omarchy-launch-audio
+1
View File
@@ -103,6 +103,7 @@ animations {
animation = fadeLayersIn, 1, 1.79, almostLinear
animation = fadeLayersOut, 1, 1.39, almostLinear
animation = workspaces, 0, 0, ease
animation = specialWorkspace, 1, 4, easeOutQuint, slidevert
}
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
@@ -0,0 +1,7 @@
# Run omarchy-restart-makima after any changes
[remap]
KEY_LEFTMETA-KEY_LEFTSHIFT-KEY_F23 = ["KEY_LEFTMETA", "KEY_LEFTALT", "KEY_SPACE"]
[settings]
GRAB_DEVICE = "true"
+4
View File
@@ -20,10 +20,12 @@ run_logged $OMARCHY_INSTALL/config/walker-elephant.sh
run_logged $OMARCHY_INSTALL/config/fast-shutdown.sh
run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
run_logged $OMARCHY_INSTALL/config/input-group.sh
run_logged $OMARCHY_INSTALL/config/makima.sh
run_logged $OMARCHY_INSTALL/config/omarchy-ai-skill.sh
run_logged $OMARCHY_INSTALL/config/kernel-modules-hook.sh
run_logged $OMARCHY_INSTALL/config/powerprofilesctl-rules.sh
run_logged $OMARCHY_INSTALL/config/wifi-powersave-rules.sh
run_logged $OMARCHY_INSTALL/config/plocate-ac-only.sh
run_logged $OMARCHY_INSTALL/config/hardware/network.sh
run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
run_logged $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
@@ -32,7 +34,9 @@ run_logged $OMARCHY_INSTALL/config/hardware/printer.sh
run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
run_logged $OMARCHY_INSTALL/config/hardware/intel.sh
run_logged $OMARCHY_INSTALL/config/hardware/vulkan.sh
run_logged $OMARCHY_INSTALL/config/hardware/fix-intel-panther-lake-display.sh
run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
run_logged $OMARCHY_INSTALL/config/hardware/fix-bcm43xx.sh
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
+1 -1
View File
@@ -30,6 +30,6 @@ EOF
sudo mkdir -p /etc/limine-entry-tool.d
cat <<EOF | sudo tee /etc/limine-entry-tool.d/t2-mac.conf >/dev/null
# Generated by Omarchy installer for T2 Mac support
KERNEL_CMDLINE[default]+="intel_iommu=on iommu=pt pcie_ports=compat"
KERNEL_CMDLINE[default]+=" intel_iommu=on iommu=pt pcie_ports=compat"
EOF
fi
@@ -0,0 +1,18 @@
# Fix display issues on Intel Panther Lake (Xe3) GPUs by disabling power-saving
# features that cause screen to run at 10hz (e.g. Dell XPS 2026).
if lspci | grep -iE 'vga|3d|display' | grep -qi 'panther lake'; then
echo "Detected Intel Panther Lake GPU, applying display fixes..."
PANTHER_LAKE_CMDLINE='KERNEL_CMDLINE[default]+=" xe.enable_psr=0 xe.enable_panel_replay=0 xe.enable_fbc=0 xe.enable_dc=0"'
sudo mkdir -p /etc/limine-entry-tool.d
cat <<EOF | sudo tee /etc/limine-entry-tool.d/intel-panther-lake-display.conf >/dev/null
# Fix Panther Lake display issues by disabling Xe power-saving features
$PANTHER_LAKE_CMDLINE
EOF
# Also append to /etc/default/limine if it exists, since it overrides drop-in configs
if [ -f /etc/default/limine ] && ! grep -q 'xe.enable_psr' /etc/default/limine; then
echo "$PANTHER_LAKE_CMDLINE" | sudo tee -a /etc/default/limine >/dev/null
fi
fi
+2 -2
View File
@@ -1,8 +1,8 @@
# This installs hardware video acceleration for Intel GPUs
# Check if we have an Intel GPU at all
if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then
# HD Graphics and newer uses intel-media-driver
if [[ ${INTEL_GPU,,} =~ "hd graphics"|"xe"|"iris" ]]; then
# HD Graphics / Iris / Xe / Arc use intel-media-driver
if [[ ${INTEL_GPU,,} =~ (hd\ graphics|uhd\ graphics|xe|iris|arc) ]]; then
omarchy-pkg-add intel-media-driver
elif [[ ${INTEL_GPU,,} =~ "gma" ]]; then
# Older generations from 2008 to ~2014-2017 use libva-intel-driver
+14
View File
@@ -0,0 +1,14 @@
# Remap Copilot key (Super+Shift+F23) to Super+Alt+Space (Omarchy Menu) using makima
mkdir -p "$HOME/.config/makima"
cp "$OMARCHY_PATH/default/makima/AT Translated Set 2 keyboard.toml" "$HOME/.config/makima/"
# Create systemd override with correct user and config path
sudo mkdir -p /etc/systemd/system/makima.service.d
sudo tee /etc/systemd/system/makima.service.d/override.conf > /dev/null <<EOF
[Service]
User=$USER
Environment="MAKIMA_CONFIG=/home/$USER/.config/makima"
EOF
sudo systemctl daemon-reload
sudo systemctl enable --now makima 2>/dev/null || true
+3
View File
@@ -0,0 +1,3 @@
sudo install -d /etc/systemd/system/plocate-updatedb.service.d
printf '%s\n' '[Unit]' 'ConditionACPower=true' | sudo tee /etc/systemd/system/plocate-updatedb.service.d/ac-only.conf >/dev/null
sudo systemctl daemon-reload
+5
View File
@@ -32,6 +32,11 @@ EOF
sudo cp $OMARCHY_PATH/default/limine/default.conf /etc/default/limine
sudo sed -i "s|@@CMDLINE@@|$CMDLINE|g" /etc/default/limine
# Append any drop-in kernel cmdline configs (from hardware fix scripts, etc.)
for dropin in /etc/limine-entry-tool.d/*.conf; do
[ -f "$dropin" ] && cat "$dropin" | sudo tee -a /etc/default/limine >/dev/null
done
# UKI and EFI fallback are EFI only
if [[ -z $EFI ]]; then
sudo sed -i '/^ENABLE_UKI=/d; /^ENABLE_LIMINE_FALLBACK=/d' /etc/default/limine
+1
View File
@@ -75,6 +75,7 @@ libreoffice-fresh
llvm
localsend
luarocks
makima-bin
mako
man-db
mariadb-libs
+1 -1
View File
@@ -1,3 +1,3 @@
echo "Drop wayfreeze as hyprpicker replaces its function"
omarchy-pkg-drop wayfreeze
omarchy-pkg-drop wayfreeze-git wayfreeze
+13
View File
@@ -0,0 +1,13 @@
echo "Add Alt+Shift+Arrow keybindings for swapping tmux windows"
TMUX_CONF=~/.config/tmux/tmux.conf
if [[ -f $TMUX_CONF ]]; then
if ! grep -q "bind -n M-S-Left swap-window" "$TMUX_CONF"; then
sed -i '/bind -n M-Right select-window -t +1/a\
bind -n M-S-Left swap-window -t -1 \\; select-window -t -1\
bind -n M-S-Right swap-window -t +1 \\; select-window -t +1' "$TMUX_CONF"
fi
omarchy-restart-tmux
fi
+67
View File
@@ -0,0 +1,67 @@
echo "Fix nvim transparency to preserve highlight foreground colors"
TRANSPARENCY_FILE="$HOME/.config/nvim/plugin/after/transparency.lua"
if [[ -f "$TRANSPARENCY_FILE" ]]; then
cat > "$TRANSPARENCY_FILE" << 'EOF'
-- Make highlight groups transparent while preserving their other attributes
local function make_transparent(name)
local ok, hl = pcall(vim.api.nvim_get_hl, 0, { name = name, link = false })
if ok then
hl.bg = nil
vim.api.nvim_set_hl(0, name, hl)
end
end
local groups = {
-- transparent background
"Normal",
"NormalFloat",
"FloatBorder",
"Pmenu",
"Terminal",
"EndOfBuffer",
"FoldColumn",
"Folded",
"SignColumn",
"LineNr",
"CursorLineNr",
"NormalNC",
"WhichKeyFloat",
"TelescopeBorder",
"TelescopeNormal",
"TelescopePromptBorder",
"TelescopePromptTitle",
-- neotree
"NeoTreeNormal",
"NeoTreeNormalNC",
"NeoTreeVertSplit",
"NeoTreeWinSeparator",
"NeoTreeEndOfBuffer",
-- nvim-tree
"NvimTreeNormal",
"NvimTreeVertSplit",
"NvimTreeEndOfBuffer",
-- notify
"NotifyINFOBody",
"NotifyERRORBody",
"NotifyWARNBody",
"NotifyTRACEBody",
"NotifyDEBUGBody",
"NotifyINFOTitle",
"NotifyERRORTitle",
"NotifyWARNTitle",
"NotifyTRACETitle",
"NotifyDEBUGTitle",
"NotifyINFOBorder",
"NotifyERRORBorder",
"NotifyWARNBorder",
"NotifyTRACEBorder",
"NotifyDEBUGBorder",
}
for _, name in ipairs(groups) do
make_transparent(name)
end
EOF
fi
+7
View File
@@ -0,0 +1,7 @@
echo "Use mise shims in ~/.config/uwsm/env"
UWSM_ENV="$HOME/.config/uwsm/env"
if [[ -f $UWSM_ENV ]] && grep -q 'mise activate bash)' "$UWSM_ENV"; then
sed -i 's/mise activate bash)/mise activate bash --shims)/g' "$UWSM_ENV"
fi
+4
View File
@@ -0,0 +1,4 @@
echo "Remap Copilot key to Omarchy Menu using makima"
omarchy-pkg-add makima-bin
source $OMARCHY_PATH/install/config/makima.sh
+11
View File
@@ -0,0 +1,11 @@
echo "Add automatic-rename settings to tmux configuration"
if [[ -f ~/.config/tmux/tmux.conf ]]; then
if ! grep -q "set -gw automatic-rename on" ~/.config/tmux/tmux.conf; then
sed -i '/set -g window-status-separator ""/a\
set -gw automatic-rename on\
set -gw automatic-rename-format '\''#{b:pane_current_path}'\''\
' ~/.config/tmux/tmux.conf
omarchy-restart-tmux
fi
fi
+3
View File
@@ -0,0 +1,3 @@
echo "Only run plocate indexing on AC power to prevent hangs after sleep"
source $OMARCHY_PATH/install/config/plocate-ac-only.sh
+7
View File
@@ -0,0 +1,7 @@
echo "Update hyprland-preview-share-picker config to default to outputs page"
CONFIG_FILE=~/.config/hyprland-preview-share-picker/config.yaml
if [[ -f $CONFIG_FILE ]]; then
sed -i 's/^default_page: windows$/default_page: outputs/' "$CONFIG_FILE"
fi
+5
View File
@@ -0,0 +1,5 @@
echo "Install Intel GPU hardware acceleration drivers if missing"
if lspci | grep -iE 'vga|3d|display' | grep -qi 'intel'; then
source "$OMARCHY_PATH/install/config/hardware/intel.sh"
fi
+1 -1
View File
@@ -1,4 +1,4 @@
{
"name": "White Omarchy",
"name": "White",
"extension": "Bjarne.white-theme"
}
+1 -1
View File
@@ -1 +1 @@
3.4.1
3.4.2