mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
1 Commits
fix-omarch
...
create-ver
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d36e2ba7a5 |
@@ -8,82 +8,31 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCOPE=""
|
# Selects region or output
|
||||||
AUDIO="false"
|
SCOPE="$1"
|
||||||
WEBCAM="false"
|
|
||||||
|
|
||||||
for arg in "$@"; do
|
# Selects audio inclusion or not
|
||||||
case "$arg" in
|
AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
|
||||||
--with-audio) AUDIO="true" ;;
|
|
||||||
--with-webcam) WEBCAM="true" ;;
|
|
||||||
output|region) SCOPE="$arg" ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
cleanup_webcam() {
|
|
||||||
pkill -f "WebcamOverlay" 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
start_webcam_overlay() {
|
|
||||||
cleanup_webcam
|
|
||||||
|
|
||||||
# Get monitor scale
|
|
||||||
local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
|
|
||||||
|
|
||||||
# Target width (base 360px, scaled to monitor)
|
|
||||||
local target_width=$(awk "BEGIN {printf \"%.0f\", 360 * $scale}")
|
|
||||||
|
|
||||||
# Try preferred 16:9 resolutions in order, use first available
|
|
||||||
local preferred_resolutions=("640x360" "1280x720" "1920x1080")
|
|
||||||
local video_size_arg=""
|
|
||||||
local available_formats=$(v4l2-ctl --list-formats-ext -d /dev/video0 2>/dev/null)
|
|
||||||
|
|
||||||
for resolution in "${preferred_resolutions[@]}"; do
|
|
||||||
if echo "$available_formats" | grep -q "$resolution"; then
|
|
||||||
video_size_arg="-video_size $resolution"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
ffplay -f v4l2 $video_size_arg -framerate 30 /dev/video0 \
|
|
||||||
-vf "scale=${target_width}:-1" \
|
|
||||||
-window_title "WebcamOverlay" \
|
|
||||||
-noborder \
|
|
||||||
-fflags nobuffer -flags low_delay \
|
|
||||||
-probesize 32 -analyzeduration 0 \
|
|
||||||
-loglevel quiet &
|
|
||||||
sleep 1
|
|
||||||
}
|
|
||||||
|
|
||||||
start_screenrecording() {
|
start_screenrecording() {
|
||||||
local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
|
filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
|
||||||
local audio_args=""
|
|
||||||
|
|
||||||
# Merge audio tracks into one - separate tracks only play one at a time in most players
|
if lspci | grep -qi 'nvidia'; then
|
||||||
[[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
|
wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
|
||||||
|
else
|
||||||
|
wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" &
|
||||||
|
fi
|
||||||
|
|
||||||
gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
|
|
||||||
toggle_screenrecording_indicator
|
toggle_screenrecording_indicator
|
||||||
}
|
}
|
||||||
|
|
||||||
stop_screenrecording() {
|
stop_screenrecording() {
|
||||||
pkill -SIGINT -f "gpu-screen-recorder" # SIGINT required to save video properly
|
pkill -x wl-screenrec
|
||||||
|
pkill -x wf-recorder
|
||||||
|
|
||||||
# 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
|
|
||||||
sleep 0.1
|
|
||||||
count=$((count + 1))
|
|
||||||
done
|
|
||||||
|
|
||||||
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
|
|
||||||
cleanup_webcam
|
|
||||||
notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
|
notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
|
||||||
fi
|
|
||||||
|
sleep 0.2 # ensures the process is actually dead before we check
|
||||||
toggle_screenrecording_indicator
|
toggle_screenrecording_indicator
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,51 +41,14 @@ toggle_screenrecording_indicator() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
screenrecording_active() {
|
screenrecording_active() {
|
||||||
pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
|
pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
if screenrecording_active; then
|
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
|
|
||||||
cleanup_webcam
|
|
||||||
else
|
|
||||||
stop_screenrecording
|
stop_screenrecording
|
||||||
fi
|
|
||||||
elif [[ "$SCOPE" == "output" ]]; then
|
elif [[ "$SCOPE" == "output" ]]; then
|
||||||
[[ "$WEBCAM" == "true" ]] && start_webcam_overlay
|
start_screenrecording
|
||||||
|
|
||||||
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"
|
|
||||||
else
|
else
|
||||||
[[ "$WEBCAM" == "true" ]] && start_webcam_overlay
|
region=$(slurp) || exit 1
|
||||||
|
start_screenrecording -g "$region"
|
||||||
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
|
fi
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ install_node() {
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
ruby)
|
ruby)
|
||||||
echo -e "Installing Ruby on Rails...\n"
|
echo -e "Installing Ruby on Rails...\n"
|
||||||
omarchy-pkg-add libyaml
|
|
||||||
mise use --global ruby@latest
|
mise use --global ruby@latest
|
||||||
mise settings add idiomatic_version_file_enable_tools ruby
|
mise settings add idiomatic_version_file_enable_tools ruby
|
||||||
mise x ruby -- gem install rails --no-document
|
mise x ruby -- gem install rails --no-document
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ fi
|
|||||||
|
|
||||||
WINDOW_PATTERN="$1"
|
WINDOW_PATTERN="$1"
|
||||||
LAUNCH_COMMAND="${2:-"uwsm app -- $WINDOW_PATTERN"}"
|
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+" "+.title)|test($p;"i"))|.address' | head -n1)
|
||||||
|
|
||||||
if [[ -n $WINDOW_ADDRESS ]]; then
|
if [[ -n $WINDOW_ADDRESS ]]; then
|
||||||
hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
|
hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
browser=$(xdg-settings get default-web-browser)
|
browser=$(xdg-settings get default-web-browser)
|
||||||
|
|
||||||
case $browser in
|
case $browser in
|
||||||
google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
|
google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
|
||||||
*) browser="chromium.desktop" ;;
|
*) browser="chromium.desktop" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
@@ -430,8 +430,7 @@ show_update_config_menu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_update_hardware_menu() {
|
show_update_hardware_menu() {
|
||||||
case $(menu "Restart" " Audio\n Wi-Fi\n Bluetooth") in
|
case $(menu "Restart" " Wi-Fi\n Bluetooth") in
|
||||||
*Audio*) present_terminal omarchy-restart-pipewire ;;
|
|
||||||
*Wi-Fi*) present_terminal omarchy-restart-wifi ;;
|
*Wi-Fi*) present_terminal omarchy-restart-wifi ;;
|
||||||
*Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
|
*Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
|
||||||
*) show_update_menu ;;
|
*) show_update_menu ;;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo -e "Unblocking bluetooth...\n"
|
|
||||||
rfkill unblock bluetooth
|
rfkill unblock bluetooth
|
||||||
rfkill list bluetooth
|
rfkill list bluetooth
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo -e "Restarting pipewire audio service...\n"
|
|
||||||
systemctl --user restart pipewire.service
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo -e "Unblocking wifi...\n"
|
|
||||||
rfkill unblock wifi
|
rfkill unblock wifi
|
||||||
rfkill list wifi
|
rfkill list wifi
|
||||||
|
|||||||
@@ -3,5 +3,12 @@
|
|||||||
case "$TERMINAL" in
|
case "$TERMINAL" in
|
||||||
"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
|
"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
|
||||||
"kitty") killall -SIGUSR1 kitty ;;
|
"kitty") killall -SIGUSR1 kitty ;;
|
||||||
"ghostty") killall -SIGUSR2 ghostty ;;
|
"ghostty")
|
||||||
|
# Use a default theme if none exists
|
||||||
|
if [[ ! -f ~/.config/omarchy/current/theme/ghostty.conf ]]; then
|
||||||
|
echo "theme = Spacegray" >~/.config/omarchy/current/theme/ghostty.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
killall -USRSIG2 ghostty
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
|
|
||||||
# which jq doesn’t support.
|
|
||||||
|
|
||||||
VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
|
VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
|
||||||
VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
|
VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
|
||||||
VS_CODE_SKIP_FLAG="$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes"
|
VS_CODE_SKIP_FLAG="$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes"
|
||||||
@@ -18,29 +15,12 @@ if omarchy-cmd-present code && [[ ! -f "$VS_CODE_SKIP_FLAG" ]]; then
|
|||||||
code --install-extension "$extension" >/dev/null
|
code --install-extension "$extension" >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create config file if there isn't already one
|
# Update theme in settings.json
|
||||||
mkdir -p "$(dirname "$VS_CODE_SETTINGS")"
|
jq -n --arg t "$theme_name" '(input? // {}) | .["workbench.colorTheme"] = $t' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
|
||||||
if [[ ! -f "$VS_CODE_SETTINGS" ]]; then
|
|
||||||
printf '{\n}\n' > "$VS_CODE_SETTINGS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create a `workbench.colorTheme` entry in settings.
|
|
||||||
if ! grep -q '"workbench.colorTheme"' "$VS_CODE_SETTINGS"; then
|
|
||||||
# Insert `"workbench.colorTheme": "",` immediately after the first `{`
|
|
||||||
# Use sed's first-match range (0,/{/) to only replace the first `{`
|
|
||||||
sed -i --follow-symlinks -E '0,/\{/{s/\{/{\
|
|
||||||
"workbench.colorTheme": "",/}' "$VS_CODE_SETTINGS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Update theme
|
|
||||||
sed -i --follow-symlinks -E \
|
|
||||||
"s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
|
|
||||||
"$VS_CODE_SETTINGS"
|
|
||||||
else
|
else
|
||||||
# Remove theme from settings.json when the theme doesn't have vscode support
|
# Remove theme from settings.json when the theme doesn't have vscode support
|
||||||
if [[ -f "$VS_CODE_SETTINGS" ]]; then
|
jq 'del(.["workbench.colorTheme"])' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
|
||||||
sed -i --follow-symlinks -E '/"workbench\.colorTheme"[[:space:]]*:[^,}]*,?/d' "$VS_CODE_SETTINGS"
|
fi
|
||||||
|
|
||||||
fi
|
mv "${VS_CODE_SETTINGS}.new" "$VS_CODE_SETTINGS"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
|
|||||||
Version=1.0
|
Version=1.0
|
||||||
Name=$APP_NAME
|
Name=$APP_NAME
|
||||||
Comment=$APP_NAME
|
Comment=$APP_NAME
|
||||||
Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
|
Exec=$TERMINAL --class $APP_CLASS -e $APP_EXEC
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Icon=$ICON_PATH
|
Icon=$ICON_PATH
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
cat $OMARCHY_PATH/version
|
||||||
git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1)
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Dynamic theme colors
|
# Dynamic theme colors
|
||||||
config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
|
config-file = "~/.config/omarchy/current/theme/ghostty.conf"
|
||||||
|
|
||||||
# Font
|
# Font
|
||||||
font-family = "CaskaydiaMono Nerd Font"
|
font-family = "CaskaydiaMono Nerd Font"
|
||||||
@@ -12,7 +12,7 @@ window-padding-y = 14
|
|||||||
confirm-close-surface=false
|
confirm-close-surface=false
|
||||||
resize-overlay = never
|
resize-overlay = never
|
||||||
|
|
||||||
# Cursor styling
|
# Cursor stlying
|
||||||
cursor-style = "block"
|
cursor-style = "block"
|
||||||
cursor-style-blink = false
|
cursor-style-blink = false
|
||||||
shell-integration-features = no-cursor
|
shell-integration-features = no-cursor
|
||||||
|
|||||||
@@ -27,9 +27,8 @@ input {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Scroll nicely in the terminal
|
# Scroll faster in the terminal
|
||||||
windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty)
|
windowrule = scrolltouchpad 1.5, tag:terminal
|
||||||
windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty
|
|
||||||
|
|
||||||
# Enable touchpad gestures for changing workspaces
|
# Enable touchpad gestures for changing workspaces
|
||||||
# See https://wiki.hyprland.org/Configuring/Gestures/
|
# See https://wiki.hyprland.org/Configuring/Gestures/
|
||||||
|
|||||||
@@ -15,9 +15,3 @@ decoration {
|
|||||||
# Use round window corners
|
# Use round window corners
|
||||||
# rounding = 8
|
# rounding = 8
|
||||||
}
|
}
|
||||||
|
|
||||||
# https://wiki.hypr.land/Configuring/Dwindle-Layout/
|
|
||||||
dwindle {
|
|
||||||
# Avoid overly wide single-window layouts on wide screens
|
|
||||||
# single_window_aspect_ratio = 1 1
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -12,4 +12,3 @@ source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
|
|||||||
source = ~/.local/share/omarchy/default/hypr/apps/system.conf
|
source = ~/.local/share/omarchy/default/hypr/apps/system.conf
|
||||||
source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf
|
source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf
|
||||||
source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
|
source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
|
||||||
source = ~/.local/share/omarchy/default/hypr/apps/webcam-overlay.conf
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# Float Steam
|
# Float Steam, fullscreen RetroArch
|
||||||
windowrule = float, class:steam
|
windowrule = float, class:steam
|
||||||
windowrule = center, class:steam, title:Steam
|
windowrule = center, class:steam, title:Steam
|
||||||
windowrule = opacity 1 1, class:steam
|
windowrule = opacity 1 1, class:steam
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ windowrule = center, tag:floating-window
|
|||||||
windowrule = size 800 600, tag:floating-window
|
windowrule = size 800 600, tag:floating-window
|
||||||
|
|
||||||
windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
|
windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
|
||||||
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)
|
windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open Folder|Save.*Files?|Save.*As|Save|All Files)
|
||||||
|
|
||||||
# Fullscreen screensaver
|
# Fullscreen screensaver
|
||||||
windowrule = fullscreen, class:Screensaver
|
windowrule = fullscreen, class:Screensaver
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
# Webcam overlay for screen recording
|
|
||||||
windowrule = float, title:WebcamOverlay
|
|
||||||
windowrule = pin, title:WebcamOverlay
|
|
||||||
windowrule = noinitialfocus, title:WebcamOverlay
|
|
||||||
windowrule = nodim, title:WebcamOverlay
|
|
||||||
windowrule = move 100%-w-40 100%-w-40, title:WebcamOverlay # There's a typo in the hyprland rule so 100%-w on the height param is actually correct here
|
|
||||||
@@ -36,9 +36,9 @@ bindd = CTRL, PRINT, Screenshot of display, exec, omarchy-cmd-screenshot output
|
|||||||
|
|
||||||
# Screen recordings
|
# Screen recordings
|
||||||
bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord region
|
bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord region
|
||||||
bindd = ALT SHIFT, PRINT, Screen record a region with audio, exec, omarchy-cmd-screenrecord region --with-audio
|
bindd = ALT SHIFT, PRINT, Screen record a region with audio, exec, omarchy-cmd-screenrecord region audio
|
||||||
bindd = CTRL ALT, PRINT, Screen record display, exec, omarchy-cmd-screenrecord output
|
bindd = CTRL ALT, PRINT, Screen record display, exec, omarchy-cmd-screenrecord output
|
||||||
bindd = CTRL ALT SHIFT, PRINT, Screen record display with audio, exec, omarchy-cmd-screenrecord output --with-audio
|
bindd = CTRL ALT SHIFT, PRINT, Screen record display with audio, exec, omarchy-cmd-screenrecord output audio
|
||||||
|
|
||||||
# Color picker
|
# Color picker
|
||||||
bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
|
bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
|
||||||
|
|||||||
@@ -87,8 +87,3 @@ misc {
|
|||||||
disable_splash_rendering = true
|
disable_splash_rendering = true
|
||||||
focus_on_activate = true
|
focus_on_activate = true
|
||||||
}
|
}
|
||||||
|
|
||||||
# https://wiki.hypr.land/Configuring/Variables/#cursor
|
|
||||||
cursor {
|
|
||||||
hide_on_key_press = true
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if pgrep -f "gpu-screen-recorder" >/dev/null; then
|
if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
|
||||||
echo '{"text": "", "tooltip": "Stop recording", "class": "active"}'
|
echo '{"text": "", "tooltip": "Stop recording", "class": "active"}'
|
||||||
else
|
else
|
||||||
echo '{"text": ""}'
|
echo '{"text": ""}'
|
||||||
|
|||||||
@@ -24,6 +24,6 @@ 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/ignore-power-button.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm43xx.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh
|
||||||
|
|||||||
5
install/config/hardware/fix-apple-bcm4360.sh
Normal file
5
install/config/hardware/fix-apple-bcm4360.sh
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip
|
||||||
|
if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then
|
||||||
|
echo "Apple BCM4360 detected"
|
||||||
|
sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
|
||||||
|
fi
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
# Install Wi-Fi drivers for Broadcom chips on MacBooks:
|
|
||||||
# - BCM4360 (2013–2015)
|
|
||||||
# - BCM4331 (2012, early 2013)
|
|
||||||
|
|
||||||
pci_info=$(lspci -nnv)
|
|
||||||
|
|
||||||
if echo "$pci_info" | grep -q "106b:" &&
|
|
||||||
(echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
|
|
||||||
echo "Apple BCM4360 / BCM4331 detected"
|
|
||||||
sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
|
|
||||||
fi
|
|
||||||
@@ -1,12 +1,7 @@
|
|||||||
# Detect MacBook models that need SPI keyboard modules
|
# Detect MacBook models that need SPI keyboard modules
|
||||||
product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)"
|
if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
|
||||||
if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
|
|
||||||
echo "Detected MacBook with SPI keyboard"
|
echo "Detected MacBook with SPI keyboard"
|
||||||
|
|
||||||
sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
|
sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
|
||||||
if [[ "$product_name" == "MacBook8,1" ]]; then
|
|
||||||
echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
|
|
||||||
else
|
|
||||||
echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
|
echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
14
install/iso.sh
Normal file
14
install/iso.sh
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Called by Omarchy ISO setup before starting configurator and archinstall
|
||||||
|
|
||||||
|
source "$OMARCHY_INSTALL/preflight/set-size-vars.sh"
|
||||||
|
source "$OMARCHY_INSTALL/helpers/logo.sh"
|
||||||
|
source "$OMARCHY_INSTALL/preflight/gum.sh"
|
||||||
|
source "$OMARCHY_INSTALL/helpers/tail-log-output.sh"
|
||||||
|
source "$OMARCHY_INSTALL/helpers/trap-errors.sh"
|
||||||
|
|
||||||
|
source $OMARCHY_INSTALL/helpers/chroot.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/logo.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/gum.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/errors.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/logging.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/layout.sh
|
||||||
@@ -35,7 +35,6 @@ github-cli
|
|||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
gnome-themes-extra
|
gnome-themes-extra
|
||||||
gpu-screen-recorder
|
|
||||||
gum
|
gum
|
||||||
gvfs-mtp
|
gvfs-mtp
|
||||||
gvfs-smb
|
gvfs-smb
|
||||||
@@ -114,12 +113,14 @@ unzip
|
|||||||
uwsm
|
uwsm
|
||||||
walker-bin
|
walker-bin
|
||||||
waybar
|
waybar
|
||||||
|
wf-recorder
|
||||||
whois
|
whois
|
||||||
wireless-regdb
|
wireless-regdb
|
||||||
wiremix
|
wiremix
|
||||||
wireplumber
|
wireplumber
|
||||||
wl-clip-persist
|
wl-clip-persist
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
wl-screenrec
|
||||||
woff2-font-awesome
|
woff2-font-awesome
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
xdg-desktop-portal-hyprland
|
xdg-desktop-portal-hyprland
|
||||||
|
|||||||
0
migrations/1757021485.sh
Normal file → Executable file
0
migrations/1757021485.sh
Normal file → Executable file
@@ -1,17 +0,0 @@
|
|||||||
echo "Fix Disk Usage and Docker TUIs"
|
|
||||||
|
|
||||||
APP_DIR="$HOME/.local/share/applications"
|
|
||||||
ICON_DIR="$APP_DIR/icons"
|
|
||||||
|
|
||||||
# Don't use omarchy-tui-remove to preserve icons
|
|
||||||
|
|
||||||
if [[ -f "$APP_DIR/Docker.desktop" ]]; then
|
|
||||||
rm "$APP_DIR/Docker.desktop"
|
|
||||||
omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -f "$APP_DIR/Disk Usage.desktop" ]]; then
|
|
||||||
rm "$APP_DIR/Disk Usage.desktop"
|
|
||||||
omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
echo "Change omarchy-screenrecord to use gpu-screen-recorder"
|
|
||||||
omarchy-pkg-drop wf-recorder wl-screenrec
|
|
||||||
omarchy-pkg-add gpu-screen-recorder
|
|
||||||
@@ -1,12 +1,3 @@
|
|||||||
background = #121212
|
|
||||||
foreground = #BEBEBE
|
|
||||||
|
|
||||||
cursor-color = #EAEAEA
|
|
||||||
cursor-text = #121212
|
|
||||||
|
|
||||||
selection-background = #333333
|
|
||||||
selection-foreground = #EAEAEA
|
|
||||||
|
|
||||||
# normal colors
|
# normal colors
|
||||||
palette = 0=#333333
|
palette = 0=#333333
|
||||||
palette = 1=#D35F5F
|
palette = 1=#D35F5F
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"name": "Matte Black",
|
"name": "MatteBlack",
|
||||||
"extension": "TahaYVR.matteblack"
|
"extension": "TahaYVR.matteblack"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1 @@
|
|||||||
# primary
|
theme = TokyoNight
|
||||||
background = #111c18
|
|
||||||
foreground = #C1C497
|
|
||||||
cursor-color = #D7C995
|
|
||||||
cursor-text = #000000
|
|
||||||
|
|
||||||
# normal colors
|
|
||||||
palette = 0=#23372B
|
|
||||||
palette = 1=#FF5345
|
|
||||||
palette = 2=#549e6a
|
|
||||||
palette = 3=#459451
|
|
||||||
palette = 4=#509475
|
|
||||||
palette = 5=#D2689C
|
|
||||||
palette = 6=#2DD5B7
|
|
||||||
palette = 7=#F6F5DD
|
|
||||||
|
|
||||||
# bright colors
|
|
||||||
palette = 8=#53685B
|
|
||||||
palette = 9=#db9f9c
|
|
||||||
palette = 10=#143614
|
|
||||||
palette = 11=#E5C736
|
|
||||||
palette = 12=#ACD4CF
|
|
||||||
palette = 13=#75bbb3
|
|
||||||
palette = 14=#8CD3CB
|
|
||||||
palette = 15=#9eebb3
|
|
||||||
|
|||||||
Reference in New Issue
Block a user