diff --git a/README.md b/README.md index 210306b..6b23dd5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This handles quite a few things; 1. Installing extra repositories for fusion (nonfree & free), vscode, insync, flatpak, etc 2. Install a ton of useful packages (see individual installation scripts for full list) 3. Install gpu drivers (include wayland suspend workarounds for nvidia) -4. Install some custom desktop icons for launching applications +4. Install app-specific desktop launchers and icons with their application installers 5. Install rnnoise and configure pipewire to create a noise filtered mic 6. Configure the system hostname 7. Configure vscode extensions diff --git a/src/bin/appimage-apps/01-cpu-x.sh b/src/bin/appimage-apps/01-cpu-x.sh index 5d9df78..b552ebe 100755 --- a/src/bin/appimage-apps/01-cpu-x.sh +++ b/src/bin/appimage-apps/01-cpu-x.sh @@ -4,7 +4,7 @@ CPU_X_VERSION="5.1.2" # Parent Path -PARENT_PATH="/opt/appimages" +PARENT_PATH="/home/${USER}/appimages" # Appimage path APPIMAGE_PATH="${PARENT_PATH}/cpu-x-latest.appimage" @@ -20,5 +20,18 @@ URL="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/releases/download/v sudo curl -L -o "${APPIMAGE_PATH}" "${URL}" # Set permissions -sudo chown root:root "${APPIMAGE_PATH}" +sudo chown "${USER}:${USER}" "${APPIMAGE_PATH}" sudo chmod 755 "${APPIMAGE_PATH}" + +APPLICATIONS_PATH="${HOME}/.local/share/applications" +mkdir -p "${APPLICATIONS_PATH}" +cat > "${APPLICATIONS_PATH}/cpu-x.desktop" < "${APPLICATIONS_PATH}/yubico-manager.desktop" < "${APPLICATIONS_PATH}/wootility.desktop" < "${APPLICATIONS_PATH}/r2modman-launcher.desktop" </dev/null + cp squashfs-root/usr/share/icons/hicolor/256x256/apps/curseforge.png "${ICON_PATH}" + rm -rf squashfs-root cd /tmp || exit rm -rf /tmp/curseforge ) +APPLICATIONS_PATH="${HOME}/.local/share/applications" +mkdir -p "${APPLICATIONS_PATH}" +cat > "${APPLICATIONS_PATH}/curseforge-wayland.desktop" < "${APPLICATIONS_PATH}/archon.desktop" </dev/null + ); then + printf 'Failed to extract Archon icon from %s\n' "${APPIMAGE_PATH}" >&2 + exit 1 + fi + EXTRACTED_ICON="${TEMP_DIR}/squashfs-root/usr/share/icons/hicolor/512x512/apps/archon-lite.png" + if [[ ! -f "${EXTRACTED_ICON}" ]]; then + printf 'Archon icon was not found in %s\n' "${APPIMAGE_PATH}" >&2 + exit 1 + fi + mkdir -p "${ICONS_PATH}" && + cp "${EXTRACTED_ICON}" "${ARCHON_ICON_PATH}" || exit 1 +fi diff --git a/src/bin/appimage-apps/11-wcl.sh b/src/bin/appimage-apps/11-wcl.sh deleted file mode 100755 index 996d2da..0000000 --- a/src/bin/appimage-apps/11-wcl.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Version -WARCRAFTLOGS_VERSION="8.15.4" - -# Parent Path -PARENT_PATH="/opt/appimages" - -# Appimage path -APPIMAGE_PATH="${PARENT_PATH}/warcraftlogs-latest.appimage" - -# Prep parent folder -if [[ ! -d "${PARENT_PATH}" ]]; then - mkdir -p "${PARENT_PATH}" -fi - -URL="https://github.com/RPGLogs/Uploaders-warcraftlogs/releases/download/v${WARCRAFTLOGS_VERSION}/warcraftlogs-v${WARCRAFTLOGS_VERSION}.AppImage" - -# Warcraft logs client -sudo curl -L -o "${APPIMAGE_PATH}" "${URL}" - -# Set permissions -sudo chown root:root "${APPIMAGE_PATH}" -sudo chmod 755 "${APPIMAGE_PATH}" diff --git a/src/bin/appimage-apps/12-ascension.sh b/src/bin/appimage-apps/12-ascension.sh deleted file mode 100755 index 8cffd7f..0000000 --- a/src/bin/appimage-apps/12-ascension.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Version -ASCENSION_VERSION="142" - -# Parent Path -PARENT_PATH="/opt/appimages" - -# Appimage path -APPIMAGE_PATH="${PARENT_PATH}/ascension-launcher-latest.appimage" - -# Prep parent folder -if [[ ! -d "${PARENT_PATH}" ]]; then - mkdir -p "${PARENT_PATH}" -fi - -URL="https://download.ascension-patch.gg/update/ascension-launcher-${ASCENSION_VERSION}.AppImage" - -# Ascension launcher -sudo curl -L -o "${APPIMAGE_PATH}" "${URL}" - -# Set permissions -sudo chown root:root "${APPIMAGE_PATH}" -sudo chmod 755 "${APPIMAGE_PATH}" diff --git a/src/bin/appimage-apps/13-wowup.sh b/src/bin/appimage-apps/13-wowup.sh index dbe81c5..8c8d1cb 100755 --- a/src/bin/appimage-apps/13-wowup.sh +++ b/src/bin/appimage-apps/13-wowup.sh @@ -4,7 +4,7 @@ WOWUP_VERSION="2.20.0" # Parent Path -PARENT_PATH="/opt/appimages" +PARENT_PATH="/home/${USER}/appimages" # Appimage path APPIMAGE_PATH="${PARENT_PATH}/wowup-client-latest.appimage" @@ -20,5 +20,18 @@ URL="https://github.com/WowUp/WowUp.CF/releases/download/v${WOWUP_VERSION}/WowUp sudo curl -L -o "${APPIMAGE_PATH}" "${URL}" # Set permissions -sudo chown root:root "${APPIMAGE_PATH}" +sudo chown "${USER}:${USER}" "${APPIMAGE_PATH}" sudo chmod 755 "${APPIMAGE_PATH}" + +APPLICATIONS_PATH="${HOME}/.local/share/applications" +mkdir -p "${APPLICATIONS_PATH}" +cat > "${APPLICATIONS_PATH}/wowup-client.desktop" < "${APPLICATIONS_PATH}/weakauras-client.desktop" < "${APPLICATIONS_PATH}/exiled-exchange.desktop" < /dev/null && pwd ) "${SCRIPT_DIR}"/03-wootility.sh "${SCRIPT_DIR}"/04-r2modman.sh "${SCRIPT_DIR}"/10-curseforge.sh -"${SCRIPT_DIR}"/11-wcl.sh +"${SCRIPT_DIR}"/11-archon.sh "${SCRIPT_DIR}"/12-ascension.sh "${SCRIPT_DIR}"/13-wowup.sh "${SCRIPT_DIR}"/14-weakauras.sh diff --git a/src/bin/fedora/05-dnf.sh b/src/bin/fedora/05-dnf.sh index f673edf..18b6312 100755 --- a/src/bin/fedora/05-dnf.sh +++ b/src/bin/fedora/05-dnf.sh @@ -49,3 +49,34 @@ sudo dnf install -y \ "wine" \ "zsh" \ "GConf2" + +APPLICATIONS_PATH="${HOME}/.local/share/applications" +mkdir -p "${APPLICATIONS_PATH}" +cat > "${APPLICATIONS_PATH}/microsoft-edge-stable-wayland.desktop" <<'EOF' +[Desktop Entry] +Name=Microsoft Edge (Wayland) +Exec=/usr/bin/microsoft-edge-stable --enable-features=UseOzonePlatform --ozone-platform=wayland %U +Icon=/usr/share/icons/hicolor/128x128/apps/microsoft-edge.png +Type=Application +Categories=Network;WebBrowser; +EOF +cat > "${APPLICATIONS_PATH}/vscode-wayland.desktop" <<'EOF' +[Desktop Entry] +Name=VSCode (Wayland) +Comment=Code Editing. Redefined. +GenericName=Text Editor +Exec=/usr/share/code/code --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --unity-launch %F +Icon=vscode +Type=Application +StartupNotify=false +StartupWMClass=Code +Categories=TextEditor;Development;IDE; +MimeType=text/plain;inode/directory;application/x-code-workspace; +Actions=new-empty-window; +Keywords=vscode; + +[Desktop Action new-empty-window] +Name=New Empty Window +Exec=/usr/share/code/code --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --new-window %F +Icon=vscode +EOF diff --git a/src/bin/fedora/08-icons.sh b/src/bin/fedora/08-icons.sh deleted file mode 100755 index 93f0acd..0000000 --- a/src/bin/fedora/08-icons.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -# Install desktop icons -cp "${SCRIPT_DIR}"/../../etc/icons/*.desktop \ - "/home/$(whoami)/.local/share/applications" diff --git a/src/bin/fedora/install.sh b/src/bin/fedora/install.sh index db78a98..83bb55d 100755 --- a/src/bin/fedora/install.sh +++ b/src/bin/fedora/install.sh @@ -10,7 +10,6 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) "${SCRIPT_DIR}"/04-insync-repo.sh "${SCRIPT_DIR}"/05-dnf.sh "${SCRIPT_DIR}"/07-gpu-driver.sh -"${SCRIPT_DIR}"/08-icons.sh "${SCRIPT_DIR}"/09-pipewire.sh "${SCRIPT_DIR}"/10-wireplumber.sh "${SCRIPT_DIR}"/11-clam.sh diff --git a/src/bin/linux/04-flatpak.sh b/src/bin/linux/04-flatpak.sh index 1e567ce..eeacd79 100644 --- a/src/bin/linux/04-flatpak.sh +++ b/src/bin/linux/04-flatpak.sh @@ -6,3 +6,32 @@ flatpak remote-add \ # Update everything sudo flatpak update -y + +APPLICATIONS_PATH="${HOME}/.local/share/applications" +mkdir -p "${APPLICATIONS_PATH}" +cat > "${APPLICATIONS_PATH}/discord-wayland.desktop" <<'EOF' +[Desktop Entry] +Name=Discord (Wayland) +Comment=Discord Client (Wayland) +GenericName=Discord +Exec=flatpak run com.discordapp.Discord --ignore-gpu-blocklist --disable-features=UseOzonePlatform --enable-features=VaapiVideoDecoder --use-gl=desktop --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiIgnoreDriverChecks --enable-features=WaylandWindowDecorations --disable-features=UseChromeOSDirectVideoDecoder --enable-native-gpu-memory-buffers +Type=Application +StartupNotify=false +StartupWMClass=Discord +Icon=com.discordapp.Discord +EOF +cat > "${APPLICATIONS_PATH}/spotify.desktop" <<'EOF' +[Desktop Entry] +Type=Application +Name=Spotify (Wayland) +GenericName=Music Player +Icon=com.spotify.Client +Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=spotify --file-forwarding com.spotify.Client --ozone-platform=wayland --disable-features=WaylandWindowDecorations @@u %U @@ +Terminal=false +MimeType=x-scheme-handler/spotify; +Categories=Audio;Music;Player;AudioVideo; +StartupWMClass=spotify +X-GNOME-UsesNotifications=true +X-Flatpak-Tags=proprietary; +X-Flatpak=com.spotify.Client +EOF diff --git a/src/etc/icons/ascension-launcher.desktop b/src/etc/icons/ascension-launcher.desktop deleted file mode 100644 index 35ee58f..0000000 --- a/src/etc/icons/ascension-launcher.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Ascension -Comment=Ascension Launcher -GenericName=Ascension -Exec=/opt/appimages/ascension-launcher-latest.appimage -Type=Application -StartupNotify=false -StartupWMClass=Ascension diff --git a/src/etc/icons/cpu-x.desktop b/src/etc/icons/cpu-x.desktop deleted file mode 100644 index dd681b8..0000000 --- a/src/etc/icons/cpu-x.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=CPU-X -Comment=CPU-X -GenericName=CPU-X -Exec=/opt/appimages/cpu-x-latest.appimage -Type=Application -StartupNotify=false -StartupWMClass=CPU-X diff --git a/src/etc/icons/curseforge-wayland.desktop b/src/etc/icons/curseforge-wayland.desktop deleted file mode 100644 index 9021f09..0000000 --- a/src/etc/icons/curseforge-wayland.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=CurseForge (Wayland) -Comment=CurseForge Addons -GenericName=CurseForge -Exec=/opt/appimages/curseforge-latest.appimage --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations % -Type=Application -StartupNotify=false -StartupWMClass=CurseForge -MimeType=x-scheme-handler/cfauth; diff --git a/src/etc/icons/discord-wayland.desktop b/src/etc/icons/discord-wayland.desktop deleted file mode 100644 index 2a68cdb..0000000 --- a/src/etc/icons/discord-wayland.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Discord (Wayland) -Comment=Discord Client (Wayland) -GenericName=Discord -Exec=flatpak run com.discordapp.Discord --ignore-gpu-blocklist --disable-features=UseOzonePlatform --enable-features=VaapiVideoDecoder --use-gl=desktop --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiIgnoreDriverChecks --enable-features=WaylandWindowDecorations --disable-features=UseChromeOSDirectVideoDecoder --enable-native-gpu-memory-buffers -Type=Application -StartupNotify=false -StartupWMClass=Discord -Icon=com.discordapp.Discord diff --git a/src/etc/icons/exiled-exchange.desktop b/src/etc/icons/exiled-exchange.desktop deleted file mode 100644 index 31e44d3..0000000 --- a/src/etc/icons/exiled-exchange.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=ExiledExchange -Comment=Exiled Exchange 2 Client -GenericName=ExiledExchange -Exec=/opt/appimages/exiled-exchange-2-latest.appimage --no-sandbox -Type=Application -StartupNotify=false -StartupWMClass=ExiledExchange diff --git a/src/etc/icons/microsoft-edge-stable-wayland.desktop b/src/etc/icons/microsoft-edge-stable-wayland.desktop deleted file mode 100644 index 67b0e03..0000000 --- a/src/etc/icons/microsoft-edge-stable-wayland.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=Microsoft Edge (Wayland) -Exec=/usr/bin/microsoft-edge-stable --enable-features=UseOzonePlatform --ozone-platform=wayland %U -Icon=/usr/share/icons/hicolor/128x128/apps/microsoft-edge.png -Type=Application -Categories=Network;WebBrowser; diff --git a/src/etc/icons/r2modman-launcher.desktop b/src/etc/icons/r2modman-launcher.desktop deleted file mode 100644 index c90f8e4..0000000 --- a/src/etc/icons/r2modman-launcher.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=R2modman -Comment=R2modman Launcher -GenericName=R2modman -Exec=/opt/appimages/r2modman-latest.appimage --no-sandbox -Type=Application -StartupNotify=false -StartupWMClass=R2modman diff --git a/src/etc/icons/vscode-wayland.desktop b/src/etc/icons/vscode-wayland.desktop deleted file mode 100644 index 846fbea..0000000 --- a/src/etc/icons/vscode-wayland.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=VSCode (Wayland) -Comment=Code Editing. Redefined. -GenericName=Text Editor -Exec=/usr/share/code/code --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --unity-launch %F -Icon=vscode -Type=Application -StartupNotify=false -StartupWMClass=Code -Categories=TextEditor;Development;IDE; -MimeType=text/plain;inode/directory;application/x-code-workspace; -Actions=new-empty-window; -Keywords=vscode; - -[Desktop Action new-empty-window] -Name=New Empty Window -Exec=/usr/share/code/code --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --new-window %F -Icon=vscode diff --git a/src/etc/icons/warcraftlogs.desktop b/src/etc/icons/warcraftlogs.desktop deleted file mode 100644 index 3c44dbc..0000000 --- a/src/etc/icons/warcraftlogs.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=WarcraftLogs -Comment=Warcraft Logs Client -GenericName=WarcraftLogs -Exec=/opt/appimages/warcraftlogs-latest.appimage --no-sandbox -Type=Application -StartupNotify=false -StartupWMClass=WarcraftLogs diff --git a/src/etc/icons/weakauras-client.desktop b/src/etc/icons/weakauras-client.desktop deleted file mode 100644 index edb84b5..0000000 --- a/src/etc/icons/weakauras-client.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Weakauras -Comment=Weakauras Launcher -GenericName=Weakauras -Exec=/opt/appimages/weakauras-client-latest.appimage -Type=Application -StartupNotify=false -StartupWMClass=Weakauras diff --git a/src/etc/icons/wootility.desktop b/src/etc/icons/wootility.desktop deleted file mode 100644 index 7d931f2..0000000 --- a/src/etc/icons/wootility.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Wootility -Comment=Wootility Launcher -GenericName=Wootility -Exec=/opt/appimages/wootility-latest.appimage -Type=Application -StartupNotify=false -StartupWMClass=Wootility diff --git a/src/etc/icons/wowup-client.desktop b/src/etc/icons/wowup-client.desktop deleted file mode 100644 index 1bf7799..0000000 --- a/src/etc/icons/wowup-client.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=WoWUP -Comment=WoWUP Client -GenericName=WoWUP -Exec=/opt/appimages/wowup-client-latest.appimage -Type=Application -StartupNotify=false -StartupWMClass=WoWUP diff --git a/src/etc/icons/yubico-manager.desktop b/src/etc/icons/yubico-manager.desktop deleted file mode 100644 index 8466450..0000000 --- a/src/etc/icons/yubico-manager.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Yubico Manager -Comment=Yubico Manager -GenericName=Yubico Manager -Exec=/opt/appimages/yubico-manager-latest.appimage -Icon=/opt/yubico-authenticator/linux_support/com.yubico.yubioath.png -Type=Application -StartupNotify=false -StartupWMClass=Yubico