mirror of
https://github.com/basecamp/omarchy.git
synced 2025-07-27 20:29:24 +00:00
Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
36c8f17749 |
@ -126,8 +126,7 @@ setup_menu() {
|
||||
}
|
||||
|
||||
open_manual() {
|
||||
setsid chromium --new-window --ozone-platform=wayland --app="https://manuals.omamix.org/2/the-omarchy-manual" >/dev/null 2>&1 &
|
||||
clear
|
||||
xdg-open "https://manuals.omamix.org/2/the-omarchy-manual"
|
||||
}
|
||||
|
||||
ack_command() {
|
||||
@ -135,3 +134,4 @@ ack_command() {
|
||||
}
|
||||
|
||||
main_menu
|
||||
|
||||
|
7
bin/omarchy-first-run
Executable file
7
bin/omarchy-first-run
Executable file
@ -0,0 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ ! -f ~/.local/state/omarchy/first-run.marker ]]; then
|
||||
chromium --new-window --app=file://$HOME/.local/share/omarchy/first-run/index.html
|
||||
mkdir -p ~/.local/state/omarchy
|
||||
touch ~/.local/state/omarchy/first-run.marker
|
||||
fi
|
@ -10,7 +10,7 @@ show_power_menu() {
|
||||
\u200D Relaunch
|
||||
\u2060 Restart
|
||||
\u2063 Shutdown"
|
||||
local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.config/wofi/select.css)
|
||||
local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.local/share/omarchy/default/wofi/select.css)
|
||||
|
||||
case "$selection" in
|
||||
*Lock*) hyprlock ;;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ "$1" == "-y" ]] || gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
|
||||
if gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
|
||||
sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
|
||||
sudo plymouth-set-default-theme -R omarchy
|
||||
fi
|
||||
|
@ -6,5 +6,6 @@ if gum confirm "Refresh Waybar config? This will replace your current settings w
|
||||
cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
|
||||
|
||||
# Restart waybar
|
||||
pkill -SIGUSR2 waybar
|
||||
pkill waybar &>/dev/null
|
||||
setsid waybar &>/dev/null &
|
||||
fi
|
||||
|
@ -1,8 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ "$1" == "-y" ]] || gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
|
||||
if gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
|
||||
# Overwrite local waybar settings with the latest in Omarchy
|
||||
cp -f ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/ 2>/dev/null
|
||||
cp -f ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/ 2>/dev/null
|
||||
cp -f ~/.local/share/omarchy/config/wofi/select.css ~/.config/wofi/ 2>/dev/null
|
||||
fi
|
||||
|
@ -56,4 +56,4 @@ grep -h '^[[:space:]]*bind' $USER_HYPRLAND_CONF $OMARCHY_BINDINGS_CONF |
|
||||
printf "%-35s → %s\n", key_combo, action;
|
||||
}
|
||||
}' |
|
||||
wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical
|
||||
flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical --style=\"$HOME/.local/share/omarchy/default/wofi/search.css\""
|
||||
|
@ -10,7 +10,7 @@ fi
|
||||
|
||||
REPO_URL="$1"
|
||||
THEMES_DIR="$HOME/.config/omarchy/themes"
|
||||
THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
|
||||
THEME_NAME=$(basename "$REPO_URL" .git)
|
||||
THEME_PATH="$THEMES_DIR/$THEME_NAME"
|
||||
THEME_BACKGROUND_PATH="$THEME_PATH/backgrounds"
|
||||
BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds"
|
||||
@ -27,10 +27,12 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Link backgrounds if present
|
||||
# Copy backgrounds if present
|
||||
if [ -d $THEME_BACKGROUND_PATH ]; then
|
||||
ln -snf $THEME_BACKGROUND_PATH $BACKGROUNDS_THEME_PATH
|
||||
mkdir -p $BACKGROUNDS_THEME_PATH
|
||||
cp $THEME_BACKGROUND_PATH/* $BACKGROUNDS_THEME_PATH/
|
||||
fi
|
||||
|
||||
# Apply the new theme with omarchy-theme-set
|
||||
omarchy-theme-set $THEME_NAME
|
||||
|
||||
|
@ -25,7 +25,7 @@ selection=$(printf '%s\n' "${themes[@]}" | wofi \
|
||||
--width 150 \
|
||||
--height 300 \
|
||||
-O alphabetical \
|
||||
--style ~/.config/wofi/select.css 2>/dev/null)
|
||||
--style ~/.local/share/omarchy/default/wofi/select.css)
|
||||
|
||||
# Remove any Pango markup before converting back to filename
|
||||
clean_selection=$(echo "$selection" | sed -E 's/<[^>]+>//g')
|
||||
@ -35,3 +35,4 @@ selected_theme=$(echo "$clean_selection" | tr '[:upper:]' '[:lower:]' | tr ' ' '
|
||||
|
||||
# Apply the selected theme
|
||||
"$HOME/.local/share/omarchy/bin/omarchy-theme-set" "$selected_theme"
|
||||
|
||||
|
@ -124,4 +124,66 @@
|
||||
"icon-size": 12,
|
||||
"spacing": 12
|
||||
}
|
||||
},
|
||||
"cpu": {
|
||||
"interval": 5,
|
||||
"format": "",
|
||||
"on-click": "alacritty -e btop"
|
||||
},
|
||||
"clock": {
|
||||
"format": "{:%A %H:%M}",
|
||||
"format-alt": "{:%d %B W%V %Y}",
|
||||
"tooltip": false
|
||||
},
|
||||
"network": {
|
||||
"format-icons": ["","","","",""],
|
||||
"format" : "{icon}",
|
||||
"format-wifi" : "{icon}",
|
||||
"format-ethernet" : "",
|
||||
"format-disconnected" : "",
|
||||
"tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
|
||||
"tooltip-format-ethernet": "⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
|
||||
"tooltip-format-disconnected": "Disconnected",
|
||||
"interval": 3,
|
||||
"nospacing": 1,
|
||||
"on-click": "alacritty --class=Impala -e impala"
|
||||
},
|
||||
"battery": {
|
||||
"format": "{capacity}% {icon}",
|
||||
"format-discharging": "{icon}",
|
||||
"format-charging": "{icon}",
|
||||
"format-plugged": "",
|
||||
"format-icons": {
|
||||
"charging": [
|
||||
"", "", "", "", "", "", "", "", "", ""
|
||||
],
|
||||
"default": [
|
||||
"", "", "", "", "", "", "", "", "", ""
|
||||
]
|
||||
},
|
||||
"format-full": "",
|
||||
"tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
|
||||
"tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
|
||||
"interval": 5,
|
||||
"states": {
|
||||
"warning": 20,
|
||||
"critical": 10
|
||||
}
|
||||
},
|
||||
"bluetooth": {
|
||||
"format": "",
|
||||
"format-disabled": "",
|
||||
"format-connected": "",
|
||||
"tooltip-format": "Devices connected: {num_connections}",
|
||||
"on-click": "GTK_THEME=Adwaita-dark blueberry"
|
||||
},
|
||||
"pulseaudio": {
|
||||
"format": "",
|
||||
"format-muted": "",
|
||||
"scroll-step": 5,
|
||||
"on-click": "GTK_THEME=Adwaita-dark pavucontrol",
|
||||
"tooltip-format": "Playing at {volume}%",
|
||||
"on-click-right": "pamixer -t",
|
||||
"ignored-sinks": ["Easy Effects Sink"]
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Colors are defined by theme file and can be referenced via @base, @text, @selected-text, and @border */
|
||||
/* Colors are defined by theme files and can be referenced via @base, @text, @selected-text, and @border */
|
||||
|
||||
* {
|
||||
font-family: 'CaskaydiaMono Nerd Font', monospace;
|
||||
@ -71,4 +71,3 @@ window {
|
||||
-gtk-icon-transform: scale(0.7);
|
||||
}
|
||||
|
||||
@import ".config/omarchy/current/theme/wofi.css";
|
||||
|
@ -2,3 +2,4 @@ exec-once = hypridle & mako & waybar & fcitx5
|
||||
exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
|
||||
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||
exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'
|
||||
exec-once = ~/.local/share/omarchy/bin/omarchy-first-run
|
||||
|
@ -1,11 +1,11 @@
|
||||
# Launching
|
||||
bind = SUPER, space, exec, pkill wofi || wofi --show drun -O alphabetical
|
||||
bind = SUPER, K, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-show-keybindings
|
||||
bind = SUPER, space, exec, pkill wofi || wofi --show drun --sort-order=alphabetical --style="$HOME/.local/share/omarchy/default/wofi/search.css"
|
||||
bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings
|
||||
|
||||
# Aesthetics
|
||||
bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
|
||||
bind = SUPER CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-bg-next
|
||||
bind = SUPER SHIFT CTRL, SPACE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-theme-menu
|
||||
bind = SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-menu
|
||||
|
||||
# Notifications
|
||||
bind = SUPER, comma, exec, makoctl dismiss
|
||||
@ -13,7 +13,7 @@ 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"
|
||||
|
||||
# Power menu controls lock, suspend, relaunch, restart, shutdown
|
||||
bind = SUPER, ESCAPE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-power-menu
|
||||
bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-power-menu
|
||||
|
||||
# Toggle idling
|
||||
bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle
|
||||
|
73
default/wofi/search.css
Normal file
73
default/wofi/search.css
Normal file
@ -0,0 +1,73 @@
|
||||
@import ".config/omarchy/current/theme/wofi.css";
|
||||
@import ".config/wofi/style.css";
|
||||
|
||||
* {
|
||||
font-family: 'CaskaydiaMono Nerd Font', monospace;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
window {
|
||||
margin: 0px;
|
||||
padding: 20px;
|
||||
background-color: @base;
|
||||
opacity: 0.95;
|
||||
}
|
||||
|
||||
#inner-box {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: none;
|
||||
background-color: @base;
|
||||
}
|
||||
|
||||
#outer-box {
|
||||
margin: 0;
|
||||
padding: 20px;
|
||||
border: none;
|
||||
background-color: @base;
|
||||
border: 2px solid @border;
|
||||
}
|
||||
|
||||
#scroll {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: none;
|
||||
background-color: @base;
|
||||
}
|
||||
|
||||
#input {
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
border: none;
|
||||
background-color: @base;
|
||||
color: @text;
|
||||
}
|
||||
|
||||
#input:focus {
|
||||
outline: none;
|
||||
box-shadow: none;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#text {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
color: @text;
|
||||
}
|
||||
|
||||
#entry {
|
||||
background-color: @base;
|
||||
}
|
||||
|
||||
#entry:selected {
|
||||
outline: none;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#entry:selected #text {
|
||||
color: @selected-text;
|
||||
}
|
||||
|
||||
#entry image {
|
||||
-gtk-icon-transform: scale(0.7);
|
||||
}
|
@ -1,11 +1,8 @@
|
||||
/* Use by power menu, theme selector, and other menus without visible search bar */
|
||||
|
||||
@import ".config/wofi/style.css";
|
||||
@import ".config/omarchy/current/theme/wofi.css";
|
||||
@import ".local/share/omarchy/default/wofi/search.css";
|
||||
|
||||
#input {
|
||||
display: none;
|
||||
opacity: 0;
|
||||
margin-top: -200px;
|
||||
}
|
||||
|
||||
@import ".config/omarchy/current/theme/wofi.css";
|
8
first-run/index.html
Normal file
8
first-run/index.html
Normal file
@ -0,0 +1,8 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Hello</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Hello!</h1>
|
||||
</body>
|
||||
</html>
|
@ -12,4 +12,4 @@ if [ -z "$OMARCHY_BARE" ]; then
|
||||
fi
|
||||
|
||||
# Copy over Omarchy applications
|
||||
source ~/.local/share/omarchy/bin/omarchy-refresh-applications || true
|
||||
source ~/.local/share/omarchy/bin/omarchy-sync-applications || true
|
||||
|
@ -13,6 +13,6 @@ if [ -f "$HOME/.config/environment.d/fcitx.conf" ]; then
|
||||
sed -i 's/^GTK_IM_MODULE=fcitx$//' "$HOME/.config/environment.d/fcitx.conf"
|
||||
fi
|
||||
|
||||
omarchy-refresh-plymouth -y
|
||||
omarchy-refresh-plymouth
|
||||
|
||||
source ~/.local/share/omarchy/install/login.sh
|
||||
|
@ -2,5 +2,4 @@ echo "Make wofi stylesheet user editable"
|
||||
if [[ -L "$HOME/.config/wofi/style.css" ]]; then
|
||||
rm "$HOME/.config/wofi/style.css"
|
||||
cp ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/
|
||||
cp ~/.local/share/omarchy/config/wofi/search.css ~/.config/wofi/
|
||||
fi
|
||||
|
@ -1,2 +0,0 @@
|
||||
echo "Make all wofi stylesheets user editable"
|
||||
omarchy-refresh-wofi -y
|
@ -1,2 +0,0 @@
|
||||
echo "Use latest Omarchy Waybar configuration"
|
||||
omarchy-refresh-waybar
|
Reference in New Issue
Block a user