Merge branch 'main' into skip-confirmation

* 🦀 feat(ux): add a minimum size bypass cli flag

* oopsie

.github/workflows/bashisms.yml

@@ -3,7 +3,7 @@ name: Check for bashisms
 on:
   pull_request:
     paths:
-      - core/tabs/**
+      - 'core/tabs/**/*.sh'
   merge_group:
   workflow_dispatch:
 
@@ -15,31 +15,33 @@ jobs:
       - uses: actions/checkout@v4
       - run: git fetch origin ${{ github.base_ref }}
 
-      - name: Get a list of changed script files
-        id: get_sh_files
-        run: |
-          sh_files=$(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs | grep '\.sh$' || true)
-          if [ -n "$sh_files" ]; then
-            echo "$sh_files" > changed_files
-            echo "changed=1" >> $GITHUB_OUTPUT
-          else
-            echo "changed=0" >> $GITHUB_OUTPUT
-          fi
-      
       - name: Install devscripts
-        if: steps.get_sh_files.outputs.changed == 1
-        run: sudo apt-get update && sudo apt-get install devscripts
+        run: sudo apt-get update && sudo apt-get install -y devscripts
+
+      - name: Get changed .sh files (PR only)
+        id: changed-sh-files
+        if: github.event_name == 'pull_request'
+        uses: tj-actions/changed-files@v45
+        with:
+          files: '**/*.sh'
+
+      - name: Get all .sh files (if workflow dispatched)
+        id: sh-files
+        if: github.event_name != 'pull_request'
+        run: |
+          files=$(find . -type f -name "*.sh" | tr '\n' ' ')
+          echo "files=${files:-none}" >> $GITHUB_ENV
+
+      - name: Set FILES for bashism check
+        id: set-files
+        run: |
+          if [[ "${{ steps.changed-sh-files.outputs.any_changed }}" == 'true' ]]; then
+            echo "FILES=${{ steps.changed-sh-files.outputs.all_changed_files }}" >> $GITHUB_ENV
+          else
+            echo "FILES=${{ env.files }}" >> $GITHUB_ENV
+          fi
 
       - name: Check for bashisms
-        if: steps.get_sh_files.outputs.changed == 1
         run: |
-          echo "Running for:\n$(cat changed_files)\n"
-          for file in $(cat changed_files); do
-            if [[ -f "$file" ]]; then
-              checkbashisms "$file"
-            fi
-          done
-
-      - name: Remove the created file
-        if: steps.get_sh_files.outputs.changed == 1
-        run: rm changed_files
+          IFS=' ' read -r -a file_array <<< "$FILES"
+          checkbashisms "${file_array[@]}"

.github/workflows/github-pages.yml

@@ -13,6 +13,10 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    environment: linutil_env
+    permissions:
+      contents: write
+      pull-requests: write
 
     steps:
       - name: Checkout Repository
@@ -24,11 +28,17 @@ jobs:
         run: |
           echo -e "<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md'
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
         with:
-          commit_message: Commit Contributing Guidelines
-          file_pattern: "docs/contributing.md"
-          add_options: '--force'
+          commit-message: Update Contributing Guidelines
+          title: 'docs: Update Contributing Guidelines'
+          body: 'Automated update of Contributing Guidelines from .github/CONTRIBUTING.md'
+          branch: update-contributing-guidelines
+          delete-branch: true
+          base: main
+          labels: documentation
+          token: ${{ secrets.PAT_TOKEN }}
         if: success()
 
       - name: Setup Python

.github/workflows/linutil.yml

@@ -78,11 +78,3 @@ jobs:
         env:
           version: ${{ env.version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: linutil-artifact
-          path: build/x86_64-unknown-linux-musl/release/linutil
-          compression-level: 0
-          overwrite: true

.github/workflows/preview.yml

@@ -3,8 +3,8 @@ name: LinUtil Preview
 on:
   workflow_dispatch:
     inputs:
-        run_id:
-          description: 'Run ID of LinUtil Release'
+        tag_name:
+          description: 'Tag name'
           required: true
   workflow_run:
     workflows: ["LinUtil Release"]
@@ -14,29 +14,47 @@ on:
 jobs:
   generate_preview:
     runs-on: ubuntu-latest
+    environment: linutil_env
+    permissions:
+      contents: write
+      pull-requests: write
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout source
+        uses: actions/checkout@v4
 
-      - name: Set Run ID
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_run" ]; then
-            echo "run_id=${{ github.event.workflow_run.id }}" >> $GITHUB_ENV
-          else
-            echo "run_id=${{ github.event.inputs.run_id }}" >> $GITHUB_ENV
-          fi
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
+      - name: Get tag name ( Workflow Run )
+        id: latest_tag
+        uses: actions/github-script@v7
+        if: github.event_name == 'workflow_run'
         with:
-          name: linutil-artifact
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ env.run_id }}
+          script: |
+            const releases = await github.rest.repos.listReleases({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 1
+            });
+            core.setOutput('result', releases.data[0].tag_name);
+          result-encoding: string
+
+      - name: Set tag name ( Workflow Run )
+        if: github.event_name == 'workflow_run'
+        run: echo "tag_name=${{ steps.latest_tag.outputs.result }}" >> $GITHUB_ENV
+
+      - name: Set tag name ( Workflow Dispatch )
+        if: ${{ github.event_name }} == 'workflow_dispatch'
+        run: echo "tag_name=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+
+      - name: Download binary
+        run: |
+          curl -LO "https://github.com/${{ github.repository }}/releases/download/${{ env.tag_name }}/linutil"
 
       - name: Set env
         run: |
           chmod +x linutil
-          echo "${{ github.workspace }}" >> $GITHUB_PATH
+          mkdir -p build
+          mv linutil build/linutil
+          echo "${{ github.workspace }}/build" >> $GITHUB_PATH
 
       - name: Generate preview
         uses: charmbracelet/vhs-action@v2.1.0
@@ -46,10 +64,15 @@ jobs:
       - name: Move preview
         run: mv preview.gif docs/assets/preview.gif
 
-      - name: Upload preview
-        uses: stefanzweifel/git-auto-commit-action@v5
+      - name: Create PR
+        uses: peter-evans/create-pull-request@v7.0.5
         with:
-          commit_message: Preview for ${{ env.run_id }}
-          file_pattern: "docs/assets/preview.gif"
-          add_options: "--force"
+          commit-message: Preview for ${{ env.tag_name }}
+          file-pattern: "docs/assets/preview.gif"
+          add-options: "--force"
+          token: ${{ secrets.PAT_TOKEN }}
+          branch: feature/preview-${{ env.tag_name }}
+          title: "Update preview for ${{ env.tag_name }}"
+          body: |
+            Automated PR to update preview gif for version ${{ env.tag_name }}
         if: success()

.github/workflows/shellcheck.yml

@@ -17,6 +17,7 @@ jobs:
       - name: Run ShellCheck
         uses: reviewdog/action-shellcheck@v1
         with:
+          shellcheck_flags: '--source-path=${{ github.workspace }}/.shellcheckrc'
           reviewdog_flags: '-fail-level=any'
 
   shfmt:

.shellcheckrc

@@ -0,0 +1,2 @@
+external-sources=true
+source=core/tabs/common-script.sh

Cargo.lock

@@ -443,6 +443,7 @@ dependencies = [
  "rand",
  "ratatui",
  "temp-dir",
+ "textwrap",
  "tree-sitter-bash",
  "tree-sitter-highlight",
  "tui-term",
@@ -889,6 +890,12 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "smawk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -955,6 +962,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width 0.1.14",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.64"
@@ -1067,6 +1085,12 @@ version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"

core/src/inner.rs

@@ -33,30 +33,18 @@ pub fn get_tabs(validate: bool) -> (TempDir, Vec<Tab>) {
 
     let tabs: Vec<Tab> = tabs
         .into_iter()
-        .map(
-            |(
-                TabEntry {
-                    name,
-                    data,
-                    multi_selectable,
-                },
-                directory,
-            )| {
-                let mut tree = Tree::new(Rc::new(ListNode {
-                    name: "root".to_string(),
-                    description: String::new(),
-                    command: Command::None,
-                    task_list: String::new(),
-                }));
-                let mut root = tree.root_mut();
-                create_directory(data, &mut root, &directory, validate);
-                Tab {
-                    name,
-                    tree,
-                    multi_selectable,
-                }
-            },
-        )
+        .map(|(TabEntry { name, data }, directory)| {
+            let mut tree = Tree::new(Rc::new(ListNode {
+                name: "root".to_string(),
+                description: String::new(),
+                command: Command::None,
+                task_list: String::new(),
+                multi_select: false,
+            }));
+            let mut root = tree.root_mut();
+            create_directory(data, &mut root, &directory, validate, true);
+            Tab { name, tree }
+        })
         .collect();
 
     if tabs.is_empty() {
@@ -74,12 +62,6 @@ struct TabList {
 struct TabEntry {
     name: String,
     data: Vec<Entry>,
-    #[serde(default = "default_multi_selectable")]
-    multi_selectable: bool,
-}
-
-fn default_multi_selectable() -> bool {
-    true
 }
 
 #[derive(Deserialize)]
@@ -94,6 +76,12 @@ struct Entry {
     entry_type: EntryType,
     #[serde(default)]
     task_list: String,
+    #[serde(default = "default_true")]
+    multi_select: bool,
+}
+
+fn default_true() -> bool {
+    true
 }
 
 #[derive(Deserialize)]
@@ -174,8 +162,11 @@ fn create_directory(
     node: &mut NodeMut<Rc<ListNode>>,
     command_dir: &Path,
     validate: bool,
+    parent_multi_select: bool,
 ) {
     for entry in data {
+        let multi_select = parent_multi_select && entry.multi_select;
+
         match entry.entry_type {
             EntryType::Entries(entries) => {
                 let mut node = node.append(Rc::new(ListNode {
@@ -183,8 +174,9 @@ fn create_directory(
                     description: entry.description,
                     command: Command::None,
                     task_list: String::new(),
+                    multi_select,
                 }));
-                create_directory(entries, &mut node, command_dir, validate);
+                create_directory(entries, &mut node, command_dir, validate, multi_select);
             }
             EntryType::Command(command) => {
                 node.append(Rc::new(ListNode {
@@ -192,6 +184,7 @@ fn create_directory(
                     description: entry.description,
                     command: Command::Raw(command),
                     task_list: String::new(),
+                    multi_select,
                 }));
             }
             EntryType::Script(script) => {
@@ -210,6 +203,7 @@ fn create_directory(
                             file: script,
                         },
                         task_list: entry.task_list,
+                        multi_select,
                     }));
                 }
             }

core/src/lib.rs

@@ -23,7 +23,6 @@ pub enum Command {
 pub struct Tab {
     pub name: String,
     pub tree: Tree<Rc<ListNode>>,
-    pub multi_selectable: bool,
 }
 
 #[derive(Clone, Hash, Eq, PartialEq)]
@@ -32,4 +31,5 @@ pub struct ListNode {
     pub description: String,
     pub command: Command,
     pub task_list: String,
+    pub multi_select: bool,
 }

core/tabs/applications-setup/Developer-tools/jetbrains-toolbox.sh

@@ -0,0 +1,48 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+manualInstall() {
+    JETBRAINS_TOOLBOX_DIR="/opt/jetbrains-toolbox"
+
+    case "$ARCH" in
+        x86_64) ARCHIVE_URL=$(curl -s "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release" | jq -r ".TBA[0].downloads.linux.link") ;;
+        aarch64) ARCHIVE_URL=$(curl -s "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release" | jq -r ".TBA[0].downloads.linuxARM64.link") ;;
+    esac
+
+    curl -fSL "$ARCHIVE_URL" -o "jetbrains-toolbox.tar.gz"
+
+    if [ -d "$JETBRAINS_TOOLBOX_DIR" ]; then
+        "$ESCALATION_TOOL" rm -rf "$JETBRAINS_TOOLBOX_DIR"
+    fi
+
+    "$ESCALATION_TOOL" mkdir -p "$JETBRAINS_TOOLBOX_DIR"
+    "$ESCALATION_TOOL" tar -xzf "jetbrains-toolbox.tar.gz" -C "$JETBRAINS_TOOLBOX_DIR" --strip-components=1
+    "$ESCALATION_TOOL" ln -sf "$JETBRAINS_TOOLBOX_DIR/jetbrains-toolbox" "/usr/bin/jetbrains-toolbox"
+}
+
+installJetBrainsToolBox() {
+    if ! command_exists jetbrains-toolbox; then
+        printf "%b\n" "${YELLOW}Installing Jetbrains Toolbox...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$AUR_HELPER" -S --needed --noconfirm jetbrains-toolbox
+                ;;
+            dnf)
+                manualInstall
+                ;;
+            *)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y libfuse2
+                manualInstall
+                ;;
+        esac
+        printf "%b\n" "${GREEN}Successfully installed Jetbrains Toolbox.${RC}"
+    else
+        printf "%b\n" "${GREEN}Jetbrains toolbox is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+checkAURHelper
+installJetBrainsToolBox

core/tabs/applications-setup/Developer-tools/meld-setup.sh

@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installMeld() {
-    if ! command_exists meld; then
+    if ! command_exists org.gnome.meld && ! command_exists meld; then
         printf "%b\n" "${YELLOW}Installing Meld...${RC}"
         case "$PACKAGER" in
             pacman)
@@ -13,7 +13,7 @@ installMeld() {
                 "$ESCALATION_TOOL" "$PACKAGER" -y install meld
                 ;;
             *)
-                . ../setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub org.gnome.meld
                 ;;
         esac

core/tabs/applications-setup/bottles-setup.sh

@@ -3,14 +3,9 @@
 . ../common-script.sh
 
 installBottles() {
-    if ! command_exists flatpak; then
-    printf "%b\n" "${YELLOW}Installing Bottles...${RC}"
-        case "$PACKAGER" in
-            *)
-                . ./setup-flatpak.sh
-                flatpak install -y flathub com.usebottles.bottles
-                ;;
-        esac
+    if ! command_exists com.usebottles.bottles; then
+        printf "%b\n" "${YELLOW}Installing Bottles...${RC}"
+        flatpak install -y flathub com.usebottles.bottles
     else
         printf "%b\n" "${GREEN}Bottles is already installed.${RC}"
     fi
@@ -18,4 +13,5 @@ installBottles() {
 
 checkEnv
 checkEscalationTool
+checkFlatpak
 installBottles

core/tabs/applications-setup/communication-apps/slack-setup.sh

@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installSlack() {
-    if ! command_exists slack; then
+    if ! command_exists com.slack.Slack && ! command_exists slack; then
         printf "%b\n" "${YELLOW}Installing Slack...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm slack-desktop
                 ;;
             *)  
-                . ../setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub com.slack.Slack
                 ;;
         esac

core/tabs/applications-setup/communication-apps/zoom-setup.sh

@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installZoom() {
-    if ! command_exists zoom; then
+    if ! command_exists us.zoom.Zoom && ! command_exists zoom; then
         printf "%b\n" "${YELLOW}Installing Zoom...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm zoom
                 ;;
             *)
-                . ../setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub us.zoom.Zoom
                 ;;
         esac

core/tabs/applications-setup/dwmtitus-setup.sh

@@ -218,6 +218,9 @@ setupDisplayManager() {
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$DM"
+                if [ "$DM" = "lightdm" ]; then
+                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lightdm-gtk-greeter
+                fi
                 ;;
             apt-get|nala)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y "$DM"

core/tabs/applications-setup/office-suites/libreoffice.sh

@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installLibreOffice() {
-    if ! command_exists libreoffice; then
+    if ! command_exists org.libreoffice.LibreOffice && ! command_exists libreoffice; then
         printf "%b\n" "${YELLOW}Installing Libre Office...${RC}"
         case "$PACKAGER" in
             apt-get|nala)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y libreoffice-core
                 ;;
             zypper|dnf)
-                . ./setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub org.libreoffice.LibreOffice
                 ;;
             pacman)

core/tabs/applications-setup/office-suites/onlyoffice.sh

@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installOnlyOffice() {
-    if ! command_exists onlyoffice-desktopeditors; then
+    if ! command_exists org.onlyoffice.desktopeditors && ! command_exists onlyoffice-desktopeditors; then
         printf "%b\n" "${YELLOW}Installing Only Office..${RC}."
         case "$PACKAGER" in
             apt-get|nala)
@@ -11,7 +11,7 @@ installOnlyOffice() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y ./onlyoffice-desktopeditors_amd64.deb
                 ;;
             zypper|dnf)
-                . ./setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub org.onlyoffice.desktopeditors
                 ;;
             pacman)

core/tabs/applications-setup/office-suites/wpsoffice.sh

@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installWpsOffice() {
-    if ! command_exists com.wps.Office; then
+    if ! command_exists com.wps.Office && ! command_exists wps; then
         printf "%b\n" "${YELLOW}Installing WPS Office...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm wps-office
                 ;;
             *)
-                . ./setup-flatpak.sh
+                checkFlatpak
                 flatpak install flathub com.wps.Office
                 ;;
         esac

core/tabs/applications-setup/setup-flatpak.sh

@@ -2,9 +2,7 @@
 
 . ../common-script.sh
 
-# Used to detect the desktop environment, Only used for the If statement in the setup_flatpak function.
-# Perhaps this should be moved to common-script.sh later on?
-detect_de() {
+checkDE() {
     if [ -n "$XDG_CURRENT_DESKTOP" ]; then
         case "$XDG_CURRENT_DESKTOP" in
             *GNOME*)
@@ -17,42 +15,11 @@ detect_de() {
     fi
 }
 
-# Install Flatpak if not already installed.
-setup_flatpak() {
-    if ! command_exists flatpak; then
-    printf "%b\n" "${YELLOW}Installing Flatpak...${RC}"
-        case "$PACKAGER" in
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm flatpak
-                ;;
-            *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y flatpak
-                ;;
-        esac
-        printf "%b\n" "Adding Flathub remote..."
-        "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    else
-        if command_exists flatpak; then
-            if ! flatpak remotes | grep -q "flathub"; then
-                printf "%b" "${YELLOW}Detected Flatpak package manager but Flathub remote is not added. Would you like to add it? (y/N): ${RC}"
-                read -r add_remote
-                case "$add_remote" in
-                    [Yy]*)
-                        printf "%b\n" "Adding Flathub remote..."
-                        "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-                        ;;
-                esac
-            else
-                # Needed mostly for systems without a polkit agent running (Error: updating: Unable to connect to system bus)
-                printf "%b\n" "${GREEN}Flathub already setup. You can quit.${RC}"
-            fi
-        fi
-    fi
-
+installExtra() {
     if [ "$PACKAGER" = "apt-get" ] || [ "$PACKAGER" = "nala" ]; then
-        detect_de
+        checkDE
         # Only used for Ubuntu GNOME. Ubuntu GNOME doesnt allow flathub to be added as a remote to their store.
-        # So in case the user wants to use a GUI siftware manager they can setup it here
+        # So in case the user wants to use a GUI software manager they can setup it here
         if [ "$DE" = "GNOME" ]; then
             printf "%b" "${YELLOW}Detected GNOME desktop environment. Would you like to install GNOME Software plugin for Flatpak? (y/N): ${RC}"
             read -r install_gnome
@@ -72,4 +39,5 @@ setup_flatpak() {
 
 checkEnv
 checkEscalationTool
-setup_flatpak
+checkFlatpak
+installExtra

core/tabs/applications-setup/tab_data.toml

@@ -54,6 +54,12 @@ description = "GitHub Desktop is a user-friendly application that simplifies the
 script = "Developer-tools/githubdesktop-setup.sh"
 task_list = "I"
 
+[[data.entries]]
+name = "JetBrains Toolbox"
+description = "JetBrains Toolbox is a collection of tools and an app that help developers work with JetBrains products."
+script = "Developer-tools/jetbrains-toolbox.sh"
+task_list = "I"
+
 [[data.entries]]
 name = "Meld"
 description = "Meld is a visual diff and merge tool that helps compare files, directories, and version-controlled projects."
@@ -194,7 +200,7 @@ task_list = "FI"
 
 [[data]]
 name = "Alacritty"
-description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.\nThis command installs and condifures alacritty terminal emulator."
+description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows. This command installs and configures alacritty terminal emulator."
 script = "alacritty-setup.sh"
 task_list = "I FM"
 
@@ -206,13 +212,13 @@ task_list = "I"
 
 [[data]]
 name = "Bash Prompt"
-description = "The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems.\nIt is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful.\nThis command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
+description = "The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems. It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful. This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash"
 script = "mybash-setup.sh"
 task_list = "I FM"
 
 [[data]]
 name = "Bottles"
-description = "Bottles allows Windows software, like applications and games, to run on Linux.\nBottles also provides tools to categorize, organize and optimize your applications."
+description = "Bottles allows Windows software, like applications and games, to run on Linux. Bottles also provides tools to categorize, organize and optimize your applications."
 script = "bottles-setup.sh"
 task_list = "FI"
 
@@ -230,13 +236,13 @@ task_list = "I PFM SS"
 
 [[data]]
 name = "Fastfetch"
-description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.\nIt is written mainly in C, with performance and customizability in mind.\nThis command installs fastfetch and configures from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
+description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily. It is written mainly in C, with performance and customizability in mind. This command installs fastfetch and configures from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash"
 script = "fastfetch-setup.sh"
 task_list = "I FM"
 
 [[data]]
 name = "Flatpak / Flathub"
-description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns.\nThis command installs Flatpak and adds the Flathub repository"
+description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns. This command installs Flatpak and adds the Flathub repository"
 script = "setup-flatpak.sh"
 task_list = "I"
 
@@ -248,7 +254,7 @@ task_list = "PFM"
 
 [[data]]
 name = "Kitty"
-description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features.\nkitty is written in a mix of C and Python programming languages.\n This command installs and configures kitty."
+description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features. kitty is written in a mix of C and Python programming languages. This command installs and configures kitty."
 script = "kitty-setup.sh"
 task_list = "I FM"
 
@@ -276,7 +282,7 @@ values = [ "linutil" ]
 
 [[data]]
 name = "Rofi"
-description = "Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport.\nThis command installs and configures rofi with configuration from CTT's DWM repo.\nhttps://github.com/ChrisTitusTech/dwm-titus"
+description = "Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport. This command installs and configures rofi with configuration from CTT's DWM repo. https://github.com/ChrisTitusTech/dwm-titus"
 script = "rofi-setup.sh"
 task_list = "I FM"
 
@@ -292,6 +298,6 @@ values = [ "wayland", "Wayland" ]
 
 [[data]]
 name = "ZSH Prompt"
-description = "The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.\nThis command installs ZSH prompt and provides basic configuration."
+description = "The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh. This command installs ZSH prompt and provides basic configuration."
 script = "zsh-setup.sh"
 task_list = "I FM"

core/tabs/common-script.sh

@@ -9,10 +9,48 @@ CYAN='\033[36m'
 GREEN='\033[32m'
 
 command_exists() {
-    for cmd in "$@"; do
-        command -v "$cmd" >/dev/null 2>&1 || return 1
-    done
-    return 0
+for cmd in "$@"; do
+    export PATH="$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:$PATH"
+    command -v "$cmd" >/dev/null 2>&1 || return 1
+done
+return 0
+}
+
+checkFlatpak() {
+    if ! command_exists flatpak; then
+        printf "%b\n" "${YELLOW}Installing Flatpak...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm flatpak
+                ;;
+            apk)
+                "$ESCALATION_TOOL" "$PACKAGER" add flatpak
+                ;;
+            *)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y flatpak
+                ;;
+        esac
+        printf "%b\n" "${YELLOW}Adding Flathub remote...${RC}"
+        "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        printf "%b\n" "${YELLOW}Applications installed by Flatpak may not appear on your desktop until the user session is restarted...${RC}"
+    else
+        if ! flatpak remotes | grep -q "flathub"; then
+            printf "%b\n" "${YELLOW}Adding Flathub remote...${RC}"
+            "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        else
+            printf "%b\n" "${CYAN}Flatpak is installed${RC}"
+        fi
+    fi
+}
+
+checkArch() {
+    case "$(uname -m)" in
+        x86_64 | amd64) ARCH="x86_64" ;;
+        aarch64 | arm64) ARCH="aarch64" ;;
+        *) printf "%b\n" "${RED}Unsupported architecture: $(uname -m)${RC}" && exit 1 ;;
+    esac
+
+    printf "%b\n" "${CYAN}System architecture: ${ARCH}${RC}"
 }
 
 checkAURHelper() {
@@ -128,6 +166,7 @@ checkDistro() {
 }
 
 checkEnv() {
+    checkArch
     checkEscalationTool
     checkCommandRequirements "curl groups $ESCALATION_TOOL"
     checkPackageManager 'nala apt-get dnf pacman zypper'

core/tabs/gaming/tab_data.toml

@@ -5,6 +5,6 @@ name = "Diablo II Resurrected"
 
 [[data.entries]]
 name = "Loot Filter"
-description = "This is a loot filter for Diablo II Resurrected.\nIt's designed to be a simple, clean, and easy to read loot filter that highlights the most important items.\nWorks on battle.net and single player.\nNo frills, no config, just highlights high runes and other valuable items.\nFor more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter"
+description = "This is a loot filter for Diablo II Resurrected. It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items. Works on battle.net and single player. No frills, no config, just highlights high runes and other valuable items. For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter"
 script = "diablo-ii/d2r-loot-filters.sh"
 task_list = "FM"

core/tabs/security/tab_data.toml

@@ -2,6 +2,6 @@ name = "Security"
 
 [[data]]
 name = "Firewall Baselines (CTT)"
-description = "Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall.\nThis command installs UFW and configures UFW based on CTT's recommended rules.\nFor more information visit: https://christitus.com/linux-security-mistakes"
+description = "Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall. This command installs UFW and configures UFW based on CTT's recommended rules. For more information visit: https://christitus.com/linux-security-mistakes"
 script = "firewall-baselines.sh"
 task_list = "I SS"

core/tabs/system-setup/gaming-setup.sh

@@ -21,12 +21,12 @@ installDepend() {
                 alsa-utils alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib giflib lib32-giflib libpng lib32-libpng \
                 libldap lib32-libldap openal lib32-openal libxcomposite lib32-libxcomposite libxinerama lib32-libxinerama \
                 ncurses lib32-ncurses vulkan-icd-loader lib32-vulkan-icd-loader ocl-icd lib32-ocl-icd libva lib32-libva \
-                gst-plugins-base-libs lib32-gst-plugins-base-libs sdl2"
+                gst-plugins-base-libs lib32-gst-plugins-base-libs sdl2 lib32-sdl2 v4l-utils lib32-v4l-utils sqlite lib32-sqlite"
 
             $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS
             ;;
         apt-get|nala)
-            DISTRO_DEPS="libasound2 libsdl2 wine64 wine32"
+            DISTRO_DEPS="libasound2-plugins:i386 libsdl2-2.0-0:i386 libdbus-1-3:i386 libsqlite3-0:i386 wine64 wine32"
 
             "$ESCALATION_TOOL" "$PACKAGER" update
             "$ESCALATION_TOOL" dpkg --add-architecture i386
@@ -36,7 +36,7 @@ installDepend() {
             "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS
             ;;
         dnf)
-            if [ "$(rpm -E %fedora)" -le 41 ]; then 
+            if [ "$(rpm -E %fedora)" -le 41 ]; then
                 "$ESCALATION_TOOL" "$PACKAGER" install ffmpeg ffmpeg-libs -y
                 "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
             else
@@ -69,7 +69,7 @@ installAdditionalDepend() {
 
             version_no_v=$(echo "$version" | tr -d v)
             curl -sSLo "lutris_${version_no_v}_all.deb" "https://github.com/lutris/lutris/releases/download/${version}/lutris_${version_no_v}_all.deb"
-            
+
             printf "%b\n" "${YELLOW}Installing Lutris...${RC}"
             "$ESCALATION_TOOL" "$PACKAGER" install ./lutris_"${version_no_v}"_all.deb
 

core/tabs/system-setup/tab_data.toml

@@ -1,5 +1,4 @@
 name = "System Setup"
-multi_selectable = false
 
 [[data]]
 name = "Arch Linux"
@@ -14,16 +13,17 @@ name = "Arch Server Setup"
 description = "This command installs a minimal arch server setup under 5 minutes."
 script = "arch/server-setup.sh"
 task_list = "SI D"
+multi_select = false
 
 [[data.entries]]
 name = "Paru AUR Helper"
-description = "Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction.\nTo know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
+description = "Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
 script = "arch/paru-setup.sh"
 task_list = "I"
 
 [[data.entries]]
 name = "Yay AUR Helper"
-description = "Yet Another Yogurt - An AUR Helper Written in Go.\nTo know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
+description = "Yet Another Yogurt - An AUR Helper Written in Go. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
 script = "arch/yay-setup.sh"
 task_list = "I"
 
@@ -55,7 +55,7 @@ task_list = "I"
 
 [[data.entries]]
 name = "RPM Fusion"
-description = "RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship.\nThat software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit.\nFor more information visit: https://rpmfusion.org/"
+description = "RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship. That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit. For more information visit: https://rpmfusion.org/"
 script = "fedora/rpm-fusion-setup.sh"
 task_list = "MP"
 
@@ -82,12 +82,14 @@ name = "Full System Cleanup"
 description = "This script is designed to remove unnecessary packages, clean old cache files, remove temporary files, and to empty the trash."
 script = "system-cleanup.sh"
 task_list = "RP PFM"
+multi_select = false
 
 [[data]]
 name = "Full System Update"
 description = "This command updates your system to the latest packages available for your distro"
 script = "system-update.sh"
 task_list = "PFM"
+multi_select = false
 
 [[data]]
 name = "Gaming Dependencies"

core/tabs/utils/encrypt_decrypt_tool.sh

@@ -8,7 +8,7 @@ printf "%b\n" "${YELLOW}Ensuring OpenSSL is installed...${RC}"
 if ! command_exists openssl; then
     case "$PACKAGER" in
         pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -Syu --noconfirm openssl
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed openssl
             ;;
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y openssl

core/tabs/utils/tab_data.toml

@@ -1,8 +1,8 @@
 name = "Utilities"
-multi_selectable = false
 
 [[data]]
 name = "Monitor Control"
+multi_select = false
 
 [[data.preconditions]]
 matches = true
@@ -78,6 +78,7 @@ script = "monitor-control/set_resolutions.sh"
 
 [[data]]
 name = "User Account Manager"
+multi_select = false
 
 [[data.entries]]
 name = "Add User"
@@ -104,6 +105,7 @@ name = "Auto Mount Drive"
 description = "This utility is designed to help with automating the process of mounting a drive on to your system."
 script = "auto-mount.sh"
 task_list = "PFM"
+multi_select = false
 
 [[data]]
 name = "Auto Login"
@@ -120,6 +122,7 @@ name = "Bluetooth Manager"
 description = "This utility is designed to manage bluetooth in your system"
 script = "bluetooth-control.sh"
 task_list = "I SS"
+multi_select = false
 
 [[data]]
 name = "Bootable USB Creator"

docs/userguide.md

@@ -17,6 +17,7 @@
 ### Developer Tools
 
 - **Github Desktop**: GitHub Desktop is a user-friendly application that simplifies the process of managing Git repositories and interacting with GitHub, providing a graphical interface for tasks like committing, branching, and syncing changes.
+- **JetBrains Toolbox**: JetBrains Toolbox is a collection of tools and an app that help developers work with JetBrains products.
 - **Meld**: Meld is a visual diff and merge tool that helps compare files, directories, and version-controlled projects.
 - **Neovim**: Neovim is a refactor, and sometimes redactor, in the tradition of Vim.
 It is not a rewrite but a continuation and extension of Vim.
@@ -44,15 +45,10 @@ https://github.com/ChrisTitusTech/neovim
 - **Thorium**: Thorium is a Chromium-based browser focused on privacy and performance.
 - **Vivaldi**: Vivaldi is a freeware, cross-platform web browser developed by Vivaldi Technologies.
 - **waterfox**: Waterfox is the privacy-focused web browser engineered to give you speed, control, and peace of mind on the internet.
-- **Alacritty**: Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.
-This command installs and condifures alacritty terminal emulator.
+- **Alacritty**: Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows. This command installs and configures alacritty terminal emulator.
 - **Android Debloater**: Universal Android Debloater (UAD) is a tool designed to help users remove bloatware and unnecessary pre-installed applications from Android devices, enhancing performance and user experience.
-- **Bash Prompt**: The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems.
-It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful.
-This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository.
-https://github.com/ChrisTitusTech/mybash
-- **Bottles**: Bottles allows Windows software, like applications and games, to run on Linux.
-Bottles also provides tools to categorize, organize and optimize your applications.
+- **Bash Prompt**: The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems. It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful. This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash
+- **Bottles**: Bottles allows Windows software, like applications and games, to run on Linux. Bottles also provides tools to categorize, organize and optimize your applications.
 - **Docker**: Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers.
 - **DWM-Titus**: DWM is a dynamic window manager for X.
 It manages windows in tiled, monocle and floating layouts.
@@ -60,41 +56,26 @@ All of the layouts can be applied dynamically, optimising the environment for th
 This command installs and configures DWM and a desktop manager.
 The list of patches applied can be found in CTT's DWM repository
 https://github.com/ChrisTitusTech/dwm-titus
-- **Fastfetch**: Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.
-It is written mainly in C, with performance and customizability in mind.
-This command installs fastfetch and configures from CTT's mybash repository.
-https://github.com/ChrisTitusTech/mybash
-- **Flatpak / Flathub**: Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns.
-This command installs Flatpak and adds the Flathub repository
+- **Fastfetch**: Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily. It is written mainly in C, with performance and customizability in mind. This command installs fastfetch and configures from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash
+- **Flatpak / Flathub**: Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns. This command installs Flatpak and adds the Flathub repository
 - **Grub Theme**: Installs ChrisTitusTech's Top 5 Bootloader Themes script to allow for easy customization of GRUB.
-- **Kitty**: kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features.
-kitty is written in a mix of C and Python programming languages.
- This command installs and configures kitty.
+- **Kitty**: kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features. kitty is written in a mix of C and Python programming languages. This command installs and configures kitty.
 - **Linutil Installer**: Installs a distro-specific Linutil package locally.
 - **Linutil Updater**: Updates your local Linutil crate installation.
-- **Rofi**: Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport.
-This command installs and configures rofi with configuration from CTT's DWM repo.
-https://github.com/ChrisTitusTech/dwm-titus
+- **Rofi**: Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport. This command installs and configures rofi with configuration from CTT's DWM repo. https://github.com/ChrisTitusTech/dwm-titus
 - **Waydroid**: Waydroid is an emulator that allows you to run Android apps and games on Linux.
-- **ZSH Prompt**: The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.
-This command installs ZSH prompt and provides basic configuration.
+- **ZSH Prompt**: The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh. This command installs ZSH prompt and provides basic configuration.
 
 ## Gaming
 
 
 ### Diablo II Resurrected
 
-- **Loot Filter**: This is a loot filter for Diablo II Resurrected.
-It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items.
-Works on battle.net and single player.
-No frills, no config, just highlights high runes and other valuable items.
-For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter
+- **Loot Filter**: This is a loot filter for Diablo II Resurrected. It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items. Works on battle.net and single player. No frills, no config, just highlights high runes and other valuable items. For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter
 
 ## Security
 
-- **Firewall Baselines (CTT)**: Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall.
-This command installs UFW and configures UFW based on CTT's recommended rules.
-For more information visit: https://christitus.com/linux-security-mistakes
+- **Firewall Baselines (CTT)**: Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall. This command installs UFW and configures UFW based on CTT's recommended rules. For more information visit: https://christitus.com/linux-security-mistakes
 
 ## System Setup
 
@@ -102,19 +83,15 @@ For more information visit: https://christitus.com/linux-security-mistakes
 ### Arch Linux
 
 - **Arch Server Setup**: This command installs a minimal arch server setup under 5 minutes.
-- **Paru AUR Helper**: Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction.
-To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
-- **Yay AUR Helper**: Yet Another Yogurt - An AUR Helper Written in Go.
-To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
+- **Paru AUR Helper**: Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
+- **Yay AUR Helper**: Yet Another Yogurt - An AUR Helper Written in Go. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
 
 ### Fedora
 
 - **Configure DNF**: Optimizes DNF for parallel downloads
 - **Multimedia Codecs**: This script is designed to install multimedia codecs, and to ensure RPM Fusion repositories are installed.
 - **Nvidia Proprietary Drivers**: This script is designed to download the proprietary NVIDIA drivers in Fedora.
-- **RPM Fusion**: RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship.
-That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit.
-For more information visit: https://rpmfusion.org/
+- **RPM Fusion**: RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship. That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit. For more information visit: https://rpmfusion.org/
 - **Upgrade to a New Fedora Release**: Upgrades system to the next Fedora release
 - **Virtualization**: Enables Virtualization through dnf
 - **Build Prerequisites**: This script is designed to handle the installation of various software dependencies across different Linux distributions

man/linutil.1

@@ -40,6 +40,10 @@ Skip confirmation prompt before executing commands.
 \fB\-\-override\-validation\fR
 Show all available entries, disregarding compatibility checks. (\fBUNSAFE\fR)
 
+.TP
+\fB\-\-size\-bypass\fR
+Bypass the terminal size limit
+
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Print help.

tui/Cargo.toml

@@ -27,6 +27,7 @@ rand = { version = "0.8.5", optional = true }
 linutil_core = { path = "../core", version = "24.9.28" }
 tree-sitter-highlight = "0.24.3"
 tree-sitter-bash = "0.23.1"
+textwrap = "0.16.1"
 anstyle = "1.0.8"
 ansi-to-tui = "7.0.0"
 zips = "0.1.7"

tui/src/filter.rs

@@ -4,7 +4,7 @@ use ego_tree::NodeId;
 use linutil_core::Tab;
 use ratatui::{
     layout::{Position, Rect},
-    style::Style,
+    style::{Color, Style},
     text::Span,
     widgets::{Block, Borders, Paragraph},
     Frame,
@@ -22,6 +22,7 @@ pub struct Filter {
     in_search_mode: bool,
     input_position: usize,
     items: Vec<ListEntry>,
+    completion_preview: Option<String>,
 }
 
 impl Filter {
@@ -31,17 +32,23 @@ impl Filter {
             in_search_mode: false,
             input_position: 0,
             items: vec![],
+            completion_preview: None,
         }
     }
+
     pub fn item_list(&self) -> &[ListEntry] {
         &self.items
     }
+
     pub fn activate_search(&mut self) {
         self.in_search_mode = true;
     }
+
     pub fn deactivate_search(&mut self) {
         self.in_search_mode = false;
+        self.completion_preview = None;
     }
+
     pub fn update_items(&mut self, tabs: &[Tab], current_tab: usize, node: NodeId) {
         if self.search_input.is_empty() {
             let curr = tabs[current_tab].tree.get(node).unwrap();
@@ -78,13 +85,34 @@ impl Filter {
             }
             self.items.sort_by(|a, b| a.node.name.cmp(&b.node.name));
         }
+
+        self.update_completion_preview();
     }
+
+    fn update_completion_preview(&mut self) {
+        if self.search_input.is_empty() {
+            self.completion_preview = None;
+            return;
+        }
+
+        let input = self.search_input.iter().collect::<String>().to_lowercase();
+        self.completion_preview = self.items.iter().find_map(|item| {
+            let item_name_lower = item.node.name.to_lowercase();
+            if item_name_lower.starts_with(&input) {
+                Some(item_name_lower[input.len()..].to_string())
+            } else {
+                None
+            }
+        });
+    }
+
     pub fn draw_searchbar(&self, frame: &mut Frame, area: Rect, theme: &Theme) {
         //Set the search bar text (If empty use the placeholder)
         let display_text = if !self.in_search_mode && self.search_input.is_empty() {
             Span::raw("Press / to search")
         } else {
-            Span::raw(self.search_input.iter().collect::<String>())
+            let input_text = self.search_input.iter().collect::<String>();
+            Span::styled(input_text, Style::default().fg(theme.focused_color()))
         };
 
         let search_color = if self.in_search_mode {
@@ -110,11 +138,22 @@ impl Filter {
             let x = area.x + cursor_position as u16 + 1;
             let y = area.y + 1;
             frame.set_cursor_position(Position::new(x, y));
+
+            if let Some(preview) = &self.completion_preview {
+                let preview_span = Span::styled(preview, Style::default().fg(Color::DarkGray));
+                let preview_paragraph = Paragraph::new(preview_span).style(Style::default());
+                let preview_area = Rect::new(
+                    x,
+                    y,
+                    (preview.len() as u16).min(area.width - cursor_position as u16 - 1),
+                    1,
+                );
+                frame.render_widget(preview_paragraph, preview_area);
+            }
         }
     }
     // Handles key events. Returns true if search must be exited
     pub fn handle_key(&mut self, event: &KeyEvent) -> SearchAction {
-        //Insert user input into the search bar
         match event.code {
             KeyCode::Char('c') if event.modifiers.contains(KeyModifiers::CONTROL) => {
                 return self.exit_search()
@@ -124,10 +163,17 @@ impl Filter {
             KeyCode::Delete => self.remove_next(),
             KeyCode::Left => return self.cursor_left(),
             KeyCode::Right => return self.cursor_right(),
+            KeyCode::Tab => return self.complete_search(),
+            KeyCode::Esc => {
+                self.input_position = 0;
+                self.search_input.clear();
+                self.completion_preview = None;
+                return SearchAction::Exit;
+            }
             KeyCode::Enter => return SearchAction::Exit,
-            KeyCode::Esc => return self.exit_search(),
             _ => return SearchAction::None,
         };
+        self.update_completion_preview();
         SearchAction::Update
     }
 
@@ -141,16 +187,19 @@ impl Filter {
         self.input_position = self.input_position.saturating_sub(1);
         SearchAction::None
     }
+
     fn cursor_right(&mut self) -> SearchAction {
         if self.input_position < self.search_input.len() {
             self.input_position += 1;
         }
         SearchAction::None
     }
+
     fn insert_char(&mut self, input: char) {
         self.search_input.insert(self.input_position, input);
         self.cursor_right();
     }
+
     fn remove_previous(&mut self) {
         let current = self.input_position;
         if current > 0 {
@@ -158,12 +207,25 @@ impl Filter {
             self.cursor_left();
         }
     }
+
     fn remove_next(&mut self) {
         let current = self.input_position;
         if current < self.search_input.len() {
             self.search_input.remove(current);
         }
     }
+
+    fn complete_search(&mut self) -> SearchAction {
+        if let Some(completion) = self.completion_preview.take() {
+            self.search_input.extend(completion.chars());
+            self.input_position = self.search_input.len();
+            self.update_completion_preview();
+            SearchAction::Update
+        } else {
+            SearchAction::None
+        }
+    }
+
     pub fn clear_search(&mut self) {
         self.search_input.clear();
         self.input_position = 0;

tui/src/floating_text.rs

@@ -20,16 +20,19 @@ use ratatui::{
 
 use ansi_to_tui::IntoText;
 
+use textwrap::wrap;
 use tree_sitter_bash as hl_bash;
 use tree_sitter_highlight::{self as hl, HighlightEvent};
 use zips::zip_result;
 
 pub struct FloatingText {
-    pub src: Vec<String>,
+    pub src: String,
+    wrapped_lines: Vec<String>,
     max_line_width: usize,
     v_scroll: usize,
     h_scroll: usize,
     mode_title: String,
+    wrap_words: bool,
     frame_height: usize,
 }
 
@@ -108,12 +111,6 @@ fn get_highlighted_string(s: &str) -> Option<String> {
     Some(output)
 }
 
-macro_rules! max_width {
-    ($($lines:tt)+) => {{
-        $($lines)+.iter().fold(0, |accum, val| accum.max(val.len()))
-    }}
-}
-
 #[inline]
 fn get_lines(s: &str) -> Vec<&str> {
     s.lines().collect::<Vec<_>>()
@@ -125,50 +122,49 @@ fn get_lines_owned(s: &str) -> Vec<String> {
 }
 
 impl FloatingText {
-    pub fn new(text: String, title: &str) -> Self {
-        let src = get_lines(&text)
-            .into_iter()
-            .map(|s| s.to_string())
-            .collect::<Vec<_>>();
+    pub fn new(text: String, title: &str, wrap_words: bool) -> Self {
+        let max_line_width = 80;
+        let wrapped_lines = if wrap_words {
+            wrap(&text, max_line_width)
+                .into_iter()
+                .map(|cow| cow.into_owned())
+                .collect()
+        } else {
+            get_lines_owned(&text)
+        };
 
-        let max_line_width = max_width!(src);
         Self {
-            src,
+            src: text,
+            wrapped_lines,
             mode_title: title.to_string(),
             max_line_width,
             v_scroll: 0,
             h_scroll: 0,
+            wrap_words,
             frame_height: 0,
         }
     }
 
     pub fn from_command(command: &Command, title: String) -> Option<Self> {
-        let (max_line_width, src) = match command {
-            Command::Raw(cmd) => {
-                // just apply highlights directly
-                (max_width!(get_lines(cmd)), Some(cmd.clone()))
-            }
-            Command::LocalFile { file, .. } => {
-                // have to read from tmp dir to get cmd src
-                let raw = std::fs::read_to_string(file)
-                    .map_err(|_| format!("File not found: {:?}", file))
-                    .unwrap();
+        let src = match command {
+            Command::Raw(cmd) => Some(cmd.clone()),
+            Command::LocalFile { file, .. } => std::fs::read_to_string(file)
+                .map_err(|_| format!("File not found: {:?}", file))
+                .ok(),
+            Command::None => None,
+        }?;
 
-                (max_width!(get_lines(&raw)), Some(raw))
-            }
-
-            // If command is a folder, we don't display a preview
-            Command::None => (0usize, None),
-        };
-
-        let src = get_lines_owned(&get_highlighted_string(&src?)?);
+        let max_line_width = 80;
+        let wrapped_lines = get_lines_owned(&get_highlighted_string(&src)?);
 
         Some(Self {
             src,
+            wrapped_lines,
             mode_title: title,
             max_line_width,
             h_scroll: 0,
             v_scroll: 0,
+            wrap_words: false,
             frame_height: 0,
         })
     }
@@ -197,6 +193,20 @@ impl FloatingText {
             self.h_scroll += 1;
         }
     }
+
+    fn update_wrapping(&mut self, width: usize) {
+        if self.max_line_width != width {
+            self.max_line_width = width;
+            self.wrapped_lines = if self.wrap_words {
+                wrap(&self.src, width)
+                    .into_iter()
+                    .map(|cow| cow.into_owned())
+                    .collect()
+            } else {
+                get_lines_owned(&get_highlighted_string(&self.src).unwrap_or(self.src.clone()))
+            };
+        }
+    }
 }
 
 impl FloatContent for FloatingText {
@@ -217,13 +227,22 @@ impl FloatContent for FloatingText {
 
         // Calculate the inner area to ensure text is not drawn over the border
         let inner_area = block.inner(area);
-        let Rect { height, .. } = inner_area;
+        let Rect { width, height, .. } = inner_area;
+
+        self.update_wrapping(width as usize);
+
         let lines = self
-            .src
+            .wrapped_lines
             .iter()
             .skip(self.v_scroll)
             .take(height as usize)
-            .flat_map(|l| l.into_text().unwrap())
+            .flat_map(|l| {
+                if self.wrap_words {
+                    vec![Line::raw(l.clone())]
+                } else {
+                    l.into_text().unwrap().lines
+                }
+            })
             .map(|line| {
                 let mut skipped = 0;
                 let mut spans = line

tui/src/main.rs

@@ -39,12 +39,20 @@ struct Args {
     #[arg(long, default_value_t = false)]
     #[clap(help = "Show all available options, disregarding compatibility checks (UNSAFE)")]
     override_validation: bool,
+    #[arg(long, default_value_t = false)]
+    #[clap(help = "Bypass the terminal size limit")]
+    size_bypass: bool,
 }
 
 fn main() -> io::Result<()> {
     let args = Args::parse();
 
-    let mut state = AppState::new(args.theme, args.override_validation, args.skip_confirmation);
+    let mut state = AppState::new(
+        args.theme,
+        args.override_validation,
+        args.size_bypass,
+        args.skip_confirmation,
+    );
 
     stdout().execute(EnterAlternateScreen)?;
     enable_raw_mode()?;

tui/src/state.rs

@@ -62,6 +62,7 @@ pub struct AppState {
     drawable: bool,
     #[cfg(feature = "tips")]
     tip: String,
+    size_bypass: bool,
     skip_confirmation: bool,
 }
 
@@ -87,7 +88,12 @@ enum SelectedItem {
 }
 
 impl AppState {
-    pub fn new(theme: Theme, override_validation: bool, skip_confirmation: bool) -> Self {
+    pub fn new(
+        theme: Theme,
+        override_validation: bool,
+        size_bypass: bool,
+        skip_confirmation: bool,
+    ) -> Self {
         let (temp_dir, tabs) = linutil_core::get_tabs(!override_validation);
         let root_id = tabs[0].tree.root().id();
 
@@ -105,6 +111,7 @@ impl AppState {
             drawable: false,
             #[cfg(feature = "tips")]
             tip: get_random_tip(),
+            size_bypass,
             skip_confirmation,
         };
 
@@ -155,12 +162,10 @@ impl AppState {
                 hints.push(Shortcut::new("Select item below", ["j", "Down"]));
                 hints.push(Shortcut::new("Next theme", ["t"]));
                 hints.push(Shortcut::new("Previous theme", ["T"]));
-
-                if self.is_current_tab_multi_selectable() {
-                    hints.push(Shortcut::new("Toggle multi-selection mode", ["v"]));
+                hints.push(Shortcut::new("Multi-selection mode", ["v"]));
+                if self.multi_select {
                     hints.push(Shortcut::new("Select multiple commands", ["Space"]));
                 }
-
                 hints.push(Shortcut::new("Next tab", ["Tab"]));
                 hints.push(Shortcut::new("Previous tab", ["Shift-Tab"]));
                 hints.push(Shortcut::new("Important actions guide", ["g"]));
@@ -190,7 +195,9 @@ impl AppState {
     pub fn draw(&mut self, frame: &mut Frame) {
         let terminal_size = frame.area();
 
-        if terminal_size.width < MIN_WIDTH || terminal_size.height < MIN_HEIGHT {
+        if !self.size_bypass
+            && (terminal_size.height < MIN_HEIGHT || terminal_size.width < MIN_WIDTH)
+        {
             let warning = Paragraph::new(format!(
                 "Terminal size too small:\nWidth = {} Height = {}\n\nMinimum size:\nWidth = {}  Height = {}",
                 terminal_size.width,
@@ -332,7 +339,12 @@ impl AppState {
                 let (indicator, style) = if is_selected {
                     (self.theme.multi_select_icon(), Style::default().bold())
                 } else {
-                    ("", Style::new())
+                    let ms_style = if self.multi_select && !node.multi_select {
+                        Style::default().fg(self.theme.multi_select_disabled_color())
+                    } else {
+                        Style::new()
+                    };
+                    ("", ms_style)
                 };
                 if *has_children {
                     Line::from(format!(
@@ -342,6 +354,7 @@ impl AppState {
                         indicator
                     ))
                     .style(self.theme.dir_color())
+                    .patch_style(style)
                 } else {
                     Line::from(format!(
                         "{}  {} {}",
@@ -359,13 +372,21 @@ impl AppState {
             |ListEntry {
                  node, has_children, ..
              }| {
+                let ms_style = if self.multi_select && !node.multi_select {
+                    Style::default().fg(self.theme.multi_select_disabled_color())
+                } else {
+                    Style::new()
+                };
                 if *has_children {
-                    Line::from(" ").style(self.theme.dir_color())
+                    Line::from(" ")
+                        .style(self.theme.dir_color())
+                        .patch_style(ms_style)
                 } else {
                     Line::from(format!("{} ", node.task_list))
                         .alignment(Alignment::Right)
                         .style(self.theme.cmd_color())
                         .bold()
+                        .patch_style(ms_style)
                 }
             },
         ));
@@ -481,6 +502,13 @@ impl AppState {
                         // enabled, need to clear it to prevent state corruption
                         if !self.multi_select {
                             self.selected_commands.clear()
+                        } else {
+                            // Prevents non multi_selectable cmd from being pushed into the selected list
+                            if let Some(node) = self.get_selected_node() {
+                                if !node.multi_select {
+                                    self.selected_commands.retain(|cmd| cmd.name != node.name);
+                                }
+                            }
                         }
                     }
                     ConfirmStatus::Confirm => self.handle_confirm_command(),
@@ -558,41 +586,31 @@ impl AppState {
     }
 
     fn toggle_multi_select(&mut self) {
-        if self.is_current_tab_multi_selectable() {
-            self.multi_select = !self.multi_select;
-            if !self.multi_select {
-                self.selected_commands.clear();
-            }
+        self.multi_select = !self.multi_select;
+        if !self.multi_select {
+            self.selected_commands.clear();
         }
     }
 
     fn toggle_selection(&mut self) {
-        if let Some(command) = self.get_selected_node() {
-            if self.selected_commands.contains(&command) {
-                self.selected_commands.retain(|c| c != &command);
-            } else {
-                self.selected_commands.push(command);
+        if let Some(node) = self.get_selected_node() {
+            if node.multi_select {
+                if self.selected_commands.contains(&node) {
+                    self.selected_commands.retain(|c| c != &node);
+                } else {
+                    self.selected_commands.push(node);
+                }
             }
         }
     }
 
-    pub fn is_current_tab_multi_selectable(&self) -> bool {
-        let index = self.current_tab.selected().unwrap_or(0);
-        self.tabs
-            .get(index)
-            .map_or(false, |tab| tab.multi_selectable)
-    }
-
     fn update_items(&mut self) {
         self.filter.update_items(
             &self.tabs,
             self.current_tab.selected().unwrap(),
             self.visit_stack.last().unwrap().0,
         );
-        if !self.is_current_tab_multi_selectable() {
-            self.multi_select = false;
-            self.selected_commands.clear();
-        }
+
         let len = self.filter.item_list().len();
         if len > 0 {
             let current = self.selection.selected().unwrap_or(0);
@@ -711,7 +729,8 @@ impl AppState {
     fn enable_description(&mut self) {
         if let Some(command_description) = self.get_selected_description() {
             if !command_description.is_empty() {
-                let description = FloatingText::new(command_description, "Command Description");
+                let description =
+                    FloatingText::new(command_description, "Command Description", true);
                 self.spawn_float(description, 80, 80);
             }
         }
@@ -801,7 +820,7 @@ impl AppState {
 
     fn toggle_task_list_guide(&mut self) {
         self.spawn_float(
-            FloatingText::new(ACTIONS_GUIDE.to_string(), "Important Actions Guide"),
+            FloatingText::new(ACTIONS_GUIDE.to_string(), "Important Actions Guide", true),
             80,
             80,
         );

tui/src/theme.rs

@@ -28,6 +28,13 @@ impl Theme {
         }
     }
 
+    pub fn multi_select_disabled_color(&self) -> Color {
+        match self {
+            Theme::Default => Color::DarkGray,
+            Theme::Compatible => Color::DarkGray,
+        }
+    }
+
     pub fn tab_color(&self) -> Color {
         match self {
             Theme::Default => Color::Rgb(255, 255, 85),