From 647601a7431b5af2462fdcfeb3e603ec73c67d63 Mon Sep 17 00:00:00 2001
From: pika <pika@team-pieck.de>
Date: Fri, 23 May 2025 16:31:47 +0200
Subject: [PATCH] structural changes

---
 install.sh | 225 ++++++++++++++++++++++-------------------------------
 1 file changed, 91 insertions(+), 134 deletions(-)

diff --git a/install.sh b/install.sh
index 58f52b6..5a5a73d 100755
--- a/install.sh
+++ b/install.sh
@@ -5,7 +5,7 @@ command_exists() {
   command -v "$@" >/dev/null 2>&1
 }
 
-getImports() {
+source-script() {
   local url="$1"
   local import="$(mktemp)"
   if command_exists curl; then
@@ -22,39 +22,41 @@ getImports() {
   rm "$import"
   echo "imported $url"
 }
+
 __pre_stow__() {
-  echo_note "__pre_stow__"
+  pen blue "Getting things ready.."
+  sleep 2
   conf="$HOME/.config"
   bak_dir="$HOME/.bak"
   dirs=(
     "btop"
     "gBar"
-    "yazi"
     "fastfetch"
+    "foot"
     "hypr"
     "tmux"
     "kitty"
     "neovide"
     "rofi"
+    "tofi"
     "waybar"
     "wlogout"
     "wob"
+    "yazi"
     "zellij"
   )
 
-  pen yellow "Trying to clean the environment.."
-
   if [ ! -d "$bak_dir" ]; then
-    repen yellow "backup dir created at $bak_dir" &&
+    pen grey "backup dir created at $bak_dir" &&
       silentexec mkdir "$bak_dir"
   else
-    pen bold yellow "Backup dir already present, clearing now" &&
+    pen bold grey "Backup dir already present, clearing now" &&
       rm -rf "${bak_dir:?}/*"
   fi
 
   for _dirs in "${dirs[@]}"; do
     if [ -d "$conf/$_dirs" ]; then
-      repen moved $_dirs
+      pen grey "moved $_dirs"
       mv -f "$conf/$_dirs" "$bak_dir"
     fi
   done
@@ -62,19 +64,21 @@ __pre_stow__() {
   h_files=(
     ".zshrc"
     ".zshenv"
+    ".bashrc"
+    ".bash_alias"
     ".wezterm.lua"
   )
 
   for _f in "${h_files[@]}"; do
     if [ -f "$HOME/$_f" ]; then
-      repen moved $_f
+      pen "moved $_f"
       mv -f "$HOME/$_f" "$bak_dir" && echo_info "Moved $_f to $bak_dir"
     fi
   done
 
   for _d in ".zsh .tmux .fzf"; do
     if [ -d "$HOME/$_d" ]; then
-      repen moved $_d
+      pen "moved $_d"
       mv -f "$HOME/$_d" "$bak_dir" && echo_info "Moved $_d to $bak_dir"
     fi
   done
@@ -112,32 +116,21 @@ askThings() {
 
   __optional__=false
 
-  if confirm askOptional "Do you also want to install optional packages?" </dev/tty; then
+  if confirm "Do you also want to install optional packages?" </dev/tty; then
     __optional__=true
   fi
   # read -r askOptional </dev/tty
 
-  if [ ! -d "$HOME/.config/nvim" ]; then
-    choose askNvim "Do you also want to install a neovim config?" default mini astro none </dev/tty
-    # read -r askNvim </dev/tty
+  if ! command_exists nvim; then
+    if confirm "Do you also want to install neovim" </dev/tty; then
+      neovim=true
+    else
+      neovim=false
+    fi
   fi
 
 }
 
-initNvim() {
-  echo_info "Do you want to init the neovim configuratin (installs plugins and lsps headlessly) (Y/n)"
-  read -r initNeovim </dev/tty
-
-  case "$initNeovim" in
-  [nN])
-    return 0
-    ;;
-  *)
-    nvim --headless +q
-    ;;
-  esac
-}
-
 ask_Neovide() {
   echo_info "Do you also want to install a neovide config? [y/N]"
   read -r askNeovide </dev/tty
@@ -151,13 +144,13 @@ ask_Neovide() {
 }
 
 instPika() {
-  if ! command_exists "$1"; then
-    if command_exists curl; then
-      curl -fsSL "https://git.k4li.de/scripts/installs/raw/branch/main/${1}.sh" | bash
-    else
-      echo_warning "curl was not found, could not install $1!"
-    fi
+  # if ! command_exists "$1"; then
+  if command_exists curl; then
+    curl -fsSL "https://git.k4li.de/scripts/installs/raw/branch/main/${1}.sh" | bash
+  else
+    echo_warning "curl was not found, could not install $1!"
   fi
+  # fi
 }
 
 cloneDots() {
@@ -165,12 +158,15 @@ cloneDots() {
   cloneName="${2:-$1}"
 
   if command_exists git; then
-    [ -d ./dotfiles ] &&
-      [ ! -d "./dotfiles/${choise}" ] &&
-      git clone --depth=1 "https://git.k4li.de/dotfiles/${choise}.git" "./dotfiles/.config/${cloneName}"
-
+    if [ -d ./dotfiles ] && [ ! -d "./dotfiles/${choise}" ]; then
+      pen red bold "Depending on your internet speed, this might take a while.."
+      spin yellow bold "Cloning dotfiles $cloneName"
+      run git clone --depth=1 "https://git.k4li.de/dotfiles/${choise}.git" "./dotfiles/.config/${cloneName}" && check "Cloned dotfiles" || throw "Failed cloning dotfiles!"
+    else
+      throw "$choise is already cloned.."
+    fi
   else
-    echo_error "Git was not found"
+    throw "Git was not found"
   fi
 }
 
@@ -182,25 +178,6 @@ __validate__() {
     [[ -n "$bar" ]] && cloneDots "$bar"
     [[ -n "$terminal" ]] && cloneDots "$terminal"
 
-    case "$askNvim" in
-    default)
-      neovim="true"
-      cloneDots "nvim"
-      ;;
-    mini)
-      neovim="true"
-      cloneDots "nvim-mini" "nvim"
-      ;;
-    astro)
-      neovim="true"
-      cloneDots "nvim-astro" "nvim"
-      ;;
-    none)
-      neovim="false"
-      return 0
-      ;;
-    esac
-
   else
     echo_error "Something went terribly wrong"
     exit 1
@@ -250,10 +227,7 @@ __dep__() {
     neovim)
       if $neovim; then
         instPika neovim
-
-        initNvim
-        ask_Neovide
-        if $neovide; then
+        if confirm "Do you also want to install a neovide config?"; then
           instPika neovide
         fi
       fi
@@ -262,18 +236,12 @@ __dep__() {
       if ! command_exists "$hyprdots_dependency"; then
         # echo_note "--- installing $hyprdots_dependency ---"
         spin bold yellow "Installing $hyprdots_dependency.."
-        if run --err err pkg-install "$hyprdots_dependency"; then
-          check green bold "$hyprdots_dependency was installed"
-        else
-          throw "$hyprdots_dependency could not get installed"
-          echo_error "${err:-}"
-        fi
+        run --err err pkg-install "$hyprdots_dependency" && check "$hyprdots_dependency installed" || throw "$hyprdots_dependency could not get installed" && echo_error "${err:-}"
       else
-        repen bold green "$hyprdots_dependency - already installed"
+        check bold green "$hyprdots_dependency - $(pen yellow bold already installed)"
       fi
       ;;
     esac
-
   done
 }
 
@@ -281,7 +249,11 @@ __monitors__() {
   if [ ! -e "$HOME/.monitors.conf" ]; then
     res="$(hyprctl monitors | grep -oP '\d+x\d+@\d+\.\d+' | head -n 1)"
     touch "$HOME/.monitors.conf"
-    echo "monitor = eDP-1, ${res}, 0x0, 1" >>"$HOME/.monitors.conf"
+    if [[ -n $res ]]; then
+      echo "monitor = eDP-1, ${res}, 0x0, 1" >>"$HOME/.monitors.conf"
+    else
+      echo "monitor = preferred,, 0x0, 1" >>"$HOME/.monitors.conf"
+    fi
   fi
 }
 
@@ -292,64 +264,44 @@ pkg_optional() {
     "trash-cli"
   )
 
-  case "$_ops" in
-  Y | y | yes)
-    for _o_ in "${_ops[@]}"; do
-      if command_exists "$_o_"; then
-        echo_note "$_o_ - is already installed"
-      else
-        echo_info "Installing $_o_"
-        pkg-install "$_o_"
-      fi
-    done
-    ;;
-  *)
-    echo default
-    ;;
-  esac
+  for pkg in "${_opts[@]}"; do
+    spin "Installing $pkg"
+    if ! command_exists $pkg; then
+      run pkg-install $pkg && check "$pkg installed" || throw "Error installing $pkg"
+    fi
+  done
 }
 
 __stow__() {
   local err
   spin grey "Linking dotfiles.."
 
-  if run --err err stow --verbose --target="$HOME" --defer=.gitmodules --restow */; then
-    check "Linked dotfiles!"
-  else
-    throw "Could not use stow to link dofiles.."
+  run --err err stow --verbose --target="$HOME" --defer=.gitmodules --restow */ && check "Linked dotfiles!" ||
+    throw "Could not use stow to link dofiles.." &&
     echo_error "${err:-}"
-  fi
 }
 
 c_fonts() {
   local err
   local dirFonts="$HOME/.local/share/fonts/"
   if [[ ! -d "$dirFonts" ]]; then
-    if choose "Seems like you may miss some fonts.. Do you want to clone them now to <$HOME/.local/share/fonts/>" </dev/tty; then
-      # echo_info "Seems like you may miss some fonts.. Do you want to clone them now to <$HOME/.local/share/fonts/> ? [y|n]" && read -r ask_fonts
-
-      # case "$ask_fonts" in
-      # [Yy])
+    if choose "Seems like you may miss some fonts.. Do you want to clone them now into $(pen blue bold $HOME/.local/share/fonts)" </dev/tty; then
       if ! command_exists git; then
-        spin "Installing fonts.."
-        if run pkg-install git; then
-          return 0
-        fi
+        spin "Installing dependencies.."
+        run pkg-install git && check "Installed git!" || throw "Couldn't install git!" && return 69
 
-        if run --err err git clone --depth=1 https://git.k4li.de/pika/fonts.git "$dirFonts"; then
-          check "Cloned fonts correctly!"
-        else
-          throw "Error cloning fonts!"
-          echo_error "${err:-}"
-        fi
       else
         git clone --depth=1 https://git.k4li.de/pika/fonts.git "$dirFonts"
       fi
+
+      spin "Cloning fonts now.. This might take a while.."
+
+      run --err err git clone --depth=1 https://git.k4li.de/pika/fonts.git "$dirFonts" && check "Cloned fonts correctly!" || throw "Error cloning fonts!" && echo_error "${err:-}"
     #   ;;
     # [Nn])
     else
       pen bold red "You might have some font issues, but that's your business now!"
-      return 0
+      return
     fi
   fi
 }
@@ -357,34 +309,18 @@ c_fonts() {
 c_wallpapers() {
   local dirWallpaper="$HOME/.wallpapers"
   if [[ ! -d "$dirWallpaper" ]]; then
-    if confirm "Seems like you may miss some wallpapers.. Do you want to clone them now to <$HOME/.wallpapers/> ?" </dev/tty; then
+    if confirm "Seems like you may miss some wallpapers.. Do you want to clone them now to $(pen blue bold $HOME/.wallpapers)?" </dev/tty; then
 
-      # case "$ask_wall" in
-      # [Yy])
-      spin blue "Preparing wallpaper clone.."
       if ! command_exists git; then
-        if run pkg-install git; then
-          return 0
-        fi
-      else
-        if run --err err git clone --depth=1 https://git.k4li.de/pika/wallpaper.git "$dirWallpaper"; then
-          check bold blue "Wallpapers loaded correctly!"
-        else
-          throw "Error downloading wallpapers!"
-          echo_error "${err:-}"
-        fi
+        spin "Installing dependencies.."
+        run pkg-install git && check "Installed git!" || throw "Couldn't install git!" && return 69
       fi
-    #   ;;
-    # [Nn])
+      spin blue bold "Cloning wallpaper repo.. This might take a while.."
+      run --err err git clone --depth=1 https://git.k4li.de/pika/wallpaper.git "$dirWallpaper" && check bold blue "Wallpapers loaded correctly!" || throw "Error downloading wallpapers!" && echo_error "${err:-}"
     else
       pen bold red "All right, be sure to checkout the $HOME/.config/hypr/.scripts/random_swww.sh to change the wallpaper dir"
       return 0
     fi
-    #   ;;
-    # *)
-    # c_wallpapers
-    #   ;;
-    # esac
   fi
 }
 
@@ -394,19 +330,31 @@ mkdirs() {
     pen grey "mkdir $HOME/.config"
     silentexec mkdir $HOME/.config
   fi
+
   if [[ ! -f $HOME/.local/share/icons/ ]]; then
     pen grey "mkdir -p $HOME/.local/share/icons/"
     silentexec mkdir -p $HOME/.local/share/icons/
   fi
-  if [[ ! -f $HOME/.local/share/fonts/ ]]; then
-    c_fonts || pen grey "mkdir -p $HOME/.local/share/fonts/" && silentexec mkdir -p $HOME/.local/share/fonts/
-  fi
 
+  c_fonts
   c_wallpapers
 }
 
+setup-env() {
+  local beddu=https://git.k4li.de/scripts/beddu/raw/branch/main/dist/beddu.sh
+  local pika=https://git.k4li.de/scripts/imports/raw/branch/main/distros.sh
+
+  if ! command_exists pkg-install && ! command_exists checkAndInstall; then
+    source-script $pika
+  fi
+
+  if ! command_exists pen && ! command_exists spin; then
+    source-script $beddu
+  fi
+}
+
 main() {
-  mkdirs
+  local err
 
   # check_root
   # get_packager
@@ -414,9 +362,18 @@ main() {
   __validate__
   __dep__
 
+  mkdirs
+
   if ! command_exists stow; then
     if confirm "We couldn't find stow on the machine, do you want us to install it?"; then
-      pkg-install stow
+      line
+      spin grey "Installing stow now.."
+      if run --err err pkg-install stow; then
+        check "Stow was installed correctly!"
+      else
+        check "Error while installing stow!"
+        echo_error "${err:-}"
+      fi
     else
       pen red bold "You cannot proceed without installing stow! Please install manually"
       exit 1
@@ -439,6 +396,6 @@ main() {
   pen blue bold "found resolution ${res}"
 }
 
-if getImports "https://git.k4li.de/scripts/imports/raw/branch/main/distros.sh" && getImports "https://git.k4li.de/scripts/beddu/raw/branch/main/dist/beddu.sh"; then
+if setup-env; then
   main
 fi