From 41f0e5fadd1826e8470d529e51bec35e5e29f625 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Mon, 22 Jan 2024 17:10:16 +0100
Subject: [PATCH] Updates structure

---
 .install/general-packages.sh       |   9 ++--
 .install/qtile-packages.sh         |   1 +
 waybar/modules.json                |   1 +
 waybar/themes/assets/ml4w-icon.png | Bin 0 -> 4859 bytes
 waybar/themes/ml4w-blur/style.css  |   2 +-
 waybar/themes/ml4w/style.css       |   4 +-
 waybar/themes/starter/config       |  13 ++++++
 waybar/themes/starter/modules.json |  59 +++++++++---------------
 waybar/themes/starter/style.css    |  69 ++++++++++++++++++++---------
 9 files changed, 91 insertions(+), 67 deletions(-)
 create mode 100644 waybar/themes/assets/ml4w-icon.png

diff --git a/.install/general-packages.sh b/.install/general-packages.sh
index 3f11279..1f910ac 100644
--- a/.install/general-packages.sh
+++ b/.install/general-packages.sh
@@ -11,14 +11,11 @@ packagesPacman=(
     "chromium" 
     "dunst" 
     "starship"
-    "neovim" 
     "mpv" 
     "freerdp" 
-    "xfce4-power-manager" 
     "thunar" 
     "mousepad"
     "noto-fonts" 
-    "ttf-font-awesome"
     "otf-font-awesome" 
     "ttf-fira-sans" 
     "ttf-fira-code" 
@@ -32,11 +29,9 @@ packagesPacman=(
     "python-click" 
     "pavucontrol" 
     "tumbler" 
-    "xautolock" 
     "blueman"
     "papirus-icon-theme"
     "polkit-gnome"
-    "qalculate-gtk"
     "brightnessctl"
     "gum"
     "man-pages"
@@ -54,3 +49,7 @@ packagesYay=(
     "trizen"
     "pacseek"
 );
+
+# Removed packages
+# "xfce4-power-manager" 
+# "ttf-font-awesome"
diff --git a/.install/qtile-packages.sh b/.install/qtile-packages.sh
index 865fcf4..7d3675e 100644
--- a/.install/qtile-packages.sh
+++ b/.install/qtile-packages.sh
@@ -9,6 +9,7 @@ packagesPacman=(
     "python-dbus-next"
     "python-iwlib"
     "xclip"
+    "xautolock" 
 );
 
 packagesYay=(
diff --git a/waybar/modules.json b/waybar/modules.json
index b9b16c2..774840c 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -358,6 +358,7 @@
         "icon": false,
     },
 
+    // Idle Inhibator
     "idle_inhibitor": {
         "format": "{icon}",
         "tooltip": true,
diff --git a/waybar/themes/assets/ml4w-icon.png b/waybar/themes/assets/ml4w-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..92a54e08601385f5d8b7c8e6a987bd89cdb092cc
GIT binary patch
literal 4859
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

literal 0
HcmV?d00001

diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/ml4w-blur/style.css
index f907226..da18725 100644
--- a/waybar/themes/ml4w-blur/style.css
+++ b/waybar/themes/ml4w-blur/style.css
@@ -185,7 +185,7 @@ window#waybar.empty #window {
 
 #custom-ml4w-welcome {
     margin-right: 15px;
-    background-image: url("../../../hypr/apps/ml4w-welcome/src/icon-small.png");
+    background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/ml4w/style.css
index ebc0e17..42edc59 100644
--- a/waybar/themes/ml4w/style.css
+++ b/waybar/themes/ml4w/style.css
@@ -186,7 +186,7 @@ window#waybar.empty #window {
 
 #custom-ml4w-welcome {
     margin-right: 15px;
-    background-image: url("../../../hypr/apps/ml4w-welcome/src/icon-small.png");
+    background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
@@ -196,7 +196,7 @@ window#waybar.empty #window {
  * Idle Inhibator
  * ----------------------------------------------------- */
 
- #idle_inhibitor {
+#idle_inhibitor {
     margin-right: 15px;
     font-size: 22px;
     font-weight: bold;
diff --git a/waybar/themes/starter/config b/waybar/themes/starter/config
index d45dbe7..1dfd1a9 100644
--- a/waybar/themes/starter/config
+++ b/waybar/themes/starter/config
@@ -34,7 +34,9 @@
         "custom/settings",
         "custom/waybarthemes",
         "custom/wallpaper",
+        // START TASK TOOGLE
         // "wlr/taskbar",
+        // END TASK TOOGLE
         "group/quicklinks",
         "hyprland/window",
         "custom/starter"
@@ -49,12 +51,23 @@
     "modules-right": [
         "custom/updates",
         "pulseaudio",
+        // START BT TOOGLE
         "bluetooth",
+        // END BT TOOGLE
         "battery", 
+        // START NETWORK TOOGLE
         "network",
+        // END NETWORK TOOGLE
         "group/hardware",
         "custom/cliphist",
+        // START IDLE TOOGLE
+        "idle_inhibitor",
+        // END IDLE TOOGLE
+        // START TRAY TOOGLE
+        "tray",
+        // END TRAY TOOGLE
         "custom/exit",
+        "custom/ml4w-welcome",
         "clock"
     ]
 }
diff --git a/waybar/themes/starter/modules.json b/waybar/themes/starter/modules.json
index 76aad7f..593d16e 100644
--- a/waybar/themes/starter/modules.json
+++ b/waybar/themes/starter/modules.json
@@ -56,15 +56,6 @@
         "separate-outputs": true
     },
 
-    // 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": "",
@@ -86,7 +77,7 @@
         "tooltip": false
     },
 
-    // Wallpaper
+    // Theme Starter Label
     "custom/starter": {
         "format": "THEME STARTER",
         "tooltip": false
@@ -128,27 +119,20 @@
         "tooltip": false
     },
 
-    // Outlook Launcher
-    "custom/outlook": {
-        "format": "",
-        "on-click": "chromium --app=https://outlook.office.com/mail/",
-        "tooltip": false
-    },
-
-    // Teams Launcher
-    "custom/teams": {
-        "format": "",
-        "on-click": "chromium --app=https://teams.microsoft.com/go",
-        "tooltip": false
-    },
-
     // Browser Launcher
     "custom/browser": {
         "format": "",
-        "on-click": "chromium",
+        "on-click": "~/dotfiles/.settings/browser.sh",
         "tooltip": false
     },    
 
+    // ML4W Welcome App
+    "custom/ml4w-welcome": {
+        "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
+        "format": " ",
+        "tooltip": false
+    },
+
     // ChatGPT Launcher
     "custom/chatgpt": {
         "format": "",
@@ -156,20 +140,6 @@
         "tooltip": false
     },
 
-    // Calculator
-    "custom/calculator": {
-        "format": "",
-        "on-click": "qalculate-gtk",
-        "tooltip": false
-    },
-
-    // Windows VM
-    "custom/windowsvm": {
-        "format": "",
-        "on-click": "~/dotfiles/scripts/launchvm.sh",
-        "tooltip": false
-    },
-
     // Rofi Application Launcher
     "custom/appmenu": {
         "format": "Apps",
@@ -344,5 +314,16 @@
         "format": "{user}",
         "interval": 60,
         "icon": false,
+    },
+
+    // Idle Inhibator
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "tooltip": true,
+        "format-icons":{
+            "activated": "",
+            "deactivated": ""
+        },
+        "on-click-right": "swaylock"        
     }
 }
diff --git a/waybar/themes/starter/style.css b/waybar/themes/starter/style.css
index f1ae480..4224494 100644
--- a/waybar/themes/starter/style.css
+++ b/waybar/themes/starter/style.css
@@ -150,31 +150,60 @@ window#waybar.empty #window {
  * Custom Quicklinks
  * ----------------------------------------------------- */
 
- #custom-brave, 
- #custom-browser, 
- #custom-keybindings, 
- #custom-outlook, 
- #custom-filemanager, 
- #custom-teams, 
- #custom-chatgpt, 
- #custom-calculator, 
- #custom-windowsvm, 
- #custom-cliphist, 
- #custom-wallpaper, 
- #custom-settings, 
- #custom-wallpaper, 
- #custom-system,
- #custom-waybarthemes {
-     margin-right: 23px;
-     font-size: 20px;
-     font-weight: bold;
-     color: @iconcolor;
- }
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
+#custom-system,
+#custom-waybarthemes {
+    margin-right: 23px;
+    font-size: 20px;
+    font-weight: bold;
+    color: @iconcolor;
+}
  
  #custom-waybarthemes,#custom-system {
      margin-right:15px;
  }
 
+
+ #custom-ml4w-welcome {
+    margin-right: 15px;
+    background-image: url("../assets/ml4w-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+/* -----------------------------------------------------
+ * Idle Inhibator
+ * ----------------------------------------------------- */
+
+ #idle_inhibitor {
+    margin-right: 15px;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+
+#idle_inhibitor.activated {
+    margin-right: 15px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: #dc2f2f;
+}
+
 /* -----------------------------------------------------
  * Custom Modules
  * ----------------------------------------------------- */