diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 000000000..35049cbcb --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[alias] +xtask = "run --package xtask --" diff --git a/.github/mkdocs.yml b/.github/mkdocs.yml index b0453a8ed..9f7e00383 100644 --- a/.github/mkdocs.yml +++ b/.github/mkdocs.yml @@ -6,7 +6,7 @@ nav: - Introduction: 'index.md' - User Guide: 'userguide.md' - Contributing: - - Contributing Guide: 'contribute.md' + - Contributing Guide: 'contributing.md' - Roadmap: 'roadmap.md' - Documentation: - Known Issues: 'KnownIssues.md' @@ -86,4 +86,4 @@ plugins: minify_html: true htmlmin_opts: remove_comments: true - cache_safe: true \ No newline at end of file + cache_safe: true diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 0bd2d4766..b76b092d1 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -20,6 +20,17 @@ jobs: with: fetch-depth: '0' # Fetch all commit history for all branches as well as tags. + - name: Copy Contributing Guidelines + run: | + echo "\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md' + + - uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: Commit Contributing Guidelines + file_pattern: "docs/contributing.md" + add_options: '--force' + if: success() + - name: Setup Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/linutil.yml b/.github/workflows/linutil.yml index e6d464da1..53c43d020 100644 --- a/.github/workflows/linutil.yml +++ b/.github/workflows/linutil.yml @@ -89,22 +89,23 @@ jobs: version: ${{ env.version }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Install vhs + - name: Setup Preview run: | - wget 'https://github.com/charmbracelet/vhs/releases/download/v0.8.0/vhs_0.8.0_amd64.deb' - sudo apt install -y ffmpeg - sudo snap install ttyd --classic - sudo dpkg -i 'vhs_0.8.0_amd64.deb' + echo "$(pwd)/build" >> $GITHUB_PATH + + - name: Generate preview + uses: charmbracelet/vhs-action@v2.1.0 + with: + path: "docs/assets/preview.tape" - - name: Build the preview + - name: Move preview run: | - export PATH="$(pwd)/build:$PATH" - vhs docs/assets/preview.tape -o docs/assets/preview.gif + mv preview.gif docs/assets/preview.gif - - name: Upload the preview + - name: Upload preview uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Preview for ${{ env.version }} file_pattern: "docs/assets/preview.gif" add_options: "--force" - if: success() + if: success() \ No newline at end of file diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index e91ad9410..6b1ad429a 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -14,17 +14,42 @@ jobs: - uses: actions/checkout@v4 - run: git fetch origin ${{ github.base_ref }} - - name: Download and set up shellcheck + - name: Download, setup, and run ShellCheck + shell: bash {0} run : | - wget https://github.com/koalaman/shellcheck/releases/download/v0.10.0/shellcheck-v0.10.0.linux.x86_64.tar.xz - tar -xf shellcheck-v0.10.0.linux.x86_64.tar.xz - cd shellcheck-v0.10.0 - chmod +x shellcheck - - - name: Run shellcheck - run: | - for file in $(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs); do + SC_URL="https://github.com/koalaman/shellcheck/releases/download/v0.10.0/shellcheck-v0.10.0.linux.x86_64.tar.xz" + curl -fsSL "$SC_URL" | tar -Jx + chmod +x "./shellcheck-v0.10.0/shellcheck" + + error=0 + files_to_check=$(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs) + + for file in $files_to_check; do if [[ "$file" == *.sh ]] && [[ -f "$file" ]]; then - ./shellcheck-v0.10.0/shellcheck -S error "$file" + sc_output=$(./shellcheck-v0.10.0/shellcheck -fgcc -Serror "$file") + iter_safe_parsed_errors=$(echo -e "$sc_output" | sed -n 's/\(.\+\)\:\([0-9]\+\)\:\([0-9]\+\)\: \(.*\)/::error file=\1,line=\2,col=\3::\4/p' | sed 's/ /:space:/g') + + for error in $iter_safe_parsed_errors; do + echo "$error" | sed 's/:space:/ /g' + error=1 + done + + tabs_detected=$(grep -nP '^\t+\S+' "$file") + + # fast fail on the action runner would fail immediately if there weren't any tabs found + # this check makes sure that we don't continue if there's something really weird going on + if [ "$?" = "2" ]; then + echo "::error file=$file::There was a critical error while grepping $file, aborting" + exit 1 + fi + + iter_safe_parsed_tabs_detected=$(echo "$tabs_detected" | sed -n 's,\([0-9]\+\).*,::error file='"$file"'\,line=\1::Found tab indentations,p' | sed 's/ /:space:/g') + + for error in $iter_safe_parsed_tabs_detected; do + echo "$error" | sed 's/:space:/ /g' + error=1 + done fi done + + exit $error diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml new file mode 100644 index 000000000..901d5e71e --- /dev/null +++ b/.github/workflows/typos.yml @@ -0,0 +1,15 @@ +name: Check for typos + +on: + [push, pull_request, workflow_dispatch] + +jobs: + check-typos: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - run: git fetch origin ${{ github.base_ref }} + + - name: Run spellcheck + uses: crate-ci/typos@v1.25.0 diff --git a/.github/workflows/xtask.yml b/.github/workflows/xtask.yml new file mode 100644 index 000000000..fab939376 --- /dev/null +++ b/.github/workflows/xtask.yml @@ -0,0 +1,58 @@ +name: XTasks + +on: + pull_request: + paths: + - "xtask" + - "Cargo.toml" + - "Cargo.lock" + - ".cargo" + - "core/tabs" + - "docs" + push: + paths: + - "xtask" + - "Cargo.toml" + - "Cargo.lock" + - ".cargo" + - "core/tabs" + - "docs" + +env: + CARGO_TERM_COLOR: always + +jobs: + docgen: + name: DocGen + runs-on: ubuntu-latest + + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Cache Cargo registry + uses: actions/cache@v4 + with: + path: ~/.cargo/registry + key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} + restore-keys: ${{ runner.os }}-cargo-registry- + + - name: Cache Cargo index + uses: actions/cache@v4 + with: + path: ~/.cargo/git + key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} + restore-keys: ${{ runner.os }}-cargo-index- + + - name: Run cargo xtask docgen + run: cargo xtask docgen + + - name: Check uncommitted documentation changes + run: | + git diff + git diff-files --quiet \ + || (echo "Run 'cargo xtask docgen' and push the changes" \ + && exit 1) diff --git a/Cargo.lock b/Cargo.lock index 9e70df7db..266ed837a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "shlex", ] @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.18" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", @@ -328,12 +328,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "getrandom" version = "0.2.15" @@ -496,7 +490,7 @@ dependencies = [ "ego-tree", "include_dir", "serde", - "tempdir", + "temp-dir", "toml", "which", ] @@ -514,8 +508,9 @@ dependencies = [ "linutil_core", "oneshot", "portable-pty", - "rand 0.8.5", + "rand", "ratatui", + "temp-dir", "tree-sitter-bash", "tree-sitter-highlight", "tui-term", @@ -716,19 +711,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.8.5" @@ -737,7 +719,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -747,24 +729,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.6.4" @@ -795,15 +762,6 @@ dependencies = [ "unicode-width 0.1.14", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.5.4" @@ -842,15 +800,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rustix" version = "0.38.37" @@ -1023,6 +972,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + [[package]] name = "strsim" version = "0.11.1" @@ -1063,14 +1018,10 @@ dependencies = [ ] [[package]] -name = "tempdir" -version = "0.3.7" +name = "temp-dir" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" [[package]] name = "termios" @@ -1083,18 +1034,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -1137,13 +1088,14 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.23.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff" +checksum = "23b84f60031bf8245b563a80c92c1034e557a914f7958f474bc0afa2eed78b98" dependencies = [ "cc", "regex", "regex-syntax", + "streaming-iterator", "tree-sitter-language", ] @@ -1159,12 +1111,13 @@ dependencies = [ [[package]] name = "tree-sitter-highlight" -version = "0.23.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395d7a477a4504fd7d5e4d003e0dd41bd5b9c4985d53592a943a8354ec452dae" +checksum = "5c727fb31f816c09fc54dc0e971d101318926866f7261b2acb820e84a61bf52d" dependencies = [ "lazy_static", "regex", + "streaming-iterator", "thiserror", "tree-sitter", ] @@ -1465,6 +1418,13 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "xtask" +version = "24.9.28" +dependencies = [ + "linutil_core", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/Cargo.toml b/Cargo.toml index cf43a012e..ef31b2a96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,14 @@ [workspace.package] license = "MIT" version = "24.9.28" +edition = "2021" [workspace.dependencies] ego-tree = "0.6.2" [workspace] -members = ["tui", "core"] +members = ["tui", "core", "xtask"] +default-members = ["tui", "core"] resolver = "2" [patch.crates-io] diff --git a/README.md b/README.md index 3c03bd873..f8aa0ea35 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ makepkg -si Replace `` with your preferred package. -If you use [yay](https://github.com/Jguer/yay), [paru](https://github.com/Morganamilo/paru) or any other [AUR Helper](https://wiki.archlinux.org/title/AUR_helpers), it's even simplier: +If you use [yay](https://github.com/Jguer/yay), [paru](https://github.com/Morganamilo/paru) or any other [AUR Helper](https://wiki.archlinux.org/title/AUR_helpers), it's even simpler: ```bash paru -S linutil diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 000000000..38770ffe4 --- /dev/null +++ b/_typos.toml @@ -0,0 +1,7 @@ +[files] +extend-exclude = ["tui/cool_tips.txt"] + +[default] +extend-ignore-identifiers-re = [ + "ratatui", +] diff --git a/core/Cargo.toml b/core/Cargo.toml index 8605c94c5..d3f420117 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -13,7 +13,7 @@ include = [ [dependencies] include_dir = "0.7.4" -tempdir = "0.3.7" +temp-dir = "0.1.14" serde = { version = "1.0.205", features = ["derive"], default-features = false } toml = { version = "0.8.19", features = ["parse"], default-features = false } which = "6.0.3" diff --git a/core/src/inner.rs b/core/src/inner.rs index 6cd4356b9..a2274dfa0 100644 --- a/core/src/inner.rs +++ b/core/src/inner.rs @@ -10,24 +10,29 @@ use crate::{Command, ListNode, Tab}; use ego_tree::{NodeMut, Tree}; use include_dir::{include_dir, Dir}; use serde::Deserialize; -use tempdir::TempDir; +use temp_dir::TempDir; const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/tabs"); -pub fn get_tabs(validate: bool) -> Vec { - let tab_files = TabList::get_tabs(); - let tabs = tab_files.into_iter().map(|path| { - let directory = path.parent().unwrap().to_owned(); - let data = std::fs::read_to_string(path).expect("Failed to read tab data"); - let mut tab_data: TabEntry = toml::from_str(&data).expect("Failed to parse tab data"); +pub fn get_tabs(validate: bool) -> (TempDir, Vec) { + let (temp_dir, tab_files) = TabList::get_tabs(); - if validate { - filter_entries(&mut tab_data.data); - } - (tab_data, directory) - }); + let tabs: Vec<_> = tab_files + .into_iter() + .map(|path| { + let directory = path.parent().unwrap().to_owned(); + let data = std::fs::read_to_string(path).expect("Failed to read tab data"); + let mut tab_data: TabEntry = toml::from_str(&data).expect("Failed to parse tab data"); + + if validate { + filter_entries(&mut tab_data.data); + } + (tab_data, directory) + }) + .collect(); let tabs: Vec = tabs + .into_iter() .map( |( TabEntry { @@ -57,7 +62,7 @@ pub fn get_tabs(validate: bool) -> Vec { if tabs.is_empty() { panic!("No tabs found"); } - tabs + (temp_dir, tabs) } #[derive(Deserialize)] @@ -248,19 +253,20 @@ fn is_executable(path: &Path) -> bool { } impl TabList { - fn get_tabs() -> Vec { - let temp_dir = TempDir::new("linutil_scripts").unwrap().into_path(); + fn get_tabs() -> (TempDir, Vec) { + let temp_dir = TempDir::new().unwrap(); TAB_DATA .extract(&temp_dir) .expect("Failed to extract the saved directory"); - let tab_files = - std::fs::read_to_string(temp_dir.join("tabs.toml")).expect("Failed to read tabs.toml"); + let tab_files = std::fs::read_to_string(temp_dir.path().join("tabs.toml")) + .expect("Failed to read tabs.toml"); let data: Self = toml::from_str(&tab_files).expect("Failed to parse tabs.toml"); - - data.directories + let tab_paths = data + .directories .iter() - .map(|path| temp_dir.join(path).join("tab_data.toml")) - .collect() + .map(|path| temp_dir.path().join(path).join("tab_data.toml")) + .collect(); + (temp_dir, tab_paths) } } diff --git a/core/tabs/applications-setup/Developer-tools/sublime-setup.sh b/core/tabs/applications-setup/Developer-tools/sublime-setup.sh index 0bbe87b76..16c034973 100644 --- a/core/tabs/applications-setup/Developer-tools/sublime-setup.sh +++ b/core/tabs/applications-setup/Developer-tools/sublime-setup.sh @@ -3,37 +3,37 @@ . ../../common-script.sh installSublime() { - if ! command_exists sublime; then - printf "%b\n" "${YELLOW}Installing Sublime...${RC}" - case "$PACKAGER" in - apt-get|nala) - curl -fsSL https://download.sublimetext.com/sublimehq-pub.gpg | "$ESCALATION_TOOL" apt-key add - - echo "deb https://download.sublimetext.com/ apt/stable/" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/sublime-text.list - "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text - ;; - zypper) - "$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg - "$ESCALATION_TOOL" "$PACKAGER" addrepo -g -f https://download.sublimetext.com/rpm/dev/x86_64/sublime-text.repo - "$ESCALATION_TOOL" "$PACKAGER" refresh - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install sublime-text - ;; - pacman) - "$AUR_HELPER" -S --needed --noconfirm sublime-text-4 - ;; - dnf) - "$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg - "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo - "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text - ;; - *) - printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" - exit 1 - ;; - esac - else - printf "%b\n" "${GREEN}Sublime is already installed.${RC}" - fi + if ! command_exists sublime; then + printf "%b\n" "${YELLOW}Installing Sublime...${RC}" + case "$PACKAGER" in + apt-get|nala) + curl -fsSL https://download.sublimetext.com/sublimehq-pub.gpg | "$ESCALATION_TOOL" apt-key add - + echo "deb https://download.sublimetext.com/ apt/stable/" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/sublime-text.list + "$ESCALATION_TOOL" "$PACKAGER" update + "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text + ;; + zypper) + "$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg + "$ESCALATION_TOOL" "$PACKAGER" addrepo -g -f https://download.sublimetext.com/rpm/dev/x86_64/sublime-text.repo + "$ESCALATION_TOOL" "$PACKAGER" refresh + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install sublime-text + ;; + pacman) + "$AUR_HELPER" -S --needed --noconfirm sublime-text-4 + ;; + dnf) + "$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg + "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo + "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text + ;; + *) + printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" + exit 1 + ;; + esac + else + printf "%b\n" "${GREEN}Sublime is already installed.${RC}" + fi } diff --git a/core/tabs/applications-setup/grub-theme.sh b/core/tabs/applications-setup/grub-theme.sh index d0b35420f..9b79b39bd 100644 --- a/core/tabs/applications-setup/grub-theme.sh +++ b/core/tabs/applications-setup/grub-theme.sh @@ -4,8 +4,12 @@ themeinstall(){ mkdir -p "$HOME/.local/share" - cd "$HOME/.local/share" && git clone "https://github.com/ChrisTitusTech/Top-5-Bootloader-Themes" - cd "$HOME/.local/share/Top-5-Bootloader-Themes" + cd "$HOME/.local/share" + if [ -d 'Top-5-Bootloader-Themes' ]; then + rm -rf 'Top-5-Bootloader-Themes' + fi + git clone "https://github.com/ChrisTitusTech/Top-5-Bootloader-Themes" + cd "Top-5-Bootloader-Themes" "$ESCALATION_TOOL" ./install.sh } diff --git a/core/tabs/applications-setup/zsh-setup.sh b/core/tabs/applications-setup/zsh-setup.sh index 01a93c8ad..a85b92404 100644 --- a/core/tabs/applications-setup/zsh-setup.sh +++ b/core/tabs/applications-setup/zsh-setup.sh @@ -44,6 +44,7 @@ RPROMPT='%F{15}(%F{166}%D{%H:%M}%F{15})%f' EOL # Ensure /etc/zsh/zshenv sets ZDOTDIR to the user's config directory + [ ! -f /etc/zsh/zshenv ] && "$ESCALATION_TOOL" mkdir -p /etc/zsh && "$ESCALATION_TOOL" touch /etc/zsh/zshenv echo "export ZDOTDIR=\"$HOME/.config/zsh\"" | "$ESCALATION_TOOL" tee -a /etc/zsh/zshenv } diff --git a/core/tabs/security/firewall-baselines.sh b/core/tabs/security/firewall-baselines.sh index 7ddfeeeb8..9c0810f4f 100644 --- a/core/tabs/security/firewall-baselines.sh +++ b/core/tabs/security/firewall-baselines.sh @@ -30,7 +30,7 @@ configureUFW() { printf "%b\n" "${YELLOW}Allowing port 80/tcp (UFW)${RC}" "$ESCALATION_TOOL" ufw allow 80/tcp - printf "%b\n" "${YELLO}Allowing port 443/tcp (UFW)${RC}" + printf "%b\n" "${YELLOW}Allowing port 443/tcp (UFW)${RC}" "$ESCALATION_TOOL" ufw allow 443/tcp printf "%b\n" "${YELLOW}Denying Incoming Packets by Default(UFW)${RC}" diff --git a/core/tabs/system-setup/arch/server-setup.sh b/core/tabs/system-setup/arch/server-setup.sh index 4ae0afd66..3a385df54 100755 --- a/core/tabs/system-setup/arch/server-setup.sh +++ b/core/tabs/system-setup/arch/server-setup.sh @@ -216,7 +216,7 @@ echo -ne " ------------------------------------------------------------------------ THIS WILL FORMAT AND DELETE ALL DATA ON THE DISK Please make sure you know what you are doing because - after formating your disk there is no way to get data back + after formatting your disk there is no way to get data back *****BACKUP YOUR DATA BEFORE CONTINUING***** ***I AM NOT RESPONSIBLE FOR ANY DATA LOSS*** ------------------------------------------------------------------------ @@ -328,7 +328,7 @@ echo -ne " pacman -S --noconfirm --needed gptfdisk btrfs-progs glibc echo -ne " ------------------------------------------------------------------------- - Formating Disk + Formatting Disk ------------------------------------------------------------------------- " umount -A --recursive /mnt # make sure everything is unmounted before we start @@ -466,7 +466,7 @@ if [[ $TOTAL_MEM -lt 8000000 ]]; then mkswap /mnt/opt/swap/swapfile swapon /mnt/opt/swap/swapfile # The line below is written to /mnt/ but doesn't contain /mnt/, since it's just / for the system itself. - echo "/opt/swap/swapfile none swap sw 0 0" >> /mnt/etc/fstab # Add swap to fstab, so it KEEPS working after installation. + echo "/opt/swap/swapfile none swap sw 0 0" >> /mnt/etc/fstab # Add swap to fstab, so it KEEPS working after installation. fi gpu_type=$(lspci | grep -E "VGA|3D|Display") @@ -493,8 +493,8 @@ nc=$(grep -c ^processor /proc/cpuinfo) echo -ne " ------------------------------------------------------------------------- You have " $nc" cores. And - changing the makeflags for " $nc" cores. Aswell as - changing the compression settings. + changing the makeflags for " $nc" cores. Aswell as + changing the compression settings. ------------------------------------------------------------------------- " TOTAL_MEM=$(cat /proc/meminfo | grep -i 'memtotal' | grep -o '[[:digit:]]*') @@ -670,4 +670,4 @@ sed -i 's/^%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# %wheel ALL=(ALL:ALL) NOPASSWD: A # Add sudo rights sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers -EOF \ No newline at end of file +EOF diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 6345fc970..74a96a417 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -15,30 +15,30 @@ installDepend() { else printf "%b\n" "${GREEN}Multilib is already enabled.${RC}" fi - "$AUR_HELPER" -S --needed --noconfirm "$DEPENDENCIES" + "$AUR_HELPER" -S --needed --noconfirm $DEPENDENCIES ;; apt-get|nala) COMPILEDEPS='build-essential' "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" dpkg --add-architecture i386 "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS ;; dnf) COMPILEDEPS='@development-tools' "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" "$PACKAGER" config-manager --set-enabled powertools - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" $COMPILEDEPS + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS "$ESCALATION_TOOL" "$PACKAGER" install -y glibc-devel.i686 libgcc.i686 ;; zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$DEPENDENCIES" "$COMPILEDEPS" + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install $DEPENDENCIES $COMPILEDEPS "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit ;; *) - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES ;; esac } diff --git a/core/tabs/system-setup/fedora/configure-dnf.sh b/core/tabs/system-setup/fedora/configure-dnf.sh index b51c8b4cc..977ea6d4b 100644 --- a/core/tabs/system-setup/fedora/configure-dnf.sh +++ b/core/tabs/system-setup/fedora/configure-dnf.sh @@ -10,7 +10,7 @@ configureDNF() { echo "fastestmirror=True" | "$ESCALATION_TOOL" tee -a /etc/dnf/dnf.conf > /dev/null echo "defaultyes=True" | "$ESCALATION_TOOL" tee -a /etc/dnf/dnf.conf > /dev/null "$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core - printf "%b\n" "${GREEN}DNF Configured Succesfully...${RC}" + printf "%b\n" "${GREEN}DNF Configured Successfully.${RC}" ;; *) printf "%b\n" "${RED}Unsupported distribution: $DTYPE${RC}" diff --git a/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh b/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh index 1e03a40f9..e123e8f0b 100755 --- a/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh +++ b/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh @@ -3,7 +3,7 @@ . ../../common-script.sh # This script allows user to download proprietary drivers for nvidia in fedora -# It also disables noveau nvidia drivers +# It also disables nouveau nvidia drivers # Installation guide link: https://rpmfusion.org/Howto/NVIDIA @@ -91,4 +91,4 @@ printf "%b\n" "${YELLOW}Warning! This script will enable Nvidia non-free reposit checkEnv checkEscalationTool -userConfirmation \ No newline at end of file +userConfirmation diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index 86ad21aa1..92c666c77 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -23,7 +23,7 @@ installDepend() { 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" - $AUR_HELPER -S --needed --noconfirm "$DEPENDENCIES" "$DISTRO_DEPS" + $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS ;; apt-get|nala) DISTRO_DEPS="libasound2 libsdl2 wine64 wine32" @@ -33,24 +33,24 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y software-properties-common "$ESCALATION_TOOL" apt-add-repository contrib -y "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$DISTRO_DEPS" + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS ;; dnf) if [ "$(rpm -E %fedora)" -le 41 ]; then "$ESCALATION_TOOL" "$PACKAGER" install ffmpeg ffmpeg-libs -y - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES else printf "%b\n" "${CYAN}Fedora < 41 detected. Installing rpmfusion repos.${RC}" "$ESCALATION_TOOL" "$PACKAGER" install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-"$(rpm -E %fedora)".noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-"$(rpm -E %fedora)".noarch.rpm -y "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 -y - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES fi ;; zypper) - "$ESCALATION_TOOL" "$PACKAGER" -n install "$DEPENDENCIES" + "$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES ;; *) - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES ;; esac } @@ -59,7 +59,7 @@ installAdditionalDepend() { case "$PACKAGER" in pacman) DISTRO_DEPS='steam lutris goverlay' - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$DISTRO_DEPS" + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm $DISTRO_DEPS ;; apt-get|nala) version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/lutris/lutris | diff --git a/core/tabs/system-setup/remove-snaps.sh b/core/tabs/system-setup/remove-snaps.sh index 6ea82934e..a46ef3230 100644 --- a/core/tabs/system-setup/remove-snaps.sh +++ b/core/tabs/system-setup/remove-snaps.sh @@ -3,27 +3,29 @@ . ../common-script.sh removeSnaps() { - case "$PACKAGER" in - pacman) - "$ESCALATION_TOOL" "$PACKAGER" -Rns snapd - ;; - apt-get|nala) - "$ESCALATION_TOOL" "$PACKAGER" autoremove --purge snapd - if [ "$ID" = ubuntu ]; then - "$ESCALATION_TOOL" apt-mark hold snapd - fi - ;; - dnf) - "$ESCALATION_TOOL" "$PACKAGER" remove snapd - ;; - zypper) - "$ESCALATION_TOOL" "$PACKAGER" remove snapd - ;; - *) - printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" - exit 1 - ;; - esac + if command_exists snap; then + case "$PACKAGER" in + pacman) + "$ESCALATION_TOOL" "$PACKAGER" -Rns snapd + ;; + apt-get|nala) + "$ESCALATION_TOOL" "$PACKAGER" autoremove --purge snapd + if [ "$ID" = ubuntu ]; then + "$ESCALATION_TOOL" apt-mark hold snapd + fi + ;; + dnf|zypper) + "$ESCALATION_TOOL" "$PACKAGER" remove snapd + ;; + *) + printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" + exit 1 + ;; + esac + printf "%b\n" "${GREEN}Successfully removed snaps.${RC}" + else + printf "%b\n" "${GREEN}Snapd is not installed.${RC}" + fi } checkEnv diff --git a/core/tabs/system-setup/system-cleanup.sh b/core/tabs/system-setup/system-cleanup.sh index 198a9d681..0a6259135 100644 --- a/core/tabs/system-setup/system-cleanup.sh +++ b/core/tabs/system-setup/system-cleanup.sh @@ -23,7 +23,7 @@ cleanup_system() { ;; pacman) "$ESCALATION_TOOL" "$PACKAGER" -Sc --noconfirm - "$ESCALATION_TOOL" "$PACKAGER" -Rns "$(pacman -Qtdq)" --noconfirm + "$ESCALATION_TOOL" "$PACKAGER" -Rns $(pacman -Qtdq) --noconfirm > /dev/null 2>&1 ;; *) printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" diff --git a/core/tabs/utils/tab_data.toml b/core/tabs/utils/tab_data.toml index 7cfc3ed78..ba7c0e1bc 100644 --- a/core/tabs/utils/tab_data.toml +++ b/core/tabs/utils/tab_data.toml @@ -16,60 +16,66 @@ values = [":0", ":1", ":2", ":3", ":4", ":5", ":6", ":7", ":8", ":9"] [[data.entries]] name = "Auto Detect Displays" -description = "This utility is designed to detect and apply recommended configuration for monitors connected with your system" +description = "This script is designed to detect and apply recommended configuration for monitors connected with your system" script = "monitor-control/auto_detect_displays.sh" [[data.entries]] name = "Change Orientation" -description = "This utility is designed to change the orientation of monitors in your system" +description = "This script is designed to change the orientation of monitors in your system" script = "monitor-control/change_orientation.sh" [[data.entries]] name = "Disable Monitor" -description = "This utility is designed to disable a monitor in your system" +description = "This script is designed to disable a monitor in your system" script = "monitor-control/disable_monitor.sh" [[data.entries]] name = "Duplicate Displays" -description = "This utility is designed to duplicate display among multi-monitor setup in your system" +description = "This script is designed to duplicate display among multi-monitor setup in your system" script = "monitor-control/duplicate_displays.sh" [[data.entries]] name = "Enable Monitor" -description = "This utility is designed to enable a monitor in your system" +description = "This script is designed to enable a monitor in your system" script = "monitor-control/enable_monitor.sh" [[data.entries]] name = "Extend Displays" -description = "This utility is designed to extend display among multi-monitor setup in your system" +description = "This script is designed to extend display among multi-monitor setup in your system" script = "monitor-control/extend_displays.sh" [[data.entries]] name = "Manage Arrangement" -description = "This utility is designed to arrange monitors in multi-monitor setup in your system" +description = "This script is designed to arrange monitors in multi-monitor setup in your system" script = "monitor-control/manage_arrangement.sh" [[data.entries]] name = "Reset Scaling" -description = "This utility is designed to reset scaling of a monitor in your system" +description = "This script is designed to reset scaling of a monitor in your system" script = "monitor-control/reset_scaling.sh" matches = true [[data.entries]] name = "Scale Monitors" -description = "This utility is designed to change the scaling of monitors in your system" +description = "This script is designed to change the scaling of monitors in your system" script = "monitor-control/scale_monitor.sh" [[data.entries]] name = "Set Brightness" script = "monitor-control/set_brightness.sh" +description = "This script is designed to change the Brightness of monitors connected to your system" matches = true [[data.entries]] name = "Set Primary Monitor" -description = "This utility is designed to set a Primary monitor in your system" +description = "This script is designed to set a Primary monitor in your system" script = "monitor-control/set_primary_monitor.sh" +[[data.entries]] +name = "Set Resolution" +description = "This script is designed to change the resolution of monitors connected to your system" +script = "monitor-control/set_resolutions.sh" + [[data]] name = "User Account Manager" diff --git a/docs/assets/preview.tape b/docs/assets/preview.tape index ca2b59d73..66b1c3591 100644 --- a/docs/assets/preview.tape +++ b/docs/assets/preview.tape @@ -61,13 +61,14 @@ Require linutil Require sh Set Shell "bash" -Set FontSize 32 -Set Width 3200 -Set Height 1800 +Set FontFamily "JetBrainsMono Nerd Font" +Set FontSize 24 +Set Width 1920 +Set Height 1080 Sleep 1s -Type "linutil -t compatible" Sleep 1s Enter +Type "linutil" Sleep 1s Enter Sleep 5s diff --git a/docs/contribute.md b/docs/contributing.md similarity index 82% rename from docs/contribute.md rename to docs/contributing.md index e47f81722..4e20b7b7d 100644 --- a/docs/contribute.md +++ b/docs/contributing.md @@ -1,4 +1,4 @@ -# How to Contribute? +\n\n# Contributing Guidelines for Linutil Thank you for considering contributing to Linutil! We appreciate your effort in helping improve this project. To ensure that your contributions align with the goals and quality standards of Linutil, please follow these guidelines: @@ -40,22 +40,28 @@ cd linutil - **Make small, targeted PRs**: Focus on one feature or fix per pull request. This makes it easier to review and increases the likelihood of acceptance. - **Avoid combining unrelated changes**: PRs that tackle multiple unrelated issues are harder to review and might be rejected because of a single problem. -## 8. Code Review and Feedback +## 8. Understand and Test the Code You Write + +- **Review your code**: Before submitting your changes, take the time to review your code for readability, efficiency and performance. Consider how your changes affect the project. +- **Avoid using LLMs**: Don't submit AI-generated code without reviewing and testing it first. Ensure that any code you submit is thoroughly understood and meets the project's standards. +- **Testing Requirements**: Failure to conduct testing after multiple requests may result in the closure of your Pull Request. + +## 9. Code Review and Feedback - **Expect feedback**: PRs will undergo code review. Be open to feedback and willing to make adjustments as needed. - **Participate in reviews**: If you feel comfortable, review other contributors' PRs as well. Peer review is a great way to learn and ensure high-quality contributions. -## 9. Contributing Is More Than Just Code +## 10. Contributing Is More Than Just Code - **Test the tool**: Running tests and providing feedback on how the tool works in different environments is a valuable contribution. - **Write well-formed issues**: Clearly describe bugs or problems you encounter, providing as much detail as possible, including steps to reproduce the issue. - **Propose reasonable feature requests**: When suggesting new features, ensure they fit within the scope, style, and design of the project. Provide clear reasoning and use cases. -## 10. Documentation +## 11. Documentation - **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this. -## 11. License +## 12. License - **Agree to the license**: By contributing to Linutil, you agree that your contributions will be licensed under the project's MIT license. diff --git a/docs/userguide.md b/docs/userguide.md index ede993313..2b7ad82bf 100644 --- a/docs/userguide.md +++ b/docs/userguide.md @@ -1,81 +1,151 @@ + # Walkthrough ---- - -## System Setup - -- **System Update**: Starts a system-wide update. -- **Compile Setup**: Installs tools and dependencies for compiling software. -- **Gaming Setup**: Configures Steam, Lutris, etc. -- **Global Theming**: Sets up and manages global themes. -- **Remove Snaps**: Removes snap packages. -- **TTY Fonts**: This Script will set the default TTY font to Terminus size 32 Bold - -### Arch Setup - -- **Paru Setup**: Installs the Paru AUR helper. -- **Yay Setup**: Installs the Yay AUR helper. -- **Server Setup**: Installs Arch Linux. - -### Fedora Setup - -- **RPM Fusion Setup**: Adds RPM Fusion free and nonfree repositories. -- **Multimedia Codecs**: Installs multimedia codecs and updates multimedia-related packages. Requires RPM Fusion repositories to be set up first. -- **NVIDIA Proprietary Driver Setup**: Installs proprietary NVIDIA drivers for GPUs from 2014 or later. -- **Virtualization Setup**: Installs virtualization tools. -- **Configure DNF**: Optimizes DNF for better speeds. ## Applications Setup -- **Flathub**: Installs Flatpak and Flathub. -- **Alacritty Setup**: Installs and configures Alacritty for you. -- **DwmTitus Setup**: Sets up the Dwm window manager. -- **Kitty Setup**: Installs and configures Kitty for you. -- **Rofi Setup**: Installs the Rofi application/script launcher. -- **Zsh Setup**: Installs and configures Zsh for you. -- **Fastfetch Setup**: Installs and configures Fastfetch. -- **Linutil Updater**: Updates the Linutil AUR / Crates.io Package. -- **Linutil Installer**: Installs Linutil via Crates.io or AUR. -- **Office Suite Setup**: Installs various office suites and PDF viewers (OnlyOffice, LibreOffice, WPS Office, FreeOffice, Evince, Okular, PDF Studio Viewer, PDF Studio). ### Developer Tools -- **Meld Setup**: Installs Meld, a visual diff and merge tool. -- **Ngrok Setup**: Installs Ngrok, a tool for creating secure tunnels to localhost. -- **Neovim Setup**: Installs and configures Neovim, a Vim-based text editor. -- **VS Code Setup**: Installs Visual Studio Code, a popular text editor. -- **Sublime Setup**: Installs Sublime Text, a nice text editor for code and markup. -- **VS Codium Setup**: Installs VS Codium, an open-source build of VS Code. -- **GitHub Desktop Setup**: Installs GitHub Desktop, a GUI for Git and GitHub. +- **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. +- **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. +This command configures neovim from CTT's neovim configuration. +https://github.com/ChrisTitusTech/neovim +- **Sublime Text**: Sublime Text is a fast, lightweight, and customizable text editor known for its simplicity, powerful features, and wide range of plugins for various programming languages. +- **VS Code**: Visual Studio Code (VS Code) is a lightweight, open-source code editor with built-in support for debugging, version control, and extensions for various programming languages and frameworks. +- **VS Codium**: VSCodium is a free, open-source version of Visual Studio Code (VS Code) that removes Microsoft-specific telemetry and branding. +- **Meld**: Meld is a visual diff and merge tool that helps compare files, directories, and version-controlled projects. +- **Ngrok**: Ngrok is a tool that creates secure, temporary tunnels to expose local servers to the internet for testing and development. + +### Communication Apps + +- **Discord**: Discord is a versatile communication platform for gamers and communities, offering voice, video, and text chat features. +- **Jitsi**: Jitsi Meet is an open-source video conferencing tool that allows users to host and join secure meetings directly from their web browsers without the need for downloads. +- **Signal**: Signal is a privacy-focused messaging app that provides end-to-end encryption for secure text, voice, and video communication. +- **Slack**: Slack is a collaboration platform designed for team communication, featuring channels, direct messaging, file sharing, and integrations with various productivity tools. +- **Telegram**: Telegram is a cloud-based messaging app known for its speed and security, offering features like group chats, channels, and end-to-end encrypted calls. +- **Zoom**: Zoom is a widely-used video conferencing platform that allows users to host virtual meetings, webinars, and online collaboration with features like screen sharing and recording. +- **Thunderbird**: Thunderbird is a free, open-source email client that offers powerful features like customizable email management, a built-in calendar, and extensive add-ons for enhanced functionality. + +### Office Suites + + +### PDF Suites + + +### Web Browsers + +- **Brave**: Brave is a free and open-source web browser developed by Brave Software, Inc. based on the Chromium web browser. +- **Chromium**: Chromium is an open-source web browser project started by Google, to provide the source code for the proprietary Google Chrome browser. +- **Google Chrome**: Google Chrome is a fast, secure, and free web browser, built for the modern web. +- **LibreWolf**: LibreWolf is a fork of Firefox, focused on privacy, security, and freedom. +- **Lynx**: Lynx is a highly configurable text-based web browser for use on cursor-addressable character cell terminals. +- **Mozilla Firefox**: Mozilla Firefox is a free and open-source web browser developed by the Mozilla Foundation. +- **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. +- **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. +- **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. +- **DWM-Titus**: DWM is a dynamic window manager for X. +It manages windows in tiled, monocle and floating layouts. +All of the layouts can be applied dynamically, optimising the environment for the application in use and the task performed. +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 +- **Docker**: Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers. +- **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. +- **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 +- **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. + +## 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 + +## 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 + +## System Setup -## Security Features -- **Firewall Baselines**: Sets up firewall rules. +### 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 + +### 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/ +- **Virtualization**: Enables Virtualization through dnf +- **Build Prerequisites**: This script is designed to handle the installation of various software dependencies across different Linux distributions +- **Full System Cleanup**: This script is designed to remove unnecessary packages, clean old cache files, remove temporary files, and to empty the trash. +- **Full System Update**: This command updates your system to the latest packages available for your distro +- **Gaming Dependencies**: This script is designed to handle the installation of gaming dependencies across different Linux distributions +- **Global Theme**: This script is designed to handle the installation and configuration of global theming +- **Remove Snaps**: This script is designed to remove snap +- **TTY Fonts**: This Script will set the default TTY font to Terminus size 32 Bold ## Utilities -- **Wifi Control**: Controls WiFi settings. -- **Numlock Control**: Sets up Numlock on boot. -- **Bluetooth Control**: Controls Bluetooth settings. - -### Monitor control - -- **Reset Scaling**: Resets monitor scaling to native resolution. -- **Scale Monitor**: Scales smaller monitors to the highest resolution of a bigger monitor. -- **Enable Monitor**: Enables a selected monitor. -- **Disable Monitor**: Disables a selected monitor. -- **Set Brightness**: Adjusts brightness for a selected monitor. -- **Set Resolutions**: Sets resolutions for connected monitors. -- **Change Orientation**: Changes the orientation of a selected monitor. -- **Extend Displays**: Extends displays to the right. -- **Duplicate Displays**: Duplicates displays. -- **Manage Arrangement**: Manages the arrangement of multiple monitors. -- **Set Primary Monitor**: Sets a selected monitor as the main display. -- **Auto Detect Displays**: Sets common resolution. + +### Monitor Control + +- **Auto Detect Displays**: This script is designed to detect and apply recommended configuration for monitors connected with your system +- **Change Orientation**: This script is designed to change the orientation of monitors in your system +- **Disable Monitor**: This script is designed to disable a monitor in your system +- **Duplicate Displays**: This script is designed to duplicate display among multi-monitor setup in your system +- **Enable Monitor**: This script is designed to enable a monitor in your system +- **Extend Displays**: This script is designed to extend display among multi-monitor setup in your system +- **Manage Arrangement**: This script is designed to arrange monitors in multi-monitor setup in your system +- **Reset Scaling**: This script is designed to reset scaling of a monitor in your system +- **Scale Monitors**: This script is designed to change the scaling of monitors in your system +- **Set Brightness**: This script is designed to change the Brightness of monitors connected to your system +- **Set Primary Monitor**: This script is designed to set a Primary monitor in your system +- **Set Resolution**: This script is designed to change the resolution of monitors connected to your system ### User Account Manager -- **Add User**: Creates a new user account. -- **Delete User**: Deletes an existing user account. -- **Add to Group**: Adds a user to specified groups. -- **Remove from Group**: Removes a user from specified groups. -- **Change Password**: Changes the password for a user account. +- **Auto Mount Drive**: This utility is designed to help with automating the process of mounting a drive on to your system. +- **Bluetooth Manager**: This utility is designed to manage bluetooth in your system +- **Numlock on Startup**: This utility is designed to configure auto enabling of numlock on boot +- **Ollama**: This utility is designed to manage ollama in your system +- **Service Manager**: This utility is designed to manage services in your system +- **WiFi Manager**: This utility is designed to manage wifi in your system diff --git a/linutil.desktop b/linutil.desktop index cb7963a56..877d4cf70 100755 --- a/linutil.desktop +++ b/linutil.desktop @@ -1,7 +1,8 @@ [Desktop Entry] Name=Linutil -Exec=sh -c "$HOME/.local/bin/linutil" +Comment=Distro-agnostic toolbox designed to simplify everyday Linux tasks +Exec=sh -c '/usr/bin/linutil || $HOME/.cargo/bin/linutil || linutil' Icon=utilities-terminal Type=Application Terminal=true -Categories=Utility; \ No newline at end of file +Categories=Utility; diff --git a/man/linutil.1 b/man/linutil.1 new file mode 100644 index 000000000..d31cf8790 --- /dev/null +++ b/man/linutil.1 @@ -0,0 +1,65 @@ +.\" manpage for Linutil +.TH "linutil" "1" "October 2024" "" "Linutil Manual" + +.SH NAME +linutil \- Chris Titus Tech's Linux Toolbox + +.SH SYNOPSIS +\fBlinutil [OPTIONS]\fR + +.SH DESCRIPTION +Linutil is a distro-agnostic toolbox designed to simplify everyday Linux tasks. +.br +It helps you set up applications and optimize your system for specific use cases. The utility is actively developed in Rust, providing performance and reliability. + +.SH LIVE VERSION +To get started with the live version, pick which branch you would like to use, then run the command in your terminal: +.TP +\fBStable Branch\fR +curl -fsSL https://christitus.com/linux | sh +.TP +\fBDevelopement branch\fR +curl -fsSL https://christitus.com/linuxdev | sh + +.SH OPTIONS +.TP +\fB\-t\fR, \fB\-\-theme\fR \fI\fR +Set the theme to use in the TUI. +.br +Possible values: +\fIdefault\fR, +\fIcompatible\fR. +.br +Defaults to \fIdefault\fR. + +.TP +\fB\-\-override\-validation\fR +Show all available entries, disregarding compatibility checks. (\fBUNSAFE\fR) + +.TP +\fB\-h\fR, \fB\-\-help\fR +Print help. + +.SH SUPPORT +If you find Linutil helpful, please consider giving it a star on GitHub to show your support! +https://github.com/ChrisTitusTech/linutil + +.SH DOCUMENTATION +For comprehensive information on how to use Linutil, visit the Official Linutil Documentation. +https://christitustech.github.io/linutil + +.SH AUTHOR +Written by Adam Perkowski. + + +.SH REPORTING BUGS +Since the project is still in active development, you may encounter some issues. +.br +Please consider submitting feedback if you do. +https://github.com/ChrisTitusTech/linutil/issues + +.SH COPYRIGHT +Copyright (c) 2024 Chris Titus. +.br +MIT License. +https://opensource.org/license/MIT diff --git a/start.sh b/start.sh index fd69cbece..3c412fb6b 100755 --- a/start.sh +++ b/start.sh @@ -14,8 +14,8 @@ check() { exit 1 fi - unset exit_code - unset message + unset exit_code + unset message } findArch() { diff --git a/tui/Cargo.toml b/tui/Cargo.toml index 6d77e3bec..40d3c357d 100644 --- a/tui/Cargo.toml +++ b/tui/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" license.workspace = true repository = "https://github.com/ChrisTitusTech/linutil/tree/main/tui" version.workspace = true -include = ["src/*.rs", "Cargo.toml", "build.rs", "cool_tips.txt"] +include = ["src/*.rs", "Cargo.toml", "build.rs", "cool_tips.txt", "../man/linutil.1"] build = "build.rs" [features] @@ -15,17 +15,18 @@ default = ["tips"] tips = ["rand"] [dependencies] -clap = { version = "4.5.18", features = ["derive"] } +clap = { version = "4.5.19", features = ["derive"] } crossterm = "0.28.1" ego-tree = { workspace = true } oneshot = "0.1.8" portable-pty = "0.8.1" ratatui = "0.28.1" tui-term = "0.1.12" +temp-dir = "0.1.14" unicode-width = "0.2.0" rand = { version = "0.8.5", optional = true } linutil_core = { path = "../core", version = "24.9.28" } -tree-sitter-highlight = "0.23.0" +tree-sitter-highlight = "0.24.2" tree-sitter-bash = "0.23.1" anstyle = "1.0.8" ansi-to-tui = "6.0.0" diff --git a/tui/src/floating_text.rs b/tui/src/floating_text.rs index cd6030be2..111941fec 100644 --- a/tui/src/floating_text.rs +++ b/tui/src/floating_text.rs @@ -213,6 +213,7 @@ impl FloatContent for FloatingText { fn draw(&mut self, frame: &mut Frame, area: Rect) { let Rect { height, .. } = area; + let lines = self .src .iter() diff --git a/tui/src/state.rs b/tui/src/state.rs index bd3dffd61..1db848813 100644 --- a/tui/src/state.rs +++ b/tui/src/state.rs @@ -1,5 +1,3 @@ -use std::rc::Rc; - use crate::{ confirmation::{ConfirmPrompt, ConfirmStatus}, filter::{Filter, SearchAction}, @@ -21,6 +19,8 @@ use ratatui::{ widgets::{Block, Borders, List, ListState, Paragraph}, Frame, }; +use std::rc::Rc; +use temp_dir::TempDir; const MIN_WIDTH: u16 = 77; const MIN_HEIGHT: u16 = 19; @@ -33,13 +33,15 @@ FM - file modification I - installation (privileged) MP - package manager actions SI - full system installation -SS - systemd actions (privileged) +SS - systemd actions (privileged) RP - package removal P* - privileged * "; pub struct AppState { + /// This must be passed to retain the temp dir until the end of the program + _temp_dir: TempDir, /// Selected theme theme: Theme, /// Currently focused area @@ -51,7 +53,7 @@ pub struct AppState { /// This stack keeps track of our "current directory". You can think of it as `pwd`. but not /// just the current directory, all paths that took us here, so we can "cd .." visit_stack: Vec, - /// This is the state asociated with the list widget, used to display the selection in the + /// This is the state associated with the list widget, used to display the selection in the /// widget selection: ListState, filter: Filter, @@ -78,10 +80,11 @@ pub struct ListEntry { impl AppState { pub fn new(theme: Theme, override_validation: bool) -> Self { - let tabs = linutil_core::get_tabs(!override_validation); + let (temp_dir, tabs) = linutil_core::get_tabs(!override_validation); let root_id = tabs[0].tree.root().id(); let mut state = Self { + _temp_dir: temp_dir, theme, focus: Focus::List, tabs, @@ -647,8 +650,8 @@ impl AppState { fn enable_preview(&mut self) { if let Some(list_node) = self.get_selected_node() { - let mut preview_title = "Command Preview - ".to_string(); - preview_title.push_str(list_node.name.as_str()); + let mut preview_title = "Command Preview - ".to_string( + preview_title.push_str(list_node.name.as_str()); if let Some(preview) = FloatingText::from_command(&list_node.command, preview_title) { self.spawn_float(preview, 80, 80); } diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml new file mode 100644 index 000000000..277057d99 --- /dev/null +++ b/xtask/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "xtask" +version.workspace = true +license.workspace = true +edition.workspace = true + +[dependencies] +linutil_core = { path = "../core" } diff --git a/xtask/src/docgen.rs b/xtask/src/docgen.rs new file mode 100644 index 000000000..992b83aa7 --- /dev/null +++ b/xtask/src/docgen.rs @@ -0,0 +1,60 @@ +use std::fs; + +use linutil_core::Command; + +use crate::path; +use crate::DynError; + +pub const USER_GUIDE: &str = "userguide.md"; + +pub fn userguide() -> Result { + let mut md = String::new(); + md.push_str("\n# Walkthrough\n"); + + let tabs = linutil_core::get_tabs(false).1; + + for tab in tabs { + #[cfg(debug_assertions)] + println!("Tab: {}", tab.name); + + md.push_str(&format!("\n## {}\n\n", tab.name)); + + for entry in tab.tree { + if entry.command == Command::None { + #[cfg(debug_assertions)] + println!(" Directory: {}", entry.name); + + if entry.name != "root".to_string() { + md.push_str(&format!("\n### {}\n\n", entry.name)); + } + + /* let current_dir = &entry.name; + + if *current_dir != "root".to_string() { + md.push_str(&format!( + "\n
{}\n\n", + current_dir + )); + } */ // Commenting this for now, might be a good idea later + } else { + if !entry.description.is_empty() { + #[cfg(debug_assertions)] + println!(" Entry: {}", entry.name); + #[cfg(debug_assertions)] + println!(" Description: {}", entry.description); + + md.push_str(&format!("- **{}**: {}\n", entry.name, entry.description)); + } /* else { + md.push_str(&format!("- **{}**\n", entry.name)); + } */ // https://github.com/ChrisTitusTech/linutil/pull/753 + } + } + } + + Ok(md) +} + +pub fn write(file: &str, data: &str) { + let path = path::docs().join(file); + fs::write(path, data).unwrap_or_else(|_| panic!("Could not write to {}", file)); +} diff --git a/xtask/src/main.rs b/xtask/src/main.rs new file mode 100644 index 000000000..fecab8c8e --- /dev/null +++ b/xtask/src/main.rs @@ -0,0 +1,40 @@ +mod docgen; +mod path; + +use std::{env, error::Error}; + +type DynError = Box; + +pub mod tasks { + use crate::docgen::USER_GUIDE; + use crate::docgen::{userguide, write}; + use crate::DynError; + + pub fn docgen() -> Result<(), DynError> { + write(USER_GUIDE, &userguide()?); + Ok(()) + } + + pub fn print_help() { + println!( + " +Usage: `cargo xtask ` + + Tasks: + docgen: Generate Markdown files. +" + ); + } +} + +fn main() -> Result<(), DynError> { + let task = env::args().nth(1); + match task { + None => tasks::print_help(), + Some(t) => match t.as_str() { + "docgen" => tasks::docgen()?, + invalid => return Err(format!("Invalid task: {}", invalid).into()), + }, + }; + Ok(()) +} diff --git a/xtask/src/path.rs b/xtask/src/path.rs new file mode 100644 index 000000000..9a3c6230c --- /dev/null +++ b/xtask/src/path.rs @@ -0,0 +1,12 @@ +use std::path::{Path, PathBuf}; + +pub fn project_root() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")) + .parent() + .unwrap() + .to_path_buf() +} + +pub fn docs() -> PathBuf { + project_root().join("docs/") +}