Merge pull request #82 from basecamp/dev

Omarchy v1.2.0
This commit is contained in:
David Heinemeier Hansson
2025-07-06 20:58:36 -07:00
committed by GitHub
20 changed files with 130 additions and 34 deletions

View File

@ -3,7 +3,7 @@
yay -S --noconfirm --needed fprint yay -S --noconfirm --needed fprint
echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m" echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
sudo fprintd-enroll sudo fprintd-enroll `whoami`
echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n" echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"

26
bin/omarchy-power-menu Executable file
View File

@ -0,0 +1,26 @@
#!/bin/bash
# Power menu for Omarchy
# Provides power off, restart, and sleep options
# Function to show power menu
show_power_menu() {
local menu_options="\u200B Lock
\u200C󰤄 Sleep
\u200D Relaunch
\u2060󰜉 Restart
󰐥\u2063 Shutdown" # These first characters are invisible sort keys
local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 200 --height 250 -O alphabetical)
case "$selection" in
*Lock*) hyprlock ;;
*Sleep*) systemctl suspend ;;
*Relaunch*) hyprctl dispatch exit ;;
*Restart*) systemctl reboot ;;
*Shutdown*) systemctl poweroff ;;
esac
}
# Main execution
show_power_menu

9
bin/omarchy-refresh-waybar Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
# Overwrite local waybar settings with the latest in Omarchy
cp -f ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/ 2>/dev/null
cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
# Restart waybar
pkill waybar &>/dev/null
setsid waybar &>/dev/null &

View File

@ -27,7 +27,6 @@ source = ~/.config/omarchy/current/theme/hyprland.conf
# Extra env variables # Extra env variables
env = GDK_SCALE,2 # Change to 1 if on a 1x display env = GDK_SCALE,2 # Change to 1 if on a 1x display
# Extra bindings # Extra bindings
bind = SUPER, A, exec, $webapp="https://chatgpt.com" bind = SUPER, A, exec, $webapp="https://chatgpt.com"
bind = SUPER SHIFT, A, exec, $webapp="https://grok.com" bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"
@ -39,8 +38,31 @@ bind = SUPER ALT, G, exec, $webapp="https://messages.google.com/web/conversation
bind = SUPER, X, exec, $webapp="https://x.com/" bind = SUPER, X, exec, $webapp="https://x.com/"
bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post" bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"
# Use multiple keyboard layouts and switch between them with Alt + Space # Control your input devices
# input { # See https://wiki.hypr.land/Configuring/Variables/#input
# kb_layout = us,dk input {
# kb_options = compose:caps,grp:alt_space_toggle # Use multiple keyboard layouts and switch between them with Alt + Space
# } # kb_layout = us,dk
# kb_options = compose:caps,grp:alt_space_toggle
# Change speed of keyboard repeat
repeat_rate = 40
repeat_delay = 600
# Increase sensitity for mouse/trackpack (default: 0)
# sensitivity = 0.35
touchpad {
# Use natural (inverse) scrolling
# natural_scroll = true
# Use two-finger clicks for right-click instead of lower-right corner
# clickfinger_behavior = true
# Control the speed of your scrolling
scroll_factor = 0.4
}
}
# Scroll faster in the terminal
windowrule = scrolltouchpad 1.5, class:Alacritty

View File

@ -10,13 +10,12 @@
"clock" "clock"
], ],
"modules-right": [ "modules-right": [
"custom/dropbox",
"bluetooth", "bluetooth",
"network", "network",
"pulseaudio", "pulseaudio",
"cpu", "cpu",
"power-profiles-daemon", "battery",
"battery" "custom/power-menu"
], ],
"hyprland/workspaces": { "hyprland/workspaces": {
"on-click": "activate", "on-click": "activate",
@ -103,23 +102,9 @@
"on-click-right": "pamixer -t", "on-click-right": "pamixer -t",
"ignored-sinks": ["Easy Effects Sink"] "ignored-sinks": ["Easy Effects Sink"]
}, },
"power-profiles-daemon": { "custom/power-menu": {
"format": "{icon}", "format": "󰐥",
"tooltip-format": "Power profile: {profile}", "on-click": "~/.local/share/omarchy/bin/omarchy-power-menu",
"tooltip": true, "tooltip": false
"format-icons": {
"power-saver": "󰡳",
"balanced": "󰊚",
"performance": "󰡴"
}
},
"custom/dropbox": {
"format": "",
"on-click": "nautilus ~/Dropbox",
"exec": "dropbox-cli status",
"return-type": "text",
"interval": 5,
"tooltip": true,
"tooltip-format": "{}"
} }
} }

View File

@ -18,12 +18,12 @@
#custom-dropbox, #custom-dropbox,
#cpu, #cpu,
#power-profiles-daemon,
#battery, #battery,
#network, #network,
#bluetooth, #bluetooth,
#pulseaudio, #pulseaudio,
#clock { #clock,
#custom-power-menu {
min-width: 12px; min-width: 12px;
margin-right: 13px; margin-right: 13px;
} }

View File

@ -5,7 +5,9 @@ HISTSIZE=32768
HISTFILESIZE="${HISTSIZE}" HISTFILESIZE="${HISTSIZE}"
# Autocompletion # Autocompletion
# source /usr/share/bash-completion/bash_completion if [[ ! -v BASH_COMPLETION_VERSINFO && -f /usr/share/bash-completion/bash_completion ]]; then
source /usr/share/bash-completion/bash_completion
fi
# Set complete path # Set complete path
export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omarchy/bin:$PATH" export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omarchy/bin:$PATH"

View File

@ -16,6 +16,11 @@ bind = SUPER CTRL, SPACE, exec, ~/.local/share/omarchy/bin/swaybg-next
bind = SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-next bind = SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-next
bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings
# Notifications
bind = SUPER, comma, exec, makoctl dismiss
bind = SUPER SHIFT, comma, exec, makoctl dismiss --all
bind = SUPER CTRL, comma, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
bind = SUPER, W, killactive, bind = SUPER, W, killactive,
# End active session # End active session

View File

@ -28,3 +28,7 @@ layerrule = blur,wofi
windowrule = float, class:(clipse) windowrule = float, class:(clipse)
windowrule = size 622 652, class:(clipse) windowrule = size 622 652, class:(clipse)
windowrule = stayfocused, class:(clipse) windowrule = stayfocused, class:(clipse)
# Float and cneter file pickers
windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?)
windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?)

View File

@ -5,7 +5,10 @@ set -e
trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR
# Install everything # Install everything
for f in ~/.local/share/omarchy/install/*.sh; do source "$f"; done for f in ~/.local/share/omarchy/install/*.sh; do
echo -e "\nRunning installer: $f"
source "$f"
done
# Ensure locate is up to date now that everything has been installed # Ensure locate is up to date now that everything has been installed
sudo updatedb sudo updatedb

View File

@ -3,4 +3,4 @@ yay -S --noconfirm --needed \
fd eza fzf ripgrep zoxide bat \ fd eza fzf ripgrep zoxide bat \
wl-clipboard fastfetch btop \ wl-clipboard fastfetch btop \
man tldr less whois plocate \ man tldr less whois plocate \
alacritty alacritty bash-completion

View File

@ -2,7 +2,7 @@ yay -S --noconfirm --needed \
brightnessctl playerctl pamixer pavucontrol wireplumber \ brightnessctl playerctl pamixer pavucontrol wireplumber \
fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool \ fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool \
wl-clip-persist clipse-bin \ wl-clip-persist clipse-bin \
nautilus sushi gnome-calculator \ nautilus sushi ffmpegthumbnailer gnome-calculator \
1password-beta 1password-cli \ 1password-beta 1password-cli \
chromium mpv \ chromium mpv \
evince imv \ evince imv \

2
migrations/1751679069.sh Normal file
View File

@ -0,0 +1,2 @@
echo "Install ffmpegthumbnailer for video thumbnails in the file manager"
yay -S --noconfirm --needed ffmpegthumbnailer

2
migrations/1751821819.sh Normal file
View File

@ -0,0 +1,2 @@
echo "Install bash-completion"
yay -S --noconfirm --needed bash-completion

View File

@ -12,3 +12,9 @@ max-icon-size=32
[app-name=Spotify] [app-name=Spotify]
invisible=1 invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false

View File

@ -12,3 +12,9 @@ max-icon-size=32
[app-name=Spotify] [app-name=Spotify]
invisible=1 invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false

View File

@ -12,3 +12,9 @@ max-icon-size=32
[app-name=Spotify] [app-name=Spotify]
invisible=1 invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false

View File

@ -12,3 +12,9 @@ max-icon-size=32
[app-name=Spotify] [app-name=Spotify]
invisible=1 invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false

View File

@ -12,3 +12,9 @@ max-icon-size=32
[app-name=Spotify] [app-name=Spotify]
invisible=1 invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false

View File

@ -12,3 +12,9 @@ max-icon-size=32
[app-name=Spotify] [app-name=Spotify]
invisible=1 invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false