Bare mode is dead in 2.0
Uninstall whatever you want yourself now that we have multi-tab uninstalls
This commit is contained in:
David Heinemeier Hansson
parent
46f8b522f1
commit
39dccccb1a
@ -9,10 +9,6 @@ gtk-update-icon-cache ~/.local/share/icons/hicolor &>/dev/null
|
||||
mkdir -p ~/.local/share/applications
|
||||
cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
|
||||
cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
|
||||
|
||||
# Only copy xtras if user is not in bare mode
|
||||
if [[ ! -f ~/.local/state/omarchy/bare.mode ]] && [ -z "$OMARCHY_BARE" ]; then
|
||||
cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
|
||||
fi
|
||||
cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
|
||||
|
||||
update-desktop-database ~/.local/share/applications
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
if omarchy-pkg-aur-accessible; then
|
||||
if [ -z "$OMARCHY_BARE" ]; then
|
||||
yay -S --noconfirm --needed \
|
||||
1password-beta 1password-cli \
|
||||
typora ttf-ia-writer
|
||||
fi
|
||||
yay -S --noconfirm --needed \
|
||||
1password-beta 1password-cli \
|
||||
typora ttf-ia-writer
|
||||
|
||||
yay -S --noconfirm --needed \
|
||||
tzupdate wl-screenrec \
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -z "$OMARCHY_BARE" ]; then
|
||||
omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/qdirstat.png
|
||||
omarchy-tui-install "Docker" "lazydocker" tile https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/docker.png
|
||||
fi
|
||||
omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/qdirstat.png
|
||||
omarchy-tui-install "Docker" "lazydocker" tile https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/docker.png
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -z "$OMARCHY_BARE" ]; then
|
||||
omarchy-webapp-install "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png
|
||||
omarchy-webapp-install "Basecamp" https://launchpad.37signals.com https://basecamp.com/assets/images/general/basecamp.png
|
||||
omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
|
||||
omarchy-webapp-install "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
|
||||
omarchy-webapp-install "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
|
||||
omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
|
||||
omarchy-webapp-install "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
|
||||
omarchy-webapp-install "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
|
||||
omarchy-webapp-install "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png
|
||||
omarchy-webapp-install "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png
|
||||
omarchy-webapp-install "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256
|
||||
omarchy-webapp-install "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png
|
||||
omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png
|
||||
fi
|
||||
omarchy-webapp-install "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png
|
||||
omarchy-webapp-install "Basecamp" https://launchpad.37signals.com https://basecamp.com/assets/images/general/basecamp.png
|
||||
omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
|
||||
omarchy-webapp-install "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
|
||||
omarchy-webapp-install "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
|
||||
omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
|
||||
omarchy-webapp-install "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
|
||||
omarchy-webapp-install "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
|
||||
omarchy-webapp-install "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png
|
||||
omarchy-webapp-install "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png
|
||||
omarchy-webapp-install "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256
|
||||
omarchy-webapp-install "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png
|
||||
omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -z "$OMARCHY_BARE" ]; then
|
||||
sudo pacman -S --noconfirm --needed \
|
||||
gnome-calculator gnome-keyring signal-desktop \
|
||||
obsidian libreoffice obs-studio kdenlive \
|
||||
xournalpp localsend
|
||||
sudo pacman -S --noconfirm --needed \
|
||||
gnome-calculator gnome-keyring signal-desktop \
|
||||
obsidian libreoffice obs-studio kdenlive \
|
||||
xournalpp localsend
|
||||
|
||||
# Packages known to be flaky or having key signing issues are run one-by-one
|
||||
for pkg in spotify pinta; do
|
||||
sudo pacman -S --noconfirm --needed "$pkg" ||
|
||||
echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
|
||||
done
|
||||
fi
|
||||
# Packages known to be flaky or having key signing issues are run one-by-one
|
||||
for pkg in spotify pinta; do
|
||||
sudo pacman -S --noconfirm --needed "$pkg" ||
|
||||
echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
|
||||
done
|
||||
|
||||
# Copy over Omarchy applications
|
||||
source omarchy-refresh-applications || true
|
||||
|
||||
@ -9,9 +9,3 @@ cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
|
||||
|
||||
# Ensure application directory exists for update-desktop-database
|
||||
mkdir -p ~/.local/share/applications
|
||||
|
||||
# If bare install, allow a way for its exclusions to not get added in updates
|
||||
if [ -n "$OMARCHY_BARE" ]; then
|
||||
mkdir -p ~/.local/state/omarchy
|
||||
touch ~/.local/state/omarchy/bare.mode
|
||||
fi
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Install asdcontrol for controlling brightness on Apple Displays
|
||||
if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then
|
||||
if ! command -v asdcontrol &>/dev/null; then
|
||||
git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
|
||||
cd /tmp/asdcontrol
|
||||
make
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
sudo pacman -S --noconfirm --needed ttf-font-awesome ttf-cascadia-mono-nerd noto-fonts noto-fonts-emoji
|
||||
sudo pacman -S --noconfirm --needed \
|
||||
ttf-font-awesome ttf-cascadia-mono-nerd ttf-jetbrains-mono \
|
||||
noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
|
||||
|
||||
mkdir -p ~/.local/share/fonts
|
||||
cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/
|
||||
fc-cache
|
||||
|
||||
if [ -z "$OMARCHY_BARE" ]; then
|
||||
sudo pacman -S --noconfirm --needed ttf-jetbrains-mono noto-fonts-cjk noto-fonts-extra
|
||||
fi
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "Installation ENV:"
|
||||
env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_BARE)="
|
||||
env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF)="
|
||||
|
||||
@ -24,11 +24,7 @@ catch_errors() {
|
||||
echo " ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀ ▀ ▀▀▀▀▀▀ "
|
||||
echo " "
|
||||
|
||||
if [[ -n $OMARCHY_BARE ]]; then
|
||||
echo "You can retry by running: OMARCHY_BARE=true bash ~/.local/share/omarchy/install.sh"
|
||||
else
|
||||
echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
|
||||
fi
|
||||
echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
|
||||
}
|
||||
|
||||
trap catch_errors ERR
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user