diff --git a/config/scripts/common/installSoftware b/config/scripts/common/installSoftware index fd7a35f..4d40d4a 100755 --- a/config/scripts/common/installSoftware +++ b/config/scripts/common/installSoftware @@ -26,6 +26,10 @@ available_pkgbuild() { true } +available_Tapt() { + [ -f /data/data/com.termux/files/usr/bin/apt ] +} + # Update the database update_Rpacman() { sudo pacman -Syu --noconfirm @@ -64,18 +68,8 @@ installed_pkgbuild() { # package # TODO Might need all the systems package too } -installed_Rapt() { - STATUS=$(mktemp) - LANG=C dpkg-query --status $1 &> $STATUS - installed=0 - if [ $? == 0 ]; then - cat $STATUS | grep '^Status:' | grep ' installed' --quiet - if [ $? == 0 ]; then - installed=1 - fi - fi - rm -f $STATUS > /dev/null - return $installed +installed_apt() { # package + dpkg -s "$1" } # Test if available in the repositories @@ -101,6 +95,10 @@ installable_makepkg() { installable_aur } +installable_apt() { + apt-cache show "$1" &> /dev/null +} + # Tell if it hadles mutiple argument for install multiinstall_pacman() { @@ -125,10 +123,14 @@ install_Ryay() { yay -S --needed --noconfirm $@ } -install_Rapt() { +install_Tapt() { apt install -y $@ } +install_Rapt() { + sudo apt install -y $@ +} + install_Rpip() { sudo pip install $@ } @@ -223,6 +225,7 @@ addUserInstallers() { addInstaller Umakepkg addInstaller Upip addInstaller Upkgbuild + addInstaller Tapt # Termux } # Installers that install with the system package manager diff --git a/config/scripts/install-prefs b/config/scripts/install-prefs index ee8fc29..3fcd86b 100755 --- a/config/scripts/install-prefs +++ b/config/scripts/install-prefs @@ -10,13 +10,17 @@ mkdir -p $HOME/.cache mkdir -p $HOME/.cache/zsh mkdir -p $HOME/.cache/mpd mkdir -p $HOME/.ssh +mkdir -p $HOME/.local/bin . $HOME/.config/scripts/softwareList echo "Doing stuff cuz" -$HOME/.config/Xresources/configure +if command -v Xorg > /dev/null +then + $HOME/.config/Xresources/configure + pip install --user --requirement $HOME/.config/lemonbar/requirements.txt +fi changeColors monokai -pip install --user --requirement $HOME/.config/lemonbar/requirements.txt vim +PlugUpgrade +PlugUpdate +PlugInstall +qall echo '# Alt keys on keypad diff --git a/config/scripts/softwareList b/config/scripts/softwareList index 74819f9..fd22090 100755 --- a/config/scripts/softwareList +++ b/config/scripts/softwareList @@ -104,9 +104,10 @@ i moreutils # Advanced shell commands (ts, sponge...) i tmux # Terminal multiplexer i bash-completion # Shell completions i fzf # Fancy file finder -i highlight # Syntax highlighter +i highlight # Syntax highlighter (TODO No termux) i zsh # Shell +# TODO Arch only for the following but not a problem i zsh-autosuggestions # Shell suggestions i zsh-completions # Shell completions i zsh-history-substring-search # Shell config @@ -117,19 +118,19 @@ i zsh-syntax-highlighting # Shell highlighting # Monitoring utilities i ncdu # Explore directories by weight on disk -i lsof # Find who/what uses the files +i lsof # Find who/what uses the files (TODO No termux) i pv # Allow to show progress in pipe # Network utilities i openssh # SSH connections -i proxytunnel # Proxy connections through HTTPS +# i proxytunnel # Proxy connections through HTTPS (TODO No termux) i curl # Transfer URL i wget # Download URL -i gnu-netcat # Network piping +i gnu-netcat netcat # Network piping i socat # Multi-purpose relay i rsync # Remote file-copying tool -i speedtest-cli # Network speed benchmarker -i bind-tools # DNS queryier +i speedtest-cli # Network speed benchmarker (TODO No termux) +i bind-tools dnsutils # DNS queryier # Archives utilities i unzip # Unarchive ZIP files