home/config/alacritty/alacritty.toml

@@ -1,109 +0,0 @@
-[window]
-decorations = "None"
-dynamic_padding = false
-opacity = 0.8
-startup_mode = "Windowed"
-
-[font]
-size = 11.0
-
-[font.bold]
-family = "Hack Nerd Font"
-style = "Bold"
-
-[font.bold_italic]
-family = "Hack Nerd Font"
-style = "Bold Italic"
-
-[font.italic]
-family = "Hack Nerd Font"
-style = "Italic"
-
-[font.normal]
-family = "Hack Nerd Font"
-style = "Regular"
-
-[keyboard]
-bindings = [
-   { key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" } #ctrl + shift + enter = open new instance in same dir
-]
-
-
-# Theme
-# catppuccin_mocha
-# https://github.com/alacritty/alacritty-theme
-[colors.primary]
-background = '#1E1E2E' # base
-foreground = '#CDD6F4' # text
-# Bright and dim foreground colors
-dim_foreground = '#CDD6F4' # text
-bright_foreground = '#CDD6F4' # text
-
-# Cursor colors
-[colors.cursor]
-text = '#1E1E2E' # base
-cursor = '#F5E0DC' # rosewater
-
-[colors.vi_mode_cursor]
-text = '#1E1E2E' # base
-cursor = '#B4BEFE' # lavender
-
-# Search colors
-[colors.search.matches]
-foreground = '#1E1E2E' # base
-background = '#A6ADC8' # subtext0
-
-[colors.search.focused_match]
-foreground = '#1E1E2E' # base
-background = '#A6E3A1' # green
-
-[colors.footer_bar]
-foreground = '#1E1E2E' # base
-background = '#A6ADC8' # subtext0
-
-# Keyboard regex hints
-[colors.hints.start]
-foreground = '#1E1E2E' # base
-background = '#F9E2AF' # yellow
-
-[colors.hints.end]
-foreground = '#1E1E2E' # base
-background = '#A6ADC8' # subtext0
-
-# Selection colors
-[colors.selection]
-text = '#1E1E2E' # base
-background = '#F5E0DC' # rosewater
-
-# Normal colors
-[colors.normal]
-black = '#45475A' # surface1
-red = '#F38BA8' # red
-green = '#A6E3A1' # green
-yellow = '#F9E2AF' # yellow
-blue = '#89B4FA' # blue
-magenta = '#F5C2E7' # pink
-cyan = '#94E2D5' # teal
-white = '#BAC2DE' # subtext1
-
-# Bright colors
-[colors.bright]
-black = '#585B70' # surface2
-red = '#F38BA8' # red
-green = '#A6E3A1' # green
-yellow = '#F9E2AF' # yellow
-blue = '#89B4FA' # blue
-magenta = '#F5C2E7' # pink
-cyan = '#94E2D5' # teal
-white = '#A6ADC8' # subtext0
-
-# Dim colors
-[colors.dim]
-black = '#45475A' # surface1
-red = '#F38BA8' # red
-green = '#A6E3A1' # green
-yellow = '#F9E2AF' # yellow
-blue = '#89B4FA' # blue
-magenta = '#F5C2E7' # pink
-cyan = '#94E2D5' # teal
-white = '#BAC2DE' # subtext1<

home/local/bin/ufetch

@@ -0,0 +1,99 @@
+#!/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 <<EOF
+
+${c0}                            .oMc   ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}                         .MMMMMP   ${lc}╭───────────── Software ─────────────${reset}
+${c0}                       .MM888MM    ${lc}│ OS ›       ${ic}${os}${reset}
+${c0} ....                .MM88888MP    ${lc}│ KERNEL ›   ${ic}${kernel}${reset}
+${c0} MMMMMMMMb.         d8MM8tt8MM     ${lc}│ PACKAGES › ${ic}${packages}${reset} 
+${c0}  MM88888MMMMc  I' dMME8ttt8MM     ${lc}│ SHELL ›    ${ic}${shell}${reset}
+${c0}   MM88tt888EMMcIdMM8E88tt88MP     ${lc}│ ${uitype} ›       ${ic}${ui}${reset}
+${c0}    MM8ttt888EEM8MMEEE8E888MC      ${lc}├───────────── Hardware ─────────────${reset}
+${c0}     MM888t8EEEM8MMEEE8t8888Mb     ${lc}│ DISK ›     ${ic}${userspace}${reset}
+${c0}     "MM88888tEM8"MME88ttt88MM     ${lc}│ CPU ›      ${ic}${cpu}${reset}
+${c0}      dM88ttt8EM8"MMM888ttt8MM     ${lc}│ GPU ›     ${ic}${gpu}${reset}
+${c0}      MM8ttt88MM" " "MMNICKMM"     ${lc}├────────────── Uptime ──────────────${reset}
+${c0}      3M88888MM"      "MMMP"       ${lc}│ ${ic}${uptime}${reset}  
+${c0}       "MNICKM"                    ${lc}╰────────────────────────────────────${reset}
+
+EOF
+
+
+

setup.sh

@@ -60,14 +60,14 @@ function inst_ufw {
 function inst_configs {
     echo "-"
     echo "Overwrite some ${BOLD}configs${NORMAL}"
-    echo "alacritty, dunst, btop, lsd"
+    echo "kitty, dunst, btop, lsd"
     echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_configs
     if [[ $confirm_configs == "Y" ]]; 
     then
 
-        cp -Rf $MOONARCH_DIR/home/config/alacritty $HOME/.config/alacritty
+        cp -Rf $MOONARCH_DIR/home/config/kitty $HOME/.config/kitty
-        chown $USER:$USER $HOME/.config/alacritty
+        chown $USER:$USER $HOME/.config/kitty
 
         cp -Rf $MOONARCH_DIR/home/config/dunst $HOME/.config/dunst
         chown $USER:$USER $HOME/.config/dunst
@@ -112,18 +112,17 @@ 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 alacritty gettext-hostname neovim lsd alsa-utils ponymix btop powertop polkit lxsession timeshift timeshift-autosnap pcmanfm librewolf)
+        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)
 
         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
 }
 
@@ -164,6 +163,8 @@ function inst_paru {
 
 function post_always {
     
+    
+
     echo " "
     echo " "
     echo " "
@@ -175,6 +176,7 @@ function post_always {
     echo " "
     echo " "
     echo "Here are some optional packages... "
+    echo "visual-studio-code-bin"
     echo "ungoogled-chromium"
     echo "filezilla"
     echo "lutris"
@@ -249,7 +251,7 @@ function inst_resources {
 
 function inst_clamav {
     echo "-"
-    echo "Installing ClamAV - Anti-Virus Scanner with freshclam and fangfrisch"
+    echo "Installing ClamAV - Anti-Virus Scanner"
     echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_clamav
     if [[ $confirm_clamav == "Y" ]]; 
@@ -265,12 +267,6 @@ 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
 }
 
@@ -282,7 +278,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 catppuccin-gtk-theme-mocha 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 arc-solid-gtk-theme flatery-icon-theme-git)
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
@@ -300,7 +296,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 alacritty
+        gsettings set org.cinnamon.desktop.default-applications.terminal exec kitty
 
         sudo mkdir -p /usr/local/share/fonts/
         sudo install -C $MOONARCH_DIR/usr/local/share/fonts/MonarchOS.ttf /usr/local/share/fonts/MonarchOS.ttf
@@ -336,13 +332,13 @@ function inst_rofi {
 
 function inst_code {
     log "-"
-    log "Installing Visual Studio Code (Codium)"
+    log "Installing Visual Studio Code"
     log "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_vscode
     log "$confirm_vscode"
     if [[ $confirm_vscode == "Y" ]]; 
     then
-        declare -a pkg_list=(vscodium-bin)
+        declare -a pkg_list=(visual-studio-code-bin)
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
@@ -350,28 +346,10 @@ function inst_code {
 
         log "Installing VSCode Extensions"
 
-        codium --install-extension catppuccin.catppuccin-vsc-pack | tee -a $LOG
+        code --install-extension catppuccin.catppuccin-vsc-pack | tee -a $LOG
-        codium --install-extension Catppuccin.catppuccin-vsc-icons | tee -a $LOG
+        code --install-extension Catppuccin.catppuccin-vsc-icons | tee -a $LOG
-        codium --install-extension Catppuccin.catppuccin-vsc | tee -a $LOG
+        code --install-extension Catppuccin.catppuccin-vsc | tee -a $LOG
-        codium --install-extension smcpeak.default-keys-windows | tee -a $LOG
+        code --install-extension smcpeak.default-keys-windows | tee -a $LOG
-    fi
-}
-
-function inst_screenshot {
-    log "-"
-    log "Installing utilities to have a nice screenshot annoation tool"
-    log "${BOLD}Continue?${NORMAL} (Y/N) "
-    read confirm_screenshot
-    log "$confirm_screenshot"
-    if [[ $confirm_screenshot == "Y" ]]; 
-    then
-        declare -a pkg_list=(satty-bin grim slurp)
-        for key in "${pkg_list[@]}"
-        do
-            pkg_inst $key
-        done 
-
-        cp -f $MOONARCH_DIR/usr/local/bin/hyprm-screenshot /usr/local/bin/
     fi
 }
 
@@ -382,7 +360,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 nwg-look cliphist swaylock-effects)
+        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 swappy swaylock-effects cava)
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
@@ -479,26 +457,6 @@ function inst_sddm {
     fi
 }
 
-function inst_nemo {
-    echo "-"
-    echo "Installing Nemo - Cinnamon File Manager with extensions"
-    echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
-    read confirm_nemo
-    if [[ $confirm_nemo == "Y" ]]; 
-    then
-        declare -a pkg_list=(nemo nemo-fileroller nemo-mediainfo-tab nemo-audio-tab cinnamon-translations)
-        for key in "${pkg_list[@]}"
-        do
-            pkg_inst $key
-        done
-
-        xdg-mime default nemo.desktop inode/directory application/x-gnome-saved-search
-        gsettings set org.nemo.desktop show-desktop-icons false
-        gsettings set org.cinnamon.desktop.default-applications.terminal exec alacritty
-        gsettings set org.cinnamon.desktop.interface can-change-accels true
-    fi
-}
-
 function log () {
     ts=$(date +"%H:%M:%S")
 
@@ -516,15 +474,13 @@ 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_zsh
 
     inst_sddm    
-    inst_hypr
     inst_bspwm
-    set_gui
+    inst_hypr
 
     inst_rofi
-    inst_nemo
-    inst_zsh
 
     inst_ufw
     inst_clamav
@@ -533,14 +489,14 @@ function init {
 
     inst_configs
     inst_bluet
-    inst_screenshot
     inst_code
     
+    set_gui
     post_always
 }
 
 printf "#####################################\n"
-printf "$(tput setaf 2)Welcome to MoonArch. Feel free.\n@version 1.0\n$(tput sgr0)"
+printf "$(tput setaf 2)Welcome to MonArch. Feel free.\n@version 1.0\n$(tput sgr0)"
 printf "#####################################\n"
 printf "\n"
 printf "$(tput setaf 2)Don't run this script as ROOT!\n$(tput sgr0)"

usr/local/bin/hyprm-screenshot

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-grim -g "$(slurp -o -r -c '#ff0000ff')" - | satty --fullscreen --filename - --output-filename ~/Pictures/Screenshots/$(date '+%Y%m%d-%H:%M:%S').png