From 2f53d5c8a61e21798bc6460d60761a0cd8e3a636 Mon Sep 17 00:00:00 2001 From: zstg Date: Sat, 2 Mar 2024 12:35:44 +0530 Subject: [PATCH 1/9] Update submodules --- airootfs/etc/calamares | 2 +- airootfs/etc/skel/.config/nvim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airootfs/etc/calamares b/airootfs/etc/calamares index 848937f8..87577872 160000 --- a/airootfs/etc/calamares +++ b/airootfs/etc/calamares @@ -1 +1 @@ -Subproject commit 848937f83ec6688a9868e27b04b43f0598450d5f +Subproject commit 87577872c0f20087148d9071a79abf29dcbfdffd diff --git a/airootfs/etc/skel/.config/nvim b/airootfs/etc/skel/.config/nvim index b8786d6a..3b332202 160000 --- a/airootfs/etc/skel/.config/nvim +++ b/airootfs/etc/skel/.config/nvim @@ -1 +1 @@ -Subproject commit b8786d6a67f7c638e103fe36d4fbea8da7c546b9 +Subproject commit 3b332202d2867d51c95e337ee8daed64038efbe2 From 97ad311d34c3675cbadd3a5b3cbee196f88df95a Mon Sep 17 00:00:00 2001 From: zstg Date: Tue, 5 Mar 2024 16:43:30 +0530 Subject: [PATCH 2/9] Added individual software dialogs --- airootfs/etc/skel/.aliases | 2 +- airootfs/opt/maneki-neko | 2 +- airootfs/usr/local/bin/StratOS-choose-atril | 32 ++++++++ airootfs/usr/local/bin/StratOS-choose-brave | 61 ++++++++++++++ .../usr/local/bin/StratOS-choose-chromium | 62 ++++++++++++++ airootfs/usr/local/bin/StratOS-choose-evince | 68 ++++++++++++++++ airootfs/usr/local/bin/StratOS-choose-firefox | 57 +++++++++++++ airootfs/usr/local/bin/StratOS-choose-github | 39 +++++++++ .../usr/local/bin/StratOS-choose-gsconnect | 23 ++++++ .../usr/local/bin/StratOS-choose-libreoffice | 45 +++++++++++ .../usr/local/bin/StratOS-choose-librewolf | 39 +++++++++ airootfs/usr/local/bin/StratOS-choose-mpv | 45 +++++++++++ .../usr/local/bin/StratOS-choose-obsidian | 45 +++++++++++ .../usr/local/bin/StratOS-choose-onlyoffice | 45 +++++++++++ .../usr/local/bin/StratOS-choose-videoplayer | 45 +++++++++++ airootfs/usr/local/bin/StratOS-choose-vlc | 39 +++++++++ .../usr/local/bin/StratOS-choose-vscodium | 39 +++++++++ .../usr/local/bin/StratOS-configure-browser | 80 ++++++++++++++----- .../usr/local/bin/StratOS-configure-distro | 30 +++---- .../local/bin/StratOS-configure-officesuite | 58 ++++++++++++++ packages.x86_64 | 7 +- 21 files changed, 824 insertions(+), 39 deletions(-) create mode 100755 airootfs/usr/local/bin/StratOS-choose-atril create mode 100755 airootfs/usr/local/bin/StratOS-choose-brave create mode 100644 airootfs/usr/local/bin/StratOS-choose-chromium create mode 100644 airootfs/usr/local/bin/StratOS-choose-evince create mode 100644 airootfs/usr/local/bin/StratOS-choose-firefox create mode 100644 airootfs/usr/local/bin/StratOS-choose-github create mode 100644 airootfs/usr/local/bin/StratOS-choose-gsconnect create mode 100644 airootfs/usr/local/bin/StratOS-choose-libreoffice create mode 100644 airootfs/usr/local/bin/StratOS-choose-librewolf create mode 100644 airootfs/usr/local/bin/StratOS-choose-mpv create mode 100644 airootfs/usr/local/bin/StratOS-choose-obsidian create mode 100644 airootfs/usr/local/bin/StratOS-choose-onlyoffice create mode 100644 airootfs/usr/local/bin/StratOS-choose-videoplayer create mode 100644 airootfs/usr/local/bin/StratOS-choose-vlc create mode 100644 airootfs/usr/local/bin/StratOS-choose-vscodium create mode 100644 airootfs/usr/local/bin/StratOS-configure-officesuite diff --git a/airootfs/etc/skel/.aliases b/airootfs/etc/skel/.aliases index 8c056cd6..7fa5faff 100644 --- a/airootfs/etc/skel/.aliases +++ b/airootfs/etc/skel/.aliases @@ -1,5 +1,5 @@ alias ls='eza --color=always' -alias rg='rg -i --sort-path' +alias rg='rg -i --sort path' alias grep='grep --color=auto' alias neofetch='neofetch --ascii_distro janus' alias fetch-arch="sudo brl fetch arch" diff --git a/airootfs/opt/maneki-neko b/airootfs/opt/maneki-neko index 1160fb97..af5ddc5d 160000 --- a/airootfs/opt/maneki-neko +++ b/airootfs/opt/maneki-neko @@ -1 +1 @@ -Subproject commit 1160fb97d725c165aedd69d26edb5f56cdf7ba33 +Subproject commit af5ddc5dacfc93172031868b081b4ecd6c74c56c diff --git a/airootfs/usr/local/bin/StratOS-choose-atril b/airootfs/usr/local/bin/StratOS-choose-atril new file mode 100755 index 00000000..e2773827 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-atril @@ -0,0 +1,32 @@ +#!/bin/bash +menu(){ + dialog --clear --title "Which PDF Viewer do you want?" \ + --menu "Choose one of the following options:" 15 40 4 \ + 1 "Atril (Pacman)" \ + 2 "Atril (AUR)" \ + 3 "Exit" 2>&1 >/dev/tty +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading Atril (Pacman)..." + sudo pacman -S atril --noconfirm + echo -e "\n==> Downloaded and Installed Atril (Pacman)." + xdg-mime default atril.desktop application/pdf + echo -e "\nSetting Default PDF Viewer to Atril (Pacman): OK" + ;; + 2) + echo "Downloading Atril (AUR)..." + yay -S atril --noconfirm + echo -e "\n==> Downloaded and Installed Atril (AUR)." + xdg-mime default atril.desktop application/pdf + echo -e "\nSetting Default PDF Viewer to Atril (AUR): OK" + ;; + 3) + echo "Exiting..." + exit 0 + ;; + esac +done \ No newline at end of file diff --git a/airootfs/usr/local/bin/StratOS-choose-brave b/airootfs/usr/local/bin/StratOS-choose-brave new file mode 100755 index 00000000..0f03c4f9 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-brave @@ -0,0 +1,61 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which Brave do you want?" \ + --menu "Choose one of the following options:" 15 40 4 \ + 1 "Brave (AUR)" \ + 2 "Brave (Flatpak)" \ + 3 "Brave (Snap)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +check_snap() { + if ! command -v snap &>/dev/null; then + echo "Snap is not installed. Installing snap!" + sudo pacman -S --needed snapd + sudo systemctl enable --now snapd.socket + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading Brave (AUR)..." + yay -S brave-bin --noconfirm + echo -e "\n==> Downloaded and Installed Brave (AUR)." + xdg-settings set default-web-browser brave-browser.desktop + echo -e "\nSetting Default Browser to Brave (AUR): OK" + ;; + 2) + check_flatpak + echo "Downloading Brave (Flatpak)..." + flatpak install flathub com.brave.Browser + echo -e "\n==> Downloaded and Installed Brave (Flatpak)." + flatpak set default-web-browser com.brave.Browser + echo -e "\nSetting Default Browser to Brave (Flatpak): OK" + ;; + 3) + check_snap + echo "Downloading Brave (Snap)..." + sudo snap install brave + echo -e "\n==> Downloaded and Installed Brave (Snap)." + sudo snap set default-web-browser brave + echo -e "\nSetting Default Browser to Brave (Snap): OK" + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-chromium b/airootfs/usr/local/bin/StratOS-choose-chromium new file mode 100644 index 00000000..b47ed413 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-chromium @@ -0,0 +1,62 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which Chromium do you want?" \ + --menu "Choose one of the following options:" 15 40 4 \ + 1 "Chromium (Pacman)" \ + 2 "Chromium (Flatpak)" \ + 3 "Chromium (Snap)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +check_snap() { + if ! command -v snap &>/dev/null; then + echo "Snap is not installed. Installing snap!" + sudo pacman -S --needed snapd + sudo systemctl enable --now snapd.socket + echo "Snap has been installed and enabled." + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading Chromium (Pacman)..." + sudo pacman -S chromium --noconfirm + echo -e "\n==> Downloaded and Installed Chromium (Pacman)." + xdg-settings set default-web-browser chromium.desktop + echo -e "\nSetting Default Browser to Chromium (Pacman): OK" + ;; + 2) + check_flatpak + echo "Downloading Chromium (Flatpak)..." + flatpak install flathub org.chromium.Chromium + echo -e "\n==> Downloaded and Installed Chromium (Flatpak)." + flatpak set default-web-browser org.chromium.Chromium + echo -e "\nSetting Default Browser to Chromium (Flatpak): OK" + ;; + 3) + check_snap + echo "Downloading Chromium (Snap)..." + sudo snap install chromium + echo -e "\n==> Downloaded and Installed Chromium (Snap)." + sudo snap set chromium as default-browser + echo -e "\nSetting Default Browser to Chromium (Snap): OK" + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-evince b/airootfs/usr/local/bin/StratOS-choose-evince new file mode 100644 index 00000000..c3f65eb2 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-evince @@ -0,0 +1,68 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which Evince do you want?" \ + --menu "Choose one of the following options:" 15 40 5 \ + 1 "Evince (Pacman)" \ + 2 "Evince (no GNOME) (AUR)" \ + 3 "Evince-Git (AUR)" \ + 4 "Evince (Flatpak)" \ + 5 "Evince (Snap)" \ + 6 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +check_snap() { + if ! command -v snap &>/dev/null; then + echo "Snap is not installed. Installing snap!" + sudo pacman -S --needed snapd + sudo systemctl enable --now snapd.socket + echo "Snap has been installed and enabled." + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading Evince (Pacman)..." + sudo pacman -S evince --noconfirm + echo -e "\n==> Downloaded and Installed Evince (Pacman)." + ;; + 2) + echo "Downloading Evince (no GNOME) (AUR)..." + yay -S evince-no-gnome --noconfirm + echo -e "\n==> Downloaded and Installed Evince (no GNOME) (AUR)." + ;; + 3) + echo "Downloading Evince-Git (AUR)..." + yay -S evince-git --noconfirm + echo -e "\n==> Downloaded and Installed Evince-Git (AUR)." + ;; + 4) + check_flatpak + echo "Downloading Evince (Flatpak)..." + flatpak install flathub org.gnome.Evince + echo -e "\n==> Downloaded and Installed Evince (Flatpak)." + ;; + 5) + check_snap + echo "Downloading Evince (Snap)..." + sudo snap install evince + echo -e "\n==> Downloaded and Installed Evince (Snap)." + ;; + 6) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-firefox b/airootfs/usr/local/bin/StratOS-choose-firefox new file mode 100644 index 00000000..124e3551 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-firefox @@ -0,0 +1,57 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which Firefox do you want?" \ + --menu "Choose one of the following options:" 15 40 5 \ + 1 "Firefox (pacman)" \ + 2 "Firefox ESR (AUR)" \ + 3 "Firefox OpenSUSE bin (AUR)" \ + 4 "Firefox OpenSUSE bin (AUR)" \ + 5 "Firefox (Flatpak)" \ + 6 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading Firefox (pacman)..." + sudo pacman -S firefox --noconfirm + echo -e "\n==> Downloaded and Installed Firefox (pacman)." + ;; + 2) + echo "Downloading Firefox ESR..." + yay -S firefox-esr --noconfirm + echo -e "\n==> Downloaded and Installed Firefox ESR (AUR)." + ;; + 3) + echo "Downloading Firefox OpenSUSE bin (AUR)..." + yay -S firefox-opensuse-bin --noconfirm + echo -e "\n==> Downloaded and Installed Firefox OpenSUSE bin (AUR)." + ;; + 4) + echo "Downloading Firefox OpenSUSE bin (AUR)..." + yay -S firefox-opensuse-bin --noconfirm + echo -e "\n==> Downloaded and Installed Firefox OpenSUSE bin (AUR)." + ;; + 5) + check_flatpak + echo "Downloading org.mozilla.Firefox (Flatpak)..." + flatpak install flathub org.mozilla.Firefox + echo -e "\n==> Downloaded and Installed org.mozilla.Firefox (Flatpak)." + ;; + 6) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-github b/airootfs/usr/local/bin/StratOS-choose-github new file mode 100644 index 00000000..504ad718 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-github @@ -0,0 +1,39 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which GitHub Desktop do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "GitHub-Desktop-bin (AUR)" \ + 2 "GitHub Desktop (Flatpak)" \ + 3 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading github-desktop-bin (AUR)..." + yay -S github-desktop-bin --noconfirm + echo -e "\n==> Downloaded and Installed github-desktop-bin (AUR)." + ;; + 2) + check_flatpak + echo "Downloading io.github.shiftey.Desktop (Flatpak)..." + flatpak install flathub io.github.shiftey.Desktop + echo -e "\n==> Downloaded and Installed io.github.shiftey.Desktop (Flatpak)." + ;; + 3) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-gsconnect b/airootfs/usr/local/bin/StratOS-choose-gsconnect new file mode 100644 index 00000000..187892a8 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-gsconnect @@ -0,0 +1,23 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which GSConnect do you want?" \ + --menu "Choose one of the following options:" 15 40 2 \ + 1 "gnome-shell-extension-gsconnect (AUR)" \ + 2 "Exit" 2>&1 >/dev/tty +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading gnome-shell-extension-gsconnect (AUR)..." + yay -S gnome-shell-extension-gsconnect --noconfirm + echo -e "\n==> Downloaded and Installed gnome-shell-extension-gsconnect (AUR)." + ;; + 2) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-libreoffice b/airootfs/usr/local/bin/StratOS-choose-libreoffice new file mode 100644 index 00000000..4561111b --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-libreoffice @@ -0,0 +1,45 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which LibreOffice do you want?" \ + --menu "Choose one of the following options:" 15 40 4 \ + 1 "libreoffice-still" \ + 2 "libreoffice-fresh" \ + 3 "LibreOffice (Flatpak)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading libreoffice-still..." + sudo pacman -S libreoffice-still --noconfirm + echo -e "\n==> Downloaded and Installed libreoffice-still." + ;; + 2) + echo "Downloading libreoffice-fresh..." + sudo pacman -S libreoffice-fresh --noconfirm + echo -e "\n==> Downloaded and Installed libreoffice-fresh." + ;; + 3) + check_flatpak + echo "Downloading LibreOffice (Flatpak)..." + flatpak install flathub org.libreoffice.LibreOffice + echo -e "\n==> Downloaded and Installed LibreOffice (Flatpak)." + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-librewolf b/airootfs/usr/local/bin/StratOS-choose-librewolf new file mode 100644 index 00000000..98dc6379 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-librewolf @@ -0,0 +1,39 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which LibreWolf do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "librewolf-bin (AUR)" \ + 2 "LibreWolf (Flatpak)" \ + 3 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading librewolf-bin (AUR)..." + yay -S librewolf-bin --noconfirm + echo -e "\n==> Downloaded and Installed librewolf-bin (AUR)." + ;; + 2) + check_flatpak + echo "Downloading LibreWolf (Flatpak)..." + flatpak install flathub io.gitlab.librewolf-community + echo -e "\n==> Downloaded and Installed LibreWolf (Flatpak)." + ;; + 3) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-mpv b/airootfs/usr/local/bin/StratOS-choose-mpv new file mode 100644 index 00000000..8fcf4322 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-mpv @@ -0,0 +1,45 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which MPV do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "mpv (pacman)" \ + 2 "mpv-git (AUR)" \ + 3 "MPV (Flatpak)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading mpv (pacman)..." + sudo pacman -S mpv --noconfirm + echo -e "\n==> Downloaded and Installed mpv (pacman)." + ;; + 2) + echo "Downloading mpv (AUR)..." + yay -S mpv-git --noconfirm + echo -e "\n==> Downloaded and Installed mpv (AUR)." + ;; + 3) + check_flatpak + echo "Downloading MPV (Flatpak)..." + flatpak install flathub com.mpv.mpv + echo -e "\n==> Downloaded and Installed MPV (Flatpak)." + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-obsidian b/airootfs/usr/local/bin/StratOS-choose-obsidian new file mode 100644 index 00000000..87251ef2 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-obsidian @@ -0,0 +1,45 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which Obsidian do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "Obsidian (pacman)" \ + 2 "Obsidian (AUR)" \ + 3 "Obsidian (Flatpak)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading Obsidian (pacman)..." + sudo pacman -S obsidian-app --noconfirm + echo -e "\n==> Downloaded and Installed Obsidian (pacman)." + ;; + 2) + echo "Downloading Obsidian (AUR)..." + yay -S obsidian --noconfirm + echo -e "\n==> Downloaded and Installed Obsidian (AUR)." + ;; + 3) + check_flatpak + echo "Downloading Obsidian (Flatpak)..." + flatpak install flathub com.obsidianmd.obsidian + echo -e "\n==> Downloaded and Installed Obsidian (Flatpak)." + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-onlyoffice b/airootfs/usr/local/bin/StratOS-choose-onlyoffice new file mode 100644 index 00000000..58208af2 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-onlyoffice @@ -0,0 +1,45 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which OnlyOffice do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "OnlyOffice (pacman)" \ + 2 "OnlyOffice (AUR)" \ + 3 "OnlyOffice (Flatpak)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading OnlyOffice (pacman)..." + sudo pacman -S onlyoffice-desktopeditors --noconfirm + echo -e "\n==> Downloaded and Installed OnlyOffice (pacman)." + ;; + 2) + echo "Downloading OnlyOffice (AUR)..." + yay -S onlyoffice-desktopeditors --noconfirm + echo -e "\n==> Downloaded and Installed OnlyOffice (AUR)." + ;; + 3) + check_flatpak + echo "Downloading OnlyOffice (Flatpak)..." + flatpak install flathub org.onlyoffice.desktopeditors + echo -e "\n==> Downloaded and Installed OnlyOffice (Flatpak)." + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-videoplayer b/airootfs/usr/local/bin/StratOS-choose-videoplayer new file mode 100644 index 00000000..4f148f8a --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-videoplayer @@ -0,0 +1,45 @@ +#!/bin/bash + +menu_video_players() { + dialog --clear --backtitle "Video Player Selector" \ + --title "Select a video player" \ + --menu "Choose one of the following options:" 18 40 4 \ + 1 "VLC (AUR)" \ + 1 "VLC (Flatpak)" \ + 2 "MPV (Pacman)" \ + 3 "MPV (flatpak)" \ + 3 "Exit" 2>&1 >/dev/tty +} + +while true; do + choice=$(menu_video_players) + case $choice in + 1) + echo "Installing VLC from AUR..." + yay -S vlc --noconfirm + echo -e "\n==> VLC installed successfully." + ;; + 2) + check_flatpak + echo "Installing VLC from Flatpak..." + flatpak install flathub org.videolan.VLC + echo -e "\n==> VLC installed successfully." + ;; + 3) + echo "Installing MPV from Arch repos..." + pkexec pacman -S mpv --noconfirm + echo -e "\n==> MPV installed successfully." + ;; + + 4) + check_flatpak + echo "Installing MPV from Flatpak..." + flatpak install flathub io.mpv.Mpv + echo -e "\n==> MPV installed successfully." + ;; + 5) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-vlc b/airootfs/usr/local/bin/StratOS-choose-vlc new file mode 100644 index 00000000..f2f5cba7 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-vlc @@ -0,0 +1,39 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which VLC do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "VLC (pacman)" \ + 2 "VLC (Flatpak)" \ + 4 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading VLC (pacman)..." + sudo pacman -S vlc --noconfirm + echo -e "\n==> Downloaded and Installed VLC (pacman)." + ;; + 2) + check_flatpak + echo "Downloading VLC (Flatpak)..." + flatpak install flathub org.videolan.VLC + echo -e "\n==> Downloaded and Installed VLC (Flatpak)." + ;; + 4) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-choose-vscodium b/airootfs/usr/local/bin/StratOS-choose-vscodium new file mode 100644 index 00000000..7d127566 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-choose-vscodium @@ -0,0 +1,39 @@ +#!/bin/bash + +menu(){ + dialog --clear --title "Which VSCodium do you want?" \ + --menu "Choose one of the following options:" 15 40 3 \ + 1 "VSCodium (AUR)" \ + 2 "VSCodium (Flatpak)" \ + 3 "Exit" 2>&1 >/dev/tty +} + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} + +while true; do + choice=$(menu) + case $choice in + 1) + echo "Downloading VSCodium (AUR)..." + yay -S vscodium-bin --noconfirm + echo -e "\n==> Downloaded and Installed VSCodium (AUR)." + ;; + 2) + check_flatpak + echo "Downloading VSCodium (Flatpak)..." + flatpak install flathub com.vscodium.codium + echo -e "\n==> Downloaded and Installed VSCodium (Flatpak)." + ;; + 3) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/airootfs/usr/local/bin/StratOS-configure-browser b/airootfs/usr/local/bin/StratOS-configure-browser index c4799d4a..45c1c90b 100755 --- a/airootfs/usr/local/bin/StratOS-configure-browser +++ b/airootfs/usr/local/bin/StratOS-configure-browser @@ -1,43 +1,83 @@ #!/bin/bash + menu() { dialog --clear --backtitle "Browser Selector" \ --title "Select a browser" \ - --menu "Choose one of the following options:" 15 40 3 \ + --menu "Choose one of the following options:" 18 40 7 \ 1 "Chromium" \ 2 "Brave" \ - 3 "Librewolf" \ - 2>&1 >/dev/tty + 3 "Librewolf (AUR)" \ + 4 "Librewolf (Flatpak)" \ + 5 "Floccus (AUR)" \ + 6 "Qutebrowser" \ + 7 "Vivaldi" \ + 8 "Exit" 2>&1 >/dev/tty } -# Made the script more verbose, for the end user. +# Function to check if Flatpak is installed +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Installing flatpak!" + sudo pacman -S --needed flatpak + flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + exit 1 + fi +} while true; do choice=$(menu) case $choice in 1) echo "Downloading Chromium..." - yay -S chromium --noconfirm - echo "\n==> Downloaded and Installed Chromium." - xdg-settings set default-web-browser chromium.desktop - echo "\nSetting Default Browser to Chromium: OK" + yay -S chromium --noconfirm + echo -e "\n==> Downloaded and Installed Chromium." + xdg-settings set default-web-browser chromium.desktop + echo -e "\nSetting Default Browser to Chromium: OK" ;; 2) echo "Downloading Brave..." - yay -S brave-bin --noconfirm - echo "\n==> Downloaded and Installed Brave." - xdg-settings set default-web-browser brave-browser.desktop - echo "\nSetting Default Browser to Brave: OK" - + yay -S brave-bin --noconfirm + echo -e "\n==> Downloaded and Installed Brave." + xdg-settings set default-web-browser brave-browser.desktop + echo -e "\nSetting Default Browser to Brave: OK" ;; 3) - echo "Downloading Librewolf..." - yay -S librewolf-bin --noconfirm - echo "\n==> Downloaded and Installed LibreWolf." - xdg-settings set default-web-browser librewolf.desktop - echo "\nSetting Default Browser to LibreWolf: OK" - + echo "Downloading Librewolf (AUR)..." + yay -S librewolf-bin --noconfirm + echo -e "\n==> Downloaded and Installed LibreWolf (AUR)." + xdg-settings set default-web-browser librewolf.desktop + echo -e "\nSetting Default Browser to LibreWolf: OK" + ;; + 4) + check_flatpak + echo "Downloading Librewolf (Flatpak)..." + flatpak install flathub io.gitlab.librewolf-community + echo -e "\n==> Downloaded and Installed LibreWolf (Flatpak)." + flatpak set default-web-browser io.gitlab.librewolf-community + echo -e "\nSetting Default Browser to LibreWolf (Flatpak): OK" + ;; + 5) + echo "Downloading Floorp (AUR)..." + yay -S floorp-bin --noconfirm + echo -e "\n==> Downloaded and Installed Floorp (AUR)." + xdg-settings set default-web-browser floorp.desktop + echo -e "\nSetting Default Browser to Floorp: OK" + ;; + 6) + echo "Downloading Qutebrowser..." + yay -S qutebrowser --noconfirm + echo -e "\n==> Downloaded and Installed Qutebrowser." + xdg-settings set default-web-browser qutebrowser.desktop + echo -e "\nSetting Default Browser to Qutebrowser: OK" + ;; + 7) + echo "Downloading Vivaldi..." + sudo pacman -S vivaldi --noconfirm + echo -e "\n==> Downloaded and Installed Vivaldi." + xdg-settings set default-web-browser vivaldi.desktop + echo -e "\nSetting Default Browser to Vivaldi: OK" ;; - *) + 8) echo "Exiting..." exit 0 ;; diff --git a/airootfs/usr/local/bin/StratOS-configure-distro b/airootfs/usr/local/bin/StratOS-configure-distro index f4693fd2..e1fd510e 100755 --- a/airootfs/usr/local/bin/StratOS-configure-distro +++ b/airootfs/usr/local/bin/StratOS-configure-distro @@ -1,11 +1,12 @@ #!/bin/bash + menu() { dialog --clear --backtitle "Distro Selector" \ --title "Select a distro" \ --menu "Choose one of the following options:" 15 40 3 \ 1 "Ubuntu" \ 2 "Fedora" \ - 2>&1 >/dev/tty + 3 "Exit" 2>&1 >/dev/tty } # Made the script more verbose, for the end user. @@ -15,22 +16,23 @@ while true; do case $choice in 1) echo "Bootstrapping Ubuntu..." - until $(which apt); do - pkexec brl remove -d ubuntu 2>/dev/null - pkexec brl fetch ubuntu - sudo apt install -y nala - done - echo "\n==> Ubuntu configured successfully." + until which apt &>/dev/null; do + pkexec brl remove -d ubuntu 2>/dev/null + pkexec brl fetch ubuntu + sudo apt update + sudo apt install -y nala + done + echo -e "\n==> Ubuntu configured successfully." ;; 2) echo "Bootstrapping Fedora..." - until $(which dnf); do - pkexec brl remove -d fedora 2>/dev/null - pkexec brl fetch fedora - done - echo "\n==> Fedora configured successfully." - ;; - *) + until which dnf &>/dev/null; do + pkexec brl remove -d fedora 2>/dev/null + pkexec brl fetch fedora + done + echo -e "\n==> Fedora configured successfully." + ;; + 3) echo "Exiting..." exit 0 ;; diff --git a/airootfs/usr/local/bin/StratOS-configure-officesuite b/airootfs/usr/local/bin/StratOS-configure-officesuite new file mode 100644 index 00000000..ead544c0 --- /dev/null +++ b/airootfs/usr/local/bin/StratOS-configure-officesuite @@ -0,0 +1,58 @@ +#!/bin/bash + +check_flatpak() { + if ! command -v flatpak &>/dev/null; then + echo "Flatpak is not installed. Please install Flatpak and run the script again." + exit 1 + fi +} + +menu_office_suites() { + dialog --clear --backtitle "Office Suite Selector" \ + --title "Select an office suite" \ + --menu "Choose one of the following options:" 18 40 5 \ + 1 "LibreOffice Fresh (Arch)" \ + 2 "LibreOffice Still (Arch)" \ + 3 "LibreOffice (Flatpak)" \ + 4 "OnlyOffice (Flatpak)" \ + 5 "Calligra Suite (AUR)" \ + 6 "Exit" 2>&1 >/dev/tty +} + +while true; do + choice=$(menu_office_suites) + case $choice in + 1) + echo "Installing LibreOffice (Fresh) from Arch repos..." + pkexec pacman -S libreoffice-fresh --noconfirm + echo -e "\n==> LibreOffice installed successfully." + ;; + 2) + echo "Installing LibreOffice (Still) from Arch repos..." + pkexec pacman -S libreoffice-fresh --noconfirm + echo -e "\n==> LibreOffice installed successfully." + ;; + + 2) + check_flatpak + echo "Installing LibreOffice from Flatpak..." + flatpak install flathub org.libreoffice.LibreOffice + echo -e "\n==> LibreOffice installed successfully." + ;; + 3) + check_flatpak + echo "Installing OnlyOffice from Flatpak..." + flatpak install flathub org.onlyoffice.desktopeditors + echo -e "\n==> OnlyOffice installed successfully." + ;; + 4) + echo "Installing Calligra Suite from AUR..." + pkexec pacman -S calligra --noconfirm + echo -e "\n==> Calligra Suite installed successfully." + ;; + 5) + echo "Exiting..." + exit 0 + ;; + esac +done diff --git a/packages.x86_64 b/packages.x86_64 index 61d8fa29..e20b70ca 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -1,13 +1,13 @@ alsa-utils amd-ucode -arch-install-scripts -archinstall +# arch-install-scripts +# archinstall archlinux-keyring # b43-fwcutter base base-devel bat -bind +# bind bibata-cursor-theme broadcom-wl # btrfs-progs @@ -41,6 +41,7 @@ fd # fsarchiver fzf git +github-cli # GNOME-related packages # gnome From df52d517aa6e9246a436829545a9f3407270dd12 Mon Sep 17 00:00:00 2001 From: zstg Date: Tue, 5 Mar 2024 21:34:25 +0530 Subject: [PATCH 3/9] Minor changes --- airootfs/usr/local/bin/StratOS-choose-chromium | 0 airootfs/usr/local/bin/StratOS-choose-evince | 0 airootfs/usr/local/bin/StratOS-choose-firefox | 0 airootfs/usr/local/bin/StratOS-choose-github | 0 airootfs/usr/local/bin/StratOS-choose-gsconnect | 0 airootfs/usr/local/bin/StratOS-choose-libreoffice | 0 airootfs/usr/local/bin/StratOS-choose-librewolf | 0 airootfs/usr/local/bin/StratOS-choose-mpv | 0 airootfs/usr/local/bin/StratOS-choose-obsidian | 6 +++--- airootfs/usr/local/bin/StratOS-choose-onlyoffice | 0 airootfs/usr/local/bin/StratOS-choose-videoplayer | 0 airootfs/usr/local/bin/StratOS-choose-vlc | 0 airootfs/usr/local/bin/StratOS-choose-vscodium | 0 airootfs/usr/local/bin/StratOS-configure-officesuite | 0 14 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-chromium mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-evince mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-firefox mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-github mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-gsconnect mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-libreoffice mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-librewolf mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-mpv mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-obsidian mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-onlyoffice mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-videoplayer mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-vlc mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-choose-vscodium mode change 100644 => 100755 airootfs/usr/local/bin/StratOS-configure-officesuite diff --git a/airootfs/usr/local/bin/StratOS-choose-chromium b/airootfs/usr/local/bin/StratOS-choose-chromium old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-evince b/airootfs/usr/local/bin/StratOS-choose-evince old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-firefox b/airootfs/usr/local/bin/StratOS-choose-firefox old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-github b/airootfs/usr/local/bin/StratOS-choose-github old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-gsconnect b/airootfs/usr/local/bin/StratOS-choose-gsconnect old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-libreoffice b/airootfs/usr/local/bin/StratOS-choose-libreoffice old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-librewolf b/airootfs/usr/local/bin/StratOS-choose-librewolf old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-mpv b/airootfs/usr/local/bin/StratOS-choose-mpv old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-obsidian b/airootfs/usr/local/bin/StratOS-choose-obsidian old mode 100644 new mode 100755 index 87251ef2..234d89e4 --- a/airootfs/usr/local/bin/StratOS-choose-obsidian +++ b/airootfs/usr/local/bin/StratOS-choose-obsidian @@ -21,14 +21,14 @@ check_flatpak() { while true; do choice=$(menu) case $choice in - 1) + 1)share the software song echo "Downloading Obsidian (pacman)..." - sudo pacman -S obsidian-app --noconfirm + sudo pacman -S obsidian --noconfirm echo -e "\n==> Downloaded and Installed Obsidian (pacman)." ;; 2) echo "Downloading Obsidian (AUR)..." - yay -S obsidian --noconfirm + yay -S obsidian-bin --noconfirm echo -e "\n==> Downloaded and Installed Obsidian (AUR)." ;; 3) diff --git a/airootfs/usr/local/bin/StratOS-choose-onlyoffice b/airootfs/usr/local/bin/StratOS-choose-onlyoffice old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-videoplayer b/airootfs/usr/local/bin/StratOS-choose-videoplayer old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-vlc b/airootfs/usr/local/bin/StratOS-choose-vlc old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-choose-vscodium b/airootfs/usr/local/bin/StratOS-choose-vscodium old mode 100644 new mode 100755 diff --git a/airootfs/usr/local/bin/StratOS-configure-officesuite b/airootfs/usr/local/bin/StratOS-configure-officesuite old mode 100644 new mode 100755 From be5a49ca29954e2633adaa84a1cae3577750aada Mon Sep 17 00:00:00 2001 From: zstg Date: Tue, 5 Mar 2024 21:37:36 +0530 Subject: [PATCH 4/9] Minor changes --- airootfs/opt/maneki-neko | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airootfs/opt/maneki-neko b/airootfs/opt/maneki-neko index af5ddc5d..754ac0c9 160000 --- a/airootfs/opt/maneki-neko +++ b/airootfs/opt/maneki-neko @@ -1 +1 @@ -Subproject commit af5ddc5dacfc93172031868b081b4ecd6c74c56c +Subproject commit 754ac0c9a063ea8542e86dd7f337b15220f94468 From d3872b231626b26fb06c8ab5d40b2baf62d2ce46 Mon Sep 17 00:00:00 2001 From: zstg Date: Mon, 18 Mar 2024 14:49:43 +0530 Subject: [PATCH 5/9] Minor changes --- .../share/applications/maneki-neko.desktop | 12 ++++++++++++ airootfs/opt/maneki-neko | 2 +- airootfs/usr/local/bin/install-using-flatpak | 2 ++ airootfs/usr/local/bin/install-using-pacman | 2 ++ airootfs/usr/local/bin/install-using-yay | 2 ++ profiledef.sh | 19 +++++++++++++++++++ 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 airootfs/etc/skel/.local/share/applications/maneki-neko.desktop create mode 100755 airootfs/usr/local/bin/install-using-flatpak create mode 100755 airootfs/usr/local/bin/install-using-pacman create mode 100755 airootfs/usr/local/bin/install-using-yay diff --git a/airootfs/etc/skel/.local/share/applications/maneki-neko.desktop b/airootfs/etc/skel/.local/share/applications/maneki-neko.desktop new file mode 100644 index 00000000..27045827 --- /dev/null +++ b/airootfs/etc/skel/.local/share/applications/maneki-neko.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=StratOS Welcome +GenericName=Welcome Screen App +Comment=Welcome Screen Application for StratOS +Exec=/opt/StratOS-maneki-neko +Icon=/opt/StratOS-maneki-neko/src/png/logo.png +Comment=StratOS welcome screen +X-GNOME-Autostart-enabled=true +Path=/opt/StratOS-maneki-neko/ +Terminal=false +StartupNotify=false \ No newline at end of file diff --git a/airootfs/opt/maneki-neko b/airootfs/opt/maneki-neko index 754ac0c9..440365a0 160000 --- a/airootfs/opt/maneki-neko +++ b/airootfs/opt/maneki-neko @@ -1 +1 @@ -Subproject commit 754ac0c9a063ea8542e86dd7f337b15220f94468 +Subproject commit 440365a000fdae32762aafbe66086c56a1cccf6f diff --git a/airootfs/usr/local/bin/install-using-flatpak b/airootfs/usr/local/bin/install-using-flatpak new file mode 100755 index 00000000..889dde23 --- /dev/null +++ b/airootfs/usr/local/bin/install-using-flatpak @@ -0,0 +1,2 @@ +#!/usr/bin/env zsh +flatpak --user install "$1" diff --git a/airootfs/usr/local/bin/install-using-pacman b/airootfs/usr/local/bin/install-using-pacman new file mode 100755 index 00000000..8bbd96cf --- /dev/null +++ b/airootfs/usr/local/bin/install-using-pacman @@ -0,0 +1,2 @@ +#!/usr/bin/env zsh +pkexec pacman -S "$1" \ No newline at end of file diff --git a/airootfs/usr/local/bin/install-using-yay b/airootfs/usr/local/bin/install-using-yay new file mode 100755 index 00000000..49c7ebff --- /dev/null +++ b/airootfs/usr/local/bin/install-using-yay @@ -0,0 +1,2 @@ +#!/usr/bin/env zsh +yay -S "$1" diff --git a/profiledef.sh b/profiledef.sh index 2a02738b..a84d7545 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -25,7 +25,26 @@ file_permissions=( ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/install-bedrock-x86_64"]="0:0:777" ["/usr/local/bin/livecd-sound"]="0:0:755" + ["/usr/local/bin/maneki-installer"]="0:0:777" ["/usr/local/bin/neofetch"]="0:0:777" + ["/usr/local/bin/install-using-pacman"]="0:0:777" + ["/usr/local/bin/install-using-yay"]="0:0:777" + ["/usr/local/bin/install-using-flatpak"]="0:0:777" + ["/usr/local/bin/StratOS-choose-atril"]="0:0:777" + ["/usr/local/bin/StratOS-choose-brave"]="0:0:777" + ["/usr/local/bin/StratOS-choose-chromium"]="0:0:777" + ["/usr/local/bin/StratOS-choose-evince"]="0:0:777" + ["/usr/local/bin/StratOS-choose-firefox"]="0:0:777" + ["/usr/local/bin/StratOS-choose-github"]="0:0:777" + ["/usr/local/bin/StratOS-choose-gsconnect"]="0:0:777" + ["/usr/local/bin/StratOS-choose-libreoffice"]="0:0:777" + ["/usr/local/bin/StratOS-choose-librewolf"]="0:0:777" + ["/usr/local/bin/StratOS-choose-mpv"]="0:0:777" + ["/usr/local/bin/StratOS-choose-obsidian"]="0:0:777" + ["/usr/local/bin/StratOS-choose-onlyoffice"]="0:0:777" + ["/usr/local/bin/StratOS-choose-videoplayer"]="0:0:777" + ["/usr/local/bin/StratOS-choose-vlc"]="0:0:777" + ["/usr/local/bin/StratOS-choose-vscodium"]="0:0:777" ["/usr/local/bin/StratOS-configure-bedrock"]="0:0:777" ["/usr/local/bin/StratOS-configure-browser"]="0:0:777" ["/usr/local/bin/StratOS-configure-distro"]="0:0:777" From 4d025dba7cd201c5def682e9e0f9620b868c08ec Mon Sep 17 00:00:00 2001 From: zstg Date: Fri, 12 Apr 2024 21:14:31 +0530 Subject: [PATCH 6/9] Added fish, modified Stratos scripts --- airootfs/opt/maneki-neko | 2 +- airootfs/usr/local/bin/StratOS-choose-atril | 5 +++-- airootfs/usr/local/bin/StratOS-choose-brave | 2 +- .../usr/local/bin/StratOS-choose-chromium | 2 +- airootfs/usr/local/bin/StratOS-choose-evince | 2 +- airootfs/usr/local/bin/StratOS-choose-firefox | 2 +- airootfs/usr/local/bin/StratOS-choose-github | 2 +- .../usr/local/bin/StratOS-choose-gsconnect | 2 +- .../usr/local/bin/StratOS-choose-libreoffice | 2 +- .../usr/local/bin/StratOS-choose-librewolf | 2 +- airootfs/usr/local/bin/StratOS-choose-mpv | 2 +- .../usr/local/bin/StratOS-choose-obsidian | 2 +- .../usr/local/bin/StratOS-choose-onlyoffice | 2 +- .../usr/local/bin/StratOS-choose-videoplayer | 2 +- airootfs/usr/local/bin/StratOS-choose-vlc | 2 +- .../usr/local/bin/StratOS-choose-vscodium | 2 +- airootfs/usr/local/bin/install-using-pacman | 2 +- airootfs/usr/local/bin/maneki-logo | 22 +++++++++++++++++++ packages.x86_64 | 1 + profiledef.sh | 2 +- 20 files changed, 43 insertions(+), 19 deletions(-) create mode 100755 airootfs/usr/local/bin/maneki-logo diff --git a/airootfs/opt/maneki-neko b/airootfs/opt/maneki-neko index 440365a0..aa399691 160000 --- a/airootfs/opt/maneki-neko +++ b/airootfs/opt/maneki-neko @@ -1 +1 @@ -Subproject commit 440365a000fdae32762aafbe66086c56a1cccf6f +Subproject commit aa399691d7c7b4fd7ae45bb1dee4cae4b33d2f6a diff --git a/airootfs/usr/local/bin/StratOS-choose-atril b/airootfs/usr/local/bin/StratOS-choose-atril index e2773827..ac8a420a 100755 --- a/airootfs/usr/local/bin/StratOS-choose-atril +++ b/airootfs/usr/local/bin/StratOS-choose-atril @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/bash +./maneki-logo menu(){ dialog --clear --title "Which PDF Viewer do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ @@ -29,4 +30,4 @@ while true; do exit 0 ;; esac -done \ No newline at end of file +done diff --git a/airootfs/usr/local/bin/StratOS-choose-brave b/airootfs/usr/local/bin/StratOS-choose-brave index 0f03c4f9..664e7a48 100755 --- a/airootfs/usr/local/bin/StratOS-choose-brave +++ b/airootfs/usr/local/bin/StratOS-choose-brave @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which Brave do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-chromium b/airootfs/usr/local/bin/StratOS-choose-chromium index b47ed413..c265b76a 100755 --- a/airootfs/usr/local/bin/StratOS-choose-chromium +++ b/airootfs/usr/local/bin/StratOS-choose-chromium @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which Chromium do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-evince b/airootfs/usr/local/bin/StratOS-choose-evince index c3f65eb2..f5982c15 100755 --- a/airootfs/usr/local/bin/StratOS-choose-evince +++ b/airootfs/usr/local/bin/StratOS-choose-evince @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which Evince do you want?" \ --menu "Choose one of the following options:" 15 40 5 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-firefox b/airootfs/usr/local/bin/StratOS-choose-firefox index 124e3551..688f3de4 100755 --- a/airootfs/usr/local/bin/StratOS-choose-firefox +++ b/airootfs/usr/local/bin/StratOS-choose-firefox @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which Firefox do you want?" \ --menu "Choose one of the following options:" 15 40 5 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-github b/airootfs/usr/local/bin/StratOS-choose-github index 504ad718..b5e40649 100755 --- a/airootfs/usr/local/bin/StratOS-choose-github +++ b/airootfs/usr/local/bin/StratOS-choose-github @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which GitHub Desktop do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-gsconnect b/airootfs/usr/local/bin/StratOS-choose-gsconnect index 187892a8..2d36dc5a 100755 --- a/airootfs/usr/local/bin/StratOS-choose-gsconnect +++ b/airootfs/usr/local/bin/StratOS-choose-gsconnect @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which GSConnect do you want?" \ --menu "Choose one of the following options:" 15 40 2 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-libreoffice b/airootfs/usr/local/bin/StratOS-choose-libreoffice index 4561111b..0295f92b 100755 --- a/airootfs/usr/local/bin/StratOS-choose-libreoffice +++ b/airootfs/usr/local/bin/StratOS-choose-libreoffice @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which LibreOffice do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-librewolf b/airootfs/usr/local/bin/StratOS-choose-librewolf index 98dc6379..f9046c09 100755 --- a/airootfs/usr/local/bin/StratOS-choose-librewolf +++ b/airootfs/usr/local/bin/StratOS-choose-librewolf @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which LibreWolf do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-mpv b/airootfs/usr/local/bin/StratOS-choose-mpv index 8fcf4322..549673c0 100755 --- a/airootfs/usr/local/bin/StratOS-choose-mpv +++ b/airootfs/usr/local/bin/StratOS-choose-mpv @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which MPV do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-obsidian b/airootfs/usr/local/bin/StratOS-choose-obsidian index 234d89e4..9ba8906f 100755 --- a/airootfs/usr/local/bin/StratOS-choose-obsidian +++ b/airootfs/usr/local/bin/StratOS-choose-obsidian @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which Obsidian do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-onlyoffice b/airootfs/usr/local/bin/StratOS-choose-onlyoffice index 58208af2..2e257c35 100755 --- a/airootfs/usr/local/bin/StratOS-choose-onlyoffice +++ b/airootfs/usr/local/bin/StratOS-choose-onlyoffice @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which OnlyOffice do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-videoplayer b/airootfs/usr/local/bin/StratOS-choose-videoplayer index 4f148f8a..6a732909 100755 --- a/airootfs/usr/local/bin/StratOS-choose-videoplayer +++ b/airootfs/usr/local/bin/StratOS-choose-videoplayer @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu_video_players() { dialog --clear --backtitle "Video Player Selector" \ --title "Select a video player" \ diff --git a/airootfs/usr/local/bin/StratOS-choose-vlc b/airootfs/usr/local/bin/StratOS-choose-vlc index f2f5cba7..adca4edb 100755 --- a/airootfs/usr/local/bin/StratOS-choose-vlc +++ b/airootfs/usr/local/bin/StratOS-choose-vlc @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which VLC do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-vscodium b/airootfs/usr/local/bin/StratOS-choose-vscodium index 7d127566..c49fcea8 100755 --- a/airootfs/usr/local/bin/StratOS-choose-vscodium +++ b/airootfs/usr/local/bin/StratOS-choose-vscodium @@ -1,5 +1,5 @@ #!/bin/bash - +./maneki-logo menu(){ dialog --clear --title "Which VSCodium do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/install-using-pacman b/airootfs/usr/local/bin/install-using-pacman index 8bbd96cf..346dfe1b 100755 --- a/airootfs/usr/local/bin/install-using-pacman +++ b/airootfs/usr/local/bin/install-using-pacman @@ -1,2 +1,2 @@ #!/usr/bin/env zsh -pkexec pacman -S "$1" \ No newline at end of file +pkexec pacman -S "$1" --noconfirm diff --git a/airootfs/usr/local/bin/maneki-logo b/airootfs/usr/local/bin/maneki-logo new file mode 100755 index 00000000..f42de9c6 --- /dev/null +++ b/airootfs/usr/local/bin/maneki-logo @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +cat << EOF +⠀⠀⠀⣀⣄⣀⠀⠀⠀⠀⠀⠀⣀⣠⣀⠀⠀⠀⠀⠀ +⠀⠀⢸⣿⣩⣿⣷⣶⣶⣶⣶⣾⣿⣍⣿⡇⠀⠀⠀⠀ +⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⢁⣀⣀⡀⠀ +⠀⠀⣾⣿⠟⠉⠉⠻⣿⣿⠟⠉⠉⠛⠀⣿⣿⣿⣿⣦ +⠀⢠⣿⣿⣷⡿⢿⣾⠛⠛⣷⡿⣿⣾⣦⣈⠉⠙⠛⠋ +⠀⠀⢿⣿⣿⣧⣤⣀⣤⣤⣀⣤⣼⣿⣿⡿⠀⣼⡿⠀ +⠀⣀⣬⠻⠿⢿⣿⣿⣿⣿⣿⣿⡿⠿⠟⣁⠐⡿⠃⠀ +⣸⣿⣿⠀⠀⠀⠀⠀⢠⡄⠀⠀⢀⣀⣼⣿⡆⠀⠀⠀ +⣿⣿⣿⣷⣶⣄⠙⣧⣄⣠⣼⣿⣿⣿⣿⣿⣷⠀⠀⠀ +⠘⢿⣿⣿⣿⣿⠀⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠀ +⣤⣄⡉⠙⠋⣁⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀ +⠟⠉⣉⣉⡉⠙⠿⣿⣿⣿⣿⠿⠋⢉⣉⣉⠉⠻⠀⠀ +⢠⣾⣿⣿⣿⣷⣦⡈⢻⡟⢁⣴⣾⣿⣿⣿⣷⡄⠀⠀ +⠸⣿⣿⣿⣿⣿⣿⡇⠀⠀⢸⣿⣿⣿⣿⣿⣿⠇⠀⠀ +⠀⠈⠉⠙⠛⠉⠉⠀⠀⠀⠀⠉⠉⠛⠋⠉⠁⠀⠀⠀ +EOF + + +echo "Loading..." +sleep 1 diff --git a/packages.x86_64 b/packages.x86_64 index e20b70ca..b70e59da 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -38,6 +38,7 @@ eza f2fs-tools fatresize fd +fish # fsarchiver fzf git diff --git a/profiledef.sh b/profiledef.sh index a84d7545..07d4c49a 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -25,7 +25,7 @@ file_permissions=( ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/install-bedrock-x86_64"]="0:0:777" ["/usr/local/bin/livecd-sound"]="0:0:755" - ["/usr/local/bin/maneki-installer"]="0:0:777" + ["/usr/local/bin/maneki-logo"]="0:0:777" ["/usr/local/bin/neofetch"]="0:0:777" ["/usr/local/bin/install-using-pacman"]="0:0:777" ["/usr/local/bin/install-using-yay"]="0:0:777" From aed9d14d35111112b321d58863bb89d03864bbc8 Mon Sep 17 00:00:00 2001 From: zstg Date: Sat, 13 Apr 2024 21:37:50 +0530 Subject: [PATCH 7/9] Minor changes --- airootfs/etc/skel/.config/fish/config.fish | 94 ++++ .../convert_aliases_to_abbreviations.fish | 16 + airootfs/etc/skel/.config/fish/fish_plugins | 1 + airootfs/etc/skel/.config/fish/fish_variables | 52 ++ airootfs/etc/skel/.config/fish/fisher.fish | 211 ++++++++ .../.config/fish/functions/fish_prompt.fish | 139 ++++++ .../fish/functions/fish_prompt.fish.bak | 139 ++++++ .../skel/.config/fish/functions/fisher.fish | 211 ++++++++ .../skel/.config/fish/functions/get-IPs.fish | 20 + .../fish/functions/tokyonight-dark.fish | 38 ++ .../skel/.config/fish/functions/which.fish | 30 ++ airootfs/etc/skel/.config/fish/git.fish | 454 ++++++++++++++++++ airootfs/usr/local/bin/StratOS-choose-atril | 2 +- airootfs/usr/local/bin/StratOS-choose-brave | 2 +- .../usr/local/bin/StratOS-choose-chromium | 2 +- airootfs/usr/local/bin/StratOS-choose-evince | 2 +- airootfs/usr/local/bin/StratOS-choose-firefox | 2 +- airootfs/usr/local/bin/StratOS-choose-github | 2 +- .../usr/local/bin/StratOS-choose-gsconnect | 2 +- .../usr/local/bin/StratOS-choose-libreoffice | 2 +- .../usr/local/bin/StratOS-choose-librewolf | 2 +- airootfs/usr/local/bin/StratOS-choose-mpv | 2 +- .../usr/local/bin/StratOS-choose-obsidian | 2 +- .../usr/local/bin/StratOS-choose-onlyoffice | 2 +- .../usr/local/bin/StratOS-choose-videoplayer | 2 +- airootfs/usr/local/bin/StratOS-choose-vlc | 2 +- .../usr/local/bin/StratOS-choose-vscodium | 2 +- packages.x86_64 | 2 +- 28 files changed, 1421 insertions(+), 16 deletions(-) create mode 100644 airootfs/etc/skel/.config/fish/config.fish create mode 100644 airootfs/etc/skel/.config/fish/convert_aliases_to_abbreviations.fish create mode 100644 airootfs/etc/skel/.config/fish/fish_plugins create mode 100644 airootfs/etc/skel/.config/fish/fish_variables create mode 100644 airootfs/etc/skel/.config/fish/fisher.fish create mode 100644 airootfs/etc/skel/.config/fish/functions/fish_prompt.fish create mode 100644 airootfs/etc/skel/.config/fish/functions/fish_prompt.fish.bak create mode 100644 airootfs/etc/skel/.config/fish/functions/fisher.fish create mode 100644 airootfs/etc/skel/.config/fish/functions/get-IPs.fish create mode 100644 airootfs/etc/skel/.config/fish/functions/tokyonight-dark.fish create mode 100644 airootfs/etc/skel/.config/fish/functions/which.fish create mode 100644 airootfs/etc/skel/.config/fish/git.fish diff --git a/airootfs/etc/skel/.config/fish/config.fish b/airootfs/etc/skel/.config/fish/config.fish new file mode 100644 index 00000000..1065b9fb --- /dev/null +++ b/airootfs/etc/skel/.config/fish/config.fish @@ -0,0 +1,94 @@ +if status is-interactive + # vim:fileencoding=utf-8:foldmethod=marker + # Commands to run in interactive sessions can go here + source (/usr/bin/starship init fish --print-full-init | psub) + # set -gx fish_key_bindings fish_vi_key_bindings + if [ "$IS_VTERM" != "1" ]; + fish_vi_key_bindings + else + fish_default_key_bindings + end + source ~/.dotfiles/shells/.profile + source ~/.dotfiles/shells/aliases + set -x MANROFFOPT "-c" + set -x MANPAGER "sh -c 'col -bx | bat -l man -p'" + set fish_greeting + echo > ~/.local/share/fish/fish_history + alias clh='echo > ~/.local/share/fish/fish_history && exec fish' + abbr -a pacman sudo pacman + abbr -a s sudo + abbr -a md mkdir -p + function fish_user_key_bindings + bind --preset -M insert \el forward-char + bind --preset -M insert \eh backward-char + bind --preset -M insert \ew forward-word + bind --preset -M insert \eb backward-word + bind --preset -M insert \cH backward-kill-word + bind --preset -M insert \e\[3\;5~ kill-word + bind --preset -M insert \ca beginning-of-line + bind --preset -M insert \ce end-of-line + bind --preset -M insert \cc 'echo; commandline | cat; commandline ""; commandline -f repaint' + end + function __conda_add_prompt # kill the right prompt __conda_add_prompt + end + source ~/.dotfiles/shells/fish/git.fish + tokyonight-dark # function to display in tokyonight-dark colours +end + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +if test -f /home/stig/.miniconda/bin/conda + eval /home/stig/.miniconda/bin/conda "shell.fish" "hook" $argv | source +else + if test -f "/home/stig/.miniconda/etc/fish/conf.d/conda.fish" + . "/home/stig/.miniconda/etc/fish/conf.d/conda.fish" + else + set -x PATH "/home/stig/.miniconda/bin" $PATH + end +end +# <<< conda initialize <<< + +# Functions needed for !! and !$ https://github.com/oh-my-fish/plugin-bang-bang +function __history_previous_command + switch (commandline -t) + case "!" + commandline -t $history[1]; commandline -f repaint + case "*" + commandline -i ! + end +end + +function __history_previous_command_arguments + switch (commandline -t) + case "!" + commandline -t "" + commandline -f history-token-search-backward + case "*" + commandline -i '$' + end +end + +if [ "$fish_key_bindings" = fish_vi_key_bindings ]; + bind -Minsert ! __history_previous_command + bind -Minsert '$' __history_previous_command_arguments +else + bind ! __history_previous_command + bind '$' __history_previous_command_arguments +end + +# Fish command history +function history + builtin history --show-time='%F %T ' +end + +function copy + set count (count $argv | tr -d \n) + if test "$count" = 2; and test -d "$argv[1]" + set from (echo $argv[1] | trim-right /) + set to (echo $argv[2]) + command cp -r $from $to + else + command cp $argv + end +end + diff --git a/airootfs/etc/skel/.config/fish/convert_aliases_to_abbreviations.fish b/airootfs/etc/skel/.config/fish/convert_aliases_to_abbreviations.fish new file mode 100644 index 00000000..4dd24d4f --- /dev/null +++ b/airootfs/etc/skel/.config/fish/convert_aliases_to_abbreviations.fish @@ -0,0 +1,16 @@ +function convert_aliases_to_abbreviations + # Define the path to the aliases file + set aliases_file ~/.dotfiles/shells/aliases + # Read each line from the aliases file + while read -l line + # Extract the alias name and command + set alias_name (echo $line | sed -n 's/^alias \([^=]*\)=.*/\1/p') + set alias_command (echo $line | sed -n 's/^alias [^=]*=\(.*\)/\1/p') + + # Check if both name and command are extracted + if test -n "$alias_name" -a -n "$alias_command" + # Create an abbreviation for the alias + abbr -a $alias_name $alias_command + end + end < $aliases_file +end diff --git a/airootfs/etc/skel/.config/fish/fish_plugins b/airootfs/etc/skel/.config/fish/fish_plugins new file mode 100644 index 00000000..64693df8 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/fish_plugins @@ -0,0 +1 @@ +jethrokuan/fzf diff --git a/airootfs/etc/skel/.config/fish/fish_variables b/airootfs/etc/skel/.config/fish/fish_variables new file mode 100644 index 00000000..fa7af3d3 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/fish_variables @@ -0,0 +1,52 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR FZF_DEFAULT_OPTS:\x2d\x2dheight\x2040\x25 +SETUVAR FZF_DISABLE_KEYBINDINGS:0 +SETUVAR FZF_LEGACY_KEYBINDINGS:1 +SETUVAR FZF_PREVIEW_DIR_CMD:ls +SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010 +SETUVAR FZF_TMUX_HEIGHT:40\x25 +SETUVAR __fish_initialized:3400 +SETUVAR _fisher_jethrokuan_2F_fzf_files:/home/DELL/\x2econfig/fish/functions/__fzf_cd\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_complete\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_complete_preview\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_find_file\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_get_dir\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_open\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_parse_commandline\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzf_reverse_isearch\x2efish\x1e/home/DELL/\x2econfig/fish/functions/__fzfcmd\x2efish\x1e/home/DELL/\x2econfig/fish/conf\x2ed/fzf\x2efish +SETUVAR _fisher_plugins:jethrokuan/fzf +SETUVAR fish_color_autosuggestion:707A8C +SETUVAR fish_color_cancel:\x2d\x2dreverse +SETUVAR fish_color_command:5CCFE6 +SETUVAR fish_color_comment:5C6773 +SETUVAR fish_color_cwd:73D0FF +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:F29E74 +SETUVAR fish_color_error:FF3333 +SETUVAR fish_color_escape:95E6CB +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:\x1d +SETUVAR fish_color_keyword:\x1d +SETUVAR fish_color_match:F28779 +SETUVAR fish_color_normal:CBCCC6 +SETUVAR fish_color_operator:FFCC66 +SETUVAR fish_color_option:\x1d +SETUVAR fish_color_param:CBCCC6 +SETUVAR fish_color_quote:BAE67E +SETUVAR fish_color_redirection:D4BFFF +SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dFFCC66 +SETUVAR fish_color_selection:\x2d\x2dbackground\x3dFFCC66 +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_greeting:\x1d +SETUVAR fish_key_bindings:fish_vi_key_bindings +SETUVAR fish_pager_color_background:\x1d +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:B3A06D +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_secondary_background:\x1d +SETUVAR fish_pager_color_secondary_completion:\x1d +SETUVAR fish_pager_color_secondary_description:\x1d +SETUVAR fish_pager_color_secondary_prefix:\x1d +SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dFFCC66 +SETUVAR fish_pager_color_selected_completion:\x1d +SETUVAR fish_pager_color_selected_description:\x1d +SETUVAR fish_pager_color_selected_prefix:\x1d +SETUVAR fish_user_paths:/home/stig/\x2elocal/share/cargo/bin diff --git a/airootfs/etc/skel/.config/fish/fisher.fish b/airootfs/etc/skel/.config/fish/fisher.fish new file mode 100644 index 00000000..72203a22 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/fisher.fish @@ -0,0 +1,211 @@ +function fisher --argument-names cmd --description "A plugin manager for Fish" + set --query fisher_path || set --local fisher_path $__fish_config_dir + set --local fisher_version 4.3.1 + set --local fish_plugins $__fish_config_dir/fish_plugins + + switch "$cmd" + case -v --version + echo "fisher, version $fisher_version" + case "" -h --help + echo "Usage: fisher install Install plugins" + echo " fisher remove Remove installed plugins" + echo " fisher update Update installed plugins" + echo " fisher update Update all installed plugins" + echo " fisher list [] List installed plugins matching regex" + echo "Options:" + echo " -v or --version Print version" + echo " -h or --help Print this help message" + echo "Variables:" + echo " \$fisher_path Plugin installation path. Default: ~/.config/fish" + case ls list + string match --entire --regex -- "$argv[2]" $_fisher_plugins + case install update remove + isatty || read --local --null --array stdin && set --append argv $stdin + + set --local install_plugins + set --local update_plugins + set --local remove_plugins + set --local arg_plugins $argv[2..-1] + set --local old_plugins $_fisher_plugins + set --local new_plugins + + if ! set --query argv[2] + if test "$cmd" != update + echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1 + else if test ! -e $fish_plugins + echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1 + end + set arg_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins) + end + + for plugin in $arg_plugins + test -e "$plugin" && set plugin (realpath $plugin) + contains -- "$plugin" $new_plugins || set --append new_plugins $plugin + end + + if set --query argv[2] + for plugin in $new_plugins + if contains -- "$plugin" $old_plugins + test "$cmd" = remove && + set --append remove_plugins $plugin || + set --append update_plugins $plugin + else if test "$cmd" = install + set --append install_plugins $plugin + else + echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1 + end + end + else + for plugin in $new_plugins + contains -- "$plugin" $old_plugins && + set --append update_plugins $plugin || + set --append install_plugins $plugin + end + + for plugin in $old_plugins + contains -- "$plugin" $new_plugins || set --append remove_plugins $plugin + end + end + + set --local pid_list + set --local source_plugins + set --local fetch_plugins $update_plugins $install_plugins + echo (set_color --bold)fisher $cmd version $fisher_version(set_color normal) + + for plugin in $fetch_plugins + set --local source (command mktemp -d) + set --append source_plugins $source + + command mkdir -p $source/{completions,conf.d,functions} + + fish --command " + if test -e $plugin + command cp -Rf $plugin/* $source + else + set temp (command mktemp -d) + set name (string split \@ $plugin) || set name[2] HEAD + set url https://codeload.github.com/\$name[1]/tar.gz/\$name[2] + + echo Fetching (set_color --underline)\$url(set_color normal) + + if curl --silent \$url | tar -xzC \$temp -f - 2>/dev/null + command cp -Rf \$temp/*/* $source + else + echo fisher: Invalid plugin name or host unavailable: \\\"$plugin\\\" >&2 + command rm -rf $source + end + command rm -rf \$temp + end + + set files $source/* && string match --quiet --regex -- .+\.fish\\\$ \$files + " & + + set --append pid_list (jobs --last --pid) + end + + wait $pid_list 2>/dev/null + + for plugin in $fetch_plugins + if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source + if set --local index (contains --index -- "$plugin" $install_plugins) + set --erase install_plugins[$index] + else + set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)] + end + end + end + + for plugin in $update_plugins $remove_plugins + if set --local index (contains --index -- "$plugin" $_fisher_plugins) + set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files + + if contains -- "$plugin" $remove_plugins + for name in (string replace --filter --regex -- '.+/conf\.d/([^/]+)\.fish$' '$1' $$plugin_files_var) + emit {$name}_uninstall + end + printf "%s\n" Removing\ (set_color red --bold)$plugin(set_color normal) " "$$plugin_files_var + end + + command rm -rf $$plugin_files_var + functions --erase (string replace --filter --regex -- '.+/functions/([^/]+)\.fish$' '$1' $$plugin_files_var) + + for name in (string replace --filter --regex -- '.+/completions/([^/]+)\.fish$' '$1' $$plugin_files_var) + complete --erase --command $name + end + + set --erase _fisher_plugins[$index] + set --erase $plugin_files_var + end + end + + if set --query update_plugins[1] || set --query install_plugins[1] + command mkdir -p $fisher_path/{functions,conf.d,completions} + end + + for plugin in $update_plugins $install_plugins + set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] + set --local files $source/{functions,conf.d,completions}/* + + if set --local index (contains --index -- $plugin $install_plugins) + set --local user_files $fisher_path/{functions,conf.d,completions}/* + set --local conflict_files + + for file in (string replace -- $source/ $fisher_path/ $files) + contains -- $file $user_files && set --append conflict_files $file + end + + if set --query conflict_files[1] && set --erase install_plugins[$index] + echo -s "fisher: Cannot install \"$plugin\": please remove or move conflicting files first:" \n" "$conflict_files >&2 + continue + end + end + + for file in (string replace -- $source/ "" $files) + command cp -Rf $source/$file $fisher_path/$file + end + + set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files + set --query files[1] && set --universal $plugin_files_var (string replace -- $source $fisher_path $files) + + contains -- $plugin $_fisher_plugins || set --universal --append _fisher_plugins $plugin + contains -- $plugin $install_plugins && set --local event install || set --local event update + + printf "%s\n" Installing\ (set_color --bold)$plugin(set_color normal) " "$$plugin_files_var + + for file in (string match --regex -- '.+/[^/]+\.fish$' $$plugin_files_var) + source $file + if set --local name (string replace --regex -- '.+conf\.d/([^/]+)\.fish$' '$1' $file) + emit {$name}_$event + end + end + end + + command rm -rf $source_plugins + + set --query _fisher_plugins[1] || set --erase _fisher_plugins + set --query _fisher_plugins && + printf "%s\n" $_fisher_plugins >$fish_plugins || + command rm -f $fish_plugins + + set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins) + test "$total" != "0 0 0" && echo (string join ", " ( + test $total[1] = 0 || echo "Installed $total[1]") ( + test $total[2] = 0 || echo "Updated $total[2]") ( + test $total[3] = 0 || echo "Removed $total[3]") + ) plugin/s + case \* + echo "fisher: Unknown command: \"$cmd\"" >&2 && return 1 + end +end + +## Migrations ## +function _fisher_fish_postexec --on-event fish_postexec + if functions --query _fisher_list + fisher update >/dev/null 2>/dev/null + set --query XDG_DATA_HOME || set --local XDG_DATA_HOME ~/.local/share + test -e $XDG_DATA_HOME/fisher && command rm -rf $XDG_DATA_HOME/fisher + functions --erase _fisher_list _fisher_plugin_parse + set --erase fisher_data + end + functions --erase _fisher_fish_postexec +end diff --git a/airootfs/etc/skel/.config/fish/functions/fish_prompt.fish b/airootfs/etc/skel/.config/fish/functions/fish_prompt.fish new file mode 100644 index 00000000..e7c661a4 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/functions/fish_prompt.fish @@ -0,0 +1,139 @@ +function fish_prompt + # This prompt shows: + # - green lines if the last return command is OK, red otherwise + # - your user name, in red if root or yellow otherwise + # - your hostname, in cyan if ssh or blue otherwise + # - the current path (with prompt_pwd) + # - date +%X + # - the current virtual environment, if any + # - the current git status, if any, with fish_git_prompt + # - the current battery state, if any, and if your power cable is unplugged, and if you have "acpi" + # - current background jobs, if any + + # It goes from: + # ┬─[nim@Hattori:~]─[11:39:00] + # ╰─>$ echo here + + # To: + # ┬─[nim@Hattori:~/w/dashboard]─[11:37:14]─[V:django20]─[G:master↑1|●1✚1…1]─[B:85%, 05:41:42 remaining] + # │ 2 15054 0% arrêtée sleep 100000 + # │ 1 15048 0% arrêtée sleep 100000 + # ╰─>$ echo there + + set -l retc red + test $status = 0; and set retc green + + set -q __fish_git_prompt_showupstream + or set -g __fish_git_prompt_showupstream auto + + function _nim_prompt_wrapper + set retc $argv[1] + set -l field_name $argv[2] + set -l field_value $argv[3] + + set_color normal + set_color $retc + echo -n '─' + set_color -o green + echo -n '[' + set_color normal + test -n $field_name + and echo -n $field_name: + set_color $retc + echo -n $field_value + set_color -o green + echo -n ']' + end + + set_color $retc + echo -n '┬─' + set_color -o green + echo -n [ + + if functions -q fish_is_root_user; and fish_is_root_user + set_color -o red + else + set_color -o yellow + end + + echo -n $USER + set_color -o white + echo -n @ + + if [ -z "$SSH_CLIENT" ] + set_color -o blue + else + set_color -o cyan + end + + echo -n (prompt_hostname) + set_color -o white + echo -n :(prompt_pwd) + set_color -o green + echo -n ']' + + # Date + _nim_prompt_wrapper $retc '' (date +%X) + + # Vi-mode + # The default mode prompt would be prefixed, which ruins our alignment. + function fish_mode_prompt + end + + if test "$fish_key_bindings" = fish_vi_key_bindings + or test "$fish_key_bindings" = fish_hybrid_key_bindings + set -l mode + switch $fish_bind_mode + case default + set mode (set_color --bold red)N + case insert + set mode (set_color --bold green)I + case replace_one + set mode (set_color --bold green)R + echo '[R]' + case replace + set mode (set_color --bold cyan)R + case visual + set mode (set_color --bold magenta)V + end + set mode $mode(set_color normal) + _nim_prompt_wrapper $retc '' $mode + end + + + # Virtual Environment + set -q VIRTUAL_ENV_DISABLE_PROMPT + or set -g VIRTUAL_ENV_DISABLE_PROMPT true + set -q VIRTUAL_ENV + and _nim_prompt_wrapper $retc V (basename "$VIRTUAL_ENV") + + # git + set -l prompt_git (fish_git_prompt '%s') + test -n "$prompt_git" + and _nim_prompt_wrapper $retc G $prompt_git + + # Battery status + type -q acpi + and test (acpi -a 2> /dev/null | string match -r off) + and _nim_prompt_wrapper $retc B (acpi -b | cut -d' ' -f 4-) + + # New line + echo + + # Background jobs + set_color normal + + for job in (jobs) + set_color $retc + echo -n '│ ' + set_color brown + echo $job + end + + set_color normal + set_color $retc + echo -n '╰─>' + set_color -o red + echo -n '$ ' + set_color normal +end diff --git a/airootfs/etc/skel/.config/fish/functions/fish_prompt.fish.bak b/airootfs/etc/skel/.config/fish/functions/fish_prompt.fish.bak new file mode 100644 index 00000000..e7c661a4 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/functions/fish_prompt.fish.bak @@ -0,0 +1,139 @@ +function fish_prompt + # This prompt shows: + # - green lines if the last return command is OK, red otherwise + # - your user name, in red if root or yellow otherwise + # - your hostname, in cyan if ssh or blue otherwise + # - the current path (with prompt_pwd) + # - date +%X + # - the current virtual environment, if any + # - the current git status, if any, with fish_git_prompt + # - the current battery state, if any, and if your power cable is unplugged, and if you have "acpi" + # - current background jobs, if any + + # It goes from: + # ┬─[nim@Hattori:~]─[11:39:00] + # ╰─>$ echo here + + # To: + # ┬─[nim@Hattori:~/w/dashboard]─[11:37:14]─[V:django20]─[G:master↑1|●1✚1…1]─[B:85%, 05:41:42 remaining] + # │ 2 15054 0% arrêtée sleep 100000 + # │ 1 15048 0% arrêtée sleep 100000 + # ╰─>$ echo there + + set -l retc red + test $status = 0; and set retc green + + set -q __fish_git_prompt_showupstream + or set -g __fish_git_prompt_showupstream auto + + function _nim_prompt_wrapper + set retc $argv[1] + set -l field_name $argv[2] + set -l field_value $argv[3] + + set_color normal + set_color $retc + echo -n '─' + set_color -o green + echo -n '[' + set_color normal + test -n $field_name + and echo -n $field_name: + set_color $retc + echo -n $field_value + set_color -o green + echo -n ']' + end + + set_color $retc + echo -n '┬─' + set_color -o green + echo -n [ + + if functions -q fish_is_root_user; and fish_is_root_user + set_color -o red + else + set_color -o yellow + end + + echo -n $USER + set_color -o white + echo -n @ + + if [ -z "$SSH_CLIENT" ] + set_color -o blue + else + set_color -o cyan + end + + echo -n (prompt_hostname) + set_color -o white + echo -n :(prompt_pwd) + set_color -o green + echo -n ']' + + # Date + _nim_prompt_wrapper $retc '' (date +%X) + + # Vi-mode + # The default mode prompt would be prefixed, which ruins our alignment. + function fish_mode_prompt + end + + if test "$fish_key_bindings" = fish_vi_key_bindings + or test "$fish_key_bindings" = fish_hybrid_key_bindings + set -l mode + switch $fish_bind_mode + case default + set mode (set_color --bold red)N + case insert + set mode (set_color --bold green)I + case replace_one + set mode (set_color --bold green)R + echo '[R]' + case replace + set mode (set_color --bold cyan)R + case visual + set mode (set_color --bold magenta)V + end + set mode $mode(set_color normal) + _nim_prompt_wrapper $retc '' $mode + end + + + # Virtual Environment + set -q VIRTUAL_ENV_DISABLE_PROMPT + or set -g VIRTUAL_ENV_DISABLE_PROMPT true + set -q VIRTUAL_ENV + and _nim_prompt_wrapper $retc V (basename "$VIRTUAL_ENV") + + # git + set -l prompt_git (fish_git_prompt '%s') + test -n "$prompt_git" + and _nim_prompt_wrapper $retc G $prompt_git + + # Battery status + type -q acpi + and test (acpi -a 2> /dev/null | string match -r off) + and _nim_prompt_wrapper $retc B (acpi -b | cut -d' ' -f 4-) + + # New line + echo + + # Background jobs + set_color normal + + for job in (jobs) + set_color $retc + echo -n '│ ' + set_color brown + echo $job + end + + set_color normal + set_color $retc + echo -n '╰─>' + set_color -o red + echo -n '$ ' + set_color normal +end diff --git a/airootfs/etc/skel/.config/fish/functions/fisher.fish b/airootfs/etc/skel/.config/fish/functions/fisher.fish new file mode 100644 index 00000000..72203a22 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/functions/fisher.fish @@ -0,0 +1,211 @@ +function fisher --argument-names cmd --description "A plugin manager for Fish" + set --query fisher_path || set --local fisher_path $__fish_config_dir + set --local fisher_version 4.3.1 + set --local fish_plugins $__fish_config_dir/fish_plugins + + switch "$cmd" + case -v --version + echo "fisher, version $fisher_version" + case "" -h --help + echo "Usage: fisher install Install plugins" + echo " fisher remove Remove installed plugins" + echo " fisher update Update installed plugins" + echo " fisher update Update all installed plugins" + echo " fisher list [] List installed plugins matching regex" + echo "Options:" + echo " -v or --version Print version" + echo " -h or --help Print this help message" + echo "Variables:" + echo " \$fisher_path Plugin installation path. Default: ~/.config/fish" + case ls list + string match --entire --regex -- "$argv[2]" $_fisher_plugins + case install update remove + isatty || read --local --null --array stdin && set --append argv $stdin + + set --local install_plugins + set --local update_plugins + set --local remove_plugins + set --local arg_plugins $argv[2..-1] + set --local old_plugins $_fisher_plugins + set --local new_plugins + + if ! set --query argv[2] + if test "$cmd" != update + echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1 + else if test ! -e $fish_plugins + echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1 + end + set arg_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins) + end + + for plugin in $arg_plugins + test -e "$plugin" && set plugin (realpath $plugin) + contains -- "$plugin" $new_plugins || set --append new_plugins $plugin + end + + if set --query argv[2] + for plugin in $new_plugins + if contains -- "$plugin" $old_plugins + test "$cmd" = remove && + set --append remove_plugins $plugin || + set --append update_plugins $plugin + else if test "$cmd" = install + set --append install_plugins $plugin + else + echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1 + end + end + else + for plugin in $new_plugins + contains -- "$plugin" $old_plugins && + set --append update_plugins $plugin || + set --append install_plugins $plugin + end + + for plugin in $old_plugins + contains -- "$plugin" $new_plugins || set --append remove_plugins $plugin + end + end + + set --local pid_list + set --local source_plugins + set --local fetch_plugins $update_plugins $install_plugins + echo (set_color --bold)fisher $cmd version $fisher_version(set_color normal) + + for plugin in $fetch_plugins + set --local source (command mktemp -d) + set --append source_plugins $source + + command mkdir -p $source/{completions,conf.d,functions} + + fish --command " + if test -e $plugin + command cp -Rf $plugin/* $source + else + set temp (command mktemp -d) + set name (string split \@ $plugin) || set name[2] HEAD + set url https://codeload.github.com/\$name[1]/tar.gz/\$name[2] + + echo Fetching (set_color --underline)\$url(set_color normal) + + if curl --silent \$url | tar -xzC \$temp -f - 2>/dev/null + command cp -Rf \$temp/*/* $source + else + echo fisher: Invalid plugin name or host unavailable: \\\"$plugin\\\" >&2 + command rm -rf $source + end + command rm -rf \$temp + end + + set files $source/* && string match --quiet --regex -- .+\.fish\\\$ \$files + " & + + set --append pid_list (jobs --last --pid) + end + + wait $pid_list 2>/dev/null + + for plugin in $fetch_plugins + if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source + if set --local index (contains --index -- "$plugin" $install_plugins) + set --erase install_plugins[$index] + else + set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)] + end + end + end + + for plugin in $update_plugins $remove_plugins + if set --local index (contains --index -- "$plugin" $_fisher_plugins) + set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files + + if contains -- "$plugin" $remove_plugins + for name in (string replace --filter --regex -- '.+/conf\.d/([^/]+)\.fish$' '$1' $$plugin_files_var) + emit {$name}_uninstall + end + printf "%s\n" Removing\ (set_color red --bold)$plugin(set_color normal) " "$$plugin_files_var + end + + command rm -rf $$plugin_files_var + functions --erase (string replace --filter --regex -- '.+/functions/([^/]+)\.fish$' '$1' $$plugin_files_var) + + for name in (string replace --filter --regex -- '.+/completions/([^/]+)\.fish$' '$1' $$plugin_files_var) + complete --erase --command $name + end + + set --erase _fisher_plugins[$index] + set --erase $plugin_files_var + end + end + + if set --query update_plugins[1] || set --query install_plugins[1] + command mkdir -p $fisher_path/{functions,conf.d,completions} + end + + for plugin in $update_plugins $install_plugins + set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] + set --local files $source/{functions,conf.d,completions}/* + + if set --local index (contains --index -- $plugin $install_plugins) + set --local user_files $fisher_path/{functions,conf.d,completions}/* + set --local conflict_files + + for file in (string replace -- $source/ $fisher_path/ $files) + contains -- $file $user_files && set --append conflict_files $file + end + + if set --query conflict_files[1] && set --erase install_plugins[$index] + echo -s "fisher: Cannot install \"$plugin\": please remove or move conflicting files first:" \n" "$conflict_files >&2 + continue + end + end + + for file in (string replace -- $source/ "" $files) + command cp -Rf $source/$file $fisher_path/$file + end + + set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files + set --query files[1] && set --universal $plugin_files_var (string replace -- $source $fisher_path $files) + + contains -- $plugin $_fisher_plugins || set --universal --append _fisher_plugins $plugin + contains -- $plugin $install_plugins && set --local event install || set --local event update + + printf "%s\n" Installing\ (set_color --bold)$plugin(set_color normal) " "$$plugin_files_var + + for file in (string match --regex -- '.+/[^/]+\.fish$' $$plugin_files_var) + source $file + if set --local name (string replace --regex -- '.+conf\.d/([^/]+)\.fish$' '$1' $file) + emit {$name}_$event + end + end + end + + command rm -rf $source_plugins + + set --query _fisher_plugins[1] || set --erase _fisher_plugins + set --query _fisher_plugins && + printf "%s\n" $_fisher_plugins >$fish_plugins || + command rm -f $fish_plugins + + set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins) + test "$total" != "0 0 0" && echo (string join ", " ( + test $total[1] = 0 || echo "Installed $total[1]") ( + test $total[2] = 0 || echo "Updated $total[2]") ( + test $total[3] = 0 || echo "Removed $total[3]") + ) plugin/s + case \* + echo "fisher: Unknown command: \"$cmd\"" >&2 && return 1 + end +end + +## Migrations ## +function _fisher_fish_postexec --on-event fish_postexec + if functions --query _fisher_list + fisher update >/dev/null 2>/dev/null + set --query XDG_DATA_HOME || set --local XDG_DATA_HOME ~/.local/share + test -e $XDG_DATA_HOME/fisher && command rm -rf $XDG_DATA_HOME/fisher + functions --erase _fisher_list _fisher_plugin_parse + set --erase fisher_data + end + functions --erase _fisher_fish_postexec +end diff --git a/airootfs/etc/skel/.config/fish/functions/get-IPs.fish b/airootfs/etc/skel/.config/fish/functions/get-IPs.fish new file mode 100644 index 00000000..6acc1f70 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/functions/get-IPs.fish @@ -0,0 +1,20 @@ +function get-IPs + # Extract the private IP address + set private_ip (ip -br -c a | tail -n 1 | awk -F '/' '{print $1}' | awk '{print $3}') + echo "Private: $private_ip" + + # Check for internet connectivity and fetch public IP + if curl -s --head --request GET www.google.com | grep "200 OK" > /dev/null + set public_ip (curl -s https://ipinfo.io/ip) + echo -n "Public: " + set_color purple + echo $public_ip + set_color normal + + else + echo -n "Public: " + set_color purple + echo NA + set_color normal + end +end diff --git a/airootfs/etc/skel/.config/fish/functions/tokyonight-dark.fish b/airootfs/etc/skel/.config/fish/functions/tokyonight-dark.fish new file mode 100644 index 00000000..6aa7cf3a --- /dev/null +++ b/airootfs/etc/skel/.config/fish/functions/tokyonight-dark.fish @@ -0,0 +1,38 @@ +function tokyonight-dark + # TokyoNight Color Palette + set -l foreground c0caf5 + set -l selection 1a1b2f + set -l comment 565f89 + set -l red f7768e + set -l orange ff9e64 + set -l yellow e0af68 + set -l green 9ece6a + set -l purple 9d7cd8 + set -l cyan 7dcfff + set -l pink bb9af7 + + # Syntax Highlighting Colors + set -g fish_color_normal $foreground + set -g fish_color_command $cyan + set -g fish_color_keyword $pink + set -g fish_color_quote $yellow + set -g fish_color_redirection $foreground + set -g fish_color_end $orange + set -g fish_color_error $red + set -g fish_color_param $purple + set -g fish_color_comment $comment + set -g fish_color_selection --background=$selection + set -g fish_color_search_match --background=$selection + set -g fish_color_operator $green + set -g fish_color_escape $pink + set -g fish_color_autosuggestion $comment + + # Completion Pager Colors + set -g fish_pager_color_progress $comment + set -g fish_pager_color_prefix $cyan + set -g fish_pager_color_completion $foreground + set -g fish_pager_color_description $comment + set -g fish_pager_color_selected_background --background=$selection + + +end diff --git a/airootfs/etc/skel/.config/fish/functions/which.fish b/airootfs/etc/skel/.config/fish/functions/which.fish new file mode 100644 index 00000000..24585571 --- /dev/null +++ b/airootfs/etc/skel/.config/fish/functions/which.fish @@ -0,0 +1,30 @@ +function which + set cmd $argv[1] + set alias_cmd (alias | rg "^alias $cmd ") + set alias_target (echo $alias_cmd | awk '{$1=""; $2=""; print}') + set str (echo $alias_target | tr -d ' ') + if test -n $str + echo -n "$cmd: aliased to" + set_color cyan + echo $alias_target | tr -d "'" + set_color normal + end + + if rg "function $cmd" $HOME/.dotfiles/shells/fish/config.fish >/dev/null + functions $cmd + end + + # Check if the function is defined in the functions directory + set func_file $HOME/.dotfiles/shells/fish/functions/$cmd.fish + if test -f $func_file + functions $cmd + end + set -l exec (command -v $cmd) + set str2 (echo $exec | tr -d ' ') + if test -n $str2 + echo -n "$cmd: found in " + set_color cyan + echo $exec + set_color normal + end +end diff --git a/airootfs/etc/skel/.config/fish/git.fish b/airootfs/etc/skel/.config/fish/git.fish new file mode 100644 index 00000000..570f8b6c --- /dev/null +++ b/airootfs/etc/skel/.config/fish/git.fish @@ -0,0 +1,454 @@ +# Git version checking +set -g git_version (git version 2>/dev/null | string split " ")[3] + +# +# Functions Current +# (sorted alphabetically by function name) +# (order should follow README) +# + +# The name of the current branch +# Back-compatibility wrapper for when this function was defined here in +# the plugin, before being pulled in to core lib/git.zsh as git_current_branch() +# to fix the core -> git plugin dependency. +function current_branch + git_current_branch +end + +# Check for develop and similarly named branches +function git_develop_branch + command git rev-parse --git-dir > /dev/null; and return + set -l branch + for branch in dev devel develop development + if command git show-ref -q --verify refs/heads/$branch + echo $branch + return 0 + end + end + + echo develop + return 1 +end + +# Check if main exists and use instead of master +function git_main_branch + command git rev-parse --git-dir > /dev/null; and return + set -l ref + for ref in refs/(heads remotes/{origin upstream})/(main trunk mainline default master) + if command git show-ref -q --verify $ref + echo (basename $ref) + return 0 + end + end + + # If no main branch was found, fall back to master but return error + echo master + return 1 +end + +function grename + if test -z "$argv[1]" -o -z "$argv[2]" + echo "Usage: $argv[0] old_branch new_branch" + return 1 + end + + # Rename branch locally + git branch -m "$argv[1]" "$argv[2]" + # Rename branch in origin remote + if git push origin :"$argv[1]" + git push --set-upstream origin "$argv[2]" + end +end + + +# +# Functions Work in Progress (WIP) +# (sorted alphabetically by function name) +# (order should follow README) +# + +# Similar to `gunwip` but recursive "Unwips" all recent `--wip--` commits not just the last one +function gunwipall + set _commit (git log --grep='--wip--' --invert-grep --max-count=1 --format=format:%H) + + # Check if a commit without "--wip--" was found and it's not the same as HEAD + if test "$_commit" != (git rev-parse HEAD) + git reset $_commit; or return 1 + end +end + +# Warn if the current branch is a WIP +function work_in_progress + command git -c log.showSignature=false log -n 1 ^/dev/null | grep -q -- "--wip--"; and echo "WIP!!" +end + +# Aliases + +alias grt='cd (git rev-parse --show-toplevel ^/dev/null || echo .)' + +function ggpnp + if test (count $argv) = 0 + ggl; and ggp + else + ggl $argv; and ggp $argv + end +end +complete -c ggpnp -f -a 'git-checkout' + +alias ggpur='ggu' +alias g='git' +alias ga='git add' +alias gaa='git add --all' +alias gapa='git add --patch' +alias gau='git add --update' +alias gav='git add --verbose' +alias gwip='git add -A; git rm (git ls-files --deleted) ^/dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"' +alias gam='git am' +alias gama='git am --abort' +alias gamc='git am --continue' +alias gamscp='git am --show-current-patch' +alias gams='git am --skip' +alias gap='git apply' +alias gapt='git apply --3way' +alias gbs='git bisect' +alias gbsb='git bisect bad' +alias gbsg='git bisect good' +alias gbsn='git bisect new' +alias gbso='git bisect old' +alias gbsr='git bisect reset' +alias gbss='git bisect start' +alias gbl='git blame -w' +alias gb='git branch' +alias gba='git branch --all' +alias gbd='git branch --delete' +alias gbD='git branch --delete --force' + +function gbda + set -l main_branch (git symbolic-ref --short HEAD) + set -l develop_branch "develop" # Assuming "develop" is your develop branch name + git branch --no-color --merged | grep -vE '^([+*]|\s*($main_branch|$develop_branch)\s*$)' | xargs -I {} git branch -d {} ^/dev/null +end + +# Copied and modified from James Roeder (jmaroeder) under MIT License +# https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish +function gbds + set default_branch (git_main_branch) + if test $status -ne 0 + set default_branch (git_develop_branch) + end + + git for-each-ref refs/heads/ "--format=%(refname:short)" | \ + while read -l branch + set merge_base (git merge-base $default_branch $branch) + if test (git cherry $default_branch (git commit-tree (git rev-parse $branch\^{tree}) -p $merge_base -m _)) = -* + git branch -D $branch + end + end +end + +alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d' +alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D' +alias gbm='git branch --move' +alias gbnm='git branch --no-merged' +alias gbr='git branch --remote' +alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)' +alias gbg='LANG=C git branch -vv | grep ": gone\]"' +alias gco='git checkout' +alias gcor='git checkout --recurse-submodules' +alias gcb='git checkout -b' +alias gcd='git checkout $(git_develop_branch)' +alias gcm='git checkout $(git_main_branch)' +alias gcp='git cherry-pick' +alias gcpa='git cherry-pick --abort' +alias gcpc='git cherry-pick --continue' +alias gclean='git clean --interactive -d' +alias gcl='git clone --recurse-submodules' + +function gccd + set -l repo + + set -l opts (commandline -p) + for opt in $opts + switch $opt + case --recurse-submodules + set repo $argv[1..-2] + case -* + # Skip options + case * + set repo $argv[1..-1] + end + end + + set -l clone_result (git clone --recurse-submodules $repo) + if test $status -ne 0 + return $status + end + + if test -d $_ + cd $_ + else + set repo (string split .git $_) + set repo (basename $repo[1]) + cd $repo + end +end +complete -c gccd -f -n '__fish_use_subcommand' -a 'git-clone' + +alias gcam='git commit --all --message' +alias gcas='git commit --all --signoff' +alias gcasm='git commit --all --signoff --message' +alias gcs='git commit --gpg-sign' +alias gcss='git commit --gpg-sign --signoff' +alias gcssm='git commit --gpg-sign --signoff --message' +alias gcmsg='git commit --message' +alias gcsm='git commit --signoff --message' +alias gc='git commit --verbose' +alias gca='git commit --verbose --all' +alias gca!='git commit --verbose --all --amend' +alias gcan!='git commit --verbose --all --no-edit --amend' +alias gcans!='git commit --verbose --all --signoff --no-edit --amend' +alias gc!='git commit --verbose --amend' +alias gcn!='git commit --verbose --no-edit --amend' +alias gcf='git config --list' +alias gdct='git describe --tags $(git rev-list --tags --max-count=1)' +alias gd='git diff' +alias gdca='git diff --cached' +alias gdcw='git diff --cached --word-diff' +alias gds='git diff --staged' +alias gdw='git diff --word-diff' +function is-at-least -a expected_version + # If no actual version is provided, default to the current Fish version + if test -z "$argv[2]" + set actual_version $FISH_VERSION + else + set actual_version $argv[2] + end + + # Compare versions using sort -CV + begin + echo $expected_version + echo $actual_version + end | sort --check=silent --version-sort + + # Return the status of the sort command + return $status +end + +function gdv + git diff -w $argv | view - +end +complete -c gdv -f -n '__fish_use_subcommand' -a 'git-diff' + +alias gdup='git diff @{upstream}' + +function gdnolock + git diff $argv ":(exclude)package-lock.json" ":(exclude)*.lock" +end +complete -c gdnolock -f -n '__fish_use_subcommand' -a 'git-diff' + +alias gdt='git diff-tree --no-commit-id --name-only -r' +alias gf='git fetch' +# --jobs= was added in git 2.8 +is-at-least 2.8 "$git_version" \ + && alias gfa='git fetch --all --prune --jobs=10' \ + || alias gfa='git fetch --all --prune' +alias gfo='git fetch origin' +alias gg='git gui citool' +alias gga='git gui citool --amend' +alias ghh='git help' +alias glgg='git log --graph' +alias glgga='git log --graph --decorate --all' +alias glgm='git log --graph --max-count=10' +alias glods='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset" --date=short' +alias glod='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset"' +alias glola='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --all' +alias glols='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --stat' +alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"' +alias glo='git log --oneline --decorate' +alias glog='git log --oneline --decorate --graph' +alias gloga='git log --oneline --decorate --graph --all' + +# Pretty log messages +function _git_log_prettily + if test -n "$argv[1]" + git log --pretty=$argv[1] + end +end +# compdef _git _git_log_prettily=git-log +alias glp='_git_log_prettily' +alias glg='git log --stat' +alias glgp='git log --stat --patch' +alias gignored='git ls-files -v | grep "^[[:lower:]]"' +alias gfg='git ls-files | grep' +alias gm='git merge' +alias gma='git merge --abort' +alias gms="git merge --squash" +alias gmom='git merge origin/$(git_main_branch)' +alias gmum='git merge upstream/$(git_main_branch)' +alias gmtl='git mergetool --no-prompt' +alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' + +alias gl='git pull' +alias gpr='git pull --rebase' +alias gprv='git pull --rebase -v' +alias gpra='git pull --rebase --autostash' +alias gprav='git pull --rebase --autostash -v' + +function ggu + if test (count $argv) != 1 + set b (git_current_branch) + end + git pull --rebase origin (set -q b $argv[1]; and echo $b) +end +complete -c ggu -f -n '__fish_use_subcommand' -a 'git-checkout' + +alias gprom='git pull --rebase origin $(git_main_branch)' +alias gpromi='git pull --rebase=interactive origin $(git_main_branch)' +alias ggpull='git pull origin "$(git_current_branch)"' + +function ggl + if test (count $argv) -ne 0 -a (count $argv) -ne 1 + git pull origin $argv + else + if test (count $argv) -eq 0 + set b (git_current_branch) + end + git pull origin (set -q b $argv[1]; and echo $b) + end +end +complete -c ggl -f -n '__fish_use_subcommand' -a 'git-checkout' + +alias gluc='git pull upstream (git_current_branch)' +alias glum='git pull upstream (git_main_branch)' +alias gp='git push' +alias gpd='git push --dry-run' + +function ggf + if test (count $argv) -ne 1 + set b (git_current_branch) + end + git push --force origin (set -q b $argv[1]; and echo $b) +end +complete -c ggf -f -n '__fish_use_subcommand' -a 'git-checkout' + +is-at-least 2.30 (command git --version | awk '{print $3}') \ + && alias gpf 'git push --force-with-lease --force-if-includes' \ + || alias gpf 'git push --force-with-lease' + +function ggfl + if test (count $argv) -ne 1 + set b (git_current_branch) + end + git push --force-with-lease origin (set -q b $argv[1]; and echo $b) +end +complete -c ggfl -f -n '__fish_use_subcommand' -a 'git-checkout' + +alias gpsup 'git push --set-upstream origin (git_current_branch)' +is-at-least 2.30 (command git --version | awk '{print $3}') \ + && alias gpsupf 'git push --set-upstream origin (git_current_branch) --force-with-lease --force-if-includes' \ + || alias gpsupf 'git push --set-upstream origin (git_current_branch) --force-with-lease' +alias gpv='git push --verbose' +alias gpoat='git push origin --all && git push origin --tags' +alias gpod='git push origin --delete' +alias ggpush 'git push origin "(git_current_branch)"' + +function ggp + if test (count $argv) -ne 0 -a (count $argv) -ne 1 + git push origin $argv + else + if test (count $argv) -eq 0 + set b (git_current_branch) + end + git push origin (set -q b $argv[1]; and echo $b) + end +end +complete -c ggp -f -n '__fish_use_subcommand' -a 'git-checkout' + +alias gpu='git push upstream' +alias grb='git rebase' +alias grba='git rebase --abort' +alias grbc='git rebase --continue' +alias grbi='git rebase --interactive' +alias grbo='git rebase --onto' +alias grbs='git rebase --skip' +alias grbd 'git rebase (git_develop_branch)' +alias grbm 'git rebase (git_main_branch)' +alias grbom 'git rebase origin/(git_main_branch)' +alias gr='git remote' +alias grv='git remote --verbose' +alias gra='git remote add' +alias grrm='git remote remove' +alias grmv='git remote rename' +alias grset='git remote set-url' +alias grup='git remote update' +alias grh='git reset' +alias gru='git reset --' +alias grhh='git reset --hard' +alias grhk='git reset --keep' +alias grhs='git reset --soft' +alias gpristine='git reset --hard && git clean --force -dfx' +alias groh 'git reset origin/(git_current_branch) --hard' +alias grs='git restore' +alias grss='git restore --source' +alias grst='git restore --staged' +alias gunwip 'git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1' +alias grev='git revert' +alias grm='git rm' +alias grmc='git rm --cached' +alias gcount='git shortlog --summary --numbered' +alias gsh='git show' +alias gsps='git show --pretty=short --show-signature' +alias gstall='git stash --all' +alias gstaa='git stash apply' +alias gstc='git stash clear' +alias gstd='git stash drop' +alias gstl='git stash list' +alias gstp='git stash pop' +# use the default stash push on git 2.13 and newer +is-at-least 2.13 (command git --version | awk '{print $3}') \ + && alias gsta 'git stash push' \ + || alias gsta 'git stash save' +alias gsts='git stash show --patch' +alias gst='git status' +alias gss='git status --short' +alias gsb='git status --short --branch' +alias gsi='git submodule init' +alias gsu='git submodule update' +alias gsd='git svn dcommit' +alias git-svn-dcommit-push 'git svn dcommit && git push github (git_main_branch):svntrunk' +alias gsr='git svn rebase' +alias gsw='git switch' +alias gswc='git switch --create' +alias gswd 'git switch (git_develop_branch)' +alias gswm 'git switch (git_main_branch)' +alias gta='git tag --annotate' +alias gts='git tag --sign' +alias gtv 'git tag | sort -V' +alias gignore='git update-index --assume-unchanged' +alias gunignore='git update-index --no-assume-unchanged' +alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' +alias gwt='git worktree' +alias gwta='git worktree add' +alias gwtls='git worktree list' +alias gwtmv='git worktree move' +alias gwtrm='git worktree remove' +alias gstu 'gsta --include-untracked' +function gtl + git tag --sort=-v:refname -n --list "$argv[1]*" +end +alias gk '\gitk --all --branches &!' +alias gke '\gitk --all (git log --walk-reflogs --pretty=%h) &!' + +# Logic for adding warnings on deprecated aliases +# set -l old_alias new_alias +# for old_alias new_alias in \ +# # gup gpr \ +# gupv gprv \ +# gupa gpra \ +# gupav gprav \ +# gupom gprom \ +# gupomi gpromi +# echo -e "%F{yellow}[oh-my-zsh] '%F{red}$old_alias%F{yellow}' is a deprecated alias, using '%F{green}$new_alias%F{yellow}' instead.%f" +# functions -q $new_alias +# end + diff --git a/airootfs/usr/local/bin/StratOS-choose-atril b/airootfs/usr/local/bin/StratOS-choose-atril index ac8a420a..4310b64b 100755 --- a/airootfs/usr/local/bin/StratOS-choose-atril +++ b/airootfs/usr/local/bin/StratOS-choose-atril @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which PDF Viewer do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-brave b/airootfs/usr/local/bin/StratOS-choose-brave index 664e7a48..25bc5d13 100755 --- a/airootfs/usr/local/bin/StratOS-choose-brave +++ b/airootfs/usr/local/bin/StratOS-choose-brave @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which Brave do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-chromium b/airootfs/usr/local/bin/StratOS-choose-chromium index c265b76a..6c3498c3 100755 --- a/airootfs/usr/local/bin/StratOS-choose-chromium +++ b/airootfs/usr/local/bin/StratOS-choose-chromium @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which Chromium do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-evince b/airootfs/usr/local/bin/StratOS-choose-evince index f5982c15..082a3e52 100755 --- a/airootfs/usr/local/bin/StratOS-choose-evince +++ b/airootfs/usr/local/bin/StratOS-choose-evince @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which Evince do you want?" \ --menu "Choose one of the following options:" 15 40 5 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-firefox b/airootfs/usr/local/bin/StratOS-choose-firefox index 688f3de4..0bb74ded 100755 --- a/airootfs/usr/local/bin/StratOS-choose-firefox +++ b/airootfs/usr/local/bin/StratOS-choose-firefox @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which Firefox do you want?" \ --menu "Choose one of the following options:" 15 40 5 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-github b/airootfs/usr/local/bin/StratOS-choose-github index b5e40649..ef7114f2 100755 --- a/airootfs/usr/local/bin/StratOS-choose-github +++ b/airootfs/usr/local/bin/StratOS-choose-github @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which GitHub Desktop do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-gsconnect b/airootfs/usr/local/bin/StratOS-choose-gsconnect index 2d36dc5a..06b9b536 100755 --- a/airootfs/usr/local/bin/StratOS-choose-gsconnect +++ b/airootfs/usr/local/bin/StratOS-choose-gsconnect @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which GSConnect do you want?" \ --menu "Choose one of the following options:" 15 40 2 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-libreoffice b/airootfs/usr/local/bin/StratOS-choose-libreoffice index 0295f92b..8a8ed186 100755 --- a/airootfs/usr/local/bin/StratOS-choose-libreoffice +++ b/airootfs/usr/local/bin/StratOS-choose-libreoffice @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which LibreOffice do you want?" \ --menu "Choose one of the following options:" 15 40 4 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-librewolf b/airootfs/usr/local/bin/StratOS-choose-librewolf index f9046c09..49e45090 100755 --- a/airootfs/usr/local/bin/StratOS-choose-librewolf +++ b/airootfs/usr/local/bin/StratOS-choose-librewolf @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which LibreWolf do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-mpv b/airootfs/usr/local/bin/StratOS-choose-mpv index 549673c0..0abfa1e0 100755 --- a/airootfs/usr/local/bin/StratOS-choose-mpv +++ b/airootfs/usr/local/bin/StratOS-choose-mpv @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which MPV do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-obsidian b/airootfs/usr/local/bin/StratOS-choose-obsidian index 9ba8906f..8453cdc9 100755 --- a/airootfs/usr/local/bin/StratOS-choose-obsidian +++ b/airootfs/usr/local/bin/StratOS-choose-obsidian @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which Obsidian do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-onlyoffice b/airootfs/usr/local/bin/StratOS-choose-onlyoffice index 2e257c35..052176e0 100755 --- a/airootfs/usr/local/bin/StratOS-choose-onlyoffice +++ b/airootfs/usr/local/bin/StratOS-choose-onlyoffice @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which OnlyOffice do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-videoplayer b/airootfs/usr/local/bin/StratOS-choose-videoplayer index 6a732909..b9cdaac3 100755 --- a/airootfs/usr/local/bin/StratOS-choose-videoplayer +++ b/airootfs/usr/local/bin/StratOS-choose-videoplayer @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu_video_players() { dialog --clear --backtitle "Video Player Selector" \ --title "Select a video player" \ diff --git a/airootfs/usr/local/bin/StratOS-choose-vlc b/airootfs/usr/local/bin/StratOS-choose-vlc index adca4edb..596ee71f 100755 --- a/airootfs/usr/local/bin/StratOS-choose-vlc +++ b/airootfs/usr/local/bin/StratOS-choose-vlc @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which VLC do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/airootfs/usr/local/bin/StratOS-choose-vscodium b/airootfs/usr/local/bin/StratOS-choose-vscodium index c49fcea8..fb71d0b2 100755 --- a/airootfs/usr/local/bin/StratOS-choose-vscodium +++ b/airootfs/usr/local/bin/StratOS-choose-vscodium @@ -1,5 +1,5 @@ #!/bin/bash -./maneki-logo +bash $(realpath $(dirname $0))/maneki-logo menu(){ dialog --clear --title "Which VSCodium do you want?" \ --menu "Choose one of the following options:" 15 40 3 \ diff --git a/packages.x86_64 b/packages.x86_64 index b70e59da..b8d8bb3f 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -11,7 +11,7 @@ bat bibata-cursor-theme broadcom-wl # btrfs-progs -calamares +calamares-git ckbcomp cmake chromium From f847c0906be2a7f2cac8b86e673e2fc542f2e5e6 Mon Sep 17 00:00:00 2001 From: zstg Date: Sun, 28 Apr 2024 09:33:56 +0530 Subject: [PATCH 8/9] Minor changes --- airootfs/opt/maneki-neko | 2 +- airootfs/usr/local/bin/StratOS-configure-gnome | 1 + airootfs/usr/local/bin/StratOS-install-apt | 0 packages.x86_64 | 5 ++++- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 airootfs/usr/local/bin/StratOS-install-apt diff --git a/airootfs/opt/maneki-neko b/airootfs/opt/maneki-neko index aa399691..e5a7b795 160000 --- a/airootfs/opt/maneki-neko +++ b/airootfs/opt/maneki-neko @@ -1 +1 @@ -Subproject commit aa399691d7c7b4fd7ae45bb1dee4cae4b33d2f6a +Subproject commit e5a7b7953f76c7dc5d0488497951c12e7c126c79 diff --git a/airootfs/usr/local/bin/StratOS-configure-gnome b/airootfs/usr/local/bin/StratOS-configure-gnome index 754c4145..79c27713 100755 --- a/airootfs/usr/local/bin/StratOS-configure-gnome +++ b/airootfs/usr/local/bin/StratOS-configure-gnome @@ -4,6 +4,7 @@ extensions=( blur-my-shell@aunetx # burn-my-windows@schneegans.github.com dash-to-dock@micxgx.gmail.com + places-menu@gnome-shell-extensions.gcampax.github.com # forge@jmmaranan.com logomenu@aryan_k space-bar@luchrioh diff --git a/airootfs/usr/local/bin/StratOS-install-apt b/airootfs/usr/local/bin/StratOS-install-apt new file mode 100644 index 00000000..e69de29b diff --git a/packages.x86_64 b/packages.x86_64 index b8d8bb3f..ef454141 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -31,7 +31,7 @@ dosfstools e2fsprogs edk2-shell efibootmgr -emacs +# emacs ethtool exfatprogs eza @@ -82,12 +82,14 @@ hdparm intel-ucode iw iwd +kcrash kpmcore kvantum lazygit less # libfido2 libusb-compat +libxpm licenses linux linux-atm @@ -140,6 +142,7 @@ smartmontools sof-firmware squashfs-tools starship +stratmacs sudo syslinux systemd-resolvconf From 3caac37f8de7bbacc1bbdd04f8f189b0f1f16a3f Mon Sep 17 00:00:00 2001 From: zstg Date: Sun, 28 Apr 2024 10:12:28 +0530 Subject: [PATCH 9/9] TODO rebuild Calamares --- airootfs/opt/maneki-neko | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airootfs/opt/maneki-neko b/airootfs/opt/maneki-neko index e5a7b795..1bd73d7c 160000 --- a/airootfs/opt/maneki-neko +++ b/airootfs/opt/maneki-neko @@ -1 +1 @@ -Subproject commit e5a7b7953f76c7dc5d0488497951c12e7c126c79 +Subproject commit 1bd73d7c0fca0ff66ebc04e65824932014cdbfc4