cleanup and setup improvements

setup.sh

@@ -60,14 +60,14 @@ function inst_ufw {
 function inst_configs {
     echo "-"
     echo "Overwrite some ${BOLD}configs${NORMAL}"
-    echo "kitty, dunst, btop, lsd"
+    echo "alacritty, dunst, btop, lsd"
     echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_configs
     if [[ $confirm_configs == "Y" ]]; 
     then
 
-        cp -Rf $MOONARCH_DIR/home/config/kitty $HOME/.config/kitty
-        chown $USER:$USER $HOME/.config/kitty
+        cp -Rf $MOONARCH_DIR/home/config/alacritty $HOME/.config/alacritty
+        chown $USER:$USER $HOME/.config/alacritty
 
         cp -Rf $MOONARCH_DIR/home/config/dunst $HOME/.config/dunst
         chown $USER:$USER $HOME/.config/dunst
@@ -112,17 +112,18 @@ function inst_basic_pkgs {
     if [[ $confirm_basics == "Y" ]]; 
     then
 
-        declare -a pkg_list=(jq dunst network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim kitty gettext-hostname neovim lsd alsa-utils ponymix btop powertop polkit lxsession timeshift timeshift-autosnap stacer-bin)
+        declare -a pkg_list=(jq dunst network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname neovim lsd alsa-utils ponymix btop powertop polkit lxsession timeshift timeshift-autosnap pcmanfm librewolf)
 
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
         done
 
+        cp $MOONARCH_DIR/usr/local/bin/volnote /usr/local/bin
+
         paru -S informant
         sudo informant read --all
 
-        cp $MOONARCH_DIR/home/local/bin/* $HOME/.local/bin/
     fi
 }
 
@@ -163,8 +164,6 @@ function inst_paru {
 
 function post_always {
     
-    
-
     echo " "
     echo " "
     echo " "
@@ -176,7 +175,6 @@ function post_always {
     echo " "
     echo " "
     echo "Here are some optional packages... "
-    echo "visual-studio-code-bin"
     echo "ungoogled-chromium"
     echo "filezilla"
     echo "lutris"
@@ -251,7 +249,7 @@ function inst_resources {
 
 function inst_clamav {
     echo "-"
-    echo "Installing ClamAV - Anti-Virus Scanner"
+    echo "Installing ClamAV - Anti-Virus Scanner with freshclam and fangfrisch"
     echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_clamav
     if [[ $confirm_clamav == "Y" ]]; 
@@ -267,6 +265,12 @@ function inst_clamav {
         sudo freshclam
         sudo -u clamav /usr/bin/fangfrisch --conf /etc/fangfrisch/fangfrisch.conf initdb
         sudo systemctl enable fangfrisch.timer
+
+        if command -v nemo &> /dev/null
+        then
+            cp -Rf $MONARCHOS_DIR/usr/share/nemo/actions/clamscan.nemo_action /usr/share/nemo/actions
+        fi
+
     fi
 }
 
@@ -278,7 +282,7 @@ function set_gui {
     read confirm_gui
     if [[ $confirm_gui == "Y" ]]; 
     then
-        declare -a pkg_list=(celluloid playerctl audacious font-manager viewnior thunar tumbler ffmpegthumbnailer pavucontrol viewnior ttf-hack-nerd ttf-joypixels sweet-cursor-theme-git arc-solid-gtk-theme flatery-icon-theme-git)
+        declare -a pkg_list=(celluloid playerctl audacious font-manager viewnior thunar tumbler ffmpegthumbnailer pavucontrol viewnior ttf-hack-nerd ttf-joypixels sweet-cursor-theme-git catppuccin-gtk-theme-mocha flatery-icon-theme-git)
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
@@ -296,7 +300,7 @@ function set_gui {
         gsettings set org.gnome.desktop.interface gtk-theme "Catppuccin-Mocha-Standard-Lavender-Dark"
         gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
         gsettings set org.gnome.desktop.interface cursor-theme Sweet-cursors
-        gsettings set org.cinnamon.desktop.default-applications.terminal exec kitty
+        gsettings set org.cinnamon.desktop.default-applications.terminal exec alacritty
 
         sudo mkdir -p /usr/local/share/fonts/
         sudo install -C $MOONARCH_DIR/usr/local/share/fonts/MonarchOS.ttf /usr/local/share/fonts/MonarchOS.ttf
@@ -367,7 +371,7 @@ function inst_screenshot {
             pkg_inst $key
         done 
 
-        cp -Rf $MOONARCH_DIR/usr/local/bin/hyprm-screenshot /usr/local/bin
+        cp -f $MOONARCH_DIR/usr/local/bin/hyprm-screenshot /usr/local/bin/
     fi
 }
 
@@ -378,7 +382,7 @@ function inst_hypr {
     read confirm_hypr
     if [[ $confirm_hypr == "Y" ]]; 
     then
-        declare -a pkg_list=(wayland xorg-xwayland hyprland swaybg waypaper-git xdg-desktop-portal-hyprland wdisplays waybar-cava nwg-look cliphist slurp grim hyprland-interactive-screenshot satty-bin swappy swaylock-effects cava)
+        declare -a pkg_list=(wayland xorg-xwayland hyprland swaybg waypaper-git xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist swaylock-effects)
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
@@ -477,7 +481,7 @@ function inst_sddm {
 
 function inst_nemo {
     echo "-"
-    echo "Installing Nemo - Cinnamon File Manager"
+    echo "Installing Nemo - Cinnamon File Manager with extensions"
     echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_nemo
     if [[ $confirm_nemo == "Y" ]]; 
@@ -512,14 +516,15 @@ function init {
     type paru >/dev/null 2>&1 || { echo >&2 "I require paru but it's not installed.  Aborting."; exit 1; }
 
     inst_basic_pkgs
-    inst_nemo
-    inst_zsh
 
     inst_sddm    
-    inst_bspwm
     inst_hypr
+    inst_bspwm
+    set_gui
 
     inst_rofi
+    inst_nemo
+    inst_zsh
 
     inst_ufw
     inst_clamav
@@ -531,7 +536,6 @@ function init {
     inst_screenshot
     inst_code
     
-    set_gui
     post_always
 }