Merge branch 'upstream-custom' into dev

This commit is contained in:
wyj
2024-06-06 00:59:44 -04:00
65 changed files with 30 additions and 247 deletions
-18
View File
@@ -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."
+3
View File
@@ -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
+17 -33
View File
@@ -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"
);
+3 -3
View File
@@ -3,9 +3,9 @@ packagesPacman=(
"hyprpaper"
"hyprlock"
"hypridle"
"xdg-desktop-portal-hyprland"
"waybar"
"grim"
"xdg-desktop-portal-hyprland"
"waybar"
"grim"
"slurp"
"swappy"
"cliphist"