mirror of
https://github.com/LukeHagar/omarchy.git
synced 2025-12-06 12:37:46 +00:00
Merge branch 'dev' into change-defaults
This commit is contained in:
7
autostart/walker.desktop
Normal file
7
autostart/walker.desktop
Normal file
@@ -0,0 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Name=Walker
|
||||
Comment=Walker Service
|
||||
Exec=walker --gapplication-service
|
||||
StartupNotify=false
|
||||
Terminal=false
|
||||
Type=Application
|
||||
14
bin/omarchy-branch-set
Executable file
14
bin/omarchy-branch-set
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
if (($# == 0)); then
|
||||
echo "Usage: omarchy-branch-set [master|dev]"
|
||||
exit 1
|
||||
else
|
||||
branch="$1"
|
||||
fi
|
||||
|
||||
case "$branch" in
|
||||
"master") git -C $OMARCHY_PATH switch master ;;
|
||||
"dev") git -C $OMARCHY_PATH switch dev ;;
|
||||
*) echo "Unknown branch: $branch"; exit 1; ;;
|
||||
esac
|
||||
15
bin/omarchy-channel-set
Executable file
15
bin/omarchy-channel-set
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
if (($# == 0)); then
|
||||
echo "Usage: omarchy-channel-set [stable|edge|dev]"
|
||||
exit 1
|
||||
else
|
||||
channel="$1"
|
||||
fi
|
||||
|
||||
case "$channel" in
|
||||
"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
|
||||
"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
|
||||
"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
|
||||
*) echo "Unknown channel: $channel"; exit 1; ;;
|
||||
esac
|
||||
@@ -12,6 +12,7 @@ if [[ -f "$FIRST_RUN_MODE" ]]; then
|
||||
bash "$OMARCHY_PATH/install/first-run/firewall.sh"
|
||||
bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
|
||||
bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
|
||||
bash "$OMARCHY_PATH/install/first-run/elephant.sh"
|
||||
sudo rm -f /etc/sudoers.d/first-run
|
||||
|
||||
bash "$OMARCHY_PATH/install/first-run/welcome.sh"
|
||||
|
||||
6
bin/omarchy-cmd-reboot
Executable file
6
bin/omarchy-cmd-reboot
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
omarchy-state clear re*-required
|
||||
omarchy-hyprland-window-close-all
|
||||
sleep 1 # Allow apps like Chrome to shutdown correctly
|
||||
systemctl reboot --no-wall
|
||||
@@ -8,15 +8,17 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SCOPE=""
|
||||
AUDIO="false"
|
||||
DESKTOP_AUDIO="false"
|
||||
MICROPHONE_AUDIO="false"
|
||||
WEBCAM="false"
|
||||
STOP_RECORDING="false"
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
--with-audio) AUDIO="true" ;;
|
||||
--with-desktop-audio) DESKTOP_AUDIO="true" ;;
|
||||
--with-microphone-audio) MICROPHONE_AUDIO="true" ;;
|
||||
--with-webcam) WEBCAM="true" ;;
|
||||
output|region) SCOPE="$arg" ;;
|
||||
--stop-recording) STOP_RECORDING="true"
|
||||
esac
|
||||
done
|
||||
|
||||
@@ -57,27 +59,35 @@ start_webcam_overlay() {
|
||||
|
||||
start_screenrecording() {
|
||||
local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
|
||||
local audio_devices=""
|
||||
local audio_args=""
|
||||
|
||||
# Merge audio tracks into one - separate tracks only play one at a time in most players
|
||||
[[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
|
||||
[[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
|
||||
|
||||
gpu-screen-recorder -w "$@" -f 60 -c mp4 $audio_args -ac aac -o "$filename" &
|
||||
if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
|
||||
# Merge audio tracks into one - separate tracks only play one at a time in most players
|
||||
[[ -n "$audio_devices" ]] && audio_devices+="|"
|
||||
audio_devices+="default_input"
|
||||
fi
|
||||
|
||||
[[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
|
||||
|
||||
gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
|
||||
toggle_screenrecording_indicator
|
||||
}
|
||||
|
||||
stop_screenrecording() {
|
||||
pkill -SIGINT -f "gpu-screen-recorder" # SIGINT required to save video properly
|
||||
pkill -SIGINT -f "^gpu-screen-recorder" # SIGINT required to save video properly
|
||||
|
||||
# Wait a maximum of 5 seconds to finish before hard killing
|
||||
local count=0
|
||||
while pgrep -f "gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
|
||||
while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
|
||||
sleep 0.1
|
||||
count=$((count + 1))
|
||||
done
|
||||
|
||||
if pgrep -f "gpu-screen-recorder" >/dev/null; then
|
||||
pkill -9 -f "gpu-screen-recorder"
|
||||
if pgrep -f "^gpu-screen-recorder" >/dev/null; then
|
||||
pkill -9 -f "^gpu-screen-recorder"
|
||||
cleanup_webcam
|
||||
notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
|
||||
else
|
||||
@@ -92,51 +102,19 @@ toggle_screenrecording_indicator() {
|
||||
}
|
||||
|
||||
screenrecording_active() {
|
||||
pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
|
||||
pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
|
||||
}
|
||||
|
||||
if screenrecording_active; then
|
||||
if pgrep -x slurp >/dev/null; then
|
||||
pkill -x slurp 2>/dev/null
|
||||
elif pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "gpu-screen-recorder" >/dev/null; then
|
||||
if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
|
||||
cleanup_webcam
|
||||
else
|
||||
stop_screenrecording
|
||||
fi
|
||||
elif [[ "$SCOPE" == "output" ]]; then
|
||||
elif [[ "$STOP_RECORDING" == "false" ]]; then
|
||||
[[ "$WEBCAM" == "true" ]] && start_webcam_overlay
|
||||
|
||||
if ! output=$(slurp -o -f "%o"); then
|
||||
[[ "$WEBCAM" == "true" ]] && cleanup_webcam
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z "$output" ]]; then
|
||||
notify-send "Error" "Could not detect monitor" -u critical
|
||||
[[ "$WEBCAM" == "true" ]] && cleanup_webcam
|
||||
exit 1
|
||||
fi
|
||||
|
||||
start_screenrecording "$output"
|
||||
start_screenrecording || cleanup_webcam
|
||||
else
|
||||
[[ "$WEBCAM" == "true" ]] && start_webcam_overlay
|
||||
|
||||
scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
|
||||
|
||||
if ! region=$(slurp -f "%wx%h+%x+%y"); then
|
||||
[[ "$WEBCAM" == "true" ]] && cleanup_webcam
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$region" =~ ^([0-9]+)x([0-9]+)\+([0-9]+)\+([0-9]+)$ ]]; then
|
||||
w=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[1]} * $scale}")
|
||||
h=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[2]} * $scale}")
|
||||
x=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[3]} * $scale}")
|
||||
y=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[4]} * $scale}")
|
||||
scaled_region="${w}x${h}+${x}+${y}"
|
||||
else
|
||||
scaled_region="$region"
|
||||
fi
|
||||
|
||||
start_screenrecording region -region "$scaled_region"
|
||||
fi
|
||||
|
||||
@@ -1,28 +1,30 @@
|
||||
#!/bin/bash
|
||||
|
||||
screensaver_in_focus() {
|
||||
hyprctl activewindow -j | jq -e '.class == "com.omarchy.Screensaver"' >/dev/null 2>&1
|
||||
hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
|
||||
}
|
||||
|
||||
exit_screensaver() {
|
||||
hyprctl keyword cursor:invisible false
|
||||
pkill -x tte 2>/dev/null
|
||||
pkill -f com.omarchy.Screensaver 2>/dev/null
|
||||
pkill -f org.omarchy.screensaver 2>/dev/null
|
||||
exit 0
|
||||
}
|
||||
|
||||
trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
|
||||
|
||||
printf '\033]11;rgb:00/00/00\007' # Set background color to black
|
||||
|
||||
hyprctl keyword cursor:invisible true &>/dev/null
|
||||
|
||||
while true; do
|
||||
effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
|
||||
tte -i ~/.config/omarchy/branding/screensaver.txt \
|
||||
--frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c --no-eol \
|
||||
"$effect" &
|
||||
--frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
|
||||
--random-effect --exclude-effects dev_worm \
|
||||
--no-eol --no-restore-cursor &
|
||||
|
||||
while pgrep -x tte >/dev/null; do
|
||||
if read -n 1 -t 3 || ! screensaver_in_focus; then
|
||||
if read -n 1 -t 1 || ! screensaver_in_focus; then
|
||||
exit_screensaver
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
if (($# == 0)); then
|
||||
echo "Usage: omarchy-cmd-share [clipboard|file|folder|picture|video]"
|
||||
echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -9,32 +9,11 @@ MODE="$1"
|
||||
shift
|
||||
|
||||
if [[ $MODE == "clipboard" ]]; then
|
||||
# Save clipboard content to a temporary text file
|
||||
TEMP_FILE=$(mktemp --suffix=.txt)
|
||||
wl-paste >"$TEMP_FILE"
|
||||
FILES="$TEMP_FILE"
|
||||
|
||||
elif [[ $MODE == "picture" ]]; then
|
||||
# Pick the most recent image from ~/Pictures
|
||||
LAST_PICTURE=$(find "$HOME/Pictures" -maxdepth 1 -type f \( -iname "*.png" -o -iname "*.jpg" -o -iname "*.jpeg" \) -printf "%T@ %p\n" 2>/dev/null | sort -nr | head -n 1 | cut -d' ' -f2-)
|
||||
if [[ -z "$LAST_PICTURE" ]]; then
|
||||
echo "No .png/.jpg found in ~/Pictures"
|
||||
exit 1
|
||||
fi
|
||||
FILES="$LAST_PICTURE"
|
||||
|
||||
elif [[ $MODE == "video" ]]; then
|
||||
# Pick the most recent .mp4 video from ~/Videos
|
||||
LAST_VIDEO=$(find "$HOME/Videos" -maxdepth 1 -type f -iname "*.mp4" -printf "%T@ %p\n" 2>/dev/null | sort -nr | head -n 1 | cut -d' ' -f2-)
|
||||
if [[ -z "$LAST_VIDEO" ]]; then
|
||||
echo "No .mp4 found in ~/Videos"
|
||||
exit 1
|
||||
fi
|
||||
FILES="$LAST_VIDEO"
|
||||
|
||||
else
|
||||
if (($# > 0)); then
|
||||
# Use files/folders provided as arguments
|
||||
FILES="$*"
|
||||
else
|
||||
if [[ $MODE == "folder" ]]; then
|
||||
|
||||
6
bin/omarchy-cmd-shutdown
Executable file
6
bin/omarchy-cmd-shutdown
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
omarchy-state clear re*-required
|
||||
omarchy-hyprland-window-close-all
|
||||
sleep 1 # Allow apps like Chrome to shutdown correctly
|
||||
systemctl poweroff --no-wall
|
||||
@@ -6,8 +6,10 @@ shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)
|
||||
|
||||
if [[ -n $shell_pid ]]; then
|
||||
cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
|
||||
shell=$(readlink -f "/proc/$shell_pid/exe" 2>/dev/null)
|
||||
|
||||
if [[ -d $cwd ]]; then
|
||||
# Check if $shell is a valid shell and $cwd is a directory.
|
||||
if grep -qs "$shell" /etc/shells && [[ -d $cwd ]]; then
|
||||
echo "$cwd"
|
||||
else
|
||||
echo "$HOME"
|
||||
|
||||
@@ -28,7 +28,6 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
|
||||
|
||||
omarchy-restart-waybar
|
||||
omarchy-restart-swayosd
|
||||
omarchy-restart-walker
|
||||
|
||||
if pgrep -x ghostty; then
|
||||
notify-send " You must restart Ghostty to see font change"
|
||||
|
||||
@@ -2,20 +2,44 @@
|
||||
|
||||
# Toggle to pop-out a tile to stay fixed on a display basis.
|
||||
|
||||
active=$(hyprctl activewindow -j)
|
||||
pinned=$(echo "$active" | jq .pinned)
|
||||
addr=$(echo "$active" | jq -r ".address")
|
||||
[ -z "$addr" ] && { echo "No active window"; exit 0; }
|
||||
# Usage:
|
||||
# omarchy-hyprland-window-pop [width height [x y]]
|
||||
#
|
||||
# Arguments:
|
||||
# width Optional. Width of the floating window. Default: 1300
|
||||
# height Optional. Height of the floating window. Default: 900
|
||||
# x Optional. X position of the window. Must provide both X and Y to take effect.
|
||||
# y Optional. Y position of the window. Must provide both X and Y to take effect.
|
||||
#
|
||||
# Behavior:
|
||||
# - If the window is already pinned, it will be unpinned and removed from the pop layer.
|
||||
# - If the window is not pinned, it will be floated, resized, moved/centered, pinned, brought to top, and popped.
|
||||
|
||||
if [ "$pinned" = "true" ]; then
|
||||
width=${1:-1300}
|
||||
height=${2:-900}
|
||||
x=${3:-}
|
||||
y=${4:-}
|
||||
|
||||
active=$(hyprctl activewindow -j)
|
||||
pinned=$(echo "$active" | jq ".pinned")
|
||||
addr=$(echo "$active" | jq -r ".address")
|
||||
|
||||
if [[ $pinned == "true" ]]; then
|
||||
hyprctl -q --batch \
|
||||
"dispatch pin address:$addr;" \
|
||||
"dispatch togglefloating address:$addr;" \
|
||||
"dispatch tagwindow -pop address:$addr;"
|
||||
else
|
||||
elif [[ -n $addr ]]; then
|
||||
hyprctl dispatch togglefloating address:$addr
|
||||
hyprctl dispatch resizeactive exact $width $height address:$addr
|
||||
|
||||
if [[ -n $x && -n $y ]]; then
|
||||
hyprctl dispatch moveactive $x $y address:$addr
|
||||
else
|
||||
hyprctl dispatch centerwindow address:$addr
|
||||
fi
|
||||
|
||||
hyprctl -q --batch \
|
||||
"dispatch togglefloating address:$addr;" \
|
||||
"dispatch centerwindow address:$addr;" \
|
||||
"dispatch pin address:$addr;" \
|
||||
"dispatch alterzorder top address:$addr;" \
|
||||
"dispatch tagwindow +pop address:$addr;"
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
echo "Now pick dependencies matching your graphics card"
|
||||
sudo pacman -Syu --noconfirm steam
|
||||
sudo pacman -S steam
|
||||
setsid gtk-launch steam >/dev/null 2>&1 &
|
||||
|
||||
17
bin/omarchy-install-xbox-controllers
Executable file
17
bin/omarchy-install-xbox-controllers
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
# Install xpadneo to ensure controllers work out of the box
|
||||
sudo pacman -S --noconfirm --needed linux-headers
|
||||
yay -S --noconfirm xpadneo-dkms
|
||||
|
||||
# Prevent xpad/xpadneo driver conflict
|
||||
echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
|
||||
echo hid_xpadneo | sudo tee /etc/modules-load.d/xpadneo.conf >/dev/null
|
||||
|
||||
# Give user access to game controllers
|
||||
sudo usermod -a -G input $USER
|
||||
|
||||
# Modules need to be loaded
|
||||
gum confirm "Install requires reboot. Ready?" && sudo reboot now
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy -e bash -c 'fastfetch; read -n 1 -s'
|
||||
exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"
|
||||
|
||||
4
bin/omarchy-launch-bluetooth
Executable file
4
bin/omarchy-launch-bluetooth
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
rfkill unblock bluetooth
|
||||
exec omarchy-launch-or-focus-tui bluetui
|
||||
@@ -4,7 +4,7 @@ omarchy-cmd-present "$EDITOR" || EDITOR=nvim
|
||||
|
||||
case "$EDITOR" in
|
||||
nvim | vim | nano | micro | hx | helix)
|
||||
exec setsid uwsm-app -- xdg-terminal-exec "$EDITOR" "$@"
|
||||
exec omarchy-launch-tui "$EDITOR" "$@"
|
||||
;;
|
||||
*)
|
||||
exec setsid uwsm-app -- "$EDITOR" "$@"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
cmd="$*"
|
||||
exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
|
||||
exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
|
||||
|
||||
@@ -7,10 +7,10 @@ fi
|
||||
|
||||
WINDOW_PATTERN="$1"
|
||||
LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
|
||||
WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "^$WINDOW_PATTERN$" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
|
||||
WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
|
||||
|
||||
if [[ -n $WINDOW_ADDRESS ]]; then
|
||||
hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
|
||||
else
|
||||
eval exec $LAUNCH_COMMAND
|
||||
eval exec setsid $LAUNCH_COMMAND
|
||||
fi
|
||||
|
||||
6
bin/omarchy-launch-or-focus-tui
Executable file
6
bin/omarchy-launch-or-focus-tui
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
APP_ID="org.omarchy.$(basename $1)"
|
||||
LAUNCH_COMMAND="omarchy-launch-tui $@"
|
||||
|
||||
exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"
|
||||
@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
|
||||
fi
|
||||
|
||||
# Exit early if screensave is already running
|
||||
pgrep -f com.omarchy.Screensaver && exit 0
|
||||
pgrep -f org.omarchy.screensaver && exit 0
|
||||
|
||||
# Allow screensaver to be turned off but also force started
|
||||
if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
|
||||
@@ -22,20 +22,22 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
|
||||
case $terminal in
|
||||
*Alacritty*)
|
||||
hyprctl dispatch exec -- \
|
||||
alacritty --class=com.omarchy.Screensaver \
|
||||
alacritty --class=org.omarchy.screensaver \
|
||||
--config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
|
||||
-e omarchy-cmd-screensaver
|
||||
;;
|
||||
*ghostty*)
|
||||
hyprctl dispatch exec -- \
|
||||
ghostty --class=com.omarchy.Screensaver \
|
||||
ghostty --class=org.omarchy.screensaver \
|
||||
--config-file=~/.local/share/omarchy/default/ghostty/screensaver \
|
||||
--font-size=18 \
|
||||
-e omarchy-cmd-screensaver
|
||||
;;
|
||||
*kitty*)
|
||||
hyprctl dispatch exec -- \
|
||||
kitty --class=com.omarchy.Screensaver \
|
||||
kitty --class=org.omarchy.screensaver \
|
||||
--override font_size=18 \
|
||||
--override window_padding_width=0 \
|
||||
-e omarchy-cmd-screensaver
|
||||
;;
|
||||
*)
|
||||
|
||||
3
bin/omarchy-launch-tui
Executable file
3
bin/omarchy-launch-tui
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.$(basename $1) -e "$1" "${@:2}"
|
||||
@@ -1,3 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
exec setsid omarchy-launch-or-focus com.omarchy.Impala "uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala"
|
||||
rfkill unblock wifi
|
||||
omarchy-launch-or-focus-tui impala
|
||||
|
||||
@@ -3,10 +3,13 @@
|
||||
# Lock the screen
|
||||
pidof hyprlock || hyprlock &
|
||||
|
||||
# Set keyboard layout to default (first layout)
|
||||
hyprctl switchxkblayout all 0 > /dev/null 2>&1
|
||||
|
||||
# Ensure 1password is locked
|
||||
if pgrep -x "1password" >/dev/null; then
|
||||
1password --lock &
|
||||
fi
|
||||
|
||||
# Avoid running screensaver when locked
|
||||
pkill -f com.omarchy.Screensaver
|
||||
pkill -f org.omarchy.screensaver
|
||||
|
||||
@@ -37,7 +37,7 @@ menu() {
|
||||
}
|
||||
|
||||
terminal() {
|
||||
xdg-terminal-exec --app-id=com.omarchy.Omarchy "$@"
|
||||
xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
|
||||
}
|
||||
|
||||
present_terminal() {
|
||||
@@ -112,23 +112,21 @@ show_screenshot_menu() {
|
||||
}
|
||||
|
||||
show_screenrecord_menu() {
|
||||
case $(menu "Screenrecord" " Region\n Region + Audio\n Display\n Display + Audio\n Display + Webcam") in
|
||||
*"Region + Audio"*) omarchy-cmd-screenrecord region --with-audio ;;
|
||||
*Region*) omarchy-cmd-screenrecord ;;
|
||||
*"Display + Audio"*) omarchy-cmd-screenrecord output --with-audio ;;
|
||||
*"Display + Webcam"*) omarchy-cmd-screenrecord output --with-audio --with-webcam ;;
|
||||
*Display*) omarchy-cmd-screenrecord output ;;
|
||||
omarchy-cmd-screenrecord --stop-recording && exit 0
|
||||
|
||||
case $(menu "Screenrecord" " With desktop audio\n With desktop + microphone audio\n With desktop + microphone audio + webcam") in
|
||||
*"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
|
||||
*"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
|
||||
*"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
|
||||
*) back_to show_capture_menu ;;
|
||||
esac
|
||||
}
|
||||
|
||||
show_share_menu() {
|
||||
case $(menu "Share" " Clipboard\n File\n Folder\n Latest Picture\n Latest Video") in
|
||||
case $(menu "Share" " Clipboard\n File \n Folder") in
|
||||
*Clipboard*) omarchy-cmd-share clipboard ;;
|
||||
*File*) terminal bash -c "omarchy-cmd-share file" ;;
|
||||
*Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
|
||||
*Picture*) omarchy-cmd-share picture ;;
|
||||
*Video*) omarchy-cmd-share video ;;
|
||||
*) back_to show_trigger_menu ;;
|
||||
esac
|
||||
}
|
||||
@@ -156,12 +154,7 @@ show_style_menu() {
|
||||
}
|
||||
|
||||
show_theme_menu() {
|
||||
theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
|
||||
if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
|
||||
back_to show_style_menu
|
||||
else
|
||||
omarchy-theme-set "$theme"
|
||||
fi
|
||||
omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
|
||||
}
|
||||
|
||||
show_font_menu() {
|
||||
@@ -180,16 +173,10 @@ show_setup_menu() {
|
||||
options="$options\n Defaults\n DNS\n Security\n Config"
|
||||
|
||||
case $(menu "Setup" "$options") in
|
||||
*Audio*) xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix ;;
|
||||
*Wifi*)
|
||||
rfkill unblock wifi
|
||||
omarchy-launch-wifi
|
||||
;;
|
||||
*Audio*) omarchy-launch-or-focus-tui wiremix ;;
|
||||
*Wifi*) omarchy-launch-wifi ;;
|
||||
*Browser*) present_terminal omarchy-default-browser select ;;
|
||||
*Bluetooth*)
|
||||
rfkill unblock bluetooth
|
||||
blueberry
|
||||
;;
|
||||
*Bluetooth*) omarchy-launch-bluetooth ;;
|
||||
*Power*) show_setup_power_menu ;;
|
||||
*Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
|
||||
*Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
|
||||
@@ -276,7 +263,7 @@ show_install_editor_menu() {
|
||||
case $(menu "Install" " VSCode\n Cursor\n Zed\n Sublime Text\n Helix\n Emacs") in
|
||||
*VSCode*) present_terminal omarchy-install-vscode ;;
|
||||
*Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
|
||||
*Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
|
||||
*Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
|
||||
*Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
|
||||
*Helix*) install "Helix" "helix" ;;
|
||||
*Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
|
||||
@@ -314,10 +301,11 @@ show_install_ai_menu() {
|
||||
}
|
||||
|
||||
show_install_gaming_menu() {
|
||||
case $(menu "Install" " Steam\n RetroArch [AUR]\n Minecraft") in
|
||||
case $(menu "Install" " Steam\n RetroArch [AUR]\n Minecraft\n Xbox Controller [AUR]") in
|
||||
*Steam*) present_terminal omarchy-install-steam ;;
|
||||
*RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
|
||||
*Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
|
||||
*Xbox*) present_terminal omarchy-install-xbox-controllers ;;
|
||||
*) show_install_menu ;;
|
||||
esac
|
||||
}
|
||||
@@ -461,8 +449,8 @@ show_system_menu() {
|
||||
*Lock*) omarchy-lock-screen ;;
|
||||
*Screensaver*) omarchy-launch-screensaver force ;;
|
||||
*Suspend*) systemctl suspend ;;
|
||||
*Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
|
||||
*Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
|
||||
*Restart*) omarchy-cmd-reboot ;;
|
||||
*Shutdown*) omarchy-cmd-shutdown ;;
|
||||
*) back_to show_main_menu ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored"
|
||||
|
||||
if [[ -f $IGNORED_PACKAGES_FILE ]]; then
|
||||
tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//'
|
||||
fi
|
||||
22
bin/omarchy-refresh-pacman
Executable file
22
bin/omarchy-refresh-pacman
Executable file
@@ -0,0 +1,22 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Take backup of existing files
|
||||
sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
|
||||
sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
|
||||
|
||||
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
|
||||
|
||||
if [[ $1 == "edge" ]]; then
|
||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
|
||||
sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
|
||||
echo "Setting channel to edge"
|
||||
else
|
||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
|
||||
sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
|
||||
echo "Setting channel to stable"
|
||||
fi
|
||||
|
||||
echo
|
||||
|
||||
# Reset all package DBs and then update
|
||||
sudo pacman -Syyu --noconfirm
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ $1 == "edge" ]]; then
|
||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
|
||||
else
|
||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
|
||||
fi
|
||||
@@ -1,5 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Ensure walker is set to autostart
|
||||
mkdir -p ~/.config/autostart/
|
||||
cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
|
||||
|
||||
omarchy-refresh-config walker/config.toml
|
||||
omarchy-refresh-config elephant/calc.toml
|
||||
omarchy-refresh-config elephant/desktopapplications.toml
|
||||
|
||||
@@ -12,11 +12,11 @@ if [[ $EUID -eq 0 ]]; then
|
||||
# Restart services as the script owner
|
||||
systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
|
||||
bash -c "
|
||||
setsid uwsm-app -- elephant &
|
||||
setsid uwsm-app -- walker --gapplication-service &
|
||||
systemctl --user restart elephant.service
|
||||
setsid walker --gapplication-service &
|
||||
"
|
||||
else
|
||||
setsid uwsm-app -- elephant &
|
||||
wait 2
|
||||
setsid uwsm-app -- walker --gapplication-service &
|
||||
elephant service enable 2>/dev/null
|
||||
systemctl --user restart elephant.service
|
||||
setsid walker --gapplication-service &
|
||||
fi
|
||||
|
||||
@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
|
||||
mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
|
||||
|
||||
if [[ ${#extra_themes[@]} -gt 0 ]]; then
|
||||
THEME_NAME=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
|
||||
THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
|
||||
else
|
||||
echo "No extra themes installed."
|
||||
exit 1
|
||||
|
||||
@@ -23,11 +23,6 @@ if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy
|
||||
fi
|
||||
fi
|
||||
|
||||
if omarchy-cmd-present helium-browser; then
|
||||
echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
|
||||
helium-browser --no-startup-window --refresh-platform-policy
|
||||
fi
|
||||
|
||||
if omarchy-cmd-present brave; then
|
||||
echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/brave/policies/managed/color.json" >/dev/null
|
||||
brave --refresh-platform-policy --no-startup-window
|
||||
|
||||
@@ -6,7 +6,7 @@ DESKTOP_DIR="$HOME/.local/share/applications/"
|
||||
if [ "$#" -eq 0 ]; then
|
||||
# Find all TUIs
|
||||
while IFS= read -r -d '' file; do
|
||||
if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
|
||||
if grep -qE '^Exec=.*(\$TERMINAL|xdg-terminal-exec).*-e' "$file"; then
|
||||
TUIS+=("$(basename "${file%.desktop}")")
|
||||
fi
|
||||
done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
gum style --border normal --border-foreground 6 --padding "1 2" \
|
||||
"Ready to update Omarchy?" \
|
||||
"Ready to update?" \
|
||||
"" \
|
||||
"• You cannot stop the update once you start!" \
|
||||
"• Make sure you're connected to power or have a full battery"
|
||||
"• Make sure you're connected to power or have a full battery" \
|
||||
"" \
|
||||
"What's new: https://github.com/basecamp/omarchy/releases"
|
||||
|
||||
echo
|
||||
|
||||
if ! gum confirm "Continue with update?"; then
|
||||
echo "Update cancelled"
|
||||
|
||||
@@ -5,6 +5,8 @@ if omarchy-pkg-missing omarchy-keyring || ! sudo pacman-key --list-keys 40DFB630
|
||||
sudo pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org
|
||||
sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
|
||||
|
||||
# This is generally not a good idea, but this is a special case because we're going to be updating
|
||||
# the full set of packages in omarchy-update-system-pkgs right after this (and it needs latest keyring)!
|
||||
sudo pacman -Sy
|
||||
omarchy-pkg-add omarchy-keyring
|
||||
|
||||
|
||||
@@ -2,20 +2,14 @@
|
||||
|
||||
set -e
|
||||
|
||||
# Used in package emergencies if a bad package has been pushed and we can't revoke.
|
||||
# Requires manually installing the good package using sudo pacman -U <url>
|
||||
ignored_packages=$(omarchy-pkg-ignored)
|
||||
|
||||
echo -e "\e[32m\nUpdate system packages\e[0m"
|
||||
[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
|
||||
sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
|
||||
sudo pacman -Syu --noconfirm
|
||||
|
||||
# Update AUR packages if any are installed
|
||||
if pacman -Qem >/dev/null; then
|
||||
if omarchy-pkg-aur-accessible; then
|
||||
echo -e "\e[32m\nUpdate AUR packages\e[0m"
|
||||
[[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm --ignore \"$ignored_packages\""
|
||||
yay -Sua --noconfirm --ignore "$ignored_packages"
|
||||
yay -Sua --noconfirm
|
||||
echo
|
||||
else
|
||||
echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
|
||||
|
||||
23
bin/omarchy-version-channel
Executable file
23
bin/omarchy-version-channel
Executable file
@@ -0,0 +1,23 @@
|
||||
#!/bin/bash
|
||||
|
||||
if grep -q "https://stable-mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
|
||||
mirror="stable"
|
||||
elif grep -q "https://mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
|
||||
mirror="edge"
|
||||
else
|
||||
mirror="unknown"
|
||||
fi
|
||||
|
||||
if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then
|
||||
pkgs="stable"
|
||||
elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then
|
||||
pkgs="edge"
|
||||
else
|
||||
pkgs="unknown"
|
||||
fi
|
||||
|
||||
if [[ $mirror == $pkgs ]]; then
|
||||
echo $mirror
|
||||
else
|
||||
echo "$mirror / $pkgs"
|
||||
fi
|
||||
3
bin/omarchy-version-pkgs
Executable file
3
bin/omarchy-version-pkgs
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
date -d "$(grep upgraded /var/log/pacman.log | tail -1 | sed -E 's/\[([^]]+)\].*/\1/')" "+%A, %B %d %Y at %H:%M"
|
||||
@@ -1,5 +1,6 @@
|
||||
--ozone-platform=wayland
|
||||
--ozone-platform-hint=wayland
|
||||
--enable-features=TouchpadOverscrollHistoryNavigation
|
||||
--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
|
||||
# Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957
|
||||
--disable-features=WaylandWpColorManagerV1
|
||||
|
||||
@@ -74,6 +74,12 @@
|
||||
"keyColor": "blue",
|
||||
"text": "branch=$(omarchy-version-branch); echo \"$branch\""
|
||||
},
|
||||
{
|
||||
"type": "command",
|
||||
"key": "│ ├",
|
||||
"keyColor": "blue",
|
||||
"text": "channel=$(omarchy-version-channel); echo \"$channel\""
|
||||
},
|
||||
{
|
||||
"type": "kernel",
|
||||
"key": "│ ├",
|
||||
@@ -122,7 +128,7 @@
|
||||
"break",
|
||||
{
|
||||
"type": "custom",
|
||||
"format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
|
||||
"format": "\u001b[90m┌────────────────Age / Uptime / Update───────────────┐"
|
||||
},
|
||||
{
|
||||
"type": "command",
|
||||
@@ -135,6 +141,12 @@
|
||||
"key": " Uptime",
|
||||
"keyColor": "magenta"
|
||||
},
|
||||
{
|
||||
"type": "command",
|
||||
"key": " Update",
|
||||
"keyColor": "magenta",
|
||||
"text": "updated=$(omarchy-version-pkgs); echo \"$updated\""
|
||||
},
|
||||
{
|
||||
"type": "custom",
|
||||
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
|
||||
|
||||
@@ -25,6 +25,10 @@ shell-integration-features = no-cursor,ssh-env
|
||||
# Keyboard bindings
|
||||
keybind = shift+insert=paste_from_clipboard
|
||||
keybind = control+insert=copy_to_clipboard
|
||||
keybind = super+control+shift+alt+arrow_down=resize_split:down,100
|
||||
keybind = super+control+shift+alt+arrow_up=resize_split:up,100
|
||||
keybind = super+control+shift+alt+arrow_left=resize_split:left,100
|
||||
keybind = super+control+shift+alt+arrow_right=resize_split:right,100
|
||||
|
||||
# Slowdown mouse scrolling
|
||||
mouse-scroll-multiplier = 0.95
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
# Application bindings
|
||||
$terminal = uwsm-app -- xdg-terminal-exec
|
||||
$browser = omarchy-launch-browser
|
||||
|
||||
bindd = SUPER, RETURN, Terminal, exec, $terminal --dir="$(omarchy-cmd-terminal-cwd)"
|
||||
bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
|
||||
bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
|
||||
bindd = SUPER SHIFT, B, Browser, exec, $browser
|
||||
bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private
|
||||
bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
|
||||
bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
|
||||
bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify
|
||||
bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
|
||||
bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
|
||||
bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
|
||||
bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
|
||||
bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
|
||||
bindd = SUPER SHIFT, T, Activity, exec, omarchy-launch-tui btop
|
||||
bindd = SUPER SHIFT, D, Docker, exec, omarchy-launch-tui lazydocker
|
||||
bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus ^signal$ "uwsm-app -- signal-desktop"
|
||||
bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus ^obsidian$ "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
|
||||
bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
|
||||
bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ monitor=,preferred,auto,auto
|
||||
|
||||
# Good compromise for 27" or 32" 4K monitors (but fractional!)
|
||||
# env = GDK_SCALE,1.75
|
||||
# monitor=,preferred,auto,1.666667
|
||||
# monitor=,preferred,auto,1.6
|
||||
|
||||
# Straight 1x setup for low-resolution displays like 1080p or 1440p
|
||||
# env = GDK_SCALE,1
|
||||
|
||||
3
config/hypr/xdph.conf
Normal file
3
config/hypr/xdph.conf
Normal file
@@ -0,0 +1,3 @@
|
||||
screencopy {
|
||||
allow_token_by_default = true
|
||||
}
|
||||
@@ -2,6 +2,7 @@ force_keyboard_focus = true # forces keyboard forcus to stay in Walker
|
||||
selection_wrap = true # wrap list if at bottom or top
|
||||
theme = "omarchy-default" # theme to use
|
||||
additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
|
||||
hide_action_hints = true # globally hide the action hints
|
||||
|
||||
[placeholders]
|
||||
"default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
|
||||
@@ -9,13 +10,15 @@ additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
|
||||
[keybinds]
|
||||
quick_activate = []
|
||||
|
||||
[columns]
|
||||
symbols = 1 # providers to be queried by default
|
||||
|
||||
[providers]
|
||||
max_results = 256 # 256 should be enough for everyone
|
||||
default = [
|
||||
"desktopapplications",
|
||||
"menus",
|
||||
"websearch",
|
||||
] # providers to be queried by default
|
||||
]
|
||||
|
||||
[[providers.prefixes]]
|
||||
prefix = "/"
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
"7": "7",
|
||||
"8": "8",
|
||||
"9": "9",
|
||||
"10": "0",
|
||||
"active": ""
|
||||
},
|
||||
"persistent-workspaces": {
|
||||
@@ -56,7 +57,7 @@
|
||||
"cpu": {
|
||||
"interval": 5,
|
||||
"format": "",
|
||||
"on-click": "xdg-terminal-exec btop"
|
||||
"on-click": "omarchy-launch-or-focus-tui btop"
|
||||
},
|
||||
"clock": {
|
||||
"format": "{:L%A %H:%M}",
|
||||
@@ -99,13 +100,14 @@
|
||||
"bluetooth": {
|
||||
"format": "",
|
||||
"format-disabled": "",
|
||||
"format-connected": "",
|
||||
"format-connected": "",
|
||||
"format-no-controller": "",
|
||||
"tooltip-format": "Devices connected: {num_connections}",
|
||||
"on-click": "blueberry"
|
||||
"on-click": "omarchy-launch-bluetooth"
|
||||
},
|
||||
"pulseaudio": {
|
||||
"format": "{icon}",
|
||||
"on-click": "xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix",
|
||||
"on-click": "omarchy-launch-or-focus-tui wiremix",
|
||||
"on-click-right": "pamixer -t",
|
||||
"tooltip-format": "Playing at {volume}%",
|
||||
"scroll-step": 5,
|
||||
@@ -123,7 +125,7 @@
|
||||
"modules": ["custom/expand-icon", "tray"]
|
||||
},
|
||||
"custom/expand-icon": {
|
||||
"format": "",
|
||||
"format": "",
|
||||
"tooltip": false
|
||||
},
|
||||
"custom/screenrecording-indicator": {
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
}
|
||||
|
||||
#custom-expand-icon {
|
||||
margin-right: 20px;
|
||||
margin-right: 18px;
|
||||
}
|
||||
|
||||
tooltip {
|
||||
|
||||
@@ -15,7 +15,7 @@ iso2sd() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Format an entire drive for a single partition using ext4
|
||||
# Format an entire drive for a single partition using exFAT
|
||||
format-drive() {
|
||||
if [ $# -ne 2 ]; then
|
||||
echo "Usage: format-drive <device> <name>"
|
||||
@@ -25,14 +25,20 @@ format-drive() {
|
||||
else
|
||||
echo "WARNING: This will completely erase all data on $1 and label it '$2'."
|
||||
read -rp "Are you sure you want to continue? (y/N): " confirm
|
||||
|
||||
if [[ "$confirm" =~ ^[Yy]$ ]]; then
|
||||
sudo wipefs -a "$1"
|
||||
sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
|
||||
sudo parted -s "$1" mklabel gpt
|
||||
sudo parted -s "$1" mkpart primary ext4 1MiB 100%
|
||||
sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
|
||||
sudo chmod -R 777 "/run/media/$USER/$2"
|
||||
echo "Drive $1 formatted and labeled '$2'."
|
||||
sudo parted -s "$1" mkpart primary 1MiB 100%
|
||||
|
||||
partition="$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
|
||||
sudo partprobe "$1" || true
|
||||
sudo udevadm settle || true
|
||||
|
||||
sudo mkfs.exfat -n "$2" "$partition"
|
||||
|
||||
echo "Drive $1 formatted as exFAT and labeled '$2'."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -49,19 +55,28 @@ transcode-video-4K() {
|
||||
|
||||
# Transcode any image to JPG image that's great for shrinking wallpapers
|
||||
img2jpg() {
|
||||
magick $1 -quality 95 -strip ${1%.*}.jpg
|
||||
img="$1"
|
||||
shift
|
||||
|
||||
magick "$img" $@ -quality 95 -strip ${img%.*}-optimized.jpg
|
||||
}
|
||||
|
||||
# Transcode any image to JPG image that's great for sharing online without being too big
|
||||
img2jpg-small() {
|
||||
magick $1 -resize 1080x\> -quality 95 -strip ${1%.*}.jpg
|
||||
img="$1"
|
||||
shift
|
||||
|
||||
magick "$img" $@ -resize 1080x\> -quality 95 -strip ${img%.*}-optimized.jpg
|
||||
}
|
||||
|
||||
# Transcode any image to compressed-but-lossless PNG
|
||||
img2png() {
|
||||
magick "$1" -strip -define png:compression-filter=5 \
|
||||
img="$1"
|
||||
shift
|
||||
|
||||
magick "$img" $@ -strip -define png:compression-filter=5 \
|
||||
-define png:compression-level=9 \
|
||||
-define png:compression-strategy=1 \
|
||||
-define png:exclude-chunk=all \
|
||||
"${1%.*}.png"
|
||||
"${img%.*}-optimized.png"
|
||||
}
|
||||
|
||||
70
default/elephant/omarchy_themes.lua
Normal file
70
default/elephant/omarchy_themes.lua
Normal file
@@ -0,0 +1,70 @@
|
||||
--
|
||||
-- Dynamic Omarchy Theme Menu for Elephant/Walker
|
||||
--
|
||||
Name = "omarchythemes"
|
||||
NamePretty = "Omarchy Themes"
|
||||
|
||||
-- The main function elephant will call
|
||||
function GetEntries()
|
||||
local entries = {}
|
||||
local theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
|
||||
|
||||
-- First, get all theme directories
|
||||
local find_dirs_cmd = "find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null"
|
||||
|
||||
local handle = io.popen(find_dirs_cmd)
|
||||
if not handle then
|
||||
return entries
|
||||
end
|
||||
|
||||
for theme_path in handle:lines() do
|
||||
local theme_name = theme_path:match(".*/(.+)$")
|
||||
|
||||
if theme_name then
|
||||
-- find preview image
|
||||
local find_preview_cmd = "find -L '"
|
||||
.. theme_path
|
||||
.. "' -maxdepth 1 -type f \\( -name 'preview.png' -o -name 'preview.jpg' \\) 2>/dev/null | head -n 1"
|
||||
local preview_handle = io.popen(find_preview_cmd)
|
||||
local preview_path = nil
|
||||
|
||||
if preview_handle then
|
||||
preview_path = preview_handle:read("*l")
|
||||
preview_handle:close()
|
||||
end
|
||||
|
||||
-- If no preview found, use first image from backgrounds folder
|
||||
if not preview_path or preview_path == "" then
|
||||
local bg_cmd = "find -L '"
|
||||
.. theme_path
|
||||
.. "/backgrounds' -maxdepth 1 -type f \\( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \\) 2>/dev/null | head -n 1"
|
||||
local bg_handle = io.popen(bg_cmd)
|
||||
if bg_handle then
|
||||
preview_path = bg_handle:read("*l")
|
||||
bg_handle:close()
|
||||
end
|
||||
end
|
||||
|
||||
if preview_path and preview_path ~= "" then
|
||||
local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
|
||||
display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
|
||||
return first:upper() .. rest:lower()
|
||||
end)
|
||||
display_name = display_name .. " "
|
||||
|
||||
table.insert(entries, {
|
||||
Text = display_name,
|
||||
Preview = preview_path,
|
||||
PreviewType = "file",
|
||||
Actions = {
|
||||
activate = "omarchy-theme-set " .. theme_name,
|
||||
},
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
handle:close()
|
||||
return entries
|
||||
end
|
||||
|
||||
3
default/ghostty/screensaver
Normal file
3
default/ghostty/screensaver
Normal file
@@ -0,0 +1,3 @@
|
||||
window-padding-x = 0
|
||||
window-padding-y = 0
|
||||
window-padding-color = "extend-always"
|
||||
@@ -17,3 +17,6 @@ windowrule = size >50% >50%, class:^(jetbrains-.*), title:^()$, floating:1
|
||||
|
||||
# Disable window flicker when autocomplete or tooltips appear
|
||||
windowrule = noinitialfocus, class:^(jetbrains-.*)$, title:^(win.*)$, floating:1
|
||||
|
||||
# Disable mouse focus
|
||||
windowrule = nofollowmouse, class:^(jetbrains-.*)$
|
||||
|
||||
@@ -3,12 +3,12 @@ windowrule = float, tag:floating-window
|
||||
windowrule = center, tag:floating-window
|
||||
windowrule = size 875 600, tag:floating-window
|
||||
|
||||
windowrule = tag +floating-window, class:(blueberry.py|com.omarchy.Impala|com.omarchy.Wiremix|com.omarchy.Omarchy|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
|
||||
windowrule = tag +floating-window, class:(org.omarchy.bluetui|org.omarchy.impala|org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)
|
||||
windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)
|
||||
windowrule = float, class:org.gnome.Calculator
|
||||
|
||||
# Fullscreen screensaver
|
||||
windowrule = fullscreen, class:com.omarchy.Screensaver
|
||||
windowrule = fullscreen, class:org.omarchy.screensaver
|
||||
|
||||
# No transparency on media windows
|
||||
windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
|
||||
|
||||
@@ -6,8 +6,6 @@ exec-once = uwsm-app -- swaybg -i ~/.config/omarchy/current/background -m fill
|
||||
exec-once = uwsm-app -- swayosd-server
|
||||
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||
exec-once = omarchy-cmd-first-run
|
||||
exec-once = uwsm-app -- elephant
|
||||
exec-once = uwsm-app -- walker --gapplication-service
|
||||
|
||||
# Slow app launch fix -- set systemd vars
|
||||
exec-once = systemctl --user import-environment $(env | cut -d'=' -f 1)
|
||||
|
||||
@@ -17,7 +17,7 @@ bindd = SUPER, RIGHT, Move window focus right, movefocus, r
|
||||
bindd = SUPER, UP, Move window focus up, movefocus, u
|
||||
bindd = SUPER, DOWN, Move window focus down, movefocus, d
|
||||
|
||||
# Switch workspaces with SUPER + [1-9]
|
||||
# Switch workspaces with SUPER + [1-9; 0]
|
||||
bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
|
||||
bindd = SUPER, code:11, Switch to workspace 2, workspace, 2
|
||||
bindd = SUPER, code:12, Switch to workspace 3, workspace, 3
|
||||
@@ -27,8 +27,9 @@ bindd = SUPER, code:15, Switch to workspace 6, workspace, 6
|
||||
bindd = SUPER, code:16, Switch to workspace 7, workspace, 7
|
||||
bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
|
||||
bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
|
||||
bindd = SUPER, code:19, Switch to workspace 10, workspace, 10
|
||||
|
||||
# Move active window to a workspace with SUPER + SHIFT + [1-9]
|
||||
# Move active window to a workspace with SUPER + SHIFT + [1-9; 0]
|
||||
bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
|
||||
bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2
|
||||
bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3
|
||||
@@ -38,6 +39,19 @@ bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6
|
||||
bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7
|
||||
bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
|
||||
bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
|
||||
bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
|
||||
|
||||
# Move active window silently to a workspace with SUPER + SHIFT + ALT + [1-9; 0]
|
||||
bindd = SUPER SHIFT ALT, code:10, Move window silently to workspace 1, movetoworkspacesilent, 1
|
||||
bindd = SUPER SHIFT ALT, code:11, Move window silently to workspace 2, movetoworkspacesilent, 2
|
||||
bindd = SUPER SHIFT ALT, code:12, Move window silently to workspace 3, movetoworkspacesilent, 3
|
||||
bindd = SUPER SHIFT ALT, code:13, Move window silently to workspace 4, movetoworkspacesilent, 4
|
||||
bindd = SUPER SHIFT ALT, code:14, Move window silently to workspace 5, movetoworkspacesilent, 5
|
||||
bindd = SUPER SHIFT ALT, code:15, Move window silently to workspace 6, movetoworkspacesilent, 6
|
||||
bindd = SUPER SHIFT ALT, code:16, Move window silently to workspace 7, movetoworkspacesilent, 7
|
||||
bindd = SUPER SHIFT ALT, code:17, Move window silently to workspace 8, movetoworkspacesilent, 8
|
||||
bindd = SUPER SHIFT ALT, code:18, Move window silently to workspace 9, movetoworkspacesilent, 9
|
||||
bindd = SUPER SHIFT ALT, code:19, Move window silently to workspace 10, movetoworkspacesilent, 10
|
||||
|
||||
# Control scratchpad
|
||||
bindd = SUPER, S, Toggle scratchpad, togglespecialworkspace, scratchpad
|
||||
@@ -91,8 +105,12 @@ bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d
|
||||
# Navigate a single set of grouped windows
|
||||
bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f
|
||||
bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b
|
||||
bindd = SUPER ALT, page_up, Next window in group, changegroupactive, f
|
||||
bindd = SUPER ALT, page_down, Previous window in group, changegroupactive, b
|
||||
|
||||
# Overload lateral window navigation for grouped windows
|
||||
bindd = SUPER ALT, LEFT, Move grouped window focus left, changegroupactive, b
|
||||
bindd = SUPER ALT, RIGHT, Move grouped window focus right, changegroupactive, f
|
||||
|
||||
# Scroll through a set of grouped windows with SUPER + ALT + scroll
|
||||
bindd = SUPER ALT, mouse_down, Next window in group, changegroupactive, f
|
||||
bindd = SUPER ALT, mouse_up, Previous window in group, changegroupactive, b
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
|
||||
bindd = SUPER SHIFT, COMMA, Dismiss all notifications, exec, makoctl dismiss --all
|
||||
bindd = SUPER CTRL, COMMA, Toggle silencing notifications, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
|
||||
bindd = SUPER ALT, COMMA, Invoke last notification, exec, makoctl invoke
|
||||
bindd = SUPER SHIFT ALT, COMMA, Invoke last notification, exec, makoctl restore
|
||||
|
||||
# Toggle idling
|
||||
bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
|
||||
|
||||
@@ -27,4 +27,4 @@ Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[omarchy]
|
||||
SigLevel = Optional TrustAll
|
||||
Server = https://pkgs.omarchy.org/$arch
|
||||
Server = https://pkgs.omarchy.org/stable/$arch
|
||||
|
||||
@@ -112,6 +112,33 @@
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="Keybinds">
|
||||
<property name="hexpand">true</property>
|
||||
<property name="margin-top">10</property>
|
||||
<style>
|
||||
<class name="keybinds"></class>
|
||||
</style>
|
||||
<child>
|
||||
<object class="GtkBox" id="GlobalKeybinds">
|
||||
<property name="spacing">10</property>
|
||||
<style>
|
||||
<class name="global-keybinds"></class>
|
||||
</style>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="ItemKeybinds">
|
||||
<property name="hexpand">true</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="spacing">10</property>
|
||||
<style>
|
||||
<class name="item-keybinds"></class>
|
||||
</style>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="Error">
|
||||
<style>
|
||||
|
||||
@@ -113,5 +113,4 @@ child:selected .item-box * {
|
||||
}
|
||||
|
||||
.preview {
|
||||
background: @background;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
# Increase lockout limit to 10 and decrease timeout to 2 minutes
|
||||
sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
|
||||
sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
|
||||
|
||||
# Ensure lockout limit is reset on restart
|
||||
sudo sed -i '/pam_faillock\.so preauth/d' /etc/pam.d/sddm-autologin
|
||||
sudo sed -i '/auth.*pam_permit\.so/a auth required pam_faillock.so authsucc' /etc/pam.d/sddm-autologin
|
||||
|
||||
@@ -15,3 +15,7 @@ Description = Restarting Walker services after system update
|
||||
When = PostTransaction
|
||||
Exec = $OMARCHY_PATH/bin/omarchy-restart-walker
|
||||
EOF
|
||||
|
||||
# Link the visual theme menu config
|
||||
mkdir -p ~/.config/elephant/menus
|
||||
ln -snf $OMARCHY_PATH/default/elephant/omarchy_themes.lua ~/.config/elephant/menus/omarchy_themes.lua
|
||||
|
||||
2
install/first-run/elephant.sh
Normal file
2
install/first-run/elephant.sh
Normal file
@@ -0,0 +1,2 @@
|
||||
elephant service enable
|
||||
systemctl --user start elephant.service
|
||||
@@ -8,7 +8,7 @@ asdcontrol
|
||||
avahi
|
||||
bash-completion
|
||||
bat
|
||||
blueberry
|
||||
bluetui
|
||||
brightnessctl
|
||||
btop
|
||||
clang
|
||||
@@ -21,6 +21,7 @@ docker-buildx
|
||||
docker-compose
|
||||
dust
|
||||
evince
|
||||
exfatprogs
|
||||
expac
|
||||
eza
|
||||
fastfetch
|
||||
|
||||
@@ -9,8 +9,19 @@ export OMARCHY_PATH=$HOME/.local/share/omarchy
|
||||
export PATH=$OMARCHY_PATH/bin/:$PATH
|
||||
EOF
|
||||
|
||||
# Ensure we have the latest repos and are ready to pull
|
||||
omarchy-refresh-pacman
|
||||
sudo systemctl restart systemd-timesyncd
|
||||
sudo pacman -Sy # Normally not advisable, but we'll do a full -Syu before finishing
|
||||
|
||||
mkdir -p ~/.local/state/omarchy/migrations
|
||||
touch ~/.local/state/omarchy/migrations/1751134560.sh
|
||||
|
||||
sudo systemctl restart systemd-timesyncd
|
||||
# Remove old AUR packages to prevent a super lengthy build on old Omarchy installs
|
||||
omarchy-pkg-drop zoom qt5-remoteobjects wf-recorder wl-screenrec
|
||||
|
||||
# Get rid of old AUR packages
|
||||
bash $OMARCHY_PATH/migrations/1756060611.sh
|
||||
touch ~/.local/state/omarchy/migrations/1756060611.sh
|
||||
|
||||
bash omarchy-update-perform
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
echo "Add Omarchy Package Repository"
|
||||
|
||||
omarchy-refresh-pacman-mirrorlist
|
||||
|
||||
if ! grep -q "omarchy" /etc/pacman.conf; then
|
||||
sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\n' /etc/pacman.conf
|
||||
sudo systemctl restart systemd-timesyncd
|
||||
sudo pacman -Syu --noconfirm
|
||||
fi
|
||||
@@ -1,3 +1,4 @@
|
||||
echo "Ensure all indexes and packages are up to date"
|
||||
|
||||
omarchy-refresh-pacman
|
||||
sudo pacman -Syu --noconfirm
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Turn on bluetooth service so blueberry works out the box
|
||||
# Turn on bluetooth service so blueberry or bluetui works out the box
|
||||
echo "Let's turn on Bluetooth service so the controls work"
|
||||
if systemctl is-enabled --quiet bluetooth.service && systemctl is-active --quiet bluetooth.service; then
|
||||
# Bluetooth is already enabled, nothing to change
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
echo "Update and restart Walker to resolve stuck Omarchy menu"
|
||||
|
||||
sudo pacman -Syu --noconfirm walker-bin
|
||||
omarchy-restart-walker
|
||||
@@ -1,3 +0,0 @@
|
||||
echo "Update Walker config to add 60s timeout such that it won't conflict with screensaver"
|
||||
|
||||
omarchy-refresh-walker
|
||||
@@ -13,7 +13,6 @@ reinstall_package_opr yay-bin yay
|
||||
reinstall_package_opr obsidian-bin obsidian
|
||||
reinstall_package_opr localsend-bin localsend
|
||||
reinstall_package_opr omarchy-chromium-bin omarchy-chromium
|
||||
reinstall_package_opr walker-bin
|
||||
reinstall_package_opr python-terminaltexteffects
|
||||
reinstall_package_opr tzupdate
|
||||
reinstall_package_opr typora
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
echo "Move Omarchy Package Repository after Arch core/extra/multilib and remove AUR"
|
||||
|
||||
sudo cp /etc/pacman.conf /etc/pacman.conf.bak
|
||||
sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
|
||||
sudo sed -i '/\[chaotic-aur\]/,+2 d' /etc/pacman.conf
|
||||
sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch" >> /etc/pacman.conf'
|
||||
omarchy-refresh-pacman
|
||||
sudo pacman -Syu --noconfirm
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
echo "Add eza themeing"
|
||||
|
||||
mkdir -p ~/.config/eza
|
||||
|
||||
if [ -f ~/.config/omarchy/current/theme/eza.yml ]; then
|
||||
ln -snf ~/.config/omarchy/current/theme/eza.yml ~/.config/eza/theme.yml
|
||||
fi
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
echo "Use new Omarchy mirror as default"
|
||||
|
||||
omarchy-refresh-pacman-mirrorlist
|
||||
omarchy-refresh-pacman
|
||||
|
||||
@@ -17,6 +17,7 @@ PACKAGES=(
|
||||
"elephant-websearch"
|
||||
"elephant-todo"
|
||||
"walker"
|
||||
"libqalculate"
|
||||
)
|
||||
|
||||
for pkg in "${PACKAGES[@]}"; do
|
||||
@@ -31,6 +32,10 @@ if [[ "$WALKER_MAJOR" -lt 2 ]]; then
|
||||
NEEDS_MIGRATION=true
|
||||
fi
|
||||
|
||||
# Ensure basic config is present
|
||||
mkdir -p ~/.config/walker
|
||||
cp -r ~/.local/share/omarchy/config/walker/* ~/.config/walker/
|
||||
|
||||
if $NEEDS_MIGRATION; then
|
||||
kill -9 $(pgrep -x walker) 2>/dev/null || true
|
||||
|
||||
@@ -41,5 +46,10 @@ if $NEEDS_MIGRATION; then
|
||||
source $OMARCHY_PATH/install/config/walker-elephant.sh
|
||||
|
||||
rm -rf ~/.config/walker/themes
|
||||
omarchy-refresh-walker
|
||||
|
||||
omarchy-refresh-config walker/config.toml
|
||||
omarchy-refresh-config elephant/calc.toml
|
||||
omarchy-refresh-config elephant/desktopapplications.toml
|
||||
fi
|
||||
|
||||
echo # Assure final success
|
||||
|
||||
@@ -8,9 +8,6 @@ if ! grep -q "map shift+insert paste_from_clipboard" "$KITTY_CONF"; then
|
||||
sed -i '/map ctrl+insert copy_to_clipboard/a map shift+insert paste_from_clipboard' "$KITTY_CONF"
|
||||
fi
|
||||
|
||||
echo "Update Walker configs"
|
||||
omarchy-refresh-walker
|
||||
|
||||
echo "Copy hooks examples"
|
||||
cp -r $OMARCHY_PATH/config/omarchy/* $HOME/.config/omarchy/
|
||||
|
||||
|
||||
@@ -4,5 +4,4 @@ WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
|
||||
|
||||
if [[ -f "$WAYBAR_CONFIG" ]] && ! grep -A5 '"custom/omarchy"' "$WAYBAR_CONFIG" | grep -q '"on-click-right"'; then
|
||||
sed -i '/"on-click": "omarchy-menu",/a\ "on-click-right": "omarchy-launch-terminal",' "$WAYBAR_CONFIG"
|
||||
omarchy-state set restart-waybar-required
|
||||
fi
|
||||
|
||||
3
migrations/1761897226.sh
Normal file
3
migrations/1761897226.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Install Copy URL extension for Brave"
|
||||
|
||||
omarchy-refresh-config brave-flags.conf
|
||||
8
migrations/1762417304.sh
Normal file
8
migrations/1762417304.sh
Normal file
@@ -0,0 +1,8 @@
|
||||
echo "Replace bluetooth GUI with TUI"
|
||||
|
||||
omarchy-pkg-add bluetui
|
||||
omarchy-pkg-drop blueberry
|
||||
|
||||
if ! grep -q "omarchy-launch-bluetooth" ~/.config/waybar/config.jsonc; then
|
||||
sed -i 's/blueberry/omarchy-launch-bluetooth/' ~/.config/waybar/config.jsonc
|
||||
fi
|
||||
@@ -1,3 +1,3 @@
|
||||
echo "Pull packages from stable Arch mirror"
|
||||
|
||||
omarchy-refresh-pacman-mirrorlist stable
|
||||
omarchy-refresh-pacman
|
||||
|
||||
10
migrations/1762873545.sh
Normal file
10
migrations/1762873545.sh
Normal file
@@ -0,0 +1,10 @@
|
||||
echo "Switch Elephant to run as a systemd service and walker to be autostarted on login"
|
||||
|
||||
pkill elephant
|
||||
elephant service enable
|
||||
systemctl --user start elephant.service
|
||||
|
||||
pkill walker
|
||||
mkdir -p ~/.config/autostart/
|
||||
cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
|
||||
setsid walker --gapplication-service &
|
||||
8
migrations/1763386443.sh
Normal file
8
migrations/1763386443.sh
Normal file
@@ -0,0 +1,8 @@
|
||||
echo "Uniquely identify terminal apps with custom app-ids using omarchy-launch-tui"
|
||||
|
||||
# Replace terminal -e calls with omarchy-launch-tui in bindings
|
||||
sed -i 's/\$terminal -e \([^ ]*\)/omarchy-launch-tui \1/g' ~/.config/hypr/bindings.conf
|
||||
|
||||
# Update waybar to use omarchy-launch-or-focus with omarchy-launch-tui for TUI apps
|
||||
sed -i 's|xdg-terminal-exec btop|omarchy-launch-or-focus-tui btop|' ~/.config/waybar/config.jsonc
|
||||
sed -i 's|xdg-terminal-exec --app-id=com\.omarchy\.Wiremix -e wiremix|omarchy-launch-or-focus-tui wiremix|' ~/.config/waybar/config.jsonc
|
||||
6
migrations/1763393133.sh
Normal file
6
migrations/1763393133.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
echo "Link new theme picker config"
|
||||
|
||||
mkdir -p ~/.config/elephant/menus
|
||||
ln -snf $OMARCHY_PATH/default/elephant/omarchy_themes.lua ~/.config/elephant/menus/omarchy_themes.lua
|
||||
sed -i '/"menus",/d' ~/.config/walker/config.toml
|
||||
omarchy-restart-walker
|
||||
3
migrations/1763409182.sh
Normal file
3
migrations/1763409182.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Install exfatprogs to support exfat in format-drive"
|
||||
|
||||
omarchy-pkg-add exfatprogs
|
||||
5
migrations/1763409505.sh
Normal file
5
migrations/1763409505.sh
Normal file
@@ -0,0 +1,5 @@
|
||||
echo "Add 10th workspace option to waybar config"
|
||||
|
||||
if ! grep -q '"10": "0",' ~/.config/waybar/config.jsonc; then
|
||||
sed -i '/"9": "9",/a\ "10": "0",' ~/.config/waybar/config.jsonc
|
||||
fi
|
||||
4
migrations/1763478660.sh
Normal file
4
migrations/1763478660.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
echo "Configure XDPH config for screensharing to remember token selection"
|
||||
|
||||
cp $OMARCHY_PATH/config/hypr/xdph.conf ~/.config/hypr/
|
||||
systemctl --user restart xdg-desktop-portal-hyprland
|
||||
28
migrations/1763558828.sh
Normal file
28
migrations/1763558828.sh
Normal file
@@ -0,0 +1,28 @@
|
||||
echo "Make Alacritty compatible with X-TerminalArgs"
|
||||
|
||||
if omarchy-pkg-present alacritty; then
|
||||
mkdir -p ~/.local/share/applications
|
||||
cat > ~/.local/share/applications/Alacritty.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
TryExec=alacritty
|
||||
Exec=alacritty
|
||||
Icon=Alacritty
|
||||
Terminal=false
|
||||
Categories=System;TerminalEmulator;
|
||||
Name=Alacritty
|
||||
GenericName=Terminal
|
||||
Comment=A fast, cross-platform, OpenGL terminal emulator
|
||||
StartupNotify=true
|
||||
StartupWMClass=Alacritty
|
||||
Actions=New;
|
||||
X-TerminalArgExec=-e
|
||||
X-TerminalArgAppId=--class=
|
||||
X-TerminalArgTitle=--title=
|
||||
X-TerminalArgDir=--working-directory=
|
||||
|
||||
[Desktop Action New]
|
||||
Name=New Terminal
|
||||
Exec=alacritty
|
||||
EOF
|
||||
fi
|
||||
3
migrations/1763560161.sh
Normal file
3
migrations/1763560161.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Hide Bluetooth module in waybar if there's no BT controller"
|
||||
|
||||
sed -i '/format-connected": "",/a\ "format-no-controller": "",' ~/.config/waybar/config.jsonc
|
||||
3
migrations/1763561396.sh
Normal file
3
migrations/1763561396.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Switch to stable Omarchy Package Repository builds"
|
||||
|
||||
omarchy-refresh-pacman
|
||||
6
migrations/1763583093.sh
Normal file
6
migrations/1763583093.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
echo "Make ethereal available as new theme"
|
||||
|
||||
if [[ ! -L ~/.config/omarchy/themes/ethereal ]]; then
|
||||
rm -rf ~/.config/omarchy/themes/ethereal
|
||||
ln -nfs ~/.local/share/omarchy/themes/ethereal ~/.config/omarchy/themes/
|
||||
fi
|
||||
6
migrations/1763626772.sh
Normal file
6
migrations/1763626772.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
echo "Make hackerman available as new theme"
|
||||
|
||||
if [[ ! -L ~/.config/omarchy/themes/hackerman ]]; then
|
||||
rm -rf ~/.config/omarchy/themes/hackerman
|
||||
ln -nfs ~/.local/share/omarchy/themes/hackerman ~/.config/omarchy/themes/
|
||||
fi
|
||||
5
migrations/1763633307.sh
Normal file
5
migrations/1763633307.sh
Normal file
@@ -0,0 +1,5 @@
|
||||
echo "Add 100-line split resizing keybindings to Ghostty"
|
||||
|
||||
if ! grep -q "resize_split:down,100" ~/.config/ghostty/config; then
|
||||
sed -i "/keybind = control+insert=copy_to_clipboard/a\keybind = super+control+shift+alt+arrow_down=resize_split:down,100\nkeybind = super+control+shift+alt+arrow_up=resize_split:up,100\nkeybind = super+control+shift+alt+arrow_left=resize_split:left,100\nkeybind = super+control+shift+alt+arrow_right=resize_split:right,100" ~/.config/ghostty/config
|
||||
fi
|
||||
3
migrations/1763634099.sh
Normal file
3
migrations/1763634099.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Using icon for bluetooth when connected"
|
||||
|
||||
sed -i 's/"format-connected": "",/"format-connected": "",/' ~/.config/waybar/config.jsonc
|
||||
5
migrations/1763653692.sh
Normal file
5
migrations/1763653692.sh
Normal file
@@ -0,0 +1,5 @@
|
||||
echo "Replace Waybar dock icon with something more obvious"
|
||||
|
||||
sed -i 's/"format": ""/"format": ""/' ~/.config/waybar/config.jsonc
|
||||
sed -i '/#custom-expand-icon {/,/}/ s/margin-right: 20px;/margin-right: 18px;/' ~/.config/waybar/style.css
|
||||
omarchy-restart-waybar
|
||||
3
migrations/1763743755.sh
Normal file
3
migrations/1763743755.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Refresh Walker config to ensure compatibility with latest version"
|
||||
|
||||
omarchy-refresh-walker
|
||||
3
migrations/1763753641.sh
Normal file
3
migrations/1763753641.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Include pacman mirror and OPR upstreams (edge vs stable) in About"
|
||||
|
||||
omarchy-refresh-fastfetch
|
||||
6
migrations/1764067068.sh
Normal file
6
migrations/1764067068.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
echo "Use Bluetooth off icon in the waybar when BlueTUI has turned off the adapter"
|
||||
|
||||
if ! grep -q '"format-off": ""' ~/.config/waybar/config.jsonc; then
|
||||
sed -i '/"format-disabled": "",/a\ "format-off": "",' ~/.config/waybar/config.jsonc
|
||||
omarchy-restart-waybar
|
||||
fi
|
||||
4
migrations/1764067963.sh
Normal file
4
migrations/1764067963.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
echo "Ensure lockout limit is reset on reboot"
|
||||
|
||||
sudo sed -i '/pam_faillock\.so preauth/d' /etc/pam.d/sddm-autologin
|
||||
sudo sed -i '/auth.*pam_permit\.so/a auth required pam_faillock.so authsucc' /etc/pam.d/sddm-autologin
|
||||
3
migrations/1764332115.sh
Normal file
3
migrations/1764332115.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Ensure emoji menu (Super + Ctrl + E) uses single column design"
|
||||
|
||||
omarchy-refresh-walker
|
||||
3
migrations/1764333665.sh
Normal file
3
migrations/1764333665.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Ensure you have package repository indexes matching your channel"
|
||||
|
||||
sudo pacman -Syyu --noconfirm
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 286 KiB After Width: | Height: | Size: 600 KiB |
@@ -1,5 +1,5 @@
|
||||
# Main background, empty for terminal default, need to be empty if you want transparent background
|
||||
theme[main_bg]="#24273a"
|
||||
theme[main_bg]="#1E1E2E"
|
||||
|
||||
# Main text color
|
||||
theme[main_fg]="#c6d0f5"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user