Merge branch 'upstream-custom' into dev

.install/cleanup.sh

@@ -13,24 +13,6 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
     fi
 fi
 
-# Check for running NetworkManager.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
-    echo ":: NetworkManager.service already running."
-else
-    sudo systemctl enable NetworkManager.service
-    sudo systemctl start NetworkManager.service
-    echo ":: NetworkManager.service activated successfully."    
-fi
-
-# Check for running bluetooth.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
-    echo ":: bluetooth.service already running."
-else
-    sudo systemctl enable bluetooth.service
-    sudo systemctl start bluetooth.service
-    echo ":: bluetooth.service activated successfully."    
-fi
-
 if [ -d ~/dotfiles/hypr/settings/ ] ;then
     rm -rf ~/dotfiles/hypr/settings
     echo ":: ~/dotfiles/hypr/settings removed."

.install/hyprland-dotfiles.sh

@@ -49,5 +49,8 @@ fi
 if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
     _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
 fi
+if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors
+fi
 echo ":: Symbolic links created."
 echo

.install/packages/general-packages.sh

@@ -7,66 +7,50 @@ packagesPacman=(
     "fastfetch"
     "ranger"
     "btop"
-    "bluez"
-    "bluez-utils"
     "neovim"
     "wget"
     "unzip"
-    "alacritty" 
-    "chromium" 
-    "dunst" 
+    "alacritty"
+    "dunst"
     "starship"
-    "mpv" 
+    "mpv"
     "thunar"
-    "nautilus" 
-    "mousepad"
-    "noto-fonts" 
-    "otf-font-awesome" 
-    "ttf-fira-sans" 
+    "nautilus"
+    "noto-fonts"
+    "otf-font-awesome"
+    "ttf-fira-sans"
     "ttf-fira-code"
     "ttf-firacode-nerd"
-    "ttf-firacode-nerd" 
-    "figlet" 
-    "vlc" 
-    "eza" 
-    "python-pip" 
-    "python-psutil" 
-    "python-rich" 
-    "python-click" 
+    "ttf-firacode-nerd"
+    "figlet"
+    "vlc"
+    "eza"
+    "python-pip"
+    "python-psutil"
+    "python-rich"
     "python-pywal"
-    "python-gobject"
-    "pavucontrol" 
-    "tumbler" 
+    "pavucontrol"
+    "tumbler"
     "papirus-icon-theme"
-    "breeze-icons"
-    "polkit-gnome"
-    "brightnessctl"
     "gum"
     "man-pages"
-    "nm-connection-editor"
     "gvfs"
     "xdg-user-dirs"
     "xdg-desktop-portal-gtk"
-    "networkmanager"
-    "network-manager-applet"
     "xarchiver"
     "thunar-archive-plugin"
     "zip"
     "fuse2"
-    "gtk4"
-    "libadwaita"
     "xdg-desktop-portal"
     "qalculate-gtk"
     "imagemagick"
-    "guvcview"
     "jq"
     "rofi-wayland"
     "fastfetch"
-    "blueman"
 );
 
 packagesYay=(
     "vimix-cursors"
     "trizen"
-    "pacseek"
+    "google-chrome"
 );

.install/packages/hyprland-packages.sh

@@ -3,9 +3,9 @@ packagesPacman=(
     "hyprpaper"
     "hyprlock"
     "hypridle"
-    "xdg-desktop-portal-hyprland" 
-    "waybar" 
-    "grim" 
+    "xdg-desktop-portal-hyprland"
+    "waybar"
+    "grim"
     "slurp"
     "swappy"
     "cliphist"

.settings/browser.sh

@@ -1 +1 @@
-chromium
+google-chrome-stable

.settings/editor.sh

@@ -1 +1 @@
-mousepad
+~/dotfiles/.settings/terminal.sh -e vim

.settings/networkmanager.sh

@@ -1 +0,0 @@
-nm-connection-editor

.settings/software.sh

@@ -1 +0,0 @@
-alacritty -e pacseek

Vimix-hyprcursors/manifest.hl

@@ -0,0 +1,4 @@
+name = Extracted Theme
+description = Automatically extracted with hyprcursor-util
+version = 0.1
+cursors_directory = hyprcursors

hypr/conf/autostart.conf

@@ -34,6 +34,3 @@ exec-once = pypr
 
 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
-
-# Load configuration from ML4W Hyprland Settings App
-exec = ~/.config/ml4w-hyprland-settings/hyprctl.sh

hypr/conf/keybindings/default.conf

@@ -40,7 +40,6 @@ bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
 bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
 bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
 bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
-bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
 bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
 bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
 bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh

scripts/filemanager.sh

@@ -1 +0,0 @@
-thunar

scripts/installtimeshift.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-#  _____ _                     _     _  __ _   
-# |_   _(_)_ __ ___   ___  ___| |__ (_)/ _| |_ 
-#   | | | | '_ ` _ \ / _ \/ __| '_ \| | |_| __|
-#   | | | | | | | | |  __/\__ \ | | | |  _| |_ 
-#   |_| |_|_| |_| |_|\___||___/_| |_|_|_|  \__|
-#                                              
-
-sleep 1
-clear
-figlet "Timeshift"
-
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-timeshift_installed=$(_isInstalledYay "timeshift")
-grubbtrfs_installed=$(_isInstalledYay "grub-btrfs")
-
-if [[ $timeshift_installed == "0" ]] ;then
-    echo ":: Timeshift is already installed"
-else
-    if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then
-        yay -S timeshift
-    fi
-fi
-if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "0" ]] ;then
-    echo ":: grub-btrfs is already installed"
-else
-    echo ":: grub-btrfs is required to select a snapshot on grub bootloader."
-    if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-        yay -S grub-btrfs
-    fi
-fi
-sleep 3

scripts/installupdates.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-#  ___           _        _ _   _   _           _       _             
-# |_ _|_ __  ___| |_ __ _| | | | | | |_ __   __| | __ _| |_ ___  ___  
-#  | || '_ \/ __| __/ _` | | | | | | | '_ \ / _` |/ _` | __/ _ \/ __| 
-#  | || | | \__ \ || (_| | | | | |_| | |_) | (_| | (_| | ||  __/\__ \ 
-# |___|_| |_|___/\__\__,_|_|_|  \___/| .__/ \__,_|\__,_|\__\___||___/ 
-#                                    |_|                              
-# by Stephan Raabe (2024) 
-# ----------------------------------------------------- 
-# Required: yay trizen timeshift btrfs-grub
-# ----------------------------------------------------- 
-
-sleep 1
-clear
-figlet "Updates"
-echo
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-# ------------------------------------------------------
-# Confirm Start
-# ------------------------------------------------------
-
-if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then
-    echo 
-    echo ":: Update started."
-elif [ $? -eq 130 ]; then
-        exit 130
-else
-    echo
-    echo ":: Update canceled."
-    exit;
-fi
-
-if [[ $(_isInstalledYay "timeshift") == "0" ]] ;then
-    if gum confirm "DO YOU WANT TO CREATE A SNAPSHOT?" ;then
-        echo
-        c=$(gum input --placeholder "Enter a comment for the snapshot...")
-        sudo timeshift --create --comments "$c"
-        sudo timeshift --list
-        sudo grub-mkconfig -o /boot/grub/grub.cfg
-        echo ":: DONE. Snapshot $c created!"
-        echo
-    elif [ $? -eq 130 ]; then
-        echo ":: Snapshot canceled."
-        exit 130
-    else
-        echo ":: Snapshot canceled."
-    fi
-    echo
-fi
-
-yay
-
-notify-send "Update complete"
-echo 
-echo ":: Update complete"
-sleep 2

scripts/onedrive.sh

@@ -1,12 +0,0 @@
-#   ___             ____       _            
-#  / _ \ _ __   ___|  _ \ _ __(_)_   _____  
-# | | | | '_ \ / _ \ | | | '__| \ \ / / _ \ 
-# | |_| | | | |  __/ |_| | |  | |\ V /  __/ 
-#  \___/|_| |_|\___|____/|_|  |_| \_/ \___| 
-#                                           
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-rclone --vfs-cache-mode writes mount OneDrive: ~/OneDrive &
-notify-send "OneDrive connected" "Microsoft OneDrive successfully mounted."

scripts/snapshot.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-#  ____                        _           _    
-# / ___| _ __   __ _ _ __  ___| |__   ___ | |_  
-# \___ \| '_ \ / _` | '_ \/ __| '_ \ / _ \| __| 
-#  ___) | | | | (_| | |_) \__ \ | | | (_) | |_  
-# |____/|_| |_|\__,_| .__/|___/_| |_|\___/ \__| 
-#                   |_|                         
-#  
-# by Stephan Raabe (2024) 
-# ----------------------------------------------------- 
-
-sleep 1
-clear
-figlet "Snapshot"
-
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-timeshift_installed=$(_isInstalledYay "timeshift")
-grubbtrfs_installed=$(_isInstalledYay "grub-btrfs")
-
-if [[ $timeshift_installed == "0" ]] ;then
-    c=$(gum input --placeholder "Enter a comment for the snapshot...")
-    sudo timeshift --create --comments "$c"
-    sudo timeshift --list
-    if [[ -d /boot/grub ]] ;then
-        if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "1" ]] ;then
-            if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-                yay -S grub-btrfs
-
-            else
-                exit
-            fi
-        fi
-        sudo grub-mkconfig -o /boot/grub/grub.cfg
-    fi
-    echo "DONE. Snapshot $c created!"
-else
-    echo "ERROR: Timeshift is not installed."
-    if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then
-        yay -S timeshift
-        echo 
-        echo ":: Timeshift has been installed. Please restart this script."
-        if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "1" ]] ;then
-            echo ":: grub-btrfs is required to select a snapshot on grub bootloader."
-            if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-                yay -S grub-btrfs
-            else
-                exit
-            fi
-        fi
-    fi
-fi

waybar/modules.json

@@ -102,8 +102,7 @@
         "return-type": "json",       
         "exec": "~/dotfiles/scripts/updates.sh",
         "restart-interval": 60,
-        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
-        "on-click-right": "~/dotfiles/.settings/software.sh"
+        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh"
     },
     
     // Wallpaper

waybar/themes/ml4w-blur-custom/modules.json

@@ -100,7 +100,6 @@
         "exec": "~/dotfiles/scripts/updates.sh",
         "restart-interval": 60,
         "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
-        "on-click-right": "~/dotfiles/.settings/software.sh",
         "tooltip": false
     },