parametrise spacer "widget"

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 4a1632905614c2d3dcf5bc6df3a4c9f4821ac7e0..acf457afad2ca97717b66b76bba1fd4bb652957c 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -173,8 +173,11 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 --    forced_width = 4,
 --    widget = wibox.widget.separator
 --}
 --    forced_width = 4,
 --    widget = wibox.widget.separator
 --}

-local spacer = wibox.widget.textbox()
-spacer:set_text(" │ ")
+local function make_spacer(text)
+    local spacer = wibox.widget.textbox()
+    spacer:set_text(text or " │ ")
+    return spacer
+end

 
 -- Keyboard map indicator and switcher
 mykeyboardlayout = awful.widget.keyboardlayout()
 
 -- Keyboard map indicator and switcher
 mykeyboardlayout = awful.widget.keyboardlayout()


@@ -193,7 +196,7 @@ local lain_bat = lain.widget.bat({
 clocksarray = clocksarray.get_clocksarray("%a %d %b %H:%M:%S %Z", {
         ["NZ"] = "Pacific/Auckland",
         ["DE"] = "Europe/Berlin"
 clocksarray = clocksarray.get_clocksarray("%a %d %b %H:%M:%S %Z", {
         ["NZ"] = "Pacific/Auckland",
         ["DE"] = "Europe/Berlin"

-    }, spacer)
+    }, make_spacer())

 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(


@@ -286,34 +289,31 @@ awful.screen.connect_for_each_screen(function(s)
 
     -- Add widgets to the wibox
     local right_widgets = gears.table.join(clocksarray, {
 
     -- Add widgets to the wibox
     local right_widgets = gears.table.join(clocksarray, {

-        spacer,
-        --spacing = 4,
-        --spacing_widget = spacer,
+        make_spacer(" "),
+        wibox.widget.systray(),

         s.mylayoutbox,
         layout = wibox.layout.fixed.horizontal,
     })
 
     if s == screen.primary then
         right_widgets = gears.table.join({
         s.mylayoutbox,
         layout = wibox.layout.fixed.horizontal,
     })
 
     if s == screen.primary then
         right_widgets = gears.table.join({

-            wibox.widget.systray(),
-            spacer,
+            make_spacer(" "),

             ccwidgets.btc_widget,
             ccwidgets.btc_widget,

-            spacer,
+            make_spacer(),

             ccwidgets.eth_widget,
             ccwidgets.eth_widget,

-            spacer,
+            make_spacer(),

             lain_bat.widget,
             lain_bat.widget,

-            spacer,
+            make_spacer(),

         }, right_widgets)
     end
 
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
         }, right_widgets)
     end
 
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
         { -- Left widgets

-            spacing = 4,
-            spacing_widget = spacer,

             layout = wibox.layout.fixed.horizontal,
             --s.namebox,
             s.mytaglist,
             layout = wibox.layout.fixed.horizontal,
             --s.namebox,
             s.mytaglist,

+            make_spacer(" "),

             s.mypromptbox,
         },
         s.mytasklist, -- Middle widget
             s.mypromptbox,
         },
         s.mytasklist, -- Middle widget