Beginning of macOS and Linux dotfiles separation and quality improvements
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
source ./p.sh
|
||||
if p c ollama &>/dev/null; then
|
||||
kgx -e "ollama serve"
|
||||
sleep 1
|
||||
kgx -e "ollama run codellama"
|
||||
else
|
||||
p i ollama
|
||||
echo
|
||||
echo 'Run the script again...'
|
||||
fi
|
||||
@@ -1,34 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
source ~/dotfiles/scripts/p.sh
|
||||
source ~/dotfiles/scripts/color.sh
|
||||
|
||||
echo -e "${GREEN}[+] Upgrading...${ENDCOLOR}"
|
||||
p
|
||||
|
||||
echo -e "${GREEN}[+] Cleaning orphaned (unneeded) packages...${ENDCOLOR}"
|
||||
sudo paru -Rsn $(paru -Qdtq)
|
||||
|
||||
echo -e "${GREEN}[+] Cleaning old pacman cache...${ENDCOLOR}"
|
||||
if p c pacman-contrib &>/dev/null; then
|
||||
paccache -rk1
|
||||
else
|
||||
p i pacman-contrib
|
||||
paccache -rk1
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}[+] Removing logs older than 7d...${ENDCOLOR}"
|
||||
sudo journalctl --vacuum-time=7d
|
||||
|
||||
if p c flatpak &>/dev/null; then
|
||||
echo -e "${GREEN}[+] Cleaning flatpak...:${ENDCOLOR}"
|
||||
flatpak remove --unused
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}[i] AUR Packages installed:${ENDCOLOR}"
|
||||
pacman -Qim | awk '/^Name/{name=$3} /^Installed Size/{print $4$5, name}' | sort -h
|
||||
|
||||
# Installed packages: pacman -Qen
|
||||
|
||||
echo
|
||||
read -p "Press enter to exit."
|
||||
@@ -1,5 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
sudo pacman -Syu
|
||||
sudo pacman -S wine wine-mono wine-gecko
|
||||
sudo pacman -S --asdeps --needed $(pacman -Si wine | sed -n '/^Opt/,/^Conf/p' | sed '$d' | sed 's/^Opt.*://g' | sed 's/^\s*//g' | tr '\n' ' ')
|
||||
@@ -1,18 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
RED="\e[31m"
|
||||
GREEN="\e[32m"
|
||||
YELLOW="\e[33m"
|
||||
BLUE="\e[34m"
|
||||
MAGENTA="\e[35m"
|
||||
CYAN="\e[36m"
|
||||
GRAY="\e[90m"
|
||||
ENDCOLOR="\e[0m"
|
||||
|
||||
ENDCOLOR="\e[0m"
|
||||
BOLD="\e[1m"
|
||||
FAINT="\e[2m"
|
||||
ITALIC="\e[3m"
|
||||
UNDERLINE="\e[4m"
|
||||
|
||||
# Example usage: echo -e "${GRAY}Gray text${ENDCOLOR}"
|
||||
@@ -1,21 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
source ~/dotfiles/scripts/color.sh
|
||||
source ~/dotfiles/scripts/p.sh
|
||||
|
||||
echo -e "${GREEN}[+] Upgrading...${ENDCOLOR}"
|
||||
sudo apt update
|
||||
sudo apt upgrade
|
||||
sudo apt dist-upgrade
|
||||
sudo apt autoremove
|
||||
sudo apt autoclean
|
||||
|
||||
echo -e "${GREEN}[+] Removing logs older than 7d...${ENDCOLOR}"
|
||||
sudo journalctl --vacuum-time=7d
|
||||
|
||||
if p c flatpak &>/dev/null; then
|
||||
echo -e "${GREEN}[+] Cleaning flatpak...:${ENDCOLOR}"
|
||||
flatpak remove --unused
|
||||
fi
|
||||
|
||||
read -p "Press enter to exit."
|
||||
@@ -1,2 +0,0 @@
|
||||
defaults write com.apple.dock persistent-apps -array-add '{"tile-type"="small-spacer-tile";}'
|
||||
killall Dock
|
||||
@@ -1,2 +0,0 @@
|
||||
defaults write com.apple.dock persistent-apps -array-add '{tile-data={}; tile-type="spacer-tile";}'
|
||||
killall Dock
|
||||
@@ -1,6 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
brew doctor
|
||||
brew update
|
||||
brew upgrade
|
||||
brew list
|
||||
@@ -1,7 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
sudo
|
||||
echo "------------------- TCP --------------------"
|
||||
sudo ss -tlpn
|
||||
echo "------------------- UDP --------------------"
|
||||
sudo ss -ulpn
|
||||
181
scripts/p.sh
181
scripts/p.sh
@@ -1,181 +0,0 @@
|
||||
#! /bin/bash
|
||||
# Cross-distro package manager wrapper
|
||||
|
||||
source ~/dotfiles/scripts/color.sh
|
||||
|
||||
d() {
|
||||
if [ "$(uname -s)" = "Darwin" ]; then
|
||||
echo 3
|
||||
else
|
||||
if [ "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then
|
||||
echo 1
|
||||
elif [ "$(grep -Ei 'arch|manjaro|artix' /etc/*release)" ]; then
|
||||
echo 2
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
m() {
|
||||
d=$(d)
|
||||
if [ $d -eq 2 ]; then
|
||||
~/dotfiles/scripts/arch-maintenance.sh
|
||||
elif [ $d -eq 1 ]; then
|
||||
~/dotfiles/scripts/debian-maintenance.sh
|
||||
elif [ $d -eq 3 ]; then
|
||||
~/dotfiles/scripts/macos-maintenance.sh
|
||||
else
|
||||
echo -e "${RED}[E] Distro not supported.${ENDCOLOR}"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
p() {
|
||||
# Detect distro type
|
||||
d=$(d)
|
||||
if [ $d -eq 1 ]; then
|
||||
distro="DEB"
|
||||
update="sudo apt update; sudo apt upgrade; sudo apt autoremove"
|
||||
install="sudo apt install"
|
||||
remove="sudo apt remove"
|
||||
elif [ $d -eq 2 ]; then
|
||||
if pacman -Qs paru >/dev/null; then
|
||||
update="paru -Syu"
|
||||
install="paru -S"
|
||||
remove="paru -R"
|
||||
else
|
||||
update="sudo pacman -Syu"
|
||||
install="sudo pacman -S"
|
||||
remove="sudo pacman -R"
|
||||
fi
|
||||
distro="ARCH"
|
||||
elif [ $d -eq 3 ]; then
|
||||
distro="MAC"
|
||||
update="brew update; brew upgrade"
|
||||
install="brew install"
|
||||
remove="brew uninstall"
|
||||
else
|
||||
echo "[E] Distro not supported."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Detect if flatpak is installed.
|
||||
if flatpak --version &>/dev/null; then
|
||||
flatpak=true
|
||||
else
|
||||
flatpak=false
|
||||
fi
|
||||
|
||||
# If no parameter
|
||||
if [ -z $1 ] || [ $1 = "u" ]; then
|
||||
echo -e "${GREEN}[+] Updating packages...${ENDCOLOR}"
|
||||
bash -c $update
|
||||
if $flatpak; then
|
||||
echo
|
||||
echo -e "${GREEN}[+] Updating flatpaks...${ENDCOLOR}"
|
||||
flatpak upgrade
|
||||
fi
|
||||
echo -e "${GREEN}[i] done.${ENDCOLOR}"
|
||||
return 0
|
||||
elif [ $1 = "i" ]; then # If first parameter is i (install)
|
||||
echo -e "${GREEN}[+] Searching for $2 on the repository...${ENDCOLOR}"
|
||||
bash -c "$install $2"
|
||||
if [ $? -eq 0 ]; then
|
||||
echo -e "${GREEN}[i] $2 installed.${ENDCOLOR}"
|
||||
return 0
|
||||
else
|
||||
if $flatpak; then
|
||||
echo
|
||||
echo -e "${YELLOW}[E] $2 not found.${ENDCOLOR}"
|
||||
echo -e "${GREEN}[+] Searching for $2 as a flatpak...${ENDCOLOR}"
|
||||
echo
|
||||
flatpak install $2 2>/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo -e "${GREEN}[i] $2 installed.${ENDCOLOR}"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
echo -e "${RED}[E] $2 not found or already installed.${ENDCOLOR}"
|
||||
return 2
|
||||
fi
|
||||
elif [ $1 = "r" ]; then # If first parameter is r (remove)
|
||||
echo -e "${YELLOW}[+] Removing $2...${ENDCOLOR}"
|
||||
bash -c "$remove $2"
|
||||
if [ $? -eq 0 ]; then
|
||||
echo -e "${GREEN}[i] $2 removed.${ENDCOLOR}"
|
||||
return 0
|
||||
else
|
||||
if $flatpak; then
|
||||
echo
|
||||
echo -e "${YELLOW}[E] $2 not found.${ENDCOLOR}"
|
||||
echo "[+] Searching for $2 as a flatpak..."
|
||||
echo -e "${GREEN}[+] Searching for $2 as a flatpak...${ENDCOLOR}"
|
||||
echo
|
||||
flatpak remove $2 2>/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo -e "${GREEN}[i] $2 removed.${ENDCOLOR}"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
echo -e "${RED}[E] $2 not found.${ENDCOLOR}"
|
||||
return 2
|
||||
fi
|
||||
elif [ $1 = "c" ]; then # If first parameter is c (check)
|
||||
if [ "$distro" = "DEB" ]; then
|
||||
if dpkg-query -W -f='${Status}' $2 2>/dev/null | grep -q "install ok installed"; then
|
||||
echo true
|
||||
return 0
|
||||
else
|
||||
if $flatpak; then
|
||||
flatpak list | grep $2 &>/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo true
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
echo false
|
||||
return 1
|
||||
fi
|
||||
elif [ "$distro" = "ARCH" ]; then
|
||||
if pacman -Qs $2 >/dev/null; then
|
||||
echo true
|
||||
return 0
|
||||
else
|
||||
if $flatpak; then
|
||||
flatpak list | grep -i $2 &>/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo true
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
echo false
|
||||
return 1
|
||||
fi
|
||||
elif [ "$distro" = "MAC" ]; then
|
||||
if brew list | grep $2 >/dev/null; then
|
||||
echo true
|
||||
return 0
|
||||
else
|
||||
echo false
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
echo 2
|
||||
fi
|
||||
else
|
||||
echo -e "${YELLOW}${UNDERLINE}[i] Usage:${ENDCOLOR}"
|
||||
echo -e "p (u) ${FAINT}- update os${ENDCOLOR}"
|
||||
echo -e "p i package ${FAINT}- install package${ENDCOLOR}"
|
||||
echo -e "p r package ${FAINT}- remove package${ENDCOLOR}"
|
||||
echo -e "p c package ${FAINT}- check if package is installed (true/false; 2 -> ERROR)${ENDCOLOR}"
|
||||
echo -e "d ${FAINT}- returns 1 -> Debian; 2 -> Arch; 0 -> Error${ENDCOLOR}"
|
||||
echo -e "m ${FAINT}- maintenance script${ENDCOLOR}"
|
||||
echo
|
||||
echo -e "${YELLOW}${UNDERLINE}[i] Order of operations:${ENDCOLOR}"
|
||||
echo "1 - Check distro repos"
|
||||
echo "2 - Check AUR if on Arch"
|
||||
echo "3 - Check flatpaks (only if flatpak support is enabled)"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user