summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bar.lua12
-rw-r--r--theme.lua15
2 files changed, 19 insertions, 8 deletions
diff --git a/bar.lua b/bar.lua
index ab6cda8..698fb2e 100644
--- a/bar.lua
+++ b/bar.lua
@@ -1,6 +1,7 @@
local awful = require("awful")
local wibox = require("wibox")
local beautiful = require("beautiful")
+local buttons = require("buttons")
-- load widgets
--local mylauncher = require("widgets.button")
@@ -48,7 +49,11 @@ local widgets = {
},
separator,
} end,
- textclock = wibox.widget.textclock("%A, %B %-e, %-I:%M %p"),
+ textclock = {
+ widget = wibox.widget.textclock,
+ format = "%A, %B %-e, %-I:%M %p",
+ font = beautiful.textclock_font,
+ },
cpu = {
layout = wibox.layout.fixed.horizontal,
wibox.widget.textbox "CPU: ",
@@ -71,7 +76,6 @@ local widgets = {
},
bat = {
layout = wibox.layout.fixed.horizontal,
- buttons = volume_buttons,
wibox.widget.textbox "BAT: ",
widget_battery,
},
@@ -100,15 +104,15 @@ function widgets.right_widgets(s) return wibox.widget {
layout = wibox.layout.fixed.horizontal,
{
layout = wibox.layout.fixed.horizontal,
- spacing = spacing,
+ spacing = spacing * 2,
{
layout = wibox.layout.fixed.horizontal,
widgets.cpu,
widgets.temp,
},
widgets.ram,
- widgets.vol,
widgets.bat,
+ widgets.vol,
},
{
widget = wibox.widget.separator,
diff --git a/theme.lua b/theme.lua
index 98f0ee8..9393030 100644
--- a/theme.lua
+++ b/theme.lua
@@ -16,16 +16,23 @@ beautiful.gap_single_client = false
-- overrides
beautiful.tasklist_font_focus = beautiful.font -- prevent bold
-beautiful.wibar_height = "18"
+beautiful.wibar_height = math.floor(beautiful.get_font_height(beautiful.font) * 1.1)
beautiful.wibar_bg = darkgray
--beautiful.layoutlist_font = "Monospace 8"
--beautiful.font = "Tamzen 10"
---beautiful.taglist_font = "Tamzen 10"
---beautiful.tasklist_font = beautiful.font
--beautiful.tasklist_align = "center" -- does nothing?
+beautiful.font_sans = beautiful.font
+beautiful.font_mono = "CommitMono 10"
+beautiful.font = beautiful.font_mono
+
+--beautiful.layoutlist_font = beautiful.font_mono
+beautiful.taglist_font = beautiful.font_sans
+beautiful.tasklist_font = beautiful.font_sans
+beautiful.textclock_font = beautiful.font_sans
+
-- hotkeys menu
-beautiful.hotkeys_font = beautiful.font -- TODO make bold
+beautiful.hotkeys_font = beautiful.font_mono -- TODO make bold
beautiful.hotkeys_description_font = beautiful.font
beautiful.hotkeys_border_color = beautiful.border_focus
beautiful.hotkeys_bg = darkgray