Merge branch 'upstream-custom' into dev

This commit is contained in:
Yingjie Wang 2024-05-23 18:21:10 -04:00
commit 2a649838a4
8 changed files with 34 additions and 10 deletions

View File

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

View File

@ -5,16 +5,17 @@ echo -e "${GREEN}"
figlet "Wallpapers"
echo -e "${NONE}"
if [ ! -d ~/wallpaper ]; then
echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
echo ""
if gum confirm "Do you want to download the repository?" ;then
wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
if [ ! -d ~/wallpaper/ ]; then
mkdir ~/wallpaper
fi
cp ~/Downloads/wallpaper-main/* ~/wallpaper/
# wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
# unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
# if [ ! -d ~/wallpaper/ ]; then
# mkdir ~/wallpaper
# fi
# cp ~/Downloads/wallpaper-main/* ~/wallpaper/
git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
echo "Wallpapers from the repository installed successfully."
elif [ $? -eq 130 ]; then
exit 130

1
chrome-flags.conf Normal file
View File

@ -0,0 +1 @@
--ozone-platform=wayland --enable-wayland-ime

View File

@ -31,4 +31,6 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh
# Start ewww daemon
exec-once = ~/dotfiles/hypr/scripts/eww.sh
exec-once = ~/dotfiles/hypr/scripts/eww.sh
exec-once = pypr

View File

@ -92,3 +92,6 @@ bind = $mainMod, P, submap, passthru
submap = passthru
bind = SUPER, Escape, submap, reset
submap = reset
# Pyprland
bind = $mainMod SHIFT, RETURN, exec, pypr toggle term

12
hypr/pyprland.toml Normal file
View File

@ -0,0 +1,12 @@
[pyprland]
plugins = [
"scratchpads",
"magnify",
]
[scratchpads.term]
animation = "fromTop"
command = "alacritty --class alacritty-dropterm"
class = "alacritty-dropterm"
size = "75% 60%"

View File

@ -33,7 +33,8 @@
"on-click": "activate",
"on-click-middle": "close",
"ignore-list": [
"Alacritty"
"Alacritty",
"alacritty-dropterm"
],
"app_ids-mapping": {
"firefoxdeveloperedition": "firefox-developer-edition"

View File

@ -35,7 +35,8 @@
"on-click": "activate",
"on-click-middle": "close",
"ignore-list": [
"Alacritty"
"Alacritty",
"alacritty-dropterm"
],
"app_ids-mapping": {
"firefoxdeveloperedition": "firefox-developer-edition"