mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-22 05:12:27 +00:00
Compare commits
26 Commits
d6e0ef5ad4
...
daed8a57e8
Author | SHA1 | Date | |
---|---|---|---|
|
daed8a57e8 | ||
|
51e2cbd607 | ||
|
b36a7df11c | ||
|
9f0863729f | ||
|
e8e1a36a63 | ||
|
d033b0f36d | ||
|
472c85eb79 | ||
|
629b1290be | ||
|
cb6e0f9cb6 | ||
|
159d2cb00f | ||
|
9dbb787ac5 | ||
|
1e39d967c5 | ||
|
e31622480b | ||
|
980365f7c9 | ||
|
421044f43e | ||
|
652b8808a9 | ||
|
8ea3da9843 | ||
|
176b19d692 | ||
|
98e2f83f43 | ||
|
9d1dc35f43 | ||
|
1234edd466 | ||
|
d1a1812709 | ||
|
f2a1766289 | ||
|
6728e7ee9b | ||
|
c36879e22f | ||
|
e463037e69 |
9
.github/dependabot.yml
vendored
9
.github/dependabot.yml
vendored
|
@ -7,11 +7,4 @@ updates:
|
|||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
ignore:
|
||||
- dependency-name: "actions/stale"
|
||||
versions: '>= 9'
|
||||
- dependency-name: "actions/setup-python"
|
||||
versions: '> 4'
|
||||
- dependency-name: "crossterm"
|
||||
versions: '> 0.27.0'
|
||||
interval: "weekly"
|
|
@ -1,2 +1,3 @@
|
|||
external-sources=true
|
||||
source=core/tabs/common-script.sh
|
||||
source=core/tabs/common-script.sh
|
||||
source=core/tabs/common-service-script.sh
|
6
Cargo.lock
generated
6
Cargo.lock
generated
|
@ -250,9 +250,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
|
|||
|
||||
[[package]]
|
||||
name = "ego-tree"
|
||||
version = "0.6.3"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
|
||||
checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
|
@ -435,8 +435,6 @@ dependencies = [
|
|||
"ansi-to-tui",
|
||||
"anstyle",
|
||||
"clap",
|
||||
"crossterm",
|
||||
"ego-tree",
|
||||
"linutil_core",
|
||||
"oneshot",
|
||||
"portable-pty",
|
||||
|
|
|
@ -3,9 +3,6 @@ license = "MIT"
|
|||
version = "24.9.28"
|
||||
edition = "2021"
|
||||
|
||||
[workspace.dependencies]
|
||||
ego-tree = "0.6.2"
|
||||
|
||||
[workspace]
|
||||
members = ["tui", "core", "xtask"]
|
||||
default-members = ["tui", "core"]
|
||||
|
|
50
README.md
50
README.md
|
@ -24,6 +24,26 @@ curl -fsSL https://christitus.com/linux | sh
|
|||
```bash
|
||||
curl -fsSL https://christitus.com/linuxdev | sh
|
||||
```
|
||||
<details>
|
||||
<summary>CLI arguments</summary>
|
||||
|
||||
Linutil supports various command-line arguments to customize its behavior. Here are some common arguments you can use:
|
||||
|
||||
- `-t, --theme <THEME>` : Set the theme to use in the application [default: default] [possible values: default, compatible].
|
||||
- `--override-validation` : Show all available options, disregarding compatibility checks (UNSAFE).
|
||||
- `-h, --help` : Print help.
|
||||
|
||||
For more detailed usage, run:
|
||||
|
||||
```bash
|
||||
curl -fsSL https://christitus.com/linux | sh -s -- --help
|
||||
```
|
||||
|
||||
```bash
|
||||
linutil --help
|
||||
```
|
||||
</details>
|
||||
|
||||
## ⬇️ Installation
|
||||
|
||||
Linutil is also available as a package in various repositories:
|
||||
|
@ -58,7 +78,15 @@ paru -S linutil
|
|||
Replace `paru` with your preferred helper and `linutil` with your preferred package.
|
||||
|
||||
</details>
|
||||
<details>
|
||||
<summary>OpenSUSE</summary>
|
||||
|
||||
Linutil can be installed on OpenSUSE with:
|
||||
```bash
|
||||
sudo zypper install linutil
|
||||
```
|
||||
|
||||
</details>
|
||||
<details>
|
||||
<summary>Cargo</summary>
|
||||
|
||||
|
@ -72,6 +100,28 @@ Note that crates installed using `cargo install` require manual updating with `c
|
|||
|
||||
</details>
|
||||
|
||||
## Configuration
|
||||
|
||||
Linutil supports configuration through a TOML config file. Path to the file can be specified with `--config` (or `-c`).
|
||||
|
||||
Available options:
|
||||
- `auto_execute` - a list of commands to execute automatically (can be combined with `--skip-confirmation`)
|
||||
|
||||
Example config:
|
||||
```toml
|
||||
# example_config.toml
|
||||
|
||||
auto_execute = [
|
||||
"Fastfetch",
|
||||
"Alacritty",
|
||||
"Kitty"
|
||||
]
|
||||
```
|
||||
|
||||
```bash
|
||||
linutil --config /path/to/example_config.toml
|
||||
```
|
||||
|
||||
## 💖 Support
|
||||
|
||||
If you find Linutil helpful, please consider giving it a ⭐️ to show your support!
|
||||
|
|
|
@ -5,11 +5,7 @@ repository = "https://github.com/ChrisTitusTech/linutil/tree/main/core"
|
|||
edition = "2021"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
include = [
|
||||
"src/*.rs",
|
||||
"Cargo.toml",
|
||||
"tabs/**",
|
||||
]
|
||||
include = ["src/*.rs", "Cargo.toml", "tabs/**"]
|
||||
|
||||
[dependencies]
|
||||
include_dir = "0.7.4"
|
||||
|
@ -17,4 +13,4 @@ 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"
|
||||
ego-tree = { workspace = true }
|
||||
ego-tree = "0.9.0"
|
||||
|
|
28
core/src/config.rs
Normal file
28
core/src/config.rs
Normal file
|
@ -0,0 +1,28 @@
|
|||
use serde::Deserialize;
|
||||
use std::path::Path;
|
||||
use std::process;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct Config {
|
||||
pub auto_execute: Vec<String>,
|
||||
}
|
||||
|
||||
impl Config {
|
||||
pub fn from_file(path: &Path) -> Self {
|
||||
let content = match std::fs::read_to_string(path) {
|
||||
Ok(content) => content,
|
||||
Err(e) => {
|
||||
eprintln!("Failed to read config file {}: {}", path.display(), e);
|
||||
process::exit(1);
|
||||
}
|
||||
};
|
||||
|
||||
match toml::from_str(&content) {
|
||||
Ok(config) => config,
|
||||
Err(e) => {
|
||||
eprintln!("Failed to parse config file: {}", e);
|
||||
process::exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
use std::{
|
||||
fs::File,
|
||||
io::{BufRead, BufReader, Read},
|
||||
ops::{Deref, DerefMut},
|
||||
os::unix::fs::PermissionsExt,
|
||||
path::{Path, PathBuf},
|
||||
rc::Rc,
|
||||
|
@ -14,8 +15,34 @@ use temp_dir::TempDir;
|
|||
|
||||
const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/tabs");
|
||||
|
||||
pub fn get_tabs(validate: bool) -> (TempDir, Vec<Tab>) {
|
||||
let (temp_dir, tab_files) = TabList::get_tabs();
|
||||
// Allow the unused TempDir to be stored for later destructor call
|
||||
#[allow(dead_code)]
|
||||
pub struct TabList(pub Vec<Tab>, TempDir);
|
||||
|
||||
// Implement deref to allow Vec<Tab> methods to be called on TabList
|
||||
impl Deref for TabList {
|
||||
type Target = Vec<Tab>;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.0
|
||||
}
|
||||
}
|
||||
impl DerefMut for TabList {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
&mut self.0
|
||||
}
|
||||
}
|
||||
impl IntoIterator for TabList {
|
||||
type Item = Tab;
|
||||
type IntoIter = std::vec::IntoIter<Self::Item>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.0.into_iter()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_tabs(validate: bool) -> TabList {
|
||||
let (temp_dir, tab_files) = TabDirectories::get_tabs();
|
||||
|
||||
let tabs: Vec<_> = tab_files
|
||||
.into_iter()
|
||||
|
@ -50,11 +77,11 @@ pub fn get_tabs(validate: bool) -> (TempDir, Vec<Tab>) {
|
|||
if tabs.is_empty() {
|
||||
panic!("No tabs found");
|
||||
}
|
||||
(temp_dir, tabs)
|
||||
TabList(tabs, temp_dir)
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct TabList {
|
||||
struct TabDirectories {
|
||||
directories: Vec<PathBuf>,
|
||||
}
|
||||
|
||||
|
@ -246,9 +273,9 @@ fn is_executable(path: &Path) -> bool {
|
|||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
impl TabList {
|
||||
impl TabDirectories {
|
||||
fn get_tabs() -> (TempDir, Vec<PathBuf>) {
|
||||
let temp_dir = TempDir::new().unwrap();
|
||||
let temp_dir = TempDir::with_prefix("linutil_scripts").unwrap();
|
||||
TAB_DATA
|
||||
.extract(&temp_dir)
|
||||
.expect("Failed to extract the saved directory");
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
mod config;
|
||||
mod inner;
|
||||
|
||||
use std::rc::Rc;
|
||||
|
||||
pub use ego_tree;
|
||||
use ego_tree::Tree;
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub use inner::get_tabs;
|
||||
pub use config::Config;
|
||||
pub use inner::{get_tabs, TabList};
|
||||
|
||||
#[derive(Clone, Hash, Eq, PartialEq)]
|
||||
pub enum Command {
|
||||
|
@ -33,3 +36,16 @@ pub struct ListNode {
|
|||
pub task_list: String,
|
||||
pub multi_select: bool,
|
||||
}
|
||||
|
||||
impl Tab {
|
||||
pub fn find_command(&self, name: &str) -> Option<Rc<ListNode>> {
|
||||
self.tree.root().descendants().find_map(|node| {
|
||||
let value = node.value();
|
||||
if value.name == name && !node.has_children() {
|
||||
Some(value.clone())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,6 +12,9 @@ installMeld() {
|
|||
apt-get|nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -y install meld
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add meld
|
||||
;;
|
||||
*)
|
||||
checkFlatpak
|
||||
flatpak install -y flathub org.gnome.meld
|
||||
|
|
|
@ -29,6 +29,9 @@ installNeovim() {
|
|||
dnf|zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf python3-virtualenv luarocks golang ShellCheck git
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add neovim ripgrep fzf py3-virtualenv luarocks go shellcheck git
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installVsCode() {
|
||||
if ! command_exists code; then
|
||||
if ! command_exists com.visualstudio.code && ! command_exists code; then
|
||||
printf "%b\n" "${YELLOW}Installing VS Code..${RC}."
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
|
@ -28,6 +28,10 @@ installVsCode() {
|
|||
printf "%b\n" '[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc' | "$ESCALATION_TOOL" tee /etc/yum.repos.d/vscode.repo > /dev/null
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y code
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install -y flathub com.visualstudio.code
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installVsCodium() {
|
||||
if ! command_exists codium; then
|
||||
if ! command_exists com.vscodium.codium && ! command_exists codium; then
|
||||
printf "%b\n" "${YELLOW}Installing VS Codium...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
|
@ -26,6 +26,10 @@ installVsCodium() {
|
|||
printf "%b\n" "[gitlab.com_paulcarroty_vscodium_repo]\nname=download.vscodium.com\nbaseurl=https://download.vscodium.com/rpms/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg\nmetadata_expire=1h" | "$ESCALATION_TOOL" tee -a /etc/yum.repos.d/vscodium.repo
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y codium
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install -y flathub com.vscodium.codium
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -9,6 +9,9 @@ installAlacritty() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm alacritty
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add alacritty
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y alacritty
|
||||
;;
|
||||
|
|
|
@ -15,6 +15,9 @@ install_adb() {
|
|||
dnf|zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y android-tools
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add android-tools
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installBrave() {
|
||||
if ! command_exists brave; then
|
||||
if ! command_exists com.brave.Browser && ! command_exists brave; then
|
||||
printf "%b\n" "${YELLOW}Installing Brave...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
|
@ -29,6 +29,10 @@ installBrave() {
|
|||
"$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install -y flathub com.brave.Browser
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -9,6 +9,9 @@ if ! command_exists chromium; then
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm chromium
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add chromium
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y chromium
|
||||
;;
|
||||
|
|
|
@ -18,6 +18,9 @@ installFirefox() {
|
|||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y firefox
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add firefox
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installLibreWolf() {
|
||||
if ! command_exists librewolf; then
|
||||
if ! command_exists io.gitlab.librewolf-community && ! command_exists librewolf; then
|
||||
printf "%b\n" "${YELLOW}Installing Librewolf...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
|
@ -32,6 +32,10 @@ Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/
|
|||
pacman)
|
||||
"$AUR_HELPER" -S --needed --noconfirm librewolf-bin
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install flathub io.gitlab.librewolf-community
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -9,6 +9,9 @@ installLynx() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add lynx
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y lynx
|
||||
;;
|
||||
|
|
|
@ -22,6 +22,7 @@ installThrorium() {
|
|||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installWaterfox() {
|
||||
if ! command_exists waterfox; then
|
||||
if ! command_exists net.waterfox.waterfox && ! command_exists waterfox; then
|
||||
printf "%b\n" "${YELLOW}Installing waterfox...${RC}"
|
||||
case "$PACKAGER" in
|
||||
pacman)
|
||||
"$AUR_HELPER" -S --needed --noconfirm waterfox-bin
|
||||
"$AUR_HELPER" -S --needed --noconfirm waterfox-bin
|
||||
;;
|
||||
*)
|
||||
. ../setup-flatpak.sh
|
||||
checkFlatpak
|
||||
flatpak install -y flathub net.waterfox.waterfox
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installDiscord() {
|
||||
if ! command_exists discord; then
|
||||
if ! command_exists com.discordapp.Discord && ! command_exists discord; then
|
||||
printf "%b\n" "${YELLOW}Installing Discord...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
|
@ -20,6 +20,10 @@ installDiscord() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" install -y https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y discord
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install -y flathub com.discordapp.Discord
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
. ../../common-script.sh
|
||||
|
||||
installJitsi() {
|
||||
if ! command_exists jitsi-meet; then
|
||||
if ! command_exists org.jitsi.jitsi-meet && ! command_exists jitsi-meet; then
|
||||
printf "%b\n" "${YELLOW}Installing Jitsi meet...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
|
@ -21,6 +21,10 @@ installJitsi() {
|
|||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y jitsi-meet
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install flathub org.jitsi.jitsi-meet
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -23,6 +23,10 @@ installSignal() {
|
|||
checkFlatpak
|
||||
flatpak install -y flathub org.signal.Signal
|
||||
;;
|
||||
apk)
|
||||
checkFlatpak
|
||||
flatpak install -y flathub org.signal.Signal
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -9,6 +9,9 @@ installTelegram() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm telegram-desktop
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add telegram-desktop
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop
|
||||
;;
|
||||
|
|
|
@ -9,6 +9,9 @@ installThunderBird() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm thunderbird
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add thunderbird
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird
|
||||
;;
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
|
||||
installZapZap() {
|
||||
if ! command_exists com.rtosta.zapzap && ! command_exists zapzap; then
|
||||
printf "%b\n" "${YELLOW}Installing Zap-Zap...${RC}"
|
||||
case "$PACKAGER" in
|
||||
pacman)
|
||||
"$AUR_HELPER" -S --needed --noconfirm zapzap
|
||||
;;
|
||||
*)
|
||||
checkFlatpak
|
||||
flatpak install flathub com.rtosta.zapzap
|
||||
;;
|
||||
esac
|
||||
else
|
||||
printf "%b\n" "${GREEN}Zap-Zap is already installed.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
checkEnv
|
||||
installZapZap
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
. ../common-service-script.sh
|
||||
|
||||
# Function to prompt the user for installation choice
|
||||
choose_installation() {
|
||||
clear
|
||||
printf "%b\n" "${YELLOW}Choose what to install:${RC}"
|
||||
printf "%b\n" "1. ${YELLOW}Docker${RC}"
|
||||
printf "%b\n" "2. ${YELLOW}Docker Compose${RC}"
|
||||
|
@ -34,19 +34,20 @@ install_docker() {
|
|||
;;
|
||||
zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install docker
|
||||
"$ESCALATION_TOOL" systemctl enable docker
|
||||
"$ESCALATION_TOOL" systemctl start docker
|
||||
;;
|
||||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm docker
|
||||
"$ESCALATION_TOOL" systemctl enable docker
|
||||
"$ESCALATION_TOOL" systemctl start docker
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add docker
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
startAndEnableService docker
|
||||
}
|
||||
|
||||
install_docker_compose() {
|
||||
|
@ -66,6 +67,9 @@ install_docker_compose() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm docker-compose
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add docker-cli-compose
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -6,7 +6,7 @@ setupDWM() {
|
|||
printf "%b\n" "${YELLOW}Installing DWM-Titus...${RC}"
|
||||
case "$PACKAGER" in # Install pre-Requisites
|
||||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel libx11 libxinerama libxft imlib2 libxcb git unzip flameshot lxappearance feh mate-polkit
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel libx11 libxinerama libxft imlib2 libxcb git unzip flameshot lxappearance feh mate-polkit meson libev uthash libconfig
|
||||
;;
|
||||
apt-get|nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y build-essential libx11-dev libxinerama-dev libxft-dev libimlib2-dev libx11-xcb-dev libfontconfig1 libx11-6 libxft2 libxinerama1 libxcb-res0-dev git unzip flameshot lxappearance feh mate-polkit
|
||||
|
@ -214,7 +214,22 @@ setupDisplayManager() {
|
|||
printf "%b\n" "${YELLOW}3. GDM ${RC}"
|
||||
printf "%b\n" "${YELLOW} ${RC}"
|
||||
printf "%b" "${YELLOW}Please select one: ${RC}"
|
||||
read -r DM
|
||||
read -r choice
|
||||
case "$choice" in
|
||||
1)
|
||||
DM="sddm"
|
||||
;;
|
||||
2)
|
||||
DM="lightdm"
|
||||
;;
|
||||
3)
|
||||
DM="gdm"
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, or 3.${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
case "$PACKAGER" in
|
||||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$DM"
|
||||
|
|
|
@ -14,6 +14,9 @@ installFastfetch() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" install -y /tmp/fastfetch.deb
|
||||
rm /tmp/fastfetch.deb
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add fastfetch
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y fastfetch
|
||||
;;
|
||||
|
|
|
@ -9,6 +9,9 @@ installKitty() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm kitty
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add kitty
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y kitty
|
||||
;;
|
||||
|
|
|
@ -25,6 +25,10 @@ installLinutil() {
|
|||
esac
|
||||
printf "%b\n" "${GREEN}Installed successfully.${RC}"
|
||||
;;
|
||||
zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install linutil -y
|
||||
printf "%b\n" "${GREEN}Installed successfully.${RC}"
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}There are no official packages for your distro.${RC}"
|
||||
printf "%b" "${YELLOW}Do you want to install the crates.io package? (y/N): ${RC}"
|
||||
|
@ -40,10 +44,12 @@ installLinutil() {
|
|||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y curl rustup man-pages man-db man
|
||||
;;
|
||||
zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -n curl gcc make
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||
. $HOME/.cargo/env
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add build-base
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add rustup
|
||||
rustup-init
|
||||
# shellcheck disable=SC1091
|
||||
. "$HOME/.cargo/env"
|
||||
;;
|
||||
*)
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||
|
|
|
@ -19,6 +19,13 @@ updateLinutil() {
|
|||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
|
||||
. $HOME/.cargo/env
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add build-base
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add rustup
|
||||
rustup-init
|
||||
# shellcheck disable=SC1091
|
||||
. "$HOME/.cargo/env"
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y rustup
|
||||
;;
|
||||
|
|
|
@ -11,6 +11,9 @@ installDepend() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig git
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add bash bash-completion tar bat tree unzip fontconfig git
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
|
||||
;;
|
||||
|
@ -54,7 +57,7 @@ installStarshipAndFzf() {
|
|||
return
|
||||
fi
|
||||
|
||||
if ! curl -sSL https://starship.rs/install.sh | sh; then
|
||||
if ! curl -sSL https://starship.rs/install.sh | "$ESCALATION_TOOL" sh; then
|
||||
printf "%b\n" "${RED}Something went wrong during starship install!${RC}"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
@ -16,6 +16,9 @@ installLibreOffice() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libreoffice-fresh
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add libreoffice
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -9,6 +9,9 @@ installEvince() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm evince
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add evince
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y evince
|
||||
;;
|
||||
|
|
|
@ -9,6 +9,9 @@ installOkular() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm okular
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add okular
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y okular
|
||||
;;
|
||||
|
|
33
core/tabs/applications-setup/podman-compose-setup.sh
Normal file
33
core/tabs/applications-setup/podman-compose-setup.sh
Normal file
|
@ -0,0 +1,33 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
|
||||
installPodmanCompose() {
|
||||
if ! command_exists podman-compose; then
|
||||
printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
|
||||
;;
|
||||
zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
|
||||
;;
|
||||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
|
||||
;;
|
||||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
installPodmanCompose
|
33
core/tabs/applications-setup/podman-setup.sh
Normal file
33
core/tabs/applications-setup/podman-setup.sh
Normal file
|
@ -0,0 +1,33 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
|
||||
installPodman() {
|
||||
if ! command_exists podman; then
|
||||
printf "%b\n" "${YELLOW}Installing Podman...${RC}"
|
||||
case "$PACKAGER" in
|
||||
apt-get|nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y podman
|
||||
;;
|
||||
zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman
|
||||
;;
|
||||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman
|
||||
;;
|
||||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y podman
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
printf "%b\n" "${GREEN}Podman is already installed.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
installPodman
|
|
@ -9,6 +9,9 @@ installRofi() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm rofi
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add rofi
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y rofi
|
||||
;;
|
||||
|
|
|
@ -84,6 +84,17 @@ description = "Sublime Text is a fast, lightweight, and customizable text editor
|
|||
script = "Developer-tools/sublime-setup.sh"
|
||||
task_list = "I"
|
||||
|
||||
[[data.entries]]
|
||||
name = "ZapZap"
|
||||
description = "ZapZap is an open source whatsapp desktop client for Linux users developed by rafatosta."
|
||||
script = "communication-apps/zapzap-setup.sh"
|
||||
task_list = "I"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Zoom"
|
||||
description = "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."
|
||||
script = "communication-apps/zoom-setup.sh"
|
||||
|
||||
[[data.entries]]
|
||||
name = "VS Code"
|
||||
description = "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."
|
||||
|
@ -228,6 +239,18 @@ description = "Docker is an open platform that uses OS-level virtualization to d
|
|||
script = "docker-setup.sh"
|
||||
task_list = "I SS"
|
||||
|
||||
[[data]]
|
||||
name = "Podman"
|
||||
description = "Podman is a daemon-less open platform that uses OS-level virtualization to deliver software in packages called containers."
|
||||
script = "podman-setup.sh"
|
||||
task_list = "I SS"
|
||||
|
||||
[[data]]
|
||||
name = "Podman-compose"
|
||||
description = "Podman Compose is a tool for defining and running multi-container applications using Podman."
|
||||
script = "podman-compose-setup.sh"
|
||||
task_list = "I SS"
|
||||
|
||||
[[data]]
|
||||
name = "DWM-Titus"
|
||||
description = "DWM is a dynamic window manager for X.\nIt manages windows in tiled, monocle and floating layouts.\nAll of the layouts can be applied dynamically, optimising the environment for the application in use and the task performed.\nThis command installs and configures DWM and a desktop manager.\nThe list of patches applied can be found in CTT's DWM repository\nhttps://github.com/ChrisTitusTech/dwm-titus"
|
||||
|
@ -267,7 +290,7 @@ task_list = "I"
|
|||
[[data.preconditions]]
|
||||
matches = false
|
||||
data = "command_exists"
|
||||
values = [ "linutil" ]
|
||||
values = ["linutil"]
|
||||
|
||||
[[data]]
|
||||
name = "Linutil Updater"
|
||||
|
@ -278,7 +301,7 @@ task_list = "I"
|
|||
[[data.preconditions]]
|
||||
matches = true
|
||||
data = "command_exists"
|
||||
values = [ "linutil" ]
|
||||
values = ["linutil"]
|
||||
|
||||
[[data]]
|
||||
name = "Rofi"
|
||||
|
@ -294,7 +317,7 @@ task_list = "I SS"
|
|||
[[data.preconditions]]
|
||||
matches = true
|
||||
data = { environment = "XDG_SESSION_TYPE" }
|
||||
values = [ "wayland", "Wayland" ]
|
||||
values = ["wayland", "Wayland"]
|
||||
|
||||
[[data]]
|
||||
name = "ZSH Prompt"
|
||||
|
|
|
@ -10,6 +10,9 @@ installZsh() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm zsh
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add zsh
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y zsh
|
||||
;;
|
||||
|
|
|
@ -123,6 +123,12 @@ checkPackageManager() {
|
|||
fi
|
||||
done
|
||||
|
||||
## Enable apk community packages
|
||||
if [ "$PACKAGER" = "apk" ] && grep -qE '^#.*community' /etc/apk/repositories; then
|
||||
"$ESCALATION_TOOL" sed -i '/community/s/^#//' /etc/apk/repositories
|
||||
"$ESCALATION_TOOL" "$PACKAGER" update
|
||||
fi
|
||||
|
||||
if [ -z "$PACKAGER" ]; then
|
||||
printf "%b\n" "${RED}Can't find a supported package manager${RC}"
|
||||
exit 1
|
||||
|
@ -169,7 +175,7 @@ checkEnv() {
|
|||
checkArch
|
||||
checkEscalationTool
|
||||
checkCommandRequirements "curl groups $ESCALATION_TOOL"
|
||||
checkPackageManager 'nala apt-get dnf pacman zypper'
|
||||
checkPackageManager 'nala apt-get dnf pacman zypper apk'
|
||||
checkCurrentDirectoryWritable
|
||||
checkSuperUser
|
||||
checkDistro
|
||||
|
|
85
core/tabs/common-service-script.sh
Normal file
85
core/tabs/common-service-script.sh
Normal file
|
@ -0,0 +1,85 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
checkInitManager() {
|
||||
for manager in $1; do
|
||||
if command_exists "$manager"; then
|
||||
INIT_MANAGER="$manager"
|
||||
printf "%b\n" "${CYAN}Using ${manager} to interact with init system${RC}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$INIT_MANAGER" ]; then
|
||||
printf "%b\n" "${RED}Can't find a supported init system${RC}"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
startService() {
|
||||
case "$INIT_MANAGER" in
|
||||
systemctl)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" start "$1"
|
||||
;;
|
||||
rc-service)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" "$1" start
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
stopService() {
|
||||
case "$INIT_MANAGER" in
|
||||
systemctl)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" stop "$1"
|
||||
;;
|
||||
rc-service)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" "$1" stop
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
enableService() {
|
||||
case "$INIT_MANAGER" in
|
||||
systemctl)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" enable "$1"
|
||||
;;
|
||||
rc-service)
|
||||
"$ESCALATION_TOOL" rc-update add "$1"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
disableService() {
|
||||
case "$INIT_MANAGER" in
|
||||
systemctl)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" disable "$1"
|
||||
;;
|
||||
rc-service)
|
||||
"$ESCALATION_TOOL" rc-update del "$1"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
startAndEnableService() {
|
||||
case "$INIT_MANAGER" in
|
||||
systemctl)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" enable --now "$1"
|
||||
;;
|
||||
rc-service)
|
||||
enableService "$1"
|
||||
startService "$1"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
isServiceActive() {
|
||||
case "$INIT_MANAGER" in
|
||||
systemctl)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" is-active --quiet "$1"
|
||||
;;
|
||||
rc-service)
|
||||
"$ESCALATION_TOOL" "$INIT_MANAGER" "$1" status --quiet
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
checkInitManager 'systemctl rc-service'
|
|
@ -9,6 +9,9 @@ installPkg() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm ufw
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add ufw
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y ufw
|
||||
;;
|
||||
|
|
60
core/tabs/system-setup/arch/linux-neptune.sh
Executable file
60
core/tabs/system-setup/arch/linux-neptune.sh
Executable file
|
@ -0,0 +1,60 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
|
||||
setUpRepos() {
|
||||
if ! grep -q "^\s*\[jupiter-staging\]" /etc/pacman.conf; then
|
||||
printf "%b\n" "${CYAN}Adding jupiter-staging to pacman repositories...${RC}"
|
||||
echo "[jupiter-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
|
||||
echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
|
||||
echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
|
||||
fi
|
||||
if ! grep -q "^\s*\[holo-staging\]" /etc/pacman.conf; then
|
||||
printf "%b\n" "${CYAN}Adding holo-staging to pacman repositories...${RC}"
|
||||
echo "[holo-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
|
||||
echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
|
||||
echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
|
||||
fi
|
||||
}
|
||||
|
||||
installKernel() {
|
||||
if ! "$PACKAGER" -Q | grep -q "\blinux-neptune"; then
|
||||
printf "%b\n" "${CYAN}Installing linux-neptune..."
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -Syyu --noconfirm
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm linux-neptune linux-neptune-headers steamdeck-dsp jupiter-staging/alsa-ucm-conf
|
||||
"$ESCALATION_TOOL" mkinitcpio -P
|
||||
else
|
||||
printf "%b\n" "${GREEN}linux-neptune detected. Skipping installation.${RC}"
|
||||
fi
|
||||
|
||||
if [ -f /etc/default/grub ]; then
|
||||
printf "%b\n" "${CYAN}Updating GRUB...${RC}"
|
||||
if ! grep -q '^UPDATEDEFAULT=' /etc/default/grub; then
|
||||
echo 'UPDATEDEFAULT=yes' | "$ESCALATION_TOOL" tee -a /etc/default/grub
|
||||
else
|
||||
"$ESCALATION_TOOL" sed -i 's/^UPDATEDEFAULT=.*/UPDATEDEFAULT=yes/' /etc/default/grub
|
||||
fi
|
||||
if [ -f /boot/grub/grub.cfg ]; then
|
||||
"$ESCALATION_TOOL" grub-mkconfig -o /boot/grub/grub.cfg
|
||||
else
|
||||
printf "%b\n" "${RED}GRUB configuration file not found. Run grub-mkconfig manually.${RC}"
|
||||
fi
|
||||
else
|
||||
printf "%b\n" "${RED}GRUB not detected. Manually set your bootloader to use linux-neptune.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
copyFirmwareFiles() {
|
||||
printf "%b\n" "${CYAN}Copying firmware files...${RC}"
|
||||
"$ESCALATION_TOOL" mkdir -p /usr/lib/firmware/cirrus
|
||||
"$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-cali.bin /usr/lib/firmware/cirrus/
|
||||
"$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-cali.wmfw /usr/lib/firmware/cirrus/
|
||||
"$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-prot.bin /usr/lib/firmware/cirrus/
|
||||
"$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-prot.wmfw /usr/lib/firmware/cirrus/
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
setUpRepos
|
||||
installKernel
|
||||
copyFirmwareFiles
|
120
core/tabs/system-setup/arch/nvidia-drivers.sh
Executable file
120
core/tabs/system-setup/arch/nvidia-drivers.sh
Executable file
|
@ -0,0 +1,120 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
|
||||
LIBVA_DIR="$HOME/.local/share/linutil/libva"
|
||||
MPV_CONF="$HOME/.config/mpv/mpv.conf"
|
||||
|
||||
installDeps() {
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel dkms ninja meson git
|
||||
|
||||
installed_kernels=$("$PACKAGER" -Q | grep -E '^linux(| |-rt|-rt-lts|-hardened|-zen|-lts)[^-headers]' | cut -d ' ' -f 1)
|
||||
|
||||
for kernel in $installed_kernels; do
|
||||
header="${kernel}-headers"
|
||||
printf "%b\n" "${CYAN}Installing headers for $kernel...${RC}"
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$header"
|
||||
done
|
||||
}
|
||||
|
||||
checkNvidiaHardware() {
|
||||
# Refer https://nouveau.freedesktop.org/CodeNames.html for model code names
|
||||
model=$(lspci -k | grep -A 2 -E "(VGA|3D)" | grep NVIDIA | sed 's/.*Corporation //;s/ .*//' | cut -c 1-2)
|
||||
case "$model" in
|
||||
GM | GP | GV) return 1 ;;
|
||||
TU | GA | AD) return 0 ;;
|
||||
*) printf "%b\n" "${RED}Unsupported hardware." && exit 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
checkIntelHardware() {
|
||||
model=$(grep "model name" /proc/cpuinfo | head -n 1 | cut -d ':' -f 2 | cut -c 2-3)
|
||||
[ "$model" -ge 11 ]
|
||||
}
|
||||
|
||||
promptUser() {
|
||||
printf "%b" "Do you want to $1 ? [y/N]:"
|
||||
read -r confirm
|
||||
[ "$confirm" = "y" ] || [ "$confirm" = "Y" ]
|
||||
}
|
||||
|
||||
setKernelParam() {
|
||||
PARAMETER="$1"
|
||||
|
||||
if grep -q "$PARAMETER" /etc/default/grub; then
|
||||
printf "%b\n" "${YELLOW}NVIDIA modesetting is already enabled in GRUB.${RC}"
|
||||
else
|
||||
"$ESCALATION_TOOL" sed -i "/^GRUB_CMDLINE_LINUX_DEFAULT=/ s/\"$/ $PARAMETER\"/" /etc/default/grub
|
||||
printf "%b\n" "${CYAN}Added $PARAMETER to /etc/default/grub.${RC}"
|
||||
"$ESCALATION_TOOL" grub-mkconfig -o /boot/grub/grub.cfg
|
||||
fi
|
||||
}
|
||||
|
||||
setupHardwareAcceleration() {
|
||||
if ! command_exists grub-mkconfig; then
|
||||
printf "%b\n" "${RED}Currently hardware acceleration is only available with GRUB.${RC}"
|
||||
return
|
||||
fi
|
||||
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libva-nvidia-driver
|
||||
|
||||
mkdir -p "$HOME/.local/share/linutil"
|
||||
if [ -d "$LIBVA_DIR" ]; then
|
||||
rm -rf "$LIBVA_DIR"
|
||||
fi
|
||||
|
||||
printf "%b\n" "${YELLOW}Cloning libva from https://github.com/intel/libva in ${LIBVA_DIR}${RC}"
|
||||
git clone --branch=v2.22-branch --depth=1 https://github.com/intel/libva "$LIBVA_DIR"
|
||||
|
||||
mkdir -p "$LIBVA_DIR/build"
|
||||
cd "$LIBVA_DIR/build" && arch-meson .. -Dwith_legacy=nvctrl && ninja
|
||||
"$ESCALATION_TOOL" ninja install
|
||||
|
||||
"$ESCALATION_TOOL" sed -i '/^MOZ_DISABLE_RDD_SANDBOX/d' "/etc/environment"
|
||||
"$ESCALATION_TOOL" sed -i '/^LIBVA_DRIVER_NAME/d' "/etc/environment"
|
||||
|
||||
printf "LIBVA_DRIVER_NAME=nvidia\nMOZ_DISABLE_RDD_SANDBOX=1" | "$ESCALATION_TOOL" tee -a /etc/environment >/dev/null
|
||||
|
||||
printf "%b\n" "${GREEN}Hardware Acceleration setup completed successfully.${RC}"
|
||||
|
||||
if promptUser "enable Hardware Acceleration in MPV player"; then
|
||||
mkdir -p "$HOME/.config/mpv"
|
||||
if [ -f "$MPV_CONF" ]; then
|
||||
sed -i '/^hwdec/d' "$MPV_CONF"
|
||||
fi
|
||||
printf "hwdec=auto" | tee -a "$MPV_CONF" >/dev/null
|
||||
printf "%b\n" "${GREEN}MPV Hardware Acceleration enabled successfully.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
installDriver() {
|
||||
# Refer https://wiki.archlinux.org/title/NVIDIA for open-dkms or dkms driver selection
|
||||
if checkNvidiaHardware && promptUser "install nvidia's open source drivers"; then
|
||||
printf "%b\n" "${YELLOW}Installing nvidia open source driver...${RC}"
|
||||
installDeps
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm nvidia-open-dkms nvidia-utils
|
||||
else
|
||||
printf "%b\n" "${YELLOW}Installing nvidia proprietary driver...${RC}"
|
||||
installDeps
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm nvidia-dkms nvidia-utils
|
||||
fi
|
||||
|
||||
if checkIntelHardware; then
|
||||
setKernelParam "ibt=off"
|
||||
fi
|
||||
|
||||
# Refer https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend
|
||||
setKernelParam "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
||||
"$ESCALATION_TOOL" systemctl enable nvidia-suspend.service nvidia-hibernate.service nvidia-resume.service
|
||||
|
||||
printf "%b\n" "${GREEN}Driver installed successfully.${RC}"
|
||||
if promptUser "setup Hardware Acceleration"; then
|
||||
setupHardwareAcceleration
|
||||
fi
|
||||
|
||||
printf "%b\n" "${GREEN}Please reboot your system for the changes to take effect.${RC}"
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
installDriver
|
104
core/tabs/system-setup/arch/virtualization.sh
Executable file
104
core/tabs/system-setup/arch/virtualization.sh
Executable file
|
@ -0,0 +1,104 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
|
||||
installQEMUDesktop() {
|
||||
if ! command_exists qemu-img; then
|
||||
printf "%b\n" "${YELLOW}Installing QEMU.${RC}"
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm qemu-desktop
|
||||
else
|
||||
printf "%b\n" "${GREEN}QEMU is already installed.${RC}"
|
||||
fi
|
||||
checkKVM
|
||||
}
|
||||
|
||||
installQEMUEmulators() {
|
||||
if ! "$PACKAGER" -Q | grep -q "qemu-emulators-full "; then
|
||||
printf "%b\n" "${YELLOW}Installing QEMU-Emulators.${RC}"
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm qemu-emulators-full swtpm
|
||||
else
|
||||
printf "%b\n" "${GREEN}QEMU-Emulators already installed.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
installVirtManager() {
|
||||
if ! command_exists virt-manager; then
|
||||
printf "%b\n" "${YELLOW}Installing Virt-Manager.${RC}"
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm virt-manager
|
||||
else
|
||||
printf "%b\n" "${GREEN}Virt-Manager already installed.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
checkKVM() {
|
||||
if [ ! -e "/dev/kvm" ]; then
|
||||
printf "%b\n" "${RED}KVM is not available. Make sure you have CPU virtualization support enabled in your BIOS/UEFI settings. Please refer https://wiki.archlinux.org/title/KVM for more information.${RC}"
|
||||
else
|
||||
"$ESCALATION_TOOL" usermod "$USER" -aG kvm
|
||||
fi
|
||||
}
|
||||
|
||||
setupLibvirt() {
|
||||
printf "%b\n" "${YELLOW}Configuring Libvirt.${RC}"
|
||||
if "$PACKAGER" -Q | grep -q "iptables "; then
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -Rdd --noconfirm iptables
|
||||
fi
|
||||
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm dnsmasq iptables-nft
|
||||
"$ESCALATION_TOOL" sed -i 's/^#\?firewall_backend\s*=\s*".*"/firewall_backend = "iptables"/' "/etc/libvirt/network.conf"
|
||||
|
||||
if systemctl is-active --quiet polkit; then
|
||||
"$ESCALATION_TOOL" sed -i 's/^#\?auth_unix_ro\s*=\s*".*"/auth_unix_ro = "polkit"/' "/etc/libvirt/libvirtd.conf"
|
||||
"$ESCALATION_TOOL" sed -i 's/^#\?auth_unix_rw\s*=\s*".*"/auth_unix_rw = "polkit"/' "/etc/libvirt/libvirtd.conf"
|
||||
fi
|
||||
|
||||
"$ESCALATION_TOOL" usermod "$USER" -aG libvirt
|
||||
|
||||
for value in libvirt libvirt_guest; do
|
||||
if ! grep -wq "$value" /etc/nsswitch.conf; then
|
||||
"$ESCALATION_TOOL" sed -i "/^hosts:/ s/$/ ${value}/" /etc/nsswitch.conf
|
||||
fi
|
||||
done
|
||||
|
||||
"$ESCALATION_TOOL" systemctl enable --now libvirtd.service
|
||||
"$ESCALATION_TOOL" virsh net-autostart default
|
||||
|
||||
checkKVM
|
||||
}
|
||||
|
||||
installLibvirt() {
|
||||
if ! command_exists libvirtd; then
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libvirt dmidecode
|
||||
else
|
||||
printf "%b\n" "${GREEN}Libvirt is already installed.${RC}"
|
||||
fi
|
||||
setupLibvirt
|
||||
}
|
||||
|
||||
main() {
|
||||
printf "%b\n" "${YELLOW}Choose what to install:${RC}"
|
||||
printf "%b\n" "1. ${YELLOW}QEMU${RC}"
|
||||
printf "%b\n" "2. ${YELLOW}QEMU-Emulators ( Extended architectures )${RC}"
|
||||
printf "%b\n" "3. ${YELLOW}Libvirt${RC}"
|
||||
printf "%b\n" "4. ${YELLOW}Virtual-Manager${RC}"
|
||||
printf "%b\n" "5. ${YELLOW}All${RC}"
|
||||
printf "%b" "Enter your choice [1-5]: "
|
||||
read -r CHOICE
|
||||
case "$CHOICE" in
|
||||
1) installQEMUDesktop ;;
|
||||
2) installQEMUEmulators ;;
|
||||
3) installLibvirt ;;
|
||||
4) installVirtManager ;;
|
||||
5)
|
||||
installQEMUDesktop
|
||||
installQEMUEmulators
|
||||
installLibvirt
|
||||
installVirtManager
|
||||
;;
|
||||
*) printf "%b\n" "${RED}Invalid choice.${RC}" && exit 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
main
|
|
@ -37,6 +37,9 @@ installDepend() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install $DEPENDENCIES $COMPILEDEPS
|
||||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add build-base multitail tar tree trash-cli unzip cmake jq
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
|
||||
;;
|
||||
|
|
168
core/tabs/system-setup/fedora/fedora-btrfs-assistant.sh
Normal file
168
core/tabs/system-setup/fedora/fedora-btrfs-assistant.sh
Normal file
|
@ -0,0 +1,168 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
|
||||
# This script automates the installation and root and home snapshot configuration of Snapper and installs Grub-Btrfs on Fedora.
|
||||
# Also installs python3-dnf-plugin-snapper package for automatic snapshots after dnf commands.
|
||||
|
||||
# Install Btrfs-Assistant/snapper and dependencies
|
||||
installBtrfsStack() {
|
||||
if ! command_exists btrfs-assistant; then
|
||||
printf "%b\n" "${YELLOW}==========================================${RC}"
|
||||
printf "%b\n" "${YELLOW}Installing Btrfs Assistant with snapper...${RC}"
|
||||
printf "%b\n" "${YELLOW}==========================================${RC}"
|
||||
case "$PACKAGER" in
|
||||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y btrfs-assistant python3-dnf-plugin-snapper
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
printf "%b\n" "${GREEN}Btrfs Assistant is already installed.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
# Create first snapper config for root and home and create new manual snapshots
|
||||
configureSnapper() {
|
||||
printf "%b\n" "${YELLOW}===========================================================================${RC}"
|
||||
printf "%b\n" "${YELLOW}Creating snapper root(/) and /home config and taking the first snapshots...${RC}"
|
||||
printf "%b\n" "${YELLOW}===========================================================================${RC}"
|
||||
"$ESCALATION_TOOL" snapper -c home create-config /home && "$ESCALATION_TOOL" snapper -c home create --description "First home Snapshot"
|
||||
"$ESCALATION_TOOL" snapper -c root create-config / && "$ESCALATION_TOOL" snapper -c root create --description "First root Snapshot"
|
||||
printf "%b\n" "${YELLOW}Updating timeline settings...${RC}"
|
||||
# Modifyling default timeline root config
|
||||
"$ESCALATION_TOOL" sed -i'' '
|
||||
s/^TIMELINE_LIMIT_HOURLY="[^"]*"/TIMELINE_LIMIT_HOURLY="1"/;
|
||||
s/^TIMELINE_LIMIT_DAILY="[^"]*"/TIMELINE_LIMIT_DAILY="2"/;
|
||||
s/^TIMELINE_LIMIT_WEEKLY="[^"]*"/TIMELINE_LIMIT_WEEKLY="1"/;
|
||||
s/^TIMELINE_LIMIT_MONTHLY="[^"]*"/TIMELINE_LIMIT_MONTHLY="0"/;
|
||||
s/^TIMELINE_LIMIT_YEARLY="[^"]*"/TIMELINE_LIMIT_YEARLY="0"/
|
||||
' /etc/snapper/configs/root
|
||||
# Modifyling default timeline for home config
|
||||
"$ESCALATION_TOOL" sed -i'' '
|
||||
s/^TIMELINE_LIMIT_HOURLY="[^"]*"/TIMELINE_LIMIT_HOURLY="2"/;
|
||||
s/^TIMELINE_LIMIT_DAILY="[^"]*"/TIMELINE_LIMIT_DAILY="1"/;
|
||||
s/^TIMELINE_LIMIT_WEEKLY="[^"]*"/TIMELINE_LIMIT_WEEKLY="0"/;
|
||||
s/^TIMELINE_LIMIT_MONTHLY="[^"]*"/TIMELINE_LIMIT_MONTHLY="1"/;
|
||||
s/^TIMELINE_LIMIT_YEARLY="[^"]*"/TIMELINE_LIMIT_YEARLY="0"/
|
||||
' /etc/snapper/configs/home
|
||||
printf "%b\n" "${GREEN}Snapper configs and first snapshots created.${RC}"
|
||||
}
|
||||
|
||||
# Starting services
|
||||
serviceStartEnable() {
|
||||
printf "%b\n" "${YELLOW}==================================================================================${RC}"
|
||||
printf "%b\n" "${YELLOW}Starting and enabling snapper-timeline.timer and snapper-cleanup.timer services...${RC}"
|
||||
printf "%b\n" "${YELLOW}==================================================================================${RC}"
|
||||
"$ESCALATION_TOOL" systemctl enable --now snapper-timeline.timer
|
||||
"$ESCALATION_TOOL" systemctl enable --now snapper-cleanup.timer
|
||||
printf "%b\n" "${GREEN}Snapper services started and enabled.${RC}"
|
||||
}
|
||||
|
||||
# Ask user if they want to install grub-btrfs
|
||||
askInstallGrubBtrfs() {
|
||||
printf "%b\n" "${YELLOW}=====================================${RC}"
|
||||
printf "%b\n" "${YELLOW}(optional) grub-btrfs installation...${RC}"
|
||||
printf "%b\n" "${YELLOW}=====================================${RC}"
|
||||
printf "%b\n" "${YELLOW}You can skip installing grub-btrfs and use only Btrfs Assistant GUI or snapper CLI.${RC}"
|
||||
printf "%b\n" "${CYAN}Notice: grub-btrfs may cause problems with booting into snapshots and other OSes on systems with secure boot/tpm. You will be asked to apply mitigation for this issue in next step.${RC}"
|
||||
|
||||
while true; do
|
||||
printf "%b" "${YELLOW}Do you want to install grub-btrfs? Press (y) for yes, (n) for no, (f) to apply tpm mitigation to already installed grub-btrfs: ${RC}"
|
||||
read -r response
|
||||
case "$response" in
|
||||
[yY]*)
|
||||
installGrubBtrfs
|
||||
break
|
||||
;;
|
||||
[nN]*)
|
||||
printf "%b\n" "${GREEN}Skipping grub-btrfs installation.${RC}"
|
||||
break
|
||||
;;
|
||||
[fF]*)
|
||||
mitigateTpmError
|
||||
break
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Invalid input. Please enter 'y' for yes, 'n' for no, or (f) to apply tpm mitigation to already installed grub-btrfs.${RC}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Install grub-btrfs
|
||||
installGrubBtrfs() {
|
||||
# Check if the grub-btrfs dir exists before attempting to clone into it.
|
||||
printf "%b\n" "${YELLOW}Downloading grub-btrfs and installing dependencies...${RC}"
|
||||
if [ -d "$HOME/grub-btrfs" ]; then
|
||||
rm -rf "$HOME/grub-btrfs"
|
||||
fi
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y make git inotify-tools
|
||||
cd "$HOME" && git clone https://github.com/Antynea/grub-btrfs
|
||||
printf "%b\n" "${YELLOW}Installing grub-btrfs...${RC}"
|
||||
cd "$HOME/grub-btrfs"
|
||||
printf "%b\n" "${YELLOW}Modifying grub-btrfs configuration for Fedora...${RC}"
|
||||
sed -i'' '/#GRUB_BTRFS_SNAPSHOT_KERNEL/a GRUB_BTRFS_SNAPSHOT_KERNEL_PARAMETERS="systemd.volatile=state"' config
|
||||
sed -i'' '/#GRUB_BTRFS_GRUB_DIRNAME/a GRUB_BTRFS_GRUB_DIRNAME="/boot/grub2"' config
|
||||
sed -i'' '/#GRUB_BTRFS_MKCONFIG=/a GRUB_BTRFS_MKCONFIG=/sbin/grub2-mkconfig' config
|
||||
sed -i'' '/#GRUB_BTRFS_SCRIPT_CHECK=/a GRUB_BTRFS_SCRIPT_CHECK=grub2-script-check' config
|
||||
"$ESCALATION_TOOL" make install
|
||||
printf "%b\n" "${YELLOW}Updating grub configuration and enabling grub-btrfsd service...${RC}"
|
||||
"$ESCALATION_TOOL" grub2-mkconfig -o /boot/grub2/grub.cfg && "$ESCALATION_TOOL" systemctl enable --now grub-btrfsd.service
|
||||
printf "%b\n" "${YELLOW}Cleaning up installation files...${RC}"
|
||||
cd .. && rm -rf "$HOME/grub-btrfs"
|
||||
printf "%b\n" "${GREEN}Grub-btrfs installed and service enabled.${RC}"
|
||||
printf "%b\n" "${CYAN}Notice: To perform a system recovery via grub-btrfs, perform a restore operation with Btrfs Assistant GUI after booting into the snapshot.${RC}"
|
||||
mitigateTpmError
|
||||
}
|
||||
|
||||
mitigateTpmError() {
|
||||
printf "%b\n" "${YELLOW}===============================================${RC}"
|
||||
printf "%b\n" "${YELLOW}Mitigation for 'tpm.c:150:unknown TPM error'...${RC}"
|
||||
printf "%b\n" "${YELLOW}===============================================${RC}"
|
||||
printf "%b\n" "${YELLOW}Some systems with secure boot/tpm may encounter 'tpm.c:150:unknown TPM error' when booting into snapshots.${RC}"
|
||||
printf "%b\n" "${YELLOW}If you encounter this issue, you can come back later and apply this mitigation or you can apply it now.${RC}"
|
||||
while true; do
|
||||
printf "%b\n" "${YELLOW}Do you want to apply the TPM error mitigation? (y/n): ${RC}"
|
||||
read -r response
|
||||
case "$response" in
|
||||
[yY]*)
|
||||
printf "%b\n" "${YELLOW}Creating /etc/grub.d/02_tpm file...${RC}"
|
||||
echo '#!/bin/sh' | "$ESCALATION_TOOL" tee /etc/grub.d/02_tpm > /dev/null
|
||||
echo 'echo "rmmod tpm"' | "$ESCALATION_TOOL" tee -a /etc/grub.d/02_tpm > /dev/null
|
||||
"$ESCALATION_TOOL" chmod +x /etc/grub.d/02_tpm # makes the file executable
|
||||
"$ESCALATION_TOOL" grub2-mkconfig -o /boot/grub2/grub.cfg # updates grub config
|
||||
printf "%b\n" "${GREEN}Mitigation applied and grub config updated.${RC}"
|
||||
break
|
||||
;;
|
||||
[nN]*)
|
||||
printf "%b\n" "${GREEN}Skipping TPM error mitigation.${RC}"
|
||||
break
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Invalid input. Please enter 'y' for yes or 'n' for no.${RC}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Post install information
|
||||
someNotices() {
|
||||
printf "%b\n" "${YELLOW}================================NOTICES================================${RC}"
|
||||
printf "%b\n" "${YELLOW}Notice: You can manage snapshots from GUI with Btrfs Assistant or CLI with snapper.${RC}"
|
||||
printf "%b\n" "${YELLOW}Notice: You may change (Hourly, daily, weekly, monthly, yearly) timeline settings with Btrfs Assistant GUI.${RC}"
|
||||
printf "%b\n" "${RED}Notice: If you used the default Fedora disk partitioning during OS installation, the /boot configured as an separate EXT4 partition. Therefore, it cannot be included in root snapshots. Backup separately...${RC}"
|
||||
printf "%b\n" "${YELLOW}================================NOTICES================================${RC}"
|
||||
printf "%b\n" "${GREEN}Setup process completed.${RC}"
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
installBtrfsStack
|
||||
configureSnapper
|
||||
serviceStartEnable
|
||||
askInstallGrubBtrfs
|
||||
someNotices
|
|
@ -50,7 +50,8 @@ installDepend() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
|
||||
printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
@ -95,6 +96,8 @@ installAdditionalDepend() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" -n install $DISTRO_DEPS
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
. ../common-service-script.sh
|
||||
|
||||
cleanup_system() {
|
||||
printf "%b\n" "${YELLOW}Performing system cleanup...${RC}"
|
||||
|
@ -23,6 +24,9 @@ cleanup_system() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" -Sc --noconfirm
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -Rns $(pacman -Qtdq) --noconfirm > /dev/null 2>&1
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" cache clean
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}. Skipping.${RC}"
|
||||
;;
|
||||
|
@ -39,7 +43,9 @@ common_cleanup() {
|
|||
if [ -d /var/log ]; then
|
||||
"$ESCALATION_TOOL" find /var/log -type f -name "*.log" -exec truncate -s 0 {} \;
|
||||
fi
|
||||
"$ESCALATION_TOOL" journalctl --vacuum-time=3d
|
||||
if [ "$INIT_MANAGER" = "systemctl" ]; then
|
||||
"$ESCALATION_TOOL" journalctl --vacuum-time=3d
|
||||
fi
|
||||
}
|
||||
|
||||
clean_data() {
|
||||
|
|
|
@ -48,6 +48,9 @@ fastUpdate() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" ref
|
||||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive dup
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" update
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
|
||||
exit 1
|
||||
|
@ -74,6 +77,9 @@ updateSystem() {
|
|||
"$ESCALATION_TOOL" "$PACKAGER" ref
|
||||
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive dup
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" upgrade
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -15,12 +15,35 @@ script = "arch/server-setup.sh"
|
|||
task_list = "SI D"
|
||||
multi_select = false
|
||||
|
||||
[[data.entries]]
|
||||
name ="Linux Neptune for SteamDeck"
|
||||
description = "Valve's fork of Linux Kernel for the SteamDeck"
|
||||
script = "arch/linux-neptune.sh"
|
||||
task_list = "I PFM K"
|
||||
|
||||
[[data.entries.preconditions]]
|
||||
matches = true
|
||||
data = { file = "/sys/devices/virtual/dmi/id/board_vendor" }
|
||||
values = [ "Valve" ]
|
||||
|
||||
[[data.entries]]
|
||||
name = "Nvidia Drivers && Hardware Acceleration"
|
||||
description = "This script installs and configures nvidia drivers with Hardware Acceleration."
|
||||
script = "arch/nvidia-drivers.sh"
|
||||
task_list = "I FM SS"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Paru AUR Helper"
|
||||
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 = "Virtualization"
|
||||
description = "QEMU, Libvirt, Virt-Manager installation and configuration."
|
||||
script = "arch/virtualization.sh"
|
||||
task_list = "FM I SS RP"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Yay AUR Helper"
|
||||
description = "Yet Another Yogurt - An AUR Helper Written in Go. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
|
||||
|
@ -71,6 +94,17 @@ description = "Enables Virtualization through dnf"
|
|||
script = "fedora/virtualization.sh"
|
||||
task_list = "I"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Btrfs Assistant, Snapper Config, grub-btrfs"
|
||||
description = "Installs Btrfs Assistant, Snapper, dnf snapper plugin and takes the first root(/) and /home snapshots. Enables snapper-timeline and snapper-cleanup services. Installs Grub-Btrfs. Notice: To perform a system recovery via grub-btrfs, perform a restore operation with Btrfs Assistant GUI after booting into the snapshot. Notice: If you used the default Fedora disk partitioning during OS installation, the /boot configured as an separate EXT4 partition. Therefore, it cannot be included in root snapshots. Backup separately."
|
||||
script = "fedora/fedora-btrfs-assistant.sh"
|
||||
task_list = "I PFM SS"
|
||||
|
||||
[[data.preconditions]]
|
||||
matches = true
|
||||
data = "command_exists"
|
||||
values = [ "btrfs" ]
|
||||
|
||||
[[data]]
|
||||
name = "Build Prerequisites"
|
||||
description = "This script is designed to handle the installation of various software dependencies across different Linux distributions"
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
. ../common-service-script.sh
|
||||
|
||||
# Function to check Bluez is installed
|
||||
setupBluetooth() {
|
||||
|
@ -10,6 +11,9 @@ setupBluetooth() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm bluez-utils
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add bluez
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y bluez
|
||||
;;
|
||||
|
@ -18,15 +22,7 @@ setupBluetooth() {
|
|||
printf "%b\n" "${GREEN}Bluez is already installed.${RC}"
|
||||
fi
|
||||
|
||||
# Check if bluetooth service is running
|
||||
if ! systemctl is-active --quiet bluetooth; then
|
||||
printf "%b\n" "${YELLOW}Bluetooth service is not running. Starting it now...${RC}"
|
||||
"$ESCALATION_TOOL" systemctl start bluetooth
|
||||
|
||||
if systemctl is-active --quiet bluetooth; then
|
||||
printf "%b\n" "${GREEN}Bluetooth service started successfully.${RC}"
|
||||
fi
|
||||
fi
|
||||
startService bluetooth
|
||||
}
|
||||
|
||||
# Function to display the main menu
|
||||
|
|
|
@ -12,6 +12,7 @@ list_devices() {
|
|||
printf "\n"
|
||||
}
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
installDependencies() {
|
||||
DEPENDENCIES="xz gzip bzip2 jq"
|
||||
if ! command_exists ${DEPENDENCIES}; then
|
||||
|
@ -23,6 +24,8 @@ installDependencies() {
|
|||
"${ESCALATION_TOOL}" "${PACKAGER}" install -y ${DEPENDENCIES};;
|
||||
pacman)
|
||||
"${ESCALATION_TOOL}" "${PACKAGER}" -S --noconfirm --needed ${DEPENDENCIES};;
|
||||
apk)
|
||||
"${ESCALATION_TOOL}" "${PACKAGER}" add ${DEPENDENCIES};;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager.${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -19,6 +19,9 @@ if ! command_exists openssl; then
|
|||
zypper)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install openssl
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add openssl
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
|
||||
exit 1
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
|
||||
# setleds can be used in all distros
|
||||
# This method works by calling a script using systemd service
|
||||
|
||||
# Create a script to toggle numlock
|
||||
. ../common-service-script.sh
|
||||
|
||||
create_file() {
|
||||
printf "%b\n" "Creating script..."
|
||||
"$ESCALATION_TOOL" tee "/usr/local/bin/numlock" >/dev/null <<'EOF'
|
||||
printf "%b\n" "Creating script..."
|
||||
"$ESCALATION_TOOL" tee "/usr/local/bin/numlock" >/dev/null <<'EOF'
|
||||
#!/bin/bash
|
||||
|
||||
for tty in /dev/tty{1..6}
|
||||
|
@ -18,13 +14,12 @@ do
|
|||
done
|
||||
EOF
|
||||
|
||||
"$ESCALATION_TOOL" chmod +x /usr/local/bin/numlock
|
||||
"$ESCALATION_TOOL" chmod +x /usr/local/bin/numlock
|
||||
}
|
||||
|
||||
# Create a systemd service to run the script on boot
|
||||
create_service() {
|
||||
printf "%b\n" "Creating service..."
|
||||
"$ESCALATION_TOOL" tee "/etc/systemd/system/numlock.service" >/dev/null <<'EOF'
|
||||
printf "%b\n" "Creating service..."
|
||||
"$ESCALATION_TOOL" tee "/etc/systemd/system/numlock.service" >/dev/null <<'EOF'
|
||||
[Unit]
|
||||
Description=numlock
|
||||
|
||||
|
@ -39,24 +34,28 @@ EOF
|
|||
}
|
||||
|
||||
numlockSetup() {
|
||||
# Check if the script and service files exists
|
||||
if [ ! -f "/usr/local/bin/numlock" ]; then
|
||||
create_file
|
||||
fi
|
||||
if [ "$INIT_MANAGER" = "rc-service" ]; then
|
||||
printf "%b\n" "${RED}Unsupported init system.${RC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f "/etc/systemd/system/numlock.service" ]; then
|
||||
create_service
|
||||
fi
|
||||
if [ ! -f "/usr/local/bin/numlock" ]; then
|
||||
create_file
|
||||
fi
|
||||
|
||||
printf "%b" "Do you want to enable Numlock on boot? (y/N): "
|
||||
read -r confirm
|
||||
if [ "$confirm" = "y" ] || [ "$confirm" = "Y" ]; then
|
||||
"$ESCALATION_TOOL" systemctl enable numlock.service --quiet
|
||||
printf "%b\n" "Numlock will be enabled on boot"
|
||||
else
|
||||
"$ESCALATION_TOOL" systemctl disable numlock.service --quiet
|
||||
printf "%b\n" "Numlock will not be enabled on boot"
|
||||
fi
|
||||
if [ ! -f "/etc/systemd/system/numlock.service" ]; then
|
||||
create_service
|
||||
fi
|
||||
|
||||
printf "%b" "Do you want to enable Numlock on boot? (y/N): "
|
||||
read -r confirm
|
||||
if [ "$confirm" = "y" ] || [ "$confirm" = "Y" ]; then
|
||||
enableService numlock
|
||||
printf "%b\n" "Numlock will be enabled on boot"
|
||||
else
|
||||
disableService numlock
|
||||
printf "%b\n" "Numlock will not be enabled on boot"
|
||||
fi
|
||||
}
|
||||
|
||||
checkEnv
|
||||
|
|
|
@ -10,8 +10,8 @@ installollama() {
|
|||
printf "%b\n" "${GREEN}ollama is already installed.${RC}"
|
||||
else
|
||||
printf "%b\n" "${YELLOW}Installing ollama...${RC}"
|
||||
curl -fsSL https://ollama.com/install.sh | sh
|
||||
"$ESCALATION_TOOL" systemctl start ollama
|
||||
curl -fsSL https://ollama.com/install.sh | "$ESCALATION_TOOL" sh
|
||||
"$ESCALATION_TOOL" startService ollama
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,9 @@ installAutoCpufreq() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm git
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add git
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y git
|
||||
;;
|
||||
|
|
27
core/tabs/utils/printers/install-cups.sh
Normal file
27
core/tabs/utils/printers/install-cups.sh
Normal file
|
@ -0,0 +1,27 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
|
||||
installCUPS() {
|
||||
clear
|
||||
|
||||
case "$PACKAGER" in
|
||||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm cups
|
||||
;;
|
||||
apt-get | nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y cups
|
||||
;;
|
||||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y cups
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
installCUPS
|
30
core/tabs/utils/printers/install-epson-printer-drivers.sh
Normal file
30
core/tabs/utils/printers/install-epson-printer-drivers.sh
Normal file
|
@ -0,0 +1,30 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../../common-script.sh
|
||||
. ./install-cups.sh
|
||||
|
||||
installEpsonPrinterDriver() {
|
||||
clear
|
||||
|
||||
case "$PACKAGER" in
|
||||
pacman)
|
||||
"$AUR_HELPER" -S --noconfirm epson-inkjet-printer-escpr
|
||||
;;
|
||||
apt-get | nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y printer-driver-escpr
|
||||
;;
|
||||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y epson-inkjet-printer-escpr
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
checkEnv
|
||||
checkEscalationTool
|
||||
checkAURHelper
|
||||
installCUPS
|
||||
installEpsonPrinterDriver
|
|
@ -11,6 +11,9 @@ install_package() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$PACKAGE"
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add "$PACKAGE"
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y "$PACKAGE"
|
||||
;;
|
||||
|
@ -34,23 +37,23 @@ setup_ssh() {
|
|||
install_package openssh
|
||||
SSH_SERVICE="sshd"
|
||||
;;
|
||||
apk)
|
||||
install_package openssh
|
||||
SSH_SERVICE="sshd"
|
||||
;;
|
||||
*)
|
||||
install_package openssh-server
|
||||
SSH_SERVICE="sshd"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Enable and start the appropriate SSH service
|
||||
"$ESCALATION_TOOL" systemctl enable "$SSH_SERVICE"
|
||||
"$ESCALATION_TOOL" systemctl start "$SSH_SERVICE"
|
||||
startAndEnableService "$SSH_SERVICE"
|
||||
|
||||
# Get the local IP address
|
||||
LOCAL_IP=$(ip -4 addr show | awk '/inet / {print $2}' | tail -n 1)
|
||||
|
||||
printf "%b\n" "${GREEN}Your local IP address is: $LOCAL_IP${RC}"
|
||||
|
||||
# Check if SSH is running
|
||||
if systemctl is-active --quiet "$SSH_SERVICE"; then
|
||||
if isServiceActive "$SSH_SERVICE"; then
|
||||
printf "%b\n" "${GREEN}SSH is up and running.${RC}"
|
||||
else
|
||||
printf "%b\n" "${RED}Failed to start SSH.${RC}"
|
||||
|
@ -130,12 +133,11 @@ setup_samba() {
|
|||
EOL
|
||||
fi
|
||||
|
||||
# Enable and start Samba services
|
||||
"$ESCALATION_TOOL" systemctl enable smb nmb
|
||||
"$ESCALATION_TOOL" systemctl start smb nmb
|
||||
for service in smb nmb; do
|
||||
startAndEnableService "$service"
|
||||
done
|
||||
|
||||
# Check if Samba is running
|
||||
if systemctl is-active --quiet smb && systemctl is-active --quiet nmb; then
|
||||
if isServiceActive smb && isServiceActive nmb; then
|
||||
printf "%b\n" "${GREEN}Samba is up and running.${RC}"
|
||||
printf "%b\n" "${YELLOW}Samba share available at: $SHARED_DIR${RC}"
|
||||
else
|
||||
|
|
|
@ -76,6 +76,21 @@ 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 = "Printers"
|
||||
|
||||
[[data.entries]]
|
||||
name = "CUPS"
|
||||
script = "printers/install-cups.sh"
|
||||
description = "This script will install the CUPS system, required for most printer drivers on Linux."
|
||||
task_list = "I"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Epson printer drivers"
|
||||
script = "printers/install-epson-printer-drivers.sh"
|
||||
description = "This script will install the Epson printer drivers."
|
||||
task_list = "I"
|
||||
|
||||
[[data]]
|
||||
name = "User Account Manager"
|
||||
multi_select = false
|
||||
|
@ -136,7 +151,7 @@ task_list = "I FM"
|
|||
|
||||
[[data]]
|
||||
name = "Numlock on Startup"
|
||||
description = "This utility is designed to configure auto enabling of numlock on boot"
|
||||
description = "This utility is designed to enable Num Lock at boot, rather than within desktop environments like KDE or GNOME"
|
||||
script = "numlock.sh"
|
||||
task_list = "PFM SS"
|
||||
|
||||
|
|
|
@ -12,9 +12,12 @@ install_timeshift() {
|
|||
pacman)
|
||||
"$ESCALATION_TOOL" "${PACKAGER}" -S --noconfirm timeshift
|
||||
;;
|
||||
*)
|
||||
dnf|zypper|apt-get|nala)
|
||||
"$ESCALATION_TOOL" "${PACKAGER}" install -y timeshift
|
||||
;;
|
||||
*)
|
||||
printf "%b\n" "${RED}Unsupported package manager.${RC}"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
printf "%b\n" "${GREEN}Timeshift is already installed.${RC}"
|
||||
|
|
|
@ -13,6 +13,9 @@ setup_xrandr() {
|
|||
apt-get|nala)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y x11-xserver-utils
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add xrandr
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y xorg-x11-server-utils
|
||||
;;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ../common-script.sh
|
||||
. ../common-service-script.sh
|
||||
|
||||
# Function to check if NetworkManager is installed
|
||||
setupNetworkManager() {
|
||||
|
@ -13,6 +14,9 @@ setupNetworkManager() {
|
|||
dnf)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y NetworkManager-1
|
||||
;;
|
||||
apk)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" add networkmanager-wifi iwd
|
||||
;;
|
||||
*)
|
||||
"$ESCALATION_TOOL" "$PACKAGER" install -y network-manager
|
||||
;;
|
||||
|
@ -22,13 +26,11 @@ setupNetworkManager() {
|
|||
fi
|
||||
|
||||
# Check if NetworkManager service is running
|
||||
if ! systemctl is-active --quiet NetworkManager; then
|
||||
if ! isServiceActive NetworkManager; then
|
||||
printf "%b\n" "${YELLOW}NetworkManager service is not running. Starting it now...${RC}"
|
||||
"$ESCALATION_TOOL" systemctl start NetworkManager
|
||||
|
||||
if systemctl is-active --quiet NetworkManager; then
|
||||
printf "%b\n" "${GREEN}NetworkManager service started successfully.${RC}"
|
||||
fi
|
||||
startService NetworkManager
|
||||
else
|
||||
printf "%b\n" "${GREEN}NetworkManager service started successfully.${RC}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
## Milestones
|
||||
### Q4 2024
|
||||
- [x] Finish the foundation of the project's CLI
|
||||
- [ ] Implement CLI arguments and configuration support
|
||||
- [x] Implement CLI arguments and configuration support
|
||||
- [ ] Add an option for logging script executions
|
||||
|
||||
### Q1 2025
|
||||
|
|
|
@ -50,6 +50,8 @@ https://github.com/ChrisTitusTech/neovim
|
|||
- **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.
|
||||
- **Podman**: Podman is a daemon-less open platform that uses OS-level virtualization to deliver software in packages called containers.
|
||||
- **Podman-compose**: Podman Compose is a tool for defining and running multi-container applications using Podman.
|
||||
- **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.
|
||||
|
@ -83,7 +85,10 @@ https://github.com/ChrisTitusTech/dwm-titus
|
|||
### Arch Linux
|
||||
|
||||
- **Arch Server Setup**: This command installs a minimal arch server setup under 5 minutes.
|
||||
- **Linux Neptune for SteamDeck**: Valve's fork of Linux Kernel for the SteamDeck
|
||||
- **Nvidia Drivers && Hardware Acceleration**: This script installs and configures nvidia drivers with Hardware Acceleration.
|
||||
- **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
|
||||
- **Virtualization**: QEMU, Libvirt, Virt-Manager installation and configuration.
|
||||
- **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
|
||||
|
@ -94,6 +99,7 @@ https://github.com/ChrisTitusTech/dwm-titus
|
|||
- **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
|
||||
- **Btrfs Assistant, Snapper Config, grub-btrfs**: Installs Btrfs Assistant, Snapper, dnf snapper plugin and takes the first root(/) and /home snapshots. Enables snapper-timeline and snapper-cleanup services. Installs Grub-Btrfs. Notice: To perform a system recovery via grub-btrfs, perform a restore operation with Btrfs Assistant GUI after booting into the snapshot. Notice: If you used the default Fedora disk partitioning during OS installation, the /boot configured as an separate EXT4 partition. Therefore, it cannot be included in root snapshots. Backup separately.
|
||||
- **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
|
||||
|
@ -120,11 +126,16 @@ https://github.com/ChrisTitusTech/dwm-titus
|
|||
- **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
|
||||
|
||||
### Printers
|
||||
|
||||
- **CUPS**: This script will install the CUPS system, required for most printer drivers on Linux.
|
||||
- **Epson printer drivers**: This script will install the Epson printer drivers.
|
||||
|
||||
### User Account Manager
|
||||
|
||||
- **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
|
||||
- **Numlock on Startup**: This utility is designed to enable Num Lock at boot, rather than within desktop environments like KDE or GNOME
|
||||
- **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
|
||||
|
|
|
@ -22,6 +22,10 @@ curl -fsSL https://christitus.com/linux | sh
|
|||
curl -fsSL https://christitus.com/linuxdev | sh
|
||||
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
\fB\-c\fR, \fB\-\-config\fR \fI<path>\fR
|
||||
Path to the configuration file.
|
||||
|
||||
.TP
|
||||
\fB\-t\fR, \fB\-\-theme\fR \fI<theme>\fR
|
||||
Set the theme to use in the TUI.
|
||||
|
@ -32,6 +36,10 @@ Possible values:
|
|||
.br
|
||||
Defaults to \fIdefault\fR.
|
||||
|
||||
.TP
|
||||
\fB\-y\fR, \fB\-\-skip\-confirmation\fR
|
||||
Skip confirmation prompt before executing commands.
|
||||
|
||||
.TP
|
||||
\fB\-\-override\-validation\fR
|
||||
Show all available entries, disregarding compatibility checks. (\fBUNSAFE\fR)
|
||||
|
|
2
start.sh
2
start.sh
|
@ -43,7 +43,7 @@ check $? "Downloading linutil"
|
|||
chmod +x "$temp_file"
|
||||
check $? "Making linutil executable"
|
||||
|
||||
"$temp_file"
|
||||
"$temp_file" "$@"
|
||||
check $? "Executing linutil"
|
||||
|
||||
rm -f "$temp_file"
|
||||
|
|
|
@ -69,7 +69,7 @@ check $? "Downloading linutil"
|
|||
chmod +x "$TMPFILE"
|
||||
check $? "Making linutil executable"
|
||||
|
||||
"$TMPFILE"
|
||||
"$TMPFILE" "$@"
|
||||
check $? "Executing linutil"
|
||||
|
||||
rm -f "$TMPFILE"
|
||||
|
|
|
@ -15,8 +15,6 @@ tips = ["rand"]
|
|||
|
||||
[dependencies]
|
||||
clap = { version = "4.5.20", features = ["derive"] }
|
||||
crossterm = "0.28.1"
|
||||
ego-tree = { workspace = true }
|
||||
oneshot = "0.1.8"
|
||||
portable-pty = "0.8.1"
|
||||
ratatui = "0.29.0"
|
||||
|
|
|
@ -2,8 +2,8 @@ use std::borrow::Cow;
|
|||
|
||||
use crate::{float::FloatContent, hint::Shortcut};
|
||||
|
||||
use crossterm::event::{KeyCode, KeyEvent};
|
||||
use ratatui::{
|
||||
crossterm::event::{KeyCode, KeyEvent},
|
||||
layout::Alignment,
|
||||
prelude::*,
|
||||
widgets::{Block, Borders, Clear, List},
|
||||
|
@ -60,6 +60,7 @@ impl FloatContent for ConfirmPrompt {
|
|||
fn draw(&mut self, frame: &mut Frame, area: Rect) {
|
||||
let block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title(" Confirm selections ")
|
||||
.title_bottom(" [y] to continue, [n] to abort ")
|
||||
.title_alignment(Alignment::Center)
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
use crate::{state::ListEntry, theme::Theme};
|
||||
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
|
||||
use ego_tree::NodeId;
|
||||
use linutil_core::Tab;
|
||||
use linutil_core::{ego_tree::NodeId, Tab};
|
||||
use ratatui::{
|
||||
crossterm::event::{KeyCode, KeyEvent, KeyModifiers},
|
||||
layout::{Position, Rect},
|
||||
style::{Color, Style},
|
||||
text::Span,
|
||||
|
@ -123,7 +122,12 @@ impl Filter {
|
|||
|
||||
//Create the search bar widget
|
||||
let search_bar = Paragraph::new(display_text)
|
||||
.block(Block::default().borders(Borders::ALL).title(" Search "))
|
||||
.block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title(" Search "),
|
||||
)
|
||||
.style(Style::default().fg(search_color));
|
||||
|
||||
//Render the search bar (First chunk of the screen)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use crossterm::event::{KeyCode, KeyEvent};
|
||||
use ratatui::{
|
||||
crossterm::event::{KeyCode, KeyEvent},
|
||||
layout::{Constraint, Direction, Layout, Rect},
|
||||
Frame,
|
||||
};
|
||||
|
|
|
@ -8,9 +8,8 @@ use crate::{float::FloatContent, hint::Shortcut};
|
|||
|
||||
use linutil_core::Command;
|
||||
|
||||
use crossterm::event::{KeyCode, KeyEvent};
|
||||
|
||||
use ratatui::{
|
||||
crossterm::event::{KeyCode, KeyEvent},
|
||||
layout::Rect,
|
||||
style::{Style, Stylize},
|
||||
text::Line,
|
||||
|
@ -171,7 +170,7 @@ impl FloatingText {
|
|||
|
||||
fn scroll_down(&mut self) {
|
||||
let visible_lines = self.frame_height.saturating_sub(2);
|
||||
if self.v_scroll + visible_lines < self.src.len() {
|
||||
if self.v_scroll + visible_lines < self.wrapped_lines.len() {
|
||||
self.v_scroll += 1;
|
||||
}
|
||||
}
|
||||
|
@ -216,6 +215,7 @@ impl FloatContent for FloatingText {
|
|||
// Define the Block with a border and background color
|
||||
let block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title(self.mode_title.clone())
|
||||
.title_alignment(ratatui::layout::Alignment::Center)
|
||||
.title_style(Style::default().reversed())
|
||||
|
|
|
@ -71,8 +71,8 @@ impl Shortcut {
|
|||
}
|
||||
|
||||
fn to_spans(&self) -> Vec<Span<'static>> {
|
||||
let mut ret: Vec<_> = self
|
||||
.key_sequences
|
||||
let description = Span::styled(self.desc, Style::default().italic());
|
||||
self.key_sequences
|
||||
.iter()
|
||||
.flat_map(|seq| {
|
||||
[
|
||||
|
@ -81,8 +81,7 @@ impl Shortcut {
|
|||
Span::default().content("] "),
|
||||
]
|
||||
})
|
||||
.collect();
|
||||
ret.push(Span::styled(self.desc, Style::default().italic()));
|
||||
ret
|
||||
.chain(std::iter::once(description))
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,27 +9,40 @@ mod theme;
|
|||
|
||||
use std::{
|
||||
io::{self, stdout},
|
||||
path::PathBuf,
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use crate::theme::Theme;
|
||||
use clap::Parser;
|
||||
use crossterm::{
|
||||
event::{self, DisableMouseCapture, Event, KeyEventKind},
|
||||
style::ResetColor,
|
||||
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
||||
ExecutableCommand,
|
||||
|
||||
use ratatui::{
|
||||
backend::CrosstermBackend,
|
||||
crossterm::{
|
||||
event::{self, DisableMouseCapture, Event, KeyEventKind},
|
||||
style::ResetColor,
|
||||
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
||||
ExecutableCommand,
|
||||
},
|
||||
Terminal,
|
||||
};
|
||||
use ratatui::{backend::CrosstermBackend, Terminal};
|
||||
use state::AppState;
|
||||
|
||||
// Linux utility toolbox
|
||||
#[derive(Debug, Parser)]
|
||||
struct Args {
|
||||
#[arg(short, long, help = "Path to the configuration file")]
|
||||
config: Option<PathBuf>,
|
||||
#[arg(short, long, value_enum)]
|
||||
#[arg(default_value_t = Theme::Default)]
|
||||
#[arg(help = "Set the theme to use in the application")]
|
||||
theme: Theme,
|
||||
#[arg(
|
||||
short = 'y',
|
||||
long,
|
||||
help = "Skip confirmation prompt before executing commands"
|
||||
)]
|
||||
skip_confirmation: bool,
|
||||
#[arg(long, default_value_t = false)]
|
||||
#[clap(help = "Show all available options, disregarding compatibility checks (UNSAFE)")]
|
||||
override_validation: bool,
|
||||
|
@ -41,7 +54,13 @@ struct Args {
|
|||
fn main() -> io::Result<()> {
|
||||
let args = Args::parse();
|
||||
|
||||
let mut state = AppState::new(args.theme, args.override_validation, args.size_bypass);
|
||||
let mut state = AppState::new(
|
||||
args.config,
|
||||
args.theme,
|
||||
args.override_validation,
|
||||
args.size_bypass,
|
||||
args.skip_confirmation,
|
||||
);
|
||||
|
||||
stdout().execute(EnterAlternateScreen)?;
|
||||
enable_raw_mode()?;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
use crate::{float::FloatContent, hint::Shortcut};
|
||||
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
|
||||
use linutil_core::Command;
|
||||
use oneshot::{channel, Receiver};
|
||||
use portable_pty::{
|
||||
ChildKiller, CommandBuilder, ExitStatus, MasterPty, NativePtySystem, PtySize, PtySystem,
|
||||
};
|
||||
use ratatui::{
|
||||
crossterm::event::{KeyCode, KeyEvent, KeyModifiers},
|
||||
layout::{Rect, Size},
|
||||
style::{Color, Style, Stylize},
|
||||
text::{Line, Span},
|
||||
|
@ -53,6 +53,7 @@ impl FloatContent for RunningCommand {
|
|||
// Display a block indicating the command is running
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title_top(Line::from("Running the command....").centered())
|
||||
.title_style(Style::default().reversed())
|
||||
.title_bottom(Line::from("Press Ctrl-C to KILL the command"))
|
||||
|
@ -80,6 +81,7 @@ impl FloatContent for RunningCommand {
|
|||
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title_top(title_line.centered())
|
||||
};
|
||||
|
||||
|
@ -253,7 +255,7 @@ impl RunningCommand {
|
|||
// Process the buffer with a parser with the current screen size
|
||||
// We don't actually need to create a new parser every time, but it is so much easier this
|
||||
// way, and doesn't cost that much
|
||||
let mut parser = vt100::Parser::new(size.height, size.width, 200);
|
||||
let mut parser = vt100::Parser::new(size.height, size.width, 1000);
|
||||
let mutex = self.buffer.lock();
|
||||
let buffer = mutex.as_ref().unwrap();
|
||||
parser.process(buffer);
|
||||
|
|
105
tui/src/state.rs
105
tui/src/state.rs
|
@ -7,20 +7,20 @@ use crate::{
|
|||
running_command::RunningCommand,
|
||||
theme::Theme,
|
||||
};
|
||||
use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
|
||||
use ego_tree::NodeId;
|
||||
use linutil_core::{ListNode, Tab};
|
||||
|
||||
use linutil_core::{ego_tree::NodeId, Config, ListNode, TabList};
|
||||
#[cfg(feature = "tips")]
|
||||
use rand::Rng;
|
||||
use ratatui::{
|
||||
crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers},
|
||||
layout::{Alignment, Constraint, Direction, Flex, Layout},
|
||||
style::{Style, Stylize},
|
||||
text::{Line, Span, Text},
|
||||
widgets::{Block, Borders, List, ListState, Paragraph},
|
||||
Frame,
|
||||
};
|
||||
use std::path::PathBuf;
|
||||
use std::rc::Rc;
|
||||
use temp_dir::TempDir;
|
||||
|
||||
const MIN_WIDTH: u16 = 100;
|
||||
const MIN_HEIGHT: u16 = 25;
|
||||
|
@ -31,6 +31,7 @@ D - disk modifications (ex. partitioning) (privileged)
|
|||
FI - flatpak installation
|
||||
FM - file modification
|
||||
I - installation (privileged)
|
||||
K - kernel modifications (privileged)
|
||||
MP - package manager actions
|
||||
SI - full system installation
|
||||
SS - systemd actions (privileged)
|
||||
|
@ -40,14 +41,12 @@ 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
|
||||
pub focus: Focus,
|
||||
/// List of tabs
|
||||
tabs: Vec<Tab>,
|
||||
tabs: TabList,
|
||||
/// Current tab
|
||||
current_tab: ListState,
|
||||
/// This stack keeps track of our "current directory". You can think of it as `pwd`. but not
|
||||
|
@ -63,6 +62,7 @@ pub struct AppState {
|
|||
#[cfg(feature = "tips")]
|
||||
tip: String,
|
||||
size_bypass: bool,
|
||||
skip_confirmation: bool,
|
||||
}
|
||||
|
||||
pub enum Focus {
|
||||
|
@ -87,12 +87,19 @@ enum SelectedItem {
|
|||
}
|
||||
|
||||
impl AppState {
|
||||
pub fn new(theme: Theme, override_validation: bool, size_bypass: bool) -> Self {
|
||||
let (temp_dir, tabs) = linutil_core::get_tabs(!override_validation);
|
||||
pub fn new(
|
||||
config_path: Option<PathBuf>,
|
||||
theme: Theme,
|
||||
override_validation: bool,
|
||||
size_bypass: bool,
|
||||
skip_confirmation: bool,
|
||||
) -> Self {
|
||||
let tabs = linutil_core::get_tabs(!override_validation);
|
||||
let root_id = tabs[0].tree.root().id();
|
||||
|
||||
let auto_execute_commands = config_path.map(|path| Config::from_file(&path).auto_execute);
|
||||
|
||||
let mut state = Self {
|
||||
_temp_dir: temp_dir,
|
||||
theme,
|
||||
focus: Focus::List,
|
||||
tabs,
|
||||
|
@ -106,12 +113,35 @@ impl AppState {
|
|||
#[cfg(feature = "tips")]
|
||||
tip: get_random_tip(),
|
||||
size_bypass,
|
||||
skip_confirmation,
|
||||
};
|
||||
|
||||
state.update_items();
|
||||
if let Some(auto_execute_commands) = auto_execute_commands {
|
||||
state.handle_initial_auto_execute(&auto_execute_commands);
|
||||
}
|
||||
|
||||
state
|
||||
}
|
||||
|
||||
fn handle_initial_auto_execute(&mut self, auto_execute_commands: &[String]) {
|
||||
self.selected_commands = auto_execute_commands
|
||||
.iter()
|
||||
.filter_map(|name| self.tabs.iter().find_map(|tab| tab.find_command(name)))
|
||||
.collect();
|
||||
|
||||
if !self.selected_commands.is_empty() {
|
||||
let cmd_names: Vec<_> = self
|
||||
.selected_commands
|
||||
.iter()
|
||||
.map(|node| node.name.as_str())
|
||||
.collect();
|
||||
|
||||
let prompt = ConfirmPrompt::new(&cmd_names);
|
||||
self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
|
||||
}
|
||||
}
|
||||
|
||||
fn get_list_item_shortcut(&self) -> Box<[Shortcut]> {
|
||||
if self.selected_item_is_dir() {
|
||||
Box::new([Shortcut::new("Go to selected dir", ["l", "Right", "Enter"])])
|
||||
|
@ -217,19 +247,19 @@ impl AppState {
|
|||
self.drawable = true;
|
||||
}
|
||||
|
||||
let label_block =
|
||||
Block::default()
|
||||
.borders(Borders::all())
|
||||
.border_set(ratatui::symbols::border::Set {
|
||||
top_left: " ",
|
||||
top_right: " ",
|
||||
bottom_left: " ",
|
||||
bottom_right: " ",
|
||||
vertical_left: " ",
|
||||
vertical_right: " ",
|
||||
horizontal_top: "*",
|
||||
horizontal_bottom: "*",
|
||||
});
|
||||
let label_block = Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.border_set(ratatui::symbols::border::Set {
|
||||
top_left: " ",
|
||||
top_right: " ",
|
||||
bottom_left: " ",
|
||||
bottom_right: " ",
|
||||
vertical_left: " ",
|
||||
vertical_right: " ",
|
||||
horizontal_top: "*",
|
||||
horizontal_bottom: "*",
|
||||
});
|
||||
let str1 = "Linutil ";
|
||||
let str2 = "by Chris Titus";
|
||||
let label = Paragraph::new(Line::from(vec![
|
||||
|
@ -253,7 +283,8 @@ impl AppState {
|
|||
|
||||
let keybinds_block = Block::default()
|
||||
.title(format!(" {} ", keybind_scope))
|
||||
.borders(Borders::all());
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED);
|
||||
|
||||
let keybinds = create_shortcut_list(shortcuts, keybind_render_width);
|
||||
let n_lines = keybinds.len() as u16;
|
||||
|
@ -297,7 +328,11 @@ impl AppState {
|
|||
};
|
||||
|
||||
let list = List::new(tabs)
|
||||
.block(Block::default().borders(Borders::ALL))
|
||||
.block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL)
|
||||
.border_set(ratatui::symbols::border::ROUNDED),
|
||||
)
|
||||
.highlight_style(tab_hl_style)
|
||||
.highlight_symbol(self.theme.tab_icon());
|
||||
frame.render_stateful_widget(list, left_chunks[1], &mut self.current_tab);
|
||||
|
@ -409,6 +444,7 @@ impl AppState {
|
|||
.block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL & !Borders::RIGHT)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title(title)
|
||||
.title_bottom(bottom_title),
|
||||
)
|
||||
|
@ -418,6 +454,7 @@ impl AppState {
|
|||
let disclaimer_list = List::new(task_items).highlight_style(style).block(
|
||||
Block::default()
|
||||
.borders(Borders::ALL & !Borders::LEFT)
|
||||
.border_set(ratatui::symbols::border::ROUNDED)
|
||||
.title(task_list_title),
|
||||
);
|
||||
|
||||
|
@ -752,14 +789,18 @@ impl AppState {
|
|||
}
|
||||
}
|
||||
|
||||
let cmd_names = self
|
||||
.selected_commands
|
||||
.iter()
|
||||
.map(|node| node.name.as_str())
|
||||
.collect::<Vec<_>>();
|
||||
if self.skip_confirmation {
|
||||
self.handle_confirm_command();
|
||||
} else {
|
||||
let cmd_names = self
|
||||
.selected_commands
|
||||
.iter()
|
||||
.map(|node| node.name.as_str())
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let prompt = ConfirmPrompt::new(&cmd_names[..]);
|
||||
self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
|
||||
let prompt = ConfirmPrompt::new(&cmd_names[..]);
|
||||
self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
|
||||
}
|
||||
}
|
||||
SelectedItem::None => {}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ pub fn userguide() -> Result<String, DynError> {
|
|||
let mut md = String::new();
|
||||
md.push_str("<!-- THIS FILE IS GENERATED BY cargo xtask docgen -->\n# Walkthrough\n");
|
||||
|
||||
let tabs = linutil_core::get_tabs(false).1;
|
||||
let tabs = linutil_core::get_tabs(false);
|
||||
|
||||
for tab in tabs {
|
||||
#[cfg(debug_assertions)]
|
||||
|
@ -24,7 +24,7 @@ pub fn userguide() -> Result<String, DynError> {
|
|||
#[cfg(debug_assertions)]
|
||||
println!(" Directory: {}", entry.name);
|
||||
|
||||
if entry.name != "root".to_string() {
|
||||
if entry.name != "root" {
|
||||
md.push_str(&format!("\n### {}\n\n", entry.name));
|
||||
}
|
||||
|
||||
|
@ -36,18 +36,16 @@ pub fn userguide() -> Result<String, DynError> {
|
|||
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);
|
||||
} 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
|
||||
}
|
||||
md.push_str(&format!("- **{}**: {}\n", entry.name, entry.description));
|
||||
} /* else {
|
||||
md.push_str(&format!("- **{}**\n", entry.name));
|
||||
} */ // https://github.com/ChrisTitusTech/linutil/pull/753
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user