mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
1 Commits
v3.0.2
...
hey-defaul
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
920e85d97b |
@@ -15,7 +15,7 @@ SCOPE="$1"
|
|||||||
AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
|
AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
|
||||||
|
|
||||||
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"
|
||||||
|
|
||||||
if lspci | grep -qi 'nvidia'; then
|
if lspci | grep -qi 'nvidia'; then
|
||||||
wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
|
wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
|
||||||
@@ -47,8 +47,7 @@ screenrecording_active() {
|
|||||||
if screenrecording_active; then
|
if screenrecording_active; then
|
||||||
stop_screenrecording
|
stop_screenrecording
|
||||||
elif [[ "$SCOPE" == "output" ]]; then
|
elif [[ "$SCOPE" == "output" ]]; then
|
||||||
output=$(slurp -o) || exit 1
|
start_screenrecording
|
||||||
start_screenrecording -g "$output"
|
|
||||||
else
|
else
|
||||||
region=$(slurp) || exit 1
|
region=$(slurp) || exit 1
|
||||||
start_screenrecording -g "$region"
|
start_screenrecording -g "$region"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo -e "Restarting pipewire audio service...\n"
|
echo -e "Restarting pirewire audio service...\n"
|
||||||
systemctl --user restart pipewire.service
|
systemctl --user restart pipewire.service
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
11
bin/omarchy-webapp-handler-hey
Executable file
11
bin/omarchy-webapp-handler-hey
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
url="$1"
|
||||||
|
web_url="https://app.hey.com"
|
||||||
|
|
||||||
|
# Handle mailto: URLs
|
||||||
|
if [[ $url =~ ^mailto: ]]; then
|
||||||
|
email=$(echo "$url" | sed 's/mailto://')
|
||||||
|
web_url="https://app.hey.com/messages/new?to=$email"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec omarchy-launch-webapp "$web_url"
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -33,3 +33,6 @@ xdg-mime default mpv.desktop video/x-ms-asf
|
|||||||
xdg-mime default mpv.desktop video/x-ogm+ogg
|
xdg-mime default mpv.desktop video/x-ogm+ogg
|
||||||
xdg-mime default mpv.desktop video/x-theora+ogg
|
xdg-mime default mpv.desktop video/x-theora+ogg
|
||||||
xdg-mime default mpv.desktop application/ogg
|
xdg-mime default mpv.desktop application/ogg
|
||||||
|
|
||||||
|
# Use Hey for mailto: links
|
||||||
|
xdg-mime default HEY.desktop x-scheme-handler/mailto
|
||||||
|
|||||||
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
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
omarchy-webapp-install "HEY" https://app.hey.com HEY.png
|
omarchy-webapp-install "HEY" https://app.hey.com HEY.png "omarchy-webapp-handler-hey %u" "x-scheme-handler/mailto"
|
||||||
omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png
|
omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png
|
||||||
omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png
|
omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png
|
||||||
omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png"
|
omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png"
|
||||||
|
|||||||
3
migrations/1758318253.sh
Normal file
3
migrations/1758318253.sh
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
echo "Ensure libyaml is available for installing Ruby"
|
||||||
|
|
||||||
|
omarchy-pkg-add libyaml
|
||||||
@@ -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
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user