Merge branch 'upstream-custom' into dev

hypr/conf/cursor.conf

@@ -1 +1,2 @@
 exec-once = hyprctl setcursor Vimix 24
+env = HYPRCURSOR_THEME,Vimix-hyprcursors

hypr/conf/windowrules/custom.conf

@@ -1,6 +1,6 @@
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Window rules
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 
 windowrule = tile,^(Microsoft-edge)$
 windowrule = tile,^(Brave-browser)$
@@ -16,4 +16,6 @@ layerrule = blur, logout_dialog
 
 windowrule = float,title=^(Mathematica)$
 windowrule = opacity 0.75, ^(Code)$
+windowrule = opacity 0.75, ^(code-url-handler)$
 windowrule = float,^(QQ)$
+windowrule = float,^(fdm)$

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
+# 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

waybar/themes/meow-blur/colored/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="MEOW Blur Colored"

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": [
@@ -79,6 +79,7 @@
 
     // Modules Right
     "modules-right": [
+        "tray",
         "clock"
     ]
 }]

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": "",

waybar/themes/ml4w-blur-custom/colored/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Custom Colored"