From efb387ef14dceba5b46bb9958c3a80e5e2ea73c9 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 22 May 2024 00:19:43 -0400 Subject: [PATCH 1/3] update: change wallpapers to my own --- .install/wallpaper.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.install/wallpaper.sh b/.install/wallpaper.sh index ecd8dc2..aefe1c2 100644 --- a/.install/wallpaper.sh +++ b/.install/wallpaper.sh @@ -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 From 73d448001428799b3c5c3fcafca06b8a318c299c Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 23 May 2024 01:35:44 -0400 Subject: [PATCH 2/3] feat: add chrome-flags.conf --- .install/hyprland-dotfiles.sh | 3 +++ chrome-flags.conf | 1 + 2 files changed, 4 insertions(+) create mode 100644 chrome-flags.conf diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index 022afc4..6486052 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -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 diff --git a/chrome-flags.conf b/chrome-flags.conf new file mode 100644 index 0000000..a6c93f9 --- /dev/null +++ b/chrome-flags.conf @@ -0,0 +1 @@ +--ozone-platform=wayland --enable-wayland-ime From 8fc4cb9d9e086661660240bd9bc21bd42133c73c Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 23 May 2024 03:18:10 -0400 Subject: [PATCH 3/3] feat: add pyprland and term dropdown --- hypr/conf/autostart.conf | 4 +++- hypr/conf/keybindings/custom.conf | 3 +++ hypr/pyprland.toml | 12 ++++++++++++ waybar/modules.json | 3 ++- waybar/themes/ml4w-blur-custom/modules.json | 3 ++- 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 hypr/pyprland.toml diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf index 5acb6f8..fd3cf8e 100644 --- a/hypr/conf/autostart.conf +++ b/hypr/conf/autostart.conf @@ -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 \ No newline at end of file +exec-once = ~/dotfiles/hypr/scripts/eww.sh + +exec-once = pypr diff --git a/hypr/conf/keybindings/custom.conf b/hypr/conf/keybindings/custom.conf index ef1b5b6..602b2f6 100644 --- a/hypr/conf/keybindings/custom.conf +++ b/hypr/conf/keybindings/custom.conf @@ -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 diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml new file mode 100644 index 0000000..b342481 --- /dev/null +++ b/hypr/pyprland.toml @@ -0,0 +1,12 @@ +[pyprland] + +plugins = [ + "scratchpads", + "magnify", +] + +[scratchpads.term] +animation = "fromTop" +command = "alacritty --class alacritty-dropterm" +class = "alacritty-dropterm" +size = "75% 60%" diff --git a/waybar/modules.json b/waybar/modules.json index 88c31d0..8305268 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -33,7 +33,8 @@ "on-click": "activate", "on-click-middle": "close", "ignore-list": [ - "Alacritty" + "Alacritty", + "alacritty-dropterm" ], "app_ids-mapping": { "firefoxdeveloperedition": "firefox-developer-edition" diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index b9759cd..a5cefb7 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -35,7 +35,8 @@ "on-click": "activate", "on-click-middle": "close", "ignore-list": [ - "Alacritty" + "Alacritty", + "alacritty-dropterm" ], "app_ids-mapping": { "firefoxdeveloperedition": "firefox-developer-edition"