merged master into laptop branch

qtile/.config/qtile/Widgets.py

@@ -1,7 +1,7 @@
 from libqtile import widget
 
 from defines import base_color, term
-from defines import blue_color, light_foreground_color, dark_foreground_color, red_color, light_purple_color, purple_color, green_color, orange_color, magenta_color
+from defines import blue_color, light_foreground_color, dark_foreground_color, red_color, light_purple_color, purple_color, green_color, orange_color, magenta_color, yellow_color
 from Custom_Widgets import MemoryC, Mic
 
 #region Powerline
@@ -34,16 +34,20 @@ def powerline_arrow(direction, color1, color2,size):
 #region Left_widgets
 def Left_widgets(size,fontsize,prompt=False):
     return [
-        widget.CurrentLayoutIcon(),
+        widget.CurrentLayoutIcon(
+            scale = 0.9,
+        ),
         *powerline_arrow('r',base_color,blue_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/archlinux-logo-small.png',
+        widget.TextBox(
+            text='',
+            foreground=light_foreground_color,
+            fontsize=fontsize+14,
             margin=5,
             background=blue_color
         ),
         *powerline_arrow('r',blue_color,base_color,size),
         widget.GroupBox(
-            fontsize=fontsize,
+            fontsize=fontsize+10,
             rounded=False,
             active=light_foreground_color,
             inactive=dark_foreground_color,
@@ -56,7 +60,9 @@ def Left_widgets(size,fontsize,prompt=False):
             urgent_alert_method='block',
             urgent_border = red_color,
         ),
+        widget.Spacer(),
         widget.WindowName(fontsize=fontsize-2),
+        widget.Spacer(),
     ]
 #endregion
 
@@ -65,25 +71,25 @@ def volume_widget(prev_color,color,size,fontsize):
     return[
         *powerline_arrow('l',prev_color,color,size),
         widget.Volume(
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             background=color,
             emoji=True,
             fontsize=fontsize,
             ),
         widget.Volume(
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             background=color,
             fontsize=fontsize,
             padding=0
             ),
         Mic(
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             background=color,
             emoji=True,
-            fontsize=fontsize,
+            fontsize=fontsize + 6,
         ),
         Mic(
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             background=color,
             fontsize=fontsize,
             padding=0
@@ -99,58 +105,58 @@ launch_htop= {'Button1': launch_htop}
 
 def System_widgets(prev_color,last_color,size,fontsize):
     return [
-        *powerline_arrow('l',prev_color,red_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/temp.png',
-            margin=5,
-            background=red_color,
-            mouse_callbacks = launch_htop,
-        ),
+        *powerline_arrow('l',prev_color,orange_color,size),
+        widget.TextBox(
+            text='',
+            foreground=light_foreground_color,
+            background=orange_color,
+            fontsize=fontsize+6
+            ),
         widget.ThermalSensor(
-            foreground=dark_foreground_color,
-            background=red_color,
+            foreground=light_foreground_color,
+            background=orange_color,
             fontsize=fontsize,
             tag_sensor='Tctl',
             mouse_callbacks = launch_htop,
             ),
-        *powerline_arrow('l',red_color,green_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/cpu.png',
-            margin=5,
+        *powerline_arrow('l',orange_color,green_color,size),
+        widget.TextBox(
+            text='',
+            foreground=light_foreground_color,
             background=green_color,
-            mouse_callbacks = launch_htop,
-        ),
+            fontsize=fontsize+6
+            ),
         widget.CPU(
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             background=green_color,
             fontsize=fontsize,
             format='{load_percent}% @ {freq_current}GHz',
             mouse_callbacks = launch_htop,
             ),
-        *powerline_arrow('l',green_color,orange_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/ram.png',
-            background=orange_color,
-            margin=-10,
-            mouse_callbacks = launch_htop,
-        ),
+        *powerline_arrow('l',green_color,yellow_color,size),
+        widget.TextBox(
+            text='﬙',
+            foreground=light_foreground_color,
+            background=yellow_color,
+            fontsize=fontsize+6
+            ),
         MemoryC(
-            foreground=dark_foreground_color,
-            background=orange_color,
+            foreground=light_foreground_color,
+            background=yellow_color,
             fontsize=fontsize,
             format=" {MemUsed}GB({MemPercent}%) | {SwapUsed}GB({SwapPercent}%)",
             mouse_callbacks = launch_htop,
             ), 
-        *powerline_arrow('l',orange_color,last_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/network.png',
+        *powerline_arrow('l',yellow_color,last_color,size),
+        widget.TextBox(
+            text='',
+            foreground=light_foreground_color,
             background=blue_color,
-            margin=5,
-            mouse_callbacks = launch_htop,
-        ),
+            fontsize=fontsize+6
+            ),
         widget.Net(
             background=last_color,
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             fontsize=fontsize,
             fmt='{:.9}',
             format='{down}↓',
@@ -158,7 +164,7 @@ def System_widgets(prev_color,last_color,size,fontsize):
             ),
         widget.Net(
             background=last_color,
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             fontsize=fontsize,
             fmt='{:.9}',
             format='{up}↑',
@@ -170,19 +176,20 @@ def System_widgets(prev_color,last_color,size,fontsize):
 #region End_widgets
 def end_widgets(prev_color,size,fontsize):
     return [
-        *powerline_arrow('l',prev_color,magenta_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/calendar.png',
-            margin=5,
-            background=magenta_color,
-        ),
+        *powerline_arrow('l',prev_color,purple_color,size),
+        widget.TextBox(
+            text='ﭷ',
+            foreground=light_foreground_color,
+            background=purple_color,
+            fontsize=fontsize+6
+            ),
         widget.Clock(
-            foreground=dark_foreground_color,
-            background=magenta_color,
+            foreground=light_foreground_color,
+            background=purple_color,
             fontsize=fontsize,
             format='%Y-%m-%d'
             ),
-        *powerline_arrow('l',magenta_color,base_color,size),
+        *powerline_arrow('l',purple_color,base_color,size),
         widget.Clock(
             font='dseg7 classic bold',
             fontsize=16,
@@ -194,52 +201,55 @@ def end_widgets(prev_color,size,fontsize):
 #region Laptop widgets
 def Laptop_widgets(prev_color,last_color,size,fontsize):
     return [
-        *powerline_arrow('l',prev_color,red_color,size),
+        *powerline_arrow('l',prev_color,orange_color,size),
         widget.Battery(
-            foreground=dark_foreground_color,
-            background=red_color,
+            foreground=light_foreground_color,
+            background=orange_color,
             fontsize=fontsize,
             update_interval=1,
-            format="{percent:2.0%}",
+            format="{char} {percent:2.0%}",
+            low_percentage=0.2,
+            notify_below=True,
+            low_foreground=red_color,
             ),
-        *powerline_arrow('l',red_color,green_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/cpu.png',
-            margin=5,
+        *powerline_arrow('l',orange_color,green_color,size),
+        widget.TextBox(
+            text='',
+            foreground=light_foreground_color,
             background=green_color,
-            mouse_callbacks = launch_htop,
-        ),
+            fontsize=fontsize+6
+            ),
         widget.CPU(
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             background=green_color,
             fontsize=fontsize,
-            format='{load_percent}%',
+            format='{load_percent}% @ {freq_current}GHz',
             mouse_callbacks = launch_htop,
             ),
-        *powerline_arrow('l',green_color,orange_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/ram.png',
-            background=orange_color,
-            margin=-10,
-            mouse_callbacks = launch_htop,
-        ),
+        *powerline_arrow('l',green_color,yellow_color,size),
+        widget.TextBox(
+            text='﬙',
+            foreground=light_foreground_color,
+            background=yellow_color,
+            fontsize=fontsize+6
+            ),
         MemoryC(
-            foreground=dark_foreground_color,
-            background=orange_color,
+            foreground=light_foreground_color,
+            background=yellow_color,
             fontsize=fontsize,
-            format=" {MemUsed}GB | {SwapUsed}GB",
+            format=" {MemUsed}GB|{SwapUsed}GB",
             mouse_callbacks = launch_htop,
             ), 
-        *powerline_arrow('l',orange_color,last_color,size),
-        widget.Image(
-            filename='~/.config/qtile/icons/network.png',
+        *powerline_arrow('l',yellow_color,last_color,size),
+        widget.TextBox(
+            text='',
+            foreground=light_foreground_color,
             background=blue_color,
-            margin=5,
-            mouse_callbacks = launch_htop,
-        ),
+            fontsize=fontsize+6
+            ),
         widget.Net(
             background=last_color,
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             fontsize=fontsize,
             fmt='{:.9}',
             format='{down}↓',
@@ -247,11 +257,11 @@ def Laptop_widgets(prev_color,last_color,size,fontsize):
             ),
         widget.Net(
             background=last_color,
-            foreground=dark_foreground_color,
+            foreground=light_foreground_color,
             fontsize=fontsize,
             fmt='{:.9}',
             format='{up}↑',
             mouse_callbacks = launch_htop,
             ),
     ]
-#endregion
+#endregion