diff --git a/home/local/bin/ufetch b/home/local/bin/ufetch deleted file mode 100755 index bfb27c8..0000000 --- a/home/local/bin/ufetch +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh -# -# ufetch-arch - tiny system info for arch -# based on https://gitlab.com/jschx/ufetch -# @modified by @nevaforget - -## INFO - -# user is already defined -host="$(cat /etc/hostname)" -os='MonarchOS / Arch Linux' -kernel="$(uname -sr)" -uptime="$(uptime -p | sed 's/up //')" -packages="$(pacman -Q | wc -l)" -shell="$(basename "${SHELL}")" -userspace="$(df -h $HOME | awk 'NR==2{print $3}') / $(df -h $HOME | awk 'NR==2{print $2}') ($(df -h $HOME | awk 'NR==2{print $5}'))" -cpu="$(grep -m 1 'model name' /proc/cpuinfo | awk -F':' '{ print $2 }' | sed -e 's/^[[:space:]]*//')" -gpu=$(lspci | grep VGA | cut -d ":" -f3) - - -## UI DETECTION - -parse_rcs() { - for f in "${@}"; do - wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)" - [ -n "${wm}" ] && echo "${wm}" && return - done -} - -rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")" - -ui='unknown' -uitype='UI' -if [ -n "${DE}" ]; then - ui="${DE}" - uitype='DE' -elif [ -n "${WM}" ]; then - ui="${WM}" - uitype='WM' -elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then - ui="${XDG_CURRENT_DESKTOP}" - uitype='DE' -elif [ -n "${DESKTOP_SESSION}" ]; then - ui="${DESKTOP_SESSION}" - uitype='DE' -elif [ -n "${rcwm}" ]; then - ui="${rcwm}" - uitype='WM' -elif [ -n "${XDG_SESSION_TYPE}" ]; then - ui="${XDG_SESSION_TYPE}" -fi - -ui="$(basename "${ui}")" - -## DEFINE COLORS - -# probably don't change these -if [ -x "$(command -v tput)" ]; then - bold="$(tput bold 2> /dev/null)" - black="$(tput setaf 0 2> /dev/null)" - red="$(tput setaf 1 2> /dev/null)" - green="$(tput setaf 2 2> /dev/null)" - yellow="$(tput setaf 3 2> /dev/null)" - blue="$(tput setaf 4 2> /dev/null)" - magenta="$(tput setaf 5 2> /dev/null)" - cyan="$(tput setaf 6 2> /dev/null)" - white="$(tput setaf 7 2> /dev/null)" - reset="$(tput sgr0 2> /dev/null)" -fi - -# you can change these -lc="${reset}${bold}${blue}" # labels -nc="${reset}${bold}${blue}" # user and hostname -ic="${reset}" # info -c0="${reset}${blue}" # first color - -## OUTPUT - -cat < /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 } diff --git a/home/local/bin/volnote b/usr/local/bin/volnote similarity index 100% rename from home/local/bin/volnote rename to usr/local/bin/volnote diff --git a/usr/share/clamscan.nemo_action b/usr/share/nemo/actions/clamscan.nemo_action similarity index 100% rename from usr/share/clamscan.nemo_action rename to usr/share/nemo/actions/clamscan.nemo_action