Merge remote-tracking branch 'origin/laptop'

qtile/.config/qtile/Groups.py

@@ -2,7 +2,7 @@ from typing import Match
 from libqtile.config import Group, ScratchPad, DropDown, Key, Match
 from libqtile.command import lazy
 
-from defines import term
+from defines import mod,term
 from Keys import keys
 
 group_names = [("","Home", 'h',{'layout': 'monadtall'}),
@@ -23,6 +23,16 @@ groups = [Group(icon, **kwargs) for icon, name, key, kwargs in group_names]
 
 groups.append(
     ScratchPad("scratchpad",[
+        DropDown(
+            'ARandR',
+            'arandr',
+            height = 0.5,
+            width = 0.8,
+            x = .1,
+            on_focus_lost_hide=True,
+            opacity=1,
+            match = Match(wm_class='arandr')
+        ),
         DropDown(
             "term",
             term,
@@ -106,6 +116,8 @@ for (icon,name,key, kwargs) in group_names:
     ])
 
 keys.extend([
+    Key([mod],'p',lazy.group['scratchpad'].dropdown_toggle('ARandR'),
+        desc="open the dropdown for ARandR"),
     Key(['mod1','control'],'space',lazy.group['scratchpad'].dropdown_toggle('term'),
         desc="open the dropdown terminal"),
     Key(['control','shift'],'Escape',lazy.group['scratchpad'].dropdown_toggle('htop'),

qtile/.config/qtile/Keys.py

@@ -52,7 +52,6 @@ keys = [
 
     #rofi
     Key([mod],'Return',lazy.spawn("rofi -show drun -show-icons -modi drun,calc,ssh"),desc="launch rofi (drun)"),
-    Key([mod],'p',lazy.spawn("bwmenu --auto-lock -1"),desc="launch bwmenu"),
 
     # audio hotkeys
     Key([], 'XF86AudioRaiseVolume', lazy.spawn('pulseaudio-ctl up 1'), desc="increase speaker volume"),

qtile/.config/qtile/Widgets.py

@@ -16,7 +16,6 @@ def powerline_arrow(direction, color1, color2,size):
                 borderwidth=0,
                 padding=0
             ),
-            widget.Sep(padding=5, linewidth=0, background=color2),
         ]
     else:
         return [
@@ -41,13 +40,13 @@ def Left_widgets(size,fontsize,prompt=False):
         widget.TextBox(
             text='',
             foreground=light_foreground_color,
-            fontsize=fontsize+14,
-            margin=5,
+            fontsize=fontsize,
+            # margin=5,
             background=blue_color
         ),
         *powerline_arrow('r',blue_color,base_color,size),
         widget.GroupBox(
-            fontsize=fontsize+10,
+            fontsize=fontsize,
             rounded=False,
             active=light_foreground_color,
             inactive=dark_foreground_color,
@@ -72,7 +71,7 @@ def volume_widget(prev_color,color,size,fontsize):
             foreground=light_foreground_color,
             background=color,
             emoji=True,
-            fontsize=fontsize,
+            fontsize=fontsize - 4,
             ),
         widget.Volume(
             foreground=light_foreground_color,
@@ -84,7 +83,7 @@ def volume_widget(prev_color,color,size,fontsize):
             foreground=light_foreground_color,
             background=color,
             emoji=True,
-            fontsize=fontsize + 6,
+            fontsize=fontsize,
         ),
         Mic(
             foreground=light_foreground_color,
@@ -179,7 +178,7 @@ def end_widgets(prev_color,size,fontsize):
             text='ﭷ',
             foreground=light_foreground_color,
             background=purple_color,
-            fontsize=fontsize+6
+            fontsize=fontsize
             ),
         widget.Clock(
             foreground=light_foreground_color,
@@ -215,13 +214,13 @@ def Laptop_widgets(prev_color,last_color,size,fontsize):
             text='',
             foreground=light_foreground_color,
             background=green_color,
-            fontsize=fontsize+6
+            fontsize=fontsize
             ),
         widget.CPU(
             foreground=light_foreground_color,
             background=green_color,
             fontsize=fontsize,
-            format='{load_percent}% @ {freq_current}GHz',
+            format='{load_percent}%',
             mouse_callbacks = launch_htop,
             ),
         *powerline_arrow('l',green_color,yellow_color,size),
@@ -229,13 +228,13 @@ def Laptop_widgets(prev_color,last_color,size,fontsize):
             text='﬙',
             foreground=light_foreground_color,
             background=yellow_color,
-            fontsize=fontsize+6
+            fontsize=fontsize
             ),
         MemoryC(
             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',yellow_color,last_color,size),
@@ -243,7 +242,7 @@ def Laptop_widgets(prev_color,last_color,size,fontsize):
             text='',
             foreground=light_foreground_color,
             background=blue_color,
-            fontsize=fontsize+6
+            fontsize=fontsize
             ),
         widget.Net(
             background=last_color,

zsh/.zshrc

@@ -139,6 +139,9 @@ alias ftemplate='git fetch template'
 alias mtemplate='git merge template/master --allow-unrelated-histories'
 alias log='git log'
 
+# docker
+alias docker='sudo docker' # use normal docker command but keep sudo requirement
+
 ### AUTOSTART ###
 
 #neofetch