Modification du theme

1 files changed, 28 insertions, 30 deletions

diff --git a/rc.lua b/rc.lua
index d2768f7..f367dc5 100644
--- a/rc.lua
+++ b/rc.lua
@@ -116,7 +116,7 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 
 -- {{{ Wibox
 -- Create a textclock widget
-mytextclock = awful.widget.textclock("<span color='#cbcbcb'> %H:%M</span> ")
+mytextclock = awful.widget.textclock("<span color='#cbcbcb'> %H:%M</span>")
 markup = lain.util.markup
 
 -- Calendar
@@ -127,14 +127,17 @@ lain.widgets.calendar:attach(mytextclock)
 cpuwidget = lain.widgets.cpu({
     settings = function()
         int_cpu_usage = tonumber(cpu_now.usage)
-        if int_cpu_usage <= 9 then
-            widget:set_markup(markup("#cbcbcb", "") .. "⋅" .. cpu_now.usage .. "%")
-        else
-            widget:set_markup(markup("#cbcbcb", "") .. cpu_now.usage .. "%")
-        end
+        widget:set_markup(markup("#cb66cb", "") .. cpu_now.usage .. "%")
     end
 })
 
+-- Wifi
+--
+
+-- wifi widget
+wifiwidget = wibox.widget.textbox()
+vicious.register(wifiwidget, vicious.widgets.wifi, '<span color="#7F9F7F">${ssid}</span>@<span color="#7F9F7F">${linp}</span>', 10, "wlp3s0")
+
 -- MPD
 -- mpdwidget = lain.widgets.mpd()
 
@@ -147,13 +150,13 @@ vicious.register(mpdwidget, vicious.widgets.mpd,
         else
           if not (args["{Artist}"] == 'N/A') then
             if not (args["{Title}"] == 'N/A') then
-              return args["{Artist}"]..' - '.. args["{Title}"] .. ' '
+                return markup.bold(args["{Artist}"]..' - '.. args["{Title}"]) .. " / "
             else
-              return args["{Artist}"] .. '  '
+                return markup.bold(args["{Artist}"] ) .. " / "
             end
           else
             if not (args["{Title}"] == 'N/A') then
-              return args["{Title}"] .. '  '
+                return markup.bold(args["{Title}"]) .. " / "
             end
             return ''
           end
@@ -164,15 +167,7 @@ vicious.register(mpdwidget, vicious.widgets.mpd,
 memwidget = lain.widgets.mem({
     settings = function()
         int_mem_now_used = tonumber(mem_now.used)
-        if int_mem_now_used <= 99 then
-            widget:set_markup(markup("#cbcbcb", " ⚠") .. "⋅⋅" .. mem_now.used .. " ☣")
-        else
-            if int_mem_now_used <= 999 then
-                widget:set_markup(markup("#cbcbcb", " ⚠") .. "⋅" .. mem_now.used .. " ☣")
-            else
-                widget:set_markup(markup("#cbcbcb", " ⚠") .. mem_now.used .. " ☣")
-            end
-        end
+        widget:set_markup(markup.fg.color("#dda", mem_now.used .. "M"))
     end
 })
 
@@ -186,27 +181,25 @@ volumewidget = lain.widgets.alsa({
 
         if int_volume_level == 100 then
             vlevel = "MX"
+        elseif int_volume_level == 0 then
+            vlevel = "MM"
         else
-            if int_volume_level <= 9 then
-                vlevel = "⋅" .. volume_now.level
-            else
-                vlevel = volume_now.level
-            end
+            vlevel = volume_now.level
         end
 
         if volume_now.status == "off" then
             vlevel = vlevel .. "#"
         else
-            vlevel = vlevel .. "% "
+            vlevel = vlevel .. "%"
         end
-        widget:set_markup(markup("#cbcbcb", header) .. vlevel)
+        widget:set_markup(markup.fg.color("#ccaacc", vlevel))
     end
 })
 
 
 -- Separators
 first = wibox.widget.textbox(markup.font("Terminus 4", " "))
-spr = wibox.widget.textbox('  ⌁ ')
+spr = wibox.widget.textbox(' ⌁ ')
 
 
 myemailwidget = wibox.widget.textbox()
@@ -222,7 +215,7 @@ function act()
               awful.spawn.easy_async("bash -c \"acpi | cut -d',' -f2 \"",
               function(percent, stderr, reason, exit_code)
                   a,b = string.find( percent, "%%")
-                  mybatwidget:set_text ( "⚡" .. string.sub(percent, 1, a+1))
+                  mybatwidget:set_text ( "🔋" .. string.sub(percent, 1, a+1))
                   -- str = awful.util.shell("acpi | cut -d',' -f2")
                   if percent == " 21%\n" or percent == " 20%\n" then
                     naughty.notify({ preset = naughty.config.presets.critical,
@@ -249,7 +242,7 @@ function act()
                   function(percent, stderr, reason, exit_code)
                       a,b = string.find( percent, "%%")
                       if a then
-                          mybatwidget:set_text ("❖" .. string.sub(percent, 1, a+1))
+                          mybatwidget:set_text ("🔌" .. string.sub(percent, 1, a+1))
                       end
               end)
           end
@@ -347,14 +340,19 @@ for s = 1, screen.count() do
 
     -- Widgets that are aligned to the right
     local right_layout = wibox.layout.fixed.horizontal()
-    right_layout:add(mpdwidget)
     if s == 1 then right_layout:add(wibox.widget.systray()) end
-    right_layout:add(first)
+    right_layout:add(spr)
+    right_layout:add(mpdwidget)
+    right_layout:add(wifiwidget)
     right_layout:add(spr)
     right_layout:add(cpuwidget)
+    right_layout:add(spr)
     right_layout:add(memwidget)
+    right_layout:add(spr)
     right_layout:add(volumewidget)
+    right_layout:add(spr)
     right_layout:add(mybatwidget)
+    right_layout:add(spr)
     right_layout:add(myemailwidget)
     right_layout:add(mytextclock)
 mytimer:start()