Compare commits
3 Commits
add-t2-sup
...
create-def
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46a663d826 | ||
|
|
4e1f3bee77 | ||
|
|
1878ea4d99 |
@@ -1,6 +1,6 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Image Viewer
|
Name=Image Viewer
|
||||||
Exec=sh -c 'imv -n "$1" "$(dirname "$1")"' sh %f
|
Exec=imv %F
|
||||||
Icon=imv
|
Icon=imv
|
||||||
Type=Application
|
Type=Application
|
||||||
MimeType=image/png;image/jpeg;image/jpg;image/gif;image/bmp;image/webp;image/tiff;image/x-xcf;image/x-portable-pixmap;image/x-xbitmap;
|
MimeType=image/png;image/jpeg;image/jpg;image/gif;image/bmp;image/webp;image/tiff;image/x-xcf;image/x-portable-pixmap;image/x-xbitmap;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
|
focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
|
||||||
|
|
||||||
sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
|
sinks=$(pactl -f json list sinks | jq '[.[] | select([.ports[]? | .availability == "available"] | any)]')
|
||||||
sinks_count=$(echo "$sinks" | jq '. | length')
|
sinks_count=$(echo "$sinks" | jq '. | length')
|
||||||
|
|
||||||
if [ "$sinks_count" -eq 0 ]; then
|
if [ "$sinks_count" -eq 0 ]; then
|
||||||
|
|||||||
@@ -6,12 +6,8 @@ FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
|
|||||||
|
|
||||||
if [[ -f "$FIRST_RUN_MODE" ]]; then
|
if [[ -f "$FIRST_RUN_MODE" ]]; then
|
||||||
rm -f "$FIRST_RUN_MODE"
|
rm -f "$FIRST_RUN_MODE"
|
||||||
|
|
||||||
bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
|
bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
|
||||||
bash "$OMARCHY_PATH/install/first-run/firewall.sh"
|
bash "$OMARCHY_PATH/install/first-run/firewall.sh"
|
||||||
bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
|
bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
|
||||||
sudo rm -f /etc/sudoers.d/first-run
|
sudo rm -f /etc/sudoers.d/first-run
|
||||||
|
|
||||||
bash "$OMARCHY_PATH/install/first-run/wifi.sh"
|
|
||||||
bash "$OMARCHY_PATH/install/first-run/welcome.sh"
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pkill slurp || hyprshot -m ${1:-region} --raw |
|
pkill slurp || hyprshot -m ${1:-region} --raw --freeze |
|
||||||
satty --filename - \
|
satty --filename - \
|
||||||
--output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
|
--output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
|
||||||
--early-exit \
|
--early-exit \
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
notify-send " Updating time and timezone..."
|
|
||||||
sudo systemctl restart systemd-timesyncd
|
sudo systemctl restart systemd-timesyncd
|
||||||
sudo tzupdate
|
sudo tzupdate
|
||||||
new_timezone=$(timedatectl show -p Timezone --value)
|
new_timezone=$(timedatectl show -p Timezone --value)
|
||||||
omarchy-restart-waybar
|
omarchy-restart-waybar
|
||||||
notify-send " Time updated and timezone set to $new_timezone"
|
notify-send "Time synced and timezone set to $new_timezone"
|
||||||
|
|||||||
@@ -1,12 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
default_browser=$(xdg-settings get default-web-browser)
|
exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@
|
||||||
browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
|
|
||||||
|
|
||||||
if [[ $browser_exec =~ (firefox|zen|librewolf) ]]; then
|
|
||||||
private_flag="--private-window"
|
|
||||||
else
|
|
||||||
private_flag="--incognito"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec setsid uwsm app -- "$browser_exec" "${@/--private/$private_flag}"
|
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [[ -z $1 && $1 != "CNCLD" ]]; then
|
# omarchy-theme-set: Set a theme, specified by its name.
|
||||||
echo "Usage: omarchy-theme-set <theme-name>"
|
# Usage: omarchy-theme-set <theme-name>
|
||||||
|
|
||||||
|
if [[ -z "$1" && "$1" != "CNCLD" ]]; then
|
||||||
|
echo "Usage: omarchy-theme-set <theme-name>" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -13,8 +16,8 @@ THEME_PATH="$THEMES_DIR/$THEME_NAME"
|
|||||||
|
|
||||||
# Check if the theme entered exists
|
# Check if the theme entered exists
|
||||||
if [[ ! -d "$THEME_PATH" ]]; then
|
if [[ ! -d "$THEME_PATH" ]]; then
|
||||||
echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
|
echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR" >&2
|
||||||
exit 1
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Update theme symlinks
|
# Update theme symlinks
|
||||||
@@ -36,24 +39,19 @@ else
|
|||||||
gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
|
gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Change browser colors via policies
|
# Change Chromium colors
|
||||||
if omarchy-cmd-present chromium || omarchy-cmd-present brave; then
|
if command -v chromium &>/dev/null; then
|
||||||
|
if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
|
||||||
|
chromium --no-startup-window --set-color-scheme="light"
|
||||||
|
else
|
||||||
|
chromium --no-startup-window --set-color-scheme="dark"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
|
if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
|
||||||
rgb=$(<~/.config/omarchy/current/theme/chromium.theme)
|
chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
|
||||||
THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${rgb//,/ })
|
|
||||||
else
|
else
|
||||||
# Use a default, neutral grey if theme doesn't have a color
|
# Use a default, neutral grey if theme doesn't have a color
|
||||||
THEME_HEX_COLOR="#1c2027"
|
chromium --no-startup-window --set-theme-color="28,32,39"
|
||||||
fi
|
|
||||||
|
|
||||||
if omarchy-cmd-present chromium; then
|
|
||||||
echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
|
|
||||||
chromium --refresh-platform-policy --no-startup-window
|
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
url="$1"
|
|
||||||
web_url="https://app.zoom.us/wc/home"
|
|
||||||
|
|
||||||
if [[ $url =~ ^zoom(mtg|us):// ]]; then
|
|
||||||
confno=$(echo "$url" | sed -n 's/.*[?&]confno=\([^&]*\).*/\1/p')
|
|
||||||
|
|
||||||
if [[ -n $confno ]]; then
|
|
||||||
pwd=$(echo "$url" | sed -n 's/.*[?&]pwd=\([^&]*\).*/\1/p')
|
|
||||||
|
|
||||||
if [[ -n $pwd ]]; then
|
|
||||||
web_url="https://app.zoom.us/wc/join/$confno?pwd=$pwd"
|
|
||||||
else
|
|
||||||
web_url="https://app.zoom.us/wc/join/$confno"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec omarchy-launch-webapp "$web_url"
|
|
||||||
@@ -1,69 +1,49 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [ "$#" -lt 3 ]; then
|
if [ "$#" -ne 3 ]; then
|
||||||
echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
|
echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
|
||||||
APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
|
APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
|
||||||
APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
|
APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
|
||||||
ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
|
ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
|
||||||
CUSTOM_EXEC=""
|
|
||||||
MIME_TYPES=""
|
|
||||||
INTERACTIVE_MODE=true
|
|
||||||
else
|
else
|
||||||
APP_NAME="$1"
|
APP_NAME="$1"
|
||||||
APP_URL="$2"
|
APP_URL="$2"
|
||||||
ICON_REF="$3"
|
ICON_URL="$3"
|
||||||
CUSTOM_EXEC="$4" # Optional custom exec command
|
|
||||||
MIME_TYPES="$5" # Optional mime types
|
|
||||||
INTERACTIVE_MODE=false
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure valid execution
|
if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_URL" ]]; then
|
||||||
if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_REF" ]]; then
|
|
||||||
echo "You must set app name, app URL, and icon URL!"
|
echo "You must set app name, app URL, and icon URL!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Refer to local icon or fetch remotely from URL
|
ICON_DIR="$HOME/.local/share/applications/icons"
|
||||||
if [[ $ICON_REF =~ ^https?:// ]]; then
|
DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
|
||||||
if curl -sL -o "$ICON_PATH" "$ICON_REF"; then
|
|
||||||
ICON_PATH="$ICON_DIR/$APP_NAME.png"
|
if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
|
||||||
else
|
ICON_PATH="$ICON_URL"
|
||||||
|
else
|
||||||
|
ICON_PATH="$ICON_DIR/$APP_NAME.png"
|
||||||
|
mkdir -p "$ICON_DIR"
|
||||||
|
if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
|
||||||
echo "Error: Failed to download icon."
|
echo "Error: Failed to download icon."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
ICON_PATH="$HOME/.local/share/applications/icons/$ICON_REF"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Use custom exec if provided, otherwise default behavior
|
|
||||||
if [[ -n $CUSTOM_EXEC ]]; then
|
|
||||||
EXEC_COMMAND="$CUSTOM_EXEC"
|
|
||||||
else
|
|
||||||
EXEC_COMMAND="omarchy-launch-webapp $APP_URL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create application .desktop file
|
|
||||||
DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
|
|
||||||
|
|
||||||
cat >"$DESKTOP_FILE" <<EOF
|
cat >"$DESKTOP_FILE" <<EOF
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Version=1.0
|
Version=1.0
|
||||||
Name=$APP_NAME
|
Name=$APP_NAME
|
||||||
Comment=$APP_NAME
|
Comment=$APP_NAME
|
||||||
Exec=$EXEC_COMMAND
|
Exec=omarchy-launch-webapp $APP_URL
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Icon=$ICON_PATH
|
Icon=$ICON_PATH
|
||||||
StartupNotify=true
|
StartupNotify=true
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Add mime types if provided
|
|
||||||
if [[ -n $MIME_TYPES ]]; then
|
|
||||||
echo "MimeType=$MIME_TYPES" >>"$DESKTOP_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
chmod +x "$DESKTOP_FILE"
|
chmod +x "$DESKTOP_FILE"
|
||||||
|
|
||||||
if [[ $INTERACTIVE_MODE == true ]]; then
|
if [ "$#" -ne 3 ]; then
|
||||||
echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
|
echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
|
||||||
fi
|
fi
|
||||||
|
|||||||
2
boot.sh
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Set install mode to online since boot.sh is used for curl installations
|
# Set install mode to online since boot.sh is used for curl installations
|
||||||
export OMARCHY_ONLINE_INSTALL=true
|
export OMARCHY_INSTALL_MODE="online"
|
||||||
|
|
||||||
ansi_art=' ▄▄▄
|
ansi_art=' ▄▄▄
|
||||||
▄█████▄ ▄███████████▄ ▄███████ ▄███████ ▄███████ ▄█ █▄ ▄█ █▄
|
▄█████▄ ▄███████████▄ ▄███████ ▄███████ ▄███████ ▄█ █▄ ▄█ █▄
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ $browser = omarchy-launch-browser
|
|||||||
bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
|
bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
|
||||||
bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
|
bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
|
||||||
bindd = SUPER, B, Browser, exec, $browser
|
bindd = SUPER, B, Browser, exec, $browser
|
||||||
bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private
|
|
||||||
bindd = SUPER, M, Music, exec, uwsm app -- spotify
|
bindd = SUPER, M, Music, exec, uwsm app -- spotify
|
||||||
bindd = SUPER, N, Neovim, exec, $terminal -e nvim
|
bindd = SUPER, N, Neovim, exec, $terminal -e nvim
|
||||||
bindd = SUPER, T, Activity, exec, $terminal -e btop
|
bindd = SUPER, T, Activity, exec, $terminal -e btop
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ source = ~/.config/omarchy/current/theme/hyprlock.conf
|
|||||||
background {
|
background {
|
||||||
monitor =
|
monitor =
|
||||||
color = $color
|
color = $color
|
||||||
path = ~/.config/omarchy/current/background
|
|
||||||
blur_passes = 3
|
|
||||||
}
|
}
|
||||||
|
|
||||||
animations {
|
animations {
|
||||||
|
|||||||
@@ -68,7 +68,7 @@
|
|||||||
"format": "{icon}",
|
"format": "{icon}",
|
||||||
"format-wifi": "{icon}",
|
"format-wifi": "{icon}",
|
||||||
"format-ethernet": "",
|
"format-ethernet": "",
|
||||||
"format-disconnected": "",
|
"format-disconnected": "",
|
||||||
"tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
|
"tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
|
||||||
"tooltip-format-ethernet": "⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
|
"tooltip-format-ethernet": "⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
|
||||||
"tooltip-format-disconnected": "Disconnected",
|
"tooltip-format-disconnected": "Disconnected",
|
||||||
@@ -108,7 +108,7 @@
|
|||||||
"on-click-right": "pamixer -t",
|
"on-click-right": "pamixer -t",
|
||||||
"tooltip-format": "Playing at {volume}%",
|
"tooltip-format": "Playing at {volume}%",
|
||||||
"scroll-step": 5,
|
"scroll-step": 5,
|
||||||
"format-muted": "",
|
"format-muted": "",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"default": ["", "", ""]
|
"default": ["", "", ""]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,13 +5,11 @@ bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
|
|||||||
bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
|
bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
|
||||||
bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
|
bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
|
||||||
bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
|
bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
|
||||||
bindd = , XF86Calculator, Calculator, exec, gnome-calculator
|
|
||||||
|
|
||||||
# Aesthetics
|
# Aesthetics
|
||||||
bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
|
bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
|
||||||
bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
|
bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
|
||||||
bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
|
bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
|
||||||
bindd = SUPER, BACKSPACE, Toggle window transparency, exec, hyprctl dispatch setprop "address:$(hyprctl activewindow -j | jq -r '.address')" opaque toggle
|
|
||||||
|
|
||||||
# Notifications
|
# Notifications
|
||||||
bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
|
bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
|
||||||
|
|||||||
@@ -13,7 +13,4 @@ invisible=true
|
|||||||
invisible=false
|
invisible=false
|
||||||
|
|
||||||
[urgency=critical]
|
[urgency=critical]
|
||||||
default-timeout=0
|
default-timeout=0
|
||||||
|
|
||||||
[summary~="Setup Wi-Fi"]
|
|
||||||
on-button-left=exec sh -c 'alacritty --class=Impala -e impala & makoctl dismiss -n "$id"'
|
|
||||||
@@ -25,5 +25,3 @@ 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-bcm4360.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-t2.sh
|
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
# Detect MacBook models that need SPI keyboard modules
|
|
||||||
if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
|
|
||||||
echo "Detected MacBook with SPI keyboard"
|
|
||||||
|
|
||||||
sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
|
|
||||||
echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
|
|
||||||
fi
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
# Detect T2 MacBook models using PCI IDs
|
|
||||||
# Vendor: 106b (Apple), Device IDs: 1801 or 1802 (T2 Security Chip)
|
|
||||||
if lspci -nn | grep -q "106b:180[12]"; then
|
|
||||||
echo "Detected MacBook with T2 chip. Installing support items..."
|
|
||||||
|
|
||||||
sudo pacman -S --noconfirm --needed \
|
|
||||||
linux-t2 \
|
|
||||||
linux-t2-headers \
|
|
||||||
apple-t2-audio-config \
|
|
||||||
apple-bcm-firmware \
|
|
||||||
t2fanrd \
|
|
||||||
tiny-dfr
|
|
||||||
|
|
||||||
echo "apple-bce" | sudo tee /etc/modules-load.d/t2.conf >/dev/null
|
|
||||||
|
|
||||||
echo "MODULES+=(apple-bce usbhid hid_apple hid_generic xhci_pci xhci_hcd)" | sudo tee /etc/mkinitcpio.conf.d/apple-t2.conf >/dev/null
|
|
||||||
|
|
||||||
cat <<EOF | sudo tee /etc/modprobe.d/brcmfmac.conf >/dev/null
|
|
||||||
# Fix for T2 MacBook WiFi connectivity issues
|
|
||||||
options brcmfmac feature_disable=0x82000
|
|
||||||
EOF
|
|
||||||
|
|
||||||
sudo mkdir -p /etc/limine-entry-tool.d
|
|
||||||
cat <<EOF | sudo tee /etc/limine-entry-tool.d/t2-mac.conf >/dev/null
|
|
||||||
# Generated by Omarchy installer for T2 Mac support
|
|
||||||
KERNEL_CMDLINE[default]+="intel_iommu=on iommu=pt pcie_ports=compat"
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
@@ -7,19 +7,19 @@ mise settings add idiomatic_version_file_enable_tools ruby
|
|||||||
# Install pre-built Ruby + Rails for x86_64
|
# Install pre-built Ruby + Rails for x86_64
|
||||||
if [[ $(uname -m) == "x86_64" ]]; then
|
if [[ $(uname -m) == "x86_64" ]]; then
|
||||||
RUBY_VERSION="3.4.5"
|
RUBY_VERSION="3.4.5"
|
||||||
RUBY_TARBALL="ruby-$RUBY_VERSION-rails-8.0.2.1-x86_64.tar.gz"
|
RUBY_TARBALL="ruby-${RUBY_VERSION}-rails-8.0.2.1-x86_64.tar.gz"
|
||||||
RUBY_URL="https://pkgs.omarchy.org/ruby/$RUBY_TARBALL"
|
RUBY_URL="https://pkgs.omarchy.org/ruby/${RUBY_TARBALL}"
|
||||||
MISE_RUBY_DIR="$HOME/.local/share/mise/installs/ruby"
|
MISE_RUBY_DIR="$HOME/.local/share/mise/installs/ruby"
|
||||||
OFFLINE_CACHE="/var/cache/omarchy/ruby"
|
OFFLINE_CACHE="/var/cache/omarchy/ruby"
|
||||||
|
|
||||||
mkdir -p "$MISE_RUBY_DIR"
|
mkdir -p "$MISE_RUBY_DIR"
|
||||||
|
|
||||||
if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
|
if [[ ${OMARCHY_INSTALL_MODE:-offline} == "offline" ]]; then
|
||||||
echo "Downloading pre-built Ruby $RUBY_VERSION..."
|
|
||||||
curl -fsSL "$RUBY_URL" | tar -xz -C "$MISE_RUBY_DIR"
|
|
||||||
else
|
|
||||||
echo "Installing Ruby from offline cache..."
|
echo "Installing Ruby from offline cache..."
|
||||||
tar -xzf "$OFFLINE_CACHE/$RUBY_TARBALL" -C "$MISE_RUBY_DIR"
|
tar -xzf "${OFFLINE_CACHE}/${RUBY_TARBALL}" -C "$MISE_RUBY_DIR"
|
||||||
|
else
|
||||||
|
echo "Downloading pre-built Ruby ${RUBY_VERSION}..."
|
||||||
|
curl -fsSL "$RUBY_URL" | tar -xz -C "$MISE_RUBY_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mise use --global "ruby@${RUBY_VERSION}"
|
mise use --global "ruby@${RUBY_VERSION}"
|
||||||
|
|||||||
@@ -19,10 +19,3 @@ ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current
|
|||||||
|
|
||||||
mkdir -p ~/.config/mako
|
mkdir -p ~/.config/mako
|
||||||
ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
|
ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
|
||||||
|
|
||||||
# Add managed policy directories for Chromium and Brave for theme changes
|
|
||||||
sudo mkdir -p /etc/chromium/policies/managed
|
|
||||||
sudo chmod a+rw /etc/chromium/policies/managed
|
|
||||||
|
|
||||||
sudo mkdir -p /etc/brave/policies/managed
|
|
||||||
sudo chmod a+rw /etc/brave/policies/managed
|
|
||||||
|
|||||||
0
install/first-run/gnome-theme.sh
Normal file → Executable file
@@ -1 +0,0 @@
|
|||||||
notify-send "👋 Welcome to Omarchy" "You're in for a great computing adventure. Have fun!" -t 30000
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
if ! ping -c3 -W1 1.1.1.1 >/dev/null 2>&1; then
|
|
||||||
notify-send " Click to Setup Wi-Fi" "Tab between sections, space selects, ? for help." -u critical -t 30000
|
|
||||||
fi
|
|
||||||
@@ -105,7 +105,7 @@ catch_errors() {
|
|||||||
options=()
|
options=()
|
||||||
|
|
||||||
# If online install, show retry first
|
# If online install, show retry first
|
||||||
if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
|
if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then
|
||||||
options+=("Retry installation")
|
options+=("Retry installation")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -8,17 +8,25 @@ broadcom-wl
|
|||||||
btrfs-progs
|
btrfs-progs
|
||||||
dart
|
dart
|
||||||
dkms
|
dkms
|
||||||
|
efibootmgr
|
||||||
egl-wayland
|
egl-wayland
|
||||||
git
|
git
|
||||||
|
git
|
||||||
gst-plugin-pipewire
|
gst-plugin-pipewire
|
||||||
gtk4-layer-shell
|
gtk4-layer-shell
|
||||||
|
gum
|
||||||
htop
|
htop
|
||||||
|
intel-media-driver
|
||||||
intltool
|
intltool
|
||||||
iwd
|
iwd
|
||||||
jdk-openjdk
|
jdk-openjdk
|
||||||
|
jq
|
||||||
|
lib32-nvidia-utils
|
||||||
libpulse
|
libpulse
|
||||||
libsass
|
libsass
|
||||||
libva-intel-driver
|
libva-intel-driver
|
||||||
|
libva-intel-driver
|
||||||
|
libva-mesa-driver
|
||||||
libva-nvidia-driver
|
libva-nvidia-driver
|
||||||
limine
|
limine
|
||||||
limine-mkinitcpio-hook
|
limine-mkinitcpio-hook
|
||||||
@@ -26,28 +34,26 @@ limine-snapper-sync
|
|||||||
linux
|
linux
|
||||||
linux-firmware
|
linux-firmware
|
||||||
linux-headers
|
linux-headers
|
||||||
macbook12-spi-driver-dkms
|
mesa
|
||||||
nvidia-dkms
|
nvidia-dkms
|
||||||
nvidia-open-dkms
|
nvidia-open-dkms
|
||||||
nvidia-utils
|
nvidia-utils
|
||||||
lib32-nvidia-utils
|
openssl
|
||||||
pipewire
|
pipewire
|
||||||
pipewire-alsa
|
pipewire-alsa
|
||||||
pipewire-jack
|
pipewire-jack
|
||||||
pipewire-pulse
|
pipewire-pulse
|
||||||
|
plymouth
|
||||||
qt5-remoteobjects
|
qt5-remoteobjects
|
||||||
qt6-wayland
|
qt6-wayland
|
||||||
sassc
|
sassc
|
||||||
snapper
|
snapper
|
||||||
|
sof-firmware
|
||||||
|
tzupdate
|
||||||
webp-pixbuf-loader
|
webp-pixbuf-loader
|
||||||
wget
|
wget
|
||||||
|
xf86-video-amdgpu
|
||||||
|
xf86-video-ati
|
||||||
|
xf86-video-nouveau
|
||||||
yay-debug
|
yay-debug
|
||||||
zram-generator
|
zram-generator
|
||||||
|
|
||||||
# T2 MacBook support packages
|
|
||||||
apple-bcm-firmware
|
|
||||||
apple-t2-audio-config
|
|
||||||
linux-t2
|
|
||||||
linux-t2-headers
|
|
||||||
t2fanrd
|
|
||||||
tiny-dfr
|
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
omarchy-webapp-install "HEY" https://app.hey.com HEY.png
|
ICON_DIR="$HOME/.local/share/applications/icons"
|
||||||
omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png
|
|
||||||
omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png
|
omarchy-webapp-install "HEY" https://app.hey.com "$ICON_DIR/HEY.png"
|
||||||
omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png"
|
omarchy-webapp-install "Basecamp" https://launchpad.37signals.com "$ICON_DIR/Basecamp.png"
|
||||||
omarchy-webapp-install "Google Contacts" https://contacts.google.com/ "Google Contacts.png"
|
omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ "$ICON_DIR/WhatsApp.png"
|
||||||
omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations "Google Messages.png"
|
omarchy-webapp-install "Google Photos" https://photos.google.com/ "$ICON_DIR/Google Photos.png"
|
||||||
omarchy-webapp-install "ChatGPT" https://chatgpt.com/ ChatGPT.png
|
omarchy-webapp-install "Google Contacts" https://contacts.google.com/ "$ICON_DIR/Google Contacts.png"
|
||||||
omarchy-webapp-install "YouTube" https://youtube.com/ YouTube.png
|
omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations "$ICON_DIR/Google Messages.png"
|
||||||
omarchy-webapp-install "GitHub" https://github.com/ GitHub.png
|
omarchy-webapp-install "ChatGPT" https://chatgpt.com/ "$ICON_DIR/ChatGPT.png"
|
||||||
omarchy-webapp-install "X" https://x.com/ X.png
|
omarchy-webapp-install "YouTube" https://youtube.com/ "$ICON_DIR/YouTube.png"
|
||||||
omarchy-webapp-install "Figma" https://figma.com/ Figma.png
|
omarchy-webapp-install "GitHub" https://github.com/ "$ICON_DIR/GitHub.png"
|
||||||
omarchy-webapp-install "Discord" https://discord.com/channels/@me Discord.png
|
omarchy-webapp-install "X" https://x.com/ "$ICON_DIR/X.png"
|
||||||
omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home Zoom.png "omarchy-webapp-handler-zoom %u" "x-scheme-handler/zoommtg;x-scheme-handler/zoomus"
|
omarchy-webapp-install "Figma" https://figma.com/ "$ICON_DIR/Figma.png"
|
||||||
|
omarchy-webapp-install "Discord" https://discord.com/channels/@me "$ICON_DIR/Discord.png"
|
||||||
|
omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home "$ICON_DIR/Zoom.png"
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ echo_in_style() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
clear
|
clear
|
||||||
echo
|
|
||||||
tte -i ~/.local/share/omarchy/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch
|
tte -i ~/.local/share/omarchy/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,3 @@
|
|||||||
# Configure pacman
|
# Configure pacman
|
||||||
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
|
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
|
||||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
|
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
if lspci -nn | grep -q "106b:180[12]"; then
|
|
||||||
cat <<EOF | sudo tee -a /etc/pacman.conf >/dev/null
|
|
||||||
|
|
||||||
[arch-mact2]
|
|
||||||
Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release
|
|
||||||
SigLevel = Never
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
clear_logo
|
clear_logo
|
||||||
gum style --foreground 3 --padding "1 0 0 $PADDING_LEFT" "Installing..."
|
gum style --foreground 3 --padding "1 0 0 $PADDING_LEFT" "Installing Omarchy..."
|
||||||
echo
|
|
||||||
start_install_log
|
start_install_log
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ sudo tee /etc/sudoers.d/first-run >/dev/null <<EOF
|
|||||||
Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run
|
Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run
|
||||||
$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw
|
$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw
|
||||||
$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw-docker
|
$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw-docker
|
||||||
$USER ALL=(ALL) NOPASSWD: /usr/bin/gtk-update-icon-cache
|
|
||||||
$USER ALL=(ALL) NOPASSWD: FIRST_RUN_CLEANUP
|
$USER ALL=(ALL) NOPASSWD: FIRST_RUN_CLEANUP
|
||||||
EOF
|
EOF
|
||||||
sudo chmod 440 /etc/sudoers.d/first-run
|
sudo chmod 440 /etc/sudoers.d/first-run
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
|
if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then
|
||||||
# Install build tools
|
# Install build tools
|
||||||
sudo pacman -S --needed --noconfirm base-devel
|
sudo pacman -S --needed --noconfirm base-devel
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Show installation environment variables
|
# Show installation environment variables
|
||||||
gum log --level info "Installation Environment:"
|
gum log --level info "Installation Environment:"
|
||||||
|
|
||||||
env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_ONLINE_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do
|
env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_INSTALL_MODE|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do
|
||||||
gum log --level info " $var"
|
gum log --level info " $var"
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
echo "Create managed policy directories for Chromium and Brave for theme switching"
|
|
||||||
|
|
||||||
sudo mkdir -p /etc/chromium/policies/managed
|
|
||||||
sudo chmod a+rw /etc/chromium/policies/managed
|
|
||||||
|
|
||||||
sudo mkdir -p /etc/brave/policies/managed
|
|
||||||
sudo chmod a+rw /etc/brave/policies/managed
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
echo "Allow Image Viewer to see all images in directory and use arrow keys to navigate"
|
|
||||||
|
|
||||||
cp -f "$HOME/.local/share/omarchy/applications/imv.desktop" "$HOME/.local/share/applications/imv.desktop"
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
echo "Copy Omarchy default app icons to .local/share/icons"
|
|
||||||
|
|
||||||
source $OMARCHY_PATH/install/packaging/icons.sh
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
echo "Update Zoom webapp to handle zoommtg:// and zoomus:// protocol links"
|
|
||||||
|
|
||||||
if [[ -f ~/.local/share/applications/Zoom.desktop ]]; then
|
|
||||||
omarchy-webapp-remove Zoom
|
|
||||||
omarchy-webapp-install Zoom https://app.zoom.us/wc/home Zoom.png "omarchy-webapp-handler-zoom %u" "x-scheme-handler/zoommtg;x-scheme-handler/zoomus"
|
|
||||||
fi
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
echo "Add a blurred background to the lock screen"
|
|
||||||
|
|
||||||
omarchy-refresh-hyprlock
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
echo "Add SUPER + SHIFT + B to start browser in private mode"
|
|
||||||
|
|
||||||
if [[ -f ~/.config/hypr/bindings.conf ]] && grep -q "SUPER, B, Browser, exec" ~/.config/hypr/bindings.conf; then
|
|
||||||
sed -i '/^bindd = SUPER, B, Browser, exec, \$browser$/a\
|
|
||||||
bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private' ~/.config/hypr/bindings.conf
|
|
||||||
fi
|
|
||||||
|
Before Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 217 KiB |
|
Before Width: | Height: | Size: 208 KiB |
|
Before Width: | Height: | Size: 257 KiB |
|
Before Width: | Height: | Size: 299 KiB |
|
Before Width: | Height: | Size: 236 KiB |
|
Before Width: | Height: | Size: 194 KiB |
|
Before Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 220 KiB |
|
Before Width: | Height: | Size: 288 KiB |
|
Before Width: | Height: | Size: 169 KiB |