From d2d71fef5508d9d5575ebf3892fae1f5a5c14c9f Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 9 Jun 2024 13:21:27 -0400 Subject: [PATCH 1/5] fix: disable use cursors from gtk, so hyprcursors will be used --- hypr/conf/cursor.conf | 1 + hypr/scripts/gtk.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hypr/conf/cursor.conf b/hypr/conf/cursor.conf index 39f83fd..0c6bfed 100644 --- a/hypr/conf/cursor.conf +++ b/hypr/conf/cursor.conf @@ -1 +1,2 @@ exec-once = hyprctl setcursor Vimix 24 +env = HYPRCURSOR_THEME,Vimix-hyprcursors diff --git a/hypr/scripts/gtk.sh b/hypr/scripts/gtk.sh index e412fab..4e56ba7 100755 --- a/hypr/scripts/gtk.sh +++ b/hypr/scripts/gtk.sh @@ -29,7 +29,7 @@ gsettings set "$gnome_schema" cursor-theme "$cursor_theme" gsettings set "$gnome_schema" font-name "$font_name" gsettings set "$gnome_schema" color-scheme "prefer-dark" -if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then - echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf - hyprctl setcursor $cursor_theme $cursor_size -fi \ No newline at end of file +# if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then +# echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf +# hyprctl setcursor $cursor_theme $cursor_size +# fi \ No newline at end of file From b156843244d1614e6a287d5ec47c113546a5ca7f Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 9 Jun 2024 13:24:27 -0400 Subject: [PATCH 2/5] fix: also set opacity for wayland vscode --- hypr/conf/windowrules/custom.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hypr/conf/windowrules/custom.conf b/hypr/conf/windowrules/custom.conf index e3ccca5..93bf3f1 100644 --- a/hypr/conf/windowrules/custom.conf +++ b/hypr/conf/windowrules/custom.conf @@ -1,6 +1,6 @@ -# ----------------------------------------------------- +# ----------------------------------------------------- # Window rules -# ----------------------------------------------------- +# ----------------------------------------------------- windowrule = tile,^(Microsoft-edge)$ windowrule = tile,^(Brave-browser)$ @@ -16,4 +16,5 @@ layerrule = blur, logout_dialog windowrule = float,title=^(Mathematica)$ windowrule = opacity 0.75, ^(Code)$ +windowrule = opacity 0.75, ^(code-url-handler)$ windowrule = float,^(QQ)$ From d1036c31c6bf8bfacad7bccb5cd4ede515dd5675 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 9 Jun 2024 13:38:26 -0400 Subject: [PATCH 3/5] update: split my waybar theme as standalone meow-blur --- waybar/themes/meow-blur/colored/config.sh | 2 ++ .../colored/style.css | 0 .../{ml4w-blur-custom => meow-blur}/config | 4 +-- .../mixed/config.sh | 0 .../mixed/style.css | 0 .../modules.json | 30 ------------------- .../{ml4w-blur-custom => meow-blur}/style.css | 0 .../themes/ml4w-blur-custom/colored/config.sh | 2 -- 8 files changed, 4 insertions(+), 34 deletions(-) create mode 100644 waybar/themes/meow-blur/colored/config.sh rename waybar/themes/{ml4w-blur-custom => meow-blur}/colored/style.css (100%) rename waybar/themes/{ml4w-blur-custom => meow-blur}/config (91%) rename waybar/themes/{ml4w-blur-custom => meow-blur}/mixed/config.sh (100%) rename waybar/themes/{ml4w-blur-custom => meow-blur}/mixed/style.css (100%) rename waybar/themes/{ml4w-blur-custom => meow-blur}/modules.json (94%) rename waybar/themes/{ml4w-blur-custom => meow-blur}/style.css (100%) delete mode 100644 waybar/themes/ml4w-blur-custom/colored/config.sh diff --git a/waybar/themes/meow-blur/colored/config.sh b/waybar/themes/meow-blur/colored/config.sh new file mode 100644 index 0000000..cfd331e --- /dev/null +++ b/waybar/themes/meow-blur/colored/config.sh @@ -0,0 +1,2 @@ +#!/bin/bash +theme_name="MEOW Blur Colored" diff --git a/waybar/themes/ml4w-blur-custom/colored/style.css b/waybar/themes/meow-blur/colored/style.css similarity index 100% rename from waybar/themes/ml4w-blur-custom/colored/style.css rename to waybar/themes/meow-blur/colored/style.css diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/meow-blur/config similarity index 91% rename from waybar/themes/ml4w-blur-custom/config rename to waybar/themes/meow-blur/config index 05c1207..cb10346 100644 --- a/waybar/themes/ml4w-blur-custom/config +++ b/waybar/themes/meow-blur/config @@ -20,7 +20,7 @@ "spacing": 0, // Load Modules - "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"], + "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"], // Modules Left "modules-left": [ @@ -61,7 +61,7 @@ "spacing": 0, // Load Modules - "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"], + "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"], // Modules Left "modules-left": [ diff --git a/waybar/themes/ml4w-blur-custom/mixed/config.sh b/waybar/themes/meow-blur/mixed/config.sh similarity index 100% rename from waybar/themes/ml4w-blur-custom/mixed/config.sh rename to waybar/themes/meow-blur/mixed/config.sh diff --git a/waybar/themes/ml4w-blur-custom/mixed/style.css b/waybar/themes/meow-blur/mixed/style.css similarity index 100% rename from waybar/themes/ml4w-blur-custom/mixed/style.css rename to waybar/themes/meow-blur/mixed/style.css diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/meow-blur/modules.json similarity index 94% rename from waybar/themes/ml4w-blur-custom/modules.json rename to waybar/themes/meow-blur/modules.json index 453f2eb..125d098 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/meow-blur/modules.json @@ -61,27 +61,11 @@ "separate-outputs": true }, - // ML4W Welcome App - "custom/ml4w-welcome": { - "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage", - "format": " ", - "tooltip": false - }, - // Empty "custom/empty": { "format": "" }, - // Youtube Subscriber Count - "custom/youtube": { - "format": " {}", - "exec": "python ~/private/youtube.py", - "restart-interval": 600, - "on-click": "chromium https://studio.youtube.com", - "tooltip": false - }, - // Cliphist "custom/cliphist": { "format": "", @@ -118,13 +102,6 @@ "tooltip": false }, - // Settings - "custom/settings": { - "format": "", - "on-click": "~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage", - "tooltip": false - }, - // Keybindings "custom/keybindings": { "format": "", @@ -146,13 +123,6 @@ "tooltip": false }, - // Teams Launcher - "custom/teams": { - "format": "", - "on-click": "chromium --app=https://teams.microsoft.com/go", - "tooltip": false - }, - // Browser Launcher "custom/browser": { "format": "", diff --git a/waybar/themes/ml4w-blur-custom/style.css b/waybar/themes/meow-blur/style.css similarity index 100% rename from waybar/themes/ml4w-blur-custom/style.css rename to waybar/themes/meow-blur/style.css diff --git a/waybar/themes/ml4w-blur-custom/colored/config.sh b/waybar/themes/ml4w-blur-custom/colored/config.sh deleted file mode 100644 index 3a49354..0000000 --- a/waybar/themes/ml4w-blur-custom/colored/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Blur Custom Colored" From 34cda567b3d9befcd0f7d0b62ab9cf238cfb5fbb Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 9 Jun 2024 20:23:15 -0400 Subject: [PATCH 4/5] update: add tray on sencond display --- waybar/themes/meow-blur/config | 1 + 1 file changed, 1 insertion(+) diff --git a/waybar/themes/meow-blur/config b/waybar/themes/meow-blur/config index cb10346..0311637 100644 --- a/waybar/themes/meow-blur/config +++ b/waybar/themes/meow-blur/config @@ -79,6 +79,7 @@ // Modules Right "modules-right": [ + "tray", "clock" ] }] From 8fb376e0956d890d692c964ac59b131fc971f09d Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 9 Jun 2024 20:29:06 -0400 Subject: [PATCH 5/5] update: float fdm --- hypr/conf/windowrules/custom.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/conf/windowrules/custom.conf b/hypr/conf/windowrules/custom.conf index 93bf3f1..5064a32 100644 --- a/hypr/conf/windowrules/custom.conf +++ b/hypr/conf/windowrules/custom.conf @@ -18,3 +18,4 @@ windowrule = float,title=^(Mathematica)$ windowrule = opacity 0.75, ^(Code)$ windowrule = opacity 0.75, ^(code-url-handler)$ windowrule = float,^(QQ)$ +windowrule = float,^(fdm)$