diff --git a/src/bin/linux/22-cpu-x.sh b/src/bin/appimage-apps/01-cpu-x.sh similarity index 100% rename from src/bin/linux/22-cpu-x.sh rename to src/bin/appimage-apps/01-cpu-x.sh diff --git a/src/bin/linux/20-yubico.sh b/src/bin/appimage-apps/02-yubico.sh similarity index 100% rename from src/bin/linux/20-yubico.sh rename to src/bin/appimage-apps/02-yubico.sh diff --git a/src/bin/linux/19-wootility.sh b/src/bin/appimage-apps/03-wootility.sh similarity index 100% rename from src/bin/linux/19-wootility.sh rename to src/bin/appimage-apps/03-wootility.sh diff --git a/src/bin/linux/17-r2modman.sh b/src/bin/appimage-apps/04-r2modman.sh similarity index 100% rename from src/bin/linux/17-r2modman.sh rename to src/bin/appimage-apps/04-r2modman.sh diff --git a/src/bin/linux/13-curseforge.sh b/src/bin/appimage-apps/10-curseforge.sh similarity index 100% rename from src/bin/linux/13-curseforge.sh rename to src/bin/appimage-apps/10-curseforge.sh diff --git a/src/bin/linux/14-wcl.sh b/src/bin/appimage-apps/11-wcl.sh similarity index 100% rename from src/bin/linux/14-wcl.sh rename to src/bin/appimage-apps/11-wcl.sh diff --git a/src/bin/linux/15-ascension.sh b/src/bin/appimage-apps/12-ascension.sh similarity index 100% rename from src/bin/linux/15-ascension.sh rename to src/bin/appimage-apps/12-ascension.sh diff --git a/src/bin/linux/16-wowup.sh b/src/bin/appimage-apps/13-wowup.sh similarity index 100% rename from src/bin/linux/16-wowup.sh rename to src/bin/appimage-apps/13-wowup.sh diff --git a/src/bin/linux/18-weakauras.sh b/src/bin/appimage-apps/14-weakauras.sh similarity index 100% rename from src/bin/linux/18-weakauras.sh rename to src/bin/appimage-apps/14-weakauras.sh diff --git a/src/bin/linux/21-exiled-exchange.sh b/src/bin/appimage-apps/20-exiled-exchange.sh similarity index 100% rename from src/bin/linux/21-exiled-exchange.sh rename to src/bin/appimage-apps/20-exiled-exchange.sh diff --git a/src/bin/appimage-apps/install.sh b/src/bin/appimage-apps/install.sh new file mode 100644 index 0000000..b60f534 --- /dev/null +++ b/src/bin/appimage-apps/install.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +"${SCRIPT_DIR}"/01-cpu-x.sh +"${SCRIPT_DIR}"/02-yubico.sh +"${SCRIPT_DIR}"/03-wootility.sh +"${SCRIPT_DIR}"/04-r2modman.sh +"${SCRIPT_DIR}"/10-curseforge.sh +"${SCRIPT_DIR}"/11-wcl.sh +"${SCRIPT_DIR}"/12-ascension.sh +"${SCRIPT_DIR}"/13-wowup.sh +"${SCRIPT_DIR}"/14-weakauras.sh +"${SCRIPT_DIR}"/20-exiled-exchange.sh diff --git a/src/bin/common/install.sh b/src/bin/common/install.sh new file mode 100644 index 0000000..e3ae1f6 --- /dev/null +++ b/src/bin/common/install.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +"${SCRIPT_DIR}"/01-sanitize.sh +"${SCRIPT_DIR}"/02-rust.sh +"${SCRIPT_DIR}"/03-kustomize.sh diff --git a/src/bin/fedora/05-dnf.sh b/src/bin/fedora/05-dnf.sh index 3de8a8b..f673edf 100755 --- a/src/bin/fedora/05-dnf.sh +++ b/src/bin/fedora/05-dnf.sh @@ -9,14 +9,17 @@ sudo dnf upgrade -y # Autoremove sudo dnf autoremove -y +# Enable Chrome repository +sudo dnf config-manager setopt google-chrome.enabled=1 + # Install groups sudo dnf -y groupinstall "Development Tools" # Install packages sudo dnf install -y \ "code" \ - "cronie" \ "cronie-anacron" \ + "cronie" \ "dbus-libs.i686" \ "dnf-plugins-core" \ "expect" \ @@ -24,6 +27,7 @@ sudo dnf install -y \ "gamescope" \ "gnome-tweaks" \ "gnutls.i686" \ + "google-chrome-stable" \ "htop" \ "insync" \ "ladspa" \ diff --git a/src/bin/fedora/10-wireplumber.sh b/src/bin/fedora/10-wireplumber.sh index ba75c34..caf2697 100755 --- a/src/bin/fedora/10-wireplumber.sh +++ b/src/bin/fedora/10-wireplumber.sh @@ -4,11 +4,10 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Install wireplumber configuration into the conf.d folder and restart wireplumber service WP_CONFIG_DIR="${HOME}/.config/wireplumber/wireplumber.conf.d/" -WP_FILE="51-disable-suspension.conf" mkdir -p "${WP_CONFIG_DIR}" -cp "${SCRIPT_DIR}/../../etc/wireplumber/${WP_FILE}" \ - "${WP_CONFIG_DIR}/${WP_FILE}" +cp -R "${SCRIPT_DIR}/../../etc/wireplumber/"* \ + "${WP_CONFIG_DIR}/" systemctl daemon-reload --user systemctl restart --user wireplumber.service diff --git a/src/bin/linux/03-zsh.sh b/src/bin/linux/02-zsh.sh similarity index 100% rename from src/bin/linux/03-zsh.sh rename to src/bin/linux/02-zsh.sh diff --git a/src/bin/linux/06-ollama.sh b/src/bin/linux/03-ollama.sh similarity index 100% rename from src/bin/linux/06-ollama.sh rename to src/bin/linux/03-ollama.sh diff --git a/src/bin/linux/08-flatpak.sh b/src/bin/linux/04-flatpak.sh old mode 100755 new mode 100644 similarity index 100% rename from src/bin/linux/08-flatpak.sh rename to src/bin/linux/04-flatpak.sh diff --git a/src/bin/linux/10-rnnoise.sh b/src/bin/linux/05-rnnoise.sh similarity index 100% rename from src/bin/linux/10-rnnoise.sh rename to src/bin/linux/05-rnnoise.sh diff --git a/src/bin/linux/11-gnome-extensions.sh b/src/bin/linux/06-gnome-extensions.sh similarity index 100% rename from src/bin/linux/11-gnome-extensions.sh rename to src/bin/linux/06-gnome-extensions.sh diff --git a/src/bin/linux/30-openshift-cli.sh b/src/bin/linux/07-openshift-cli.sh similarity index 100% rename from src/bin/linux/30-openshift-cli.sh rename to src/bin/linux/07-openshift-cli.sh diff --git a/src/bin/linux/31-opm.sh b/src/bin/linux/08-opm.sh similarity index 100% rename from src/bin/linux/31-opm.sh rename to src/bin/linux/08-opm.sh diff --git a/src/bin/linux/12-yubico-authenticator.sh b/src/bin/linux/09-yubico-authenticator.sh similarity index 100% rename from src/bin/linux/12-yubico-authenticator.sh rename to src/bin/linux/09-yubico-authenticator.sh diff --git a/src/bin/linux/install.sh b/src/bin/linux/install.sh index bead667..48e1173 100755 --- a/src/bin/linux/install.sh +++ b/src/bin/linux/install.sh @@ -2,27 +2,14 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +"${SCRIPT_DIR}"/../common/install.sh + "${SCRIPT_DIR}"/01-hostname.sh -"${SCRIPT_DIR}"/03-zsh.sh -"${SCRIPT_DIR}"/05-rust.sh -"${SCRIPT_DIR}"/06-ollama.sh -"${SCRIPT_DIR}"/08-flatpak.sh -"${SCRIPT_DIR}"/09-snap.sh -"${SCRIPT_DIR}"/10-rnnoise.sh -"${SCRIPT_DIR}"/11-gnome-extensions.sh -"${SCRIPT_DIR}"/12-yubico-authenticator.sh -"${SCRIPT_DIR}"/13-curseforge.sh -"${SCRIPT_DIR}"/14-wcl.sh -"${SCRIPT_DIR}"/15-ascension.sh -"${SCRIPT_DIR}"/16-wowup.sh -"${SCRIPT_DIR}"/17-r2modman.sh -"${SCRIPT_DIR}"/18-weakauras.sh -"${SCRIPT_DIR}"/19-wootility.sh -"${SCRIPT_DIR}"/20-yubico.sh -"${SCRIPT_DIR}"/21-exiled-exchange.sh -"${SCRIPT_DIR}"/22-cpu-x.sh -"${SCRIPT_DIR}"/30-openshift-cli.sh -"${SCRIPT_DIR}"/31-opm.sh -"${SCRIPT_DIR}"/../common/01-sanitize.sh -"${SCRIPT_DIR}"/../common/02-rust.sh -"${SCRIPT_DIR}"/../common/03-kustomize.sh +"${SCRIPT_DIR}"/02-zsh.sh +"${SCRIPT_DIR}"/03-ollama.sh +"${SCRIPT_DIR}"/04-flatpak.sh +"${SCRIPT_DIR}"/05-rnnoise.sh +"${SCRIPT_DIR}"/06-gnome-extensions.sh +"${SCRIPT_DIR}"/07-openshift-cli.sh +"${SCRIPT_DIR}"/08-opm.sh +"${SCRIPT_DIR}"/09-yubico-authenticator.sh diff --git a/src/etc/icons/curseforge.desktop b/src/etc/icons/curseforge.desktop deleted file mode 100644 index 01eead6..0000000 --- a/src/etc/icons/curseforge.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=CurseForge -Comment=CurseForge Addons -GenericName=CurseForge -Exec=/opt/appimages/curseforge-latest.appimage % -Type=Application -StartupNotify=false -StartupWMClass=CurseForge -MimeType=x-scheme-handler/cfauth; diff --git a/src/etc/icons/slack-wayland.desktop b/src/etc/icons/slack-wayland.desktop deleted file mode 100644 index 4f9b282..0000000 --- a/src/etc/icons/slack-wayland.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Slack (Wayland) -StartupWMClass=Slack -Comment=Slack Desktop -GenericName=Slack Client for Linux (Wayland) -Exec=/usr/bin/slack --enable-features=WebRTCPipeWireCapturer %U -Icon=/usr/share/pixmaps/slack.png -Type=Application -StartupNotify=true -Categories=GNOME;GTK;Network;InstantMessaging; -MimeType=x-scheme-handler/slack; - diff --git a/src/etc/icons/vscode-wayland.desktop b/src/etc/icons/vscode-wayland.desktop index 6d6f182..846fbea 100644 --- a/src/etc/icons/vscode-wayland.desktop +++ b/src/etc/icons/vscode-wayland.desktop @@ -3,7 +3,7 @@ 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=com.visualstudio.code +Icon=vscode Type=Application StartupNotify=false StartupWMClass=Code @@ -15,4 +15,4 @@ 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=com.visualstudio.code +Icon=vscode