diff --git a/README.rst b/README.rst index 6020ca4..845ff96 100644 --- a/README.rst +++ b/README.rst @@ -143,7 +143,7 @@ Notes Complements are provided by lain_ and freedesktop_. **Be sure** to satisfy their dependencies. -Fonts are Terminus_ (Multicolor, Powerarrow, Powerarrow Dark), Tamzen_ (Copland), Roboto_ (Holo, Vertex) and Tamsyn_ (other ones). +Fonts are Terminus_ (Multicolor, Powerarrow, Powerarrow Dark), Roboto_ (Holo, Vertex) and Tamsyn_ (other ones). Every theme has a colorscheme_. diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index 9e3fd0c..f2e9f52 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -90,8 +90,8 @@ theme.cal = lain.widget.cal({ bg = theme.bg_normal }}) ---[[ Mail IMAP check --- commented because it needs to be set before use +-- Mail IMAP check +--[[ commented because it needs to be set before use local mail = lain.widget.imap({ timeout = 180, server = "server", @@ -132,6 +132,7 @@ theme.mpd = lain.widget.mpd({ }) -- /home fs +--[[ commented because it uses theme.fs = lain.widget.fs({ notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, settings = function() @@ -146,6 +147,7 @@ theme.fs = lain.widget.fs({ widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. fs_p)) end }) +--]] -- Battery local bat = lain.widget.bat({ diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index 584712d..9d444a5 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -17,7 +17,7 @@ local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility local theme = {} theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/copland" theme.wallpaper = theme.dir .. "/wall.png" -theme.font = "Misc Tamzen 10.5" +theme.font = "Misc Tamsyn 10.5" theme.fg_normal = "#BBBBBB" theme.fg_focus = "#78A4FF" theme.bg_normal = "#111111" @@ -95,14 +95,14 @@ local green = "#8FEB8F" -- Textclock --os.setlocale(os.getenv("LANG")) -- to localize the clock -local mytextclock = wibox.widget.textclock(" %H:%M ") +local mytextclock = wibox.widget.textclock(" %H:%M ") mytextclock.font = theme.font -- Calendar theme.cal = lain.widget.cal({ attach_to = { mytextclock }, notification_preset = { - font = "Misc Tamzen 11", + font = "Misc Tamsyn 11", fg = theme.fg_normal, bg = theme.bg_normal } @@ -120,7 +120,7 @@ local mail = lain.widget.imap({ count = "" if mailcount > 0 then - mail = " Mail " + mail = " Mail " count = mailcount .. " " end @@ -135,11 +135,11 @@ theme.mpd = lain.widget.mpd({ settings = function() if mpd_now.state == "play" then title = mpd_now.title - artist = " " .. mpd_now.artist .. markup("#777777", " | ") + artist = " " .. mpd_now.artist .. markup("#777777", " | ") mpdicon:set_image(theme.play) elseif mpd_now.state == "pause" then title = "mpd " - artist = "paused" .. markup("#777777", " | ") + artist = "paused" .. markup("#777777", " | ") mpdicon:set_image(theme.pause) else title = "" @@ -215,7 +215,7 @@ local fsbar = wibox.widget { widget = wibox.widget.progressbar, } theme.fs = lain.widget.fs { - notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamzen 10.5" }, + notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, settings = function() if fs_now["/home"].percentage < 90 then fsbar:set_color(theme.fg_normal) @@ -282,10 +282,10 @@ theme.weather = lain.widget.weather({ }) -- Separators -local first = wibox.widget.textbox(markup.font("Misc Tamzen 3", " ")) +local first = wibox.widget.textbox(markup.font("Misc Tamsyn 3", " ")) local spr = wibox.widget.textbox(' ') -local small_spr = wibox.widget.textbox(markup.font("Misc Tamzen 4", " ")) -local bar_spr = wibox.widget.textbox(markup.font("Misc Tamzen 3", " ") .. markup.fontfg(theme.font, "#777777", "|") .. markup.font("Misc Tamzen 5", " ")) +local small_spr = wibox.widget.textbox(markup.font("Misc Tamsyn 4", " ")) +local bar_spr = wibox.widget.textbox(markup.font("Misc Tamsyn 3", " ") .. markup.fontfg(theme.font, "#777777", "|") .. markup.font("Misc Tamsyn 5", " ")) -- Eminent-like task filtering local orig_filter = awful.widget.taglist.filter.all