diff --git a/freedesktop b/freedesktop index 76da498..23528cf 160000 --- a/freedesktop +++ b/freedesktop @@ -1 +1 @@ -Subproject commit 76da49886064f1df87b30f9fe969af9704745132 +Subproject commit 23528cf6857cc4af1558f4e8f177c62745752982 diff --git a/lain b/lain index d5fb632..5d892e0 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit d5fb6326d2e48d7a1b00d8acf9e37f9174322bb2 +Subproject commit 5d892e0ceb9d4dece6d2d61b2e5c4046bbc91e9f diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 974c9f3..6a85c53 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -15,7 +15,7 @@ local beautiful = require("beautiful") local naughty = require("naughty") local lain = require("lain") --local menubar = require("menubar") -local freedesktop = require"(freedesktop") +local freedesktop = require("freedesktop") local hotkeys_popup = require("awful.hotkeys_popup").widget -- }}} @@ -172,6 +172,7 @@ mpdwidget = lain.widgets.mpd({ -- /home fs fshome = lain.widgets.fs({ partition = "/home", + options = "--exclude-type=tmpfs", settings = function() fs_header = "" fs_p = "" @@ -197,8 +198,6 @@ batwidget = lain.widgets.bat({ -- ALSA volume volume = lain.widgets.alsa({ settings = function() -separators = lain.util.separators -separators = lain.util.separators header = " Vol " level = volume_now.level @@ -216,7 +215,7 @@ myweather = lain.widgets.weather({ city_id = 123456, -- placeholder settings = function() units = math.floor(weather_now["main"]["temp"]) - widget:set_text(" " .. units .. " ") + widget:set_markup(" " .. units .. " ") end }) @@ -280,6 +279,14 @@ local function set_wallpaper(s) end end +local barheight = 18 +local barcolor = gears.color({ + type = "linear", + from = { barheight, 0 }, + to = { barheight, barheight }, + stops = { {0, beautiful.bg_focus }, {0.8, beautiful.border_normal}, {1, "#1A1A1A"} } +}) + -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) screen.connect_signal("property::geometry", set_wallpaper) @@ -306,13 +313,14 @@ awful.screen.connect_for_each_screen(function(s) awful.button({ }, 4, function () awful.layout.inc( 1) end), awful.button({ }, 5, function () awful.layout.inc(-1) end))) -- Create a taglist widget - s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons, { bg_focus = barcolor }) + -- Create a tasklist widget - s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons, { bg_normal = barcolor, bg_focus = barcolor }) -- Create the wibox - s.mywibox = awful.wibar({ position = "top", screen = s, height = 18 }) + s.mywibox = awful.wibar({ position = "top", screen = s, height = barheight, bg = barcolor }) -- Add widgets to the wibox s.mywibox:setup { @@ -489,7 +497,7 @@ globalkeys = awful.util.table.join( -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7, "--exclude-type=tmpfs") end), + awful.key({ altkey, }, "h", function () fshome.show(7) end), awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control diff --git a/rc.lua.copland b/rc.lua.copland index d2edc83..bce1a00 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -243,6 +243,7 @@ fsbar = wibox.widget { } fshome = lain.widgets.fs({ partition = "/home", + options = "--exclude-type=tmpfs", settings = function() if fs_now.used < 90 then fsbar:set_color(beautiful.fg_normal) @@ -562,7 +563,7 @@ globalkeys = awful.util.table.join( -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7, "--exclude-type=tmpfs") end), + awful.key({ altkey, }, "h", function () fshome.show(7) end), awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control diff --git a/rc.lua.dremora b/rc.lua.dremora index 732c9a1..284baba 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -176,6 +176,7 @@ mpdwidget = lain.widgets.mpd({ -- /home fs fshome = lain.widgets.fs({ partition = "/home", + options = "--exclude-type=tmpfs", notification_preset = { fg = white }, settings = function() fs_header = "" @@ -489,7 +490,7 @@ globalkeys = awful.util.table.join( -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7, "--exclude-type=tmpfs") end), + awful.key({ altkey, }, "h", function () fshome.show(7) end), awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control diff --git a/rc.lua.multicolor b/rc.lua.multicolor index f170b46..d1144c7 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -159,6 +159,7 @@ myweather = lain.widgets.weather({ -- / fs fsicon = wibox.widget.imagebox(beautiful.widget_fs) fsroot = lain.widgets.fs({ + options = "--exclude-type=tmpfs", settings = function() widget:set_markup(markup("#80d9d8", fs_now.used .. "% ")) end diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 342eff7..d24a163 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -125,7 +125,7 @@ mytextclock = lain.widgets.abase({ timeout = 60, cmd = "date +'%a %d %b %R'", settings = function() - widget:set_text(" " .. output) + widget:set_markup(" " .. output) end }) diff --git a/themes/blackburn/icons/topbar/1024.png b/themes/blackburn/icons/topbar/1024.png deleted file mode 100644 index 2ab0650..0000000 Binary files a/themes/blackburn/icons/topbar/1024.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1152.png b/themes/blackburn/icons/topbar/1152.png deleted file mode 100644 index a16ba53..0000000 Binary files a/themes/blackburn/icons/topbar/1152.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1280.png b/themes/blackburn/icons/topbar/1280.png deleted file mode 100644 index 163e95d..0000000 Binary files a/themes/blackburn/icons/topbar/1280.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1366.png b/themes/blackburn/icons/topbar/1366.png deleted file mode 100644 index 82897e2..0000000 Binary files a/themes/blackburn/icons/topbar/1366.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1440.png b/themes/blackburn/icons/topbar/1440.png deleted file mode 100644 index d07889c..0000000 Binary files a/themes/blackburn/icons/topbar/1440.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1600.png b/themes/blackburn/icons/topbar/1600.png deleted file mode 100644 index a8a9dd9..0000000 Binary files a/themes/blackburn/icons/topbar/1600.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1680.png b/themes/blackburn/icons/topbar/1680.png deleted file mode 100644 index 30158a2..0000000 Binary files a/themes/blackburn/icons/topbar/1680.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/1920.png b/themes/blackburn/icons/topbar/1920.png deleted file mode 100644 index 1d4d9b3..0000000 Binary files a/themes/blackburn/icons/topbar/1920.png and /dev/null differ diff --git a/themes/blackburn/icons/topbar/2560.png b/themes/blackburn/icons/topbar/2560.png deleted file mode 100644 index d4f8b1a..0000000 Binary files a/themes/blackburn/icons/topbar/2560.png and /dev/null differ diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index 83aa3fa..423049e 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -50,6 +50,7 @@ theme.layout_fullscreen = theme.dir .. "/icons/fullscreen.png" theme.layout_magnifier = theme.dir .. "/icons/magnifier.png" theme.layout_floating = theme.dir .. "/icons/floating.png" +theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true theme.useless_gap = 0 diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index 0995e39..d4f72f1 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -29,11 +29,6 @@ theme.titlebar_bg_focus = "#262626" theme.menu_height = 16 theme.menu_width = 130 -theme.tasklist_sticky = "" -theme.tasklist_ontop = "" -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" theme.tasklist_disable_icon = true theme.awesome_icon = theme.dir .."/icons/awesome.png" diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua index 7c9b771..fa9559a 100644 --- a/themes/dremora/theme.lua +++ b/themes/dremora/theme.lua @@ -47,10 +47,8 @@ theme.layout_fullscreen = theme.dir .. "/icons/fullscreen.png" theme.layout_magnifier = theme.dir .. "/icons/magnifier.png" theme.layout_floating = theme.dir .. "/icons/floating.png" +theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" theme.useless_gap = 10 diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index 9a59a7b..c3a45ed 100644 --- a/themes/holo/theme.lua +++ b/themes/holo/theme.lua @@ -78,10 +78,8 @@ theme.layout_fullscreen = theme.icon_dir .. "/fullscreen.png" theme.layout_magnifier = theme.icon_dir .. "/magnifier.png" theme.layout_floating = theme.icon_dir .. "/floating.png" +theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" -- lain related theme.useless_gap_width = 10 diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index fa83a21..ba0622a 100644 --- a/themes/multicolor/theme.lua +++ b/themes/multicolor/theme.lua @@ -54,10 +54,8 @@ theme.widget_vol = theme.confdir .. "/icons/spkr.png" theme.taglist_squares_sel = theme.confdir .. "/icons/square_a.png" theme.taglist_squares_unsel = theme.confdir .. "/icons/square_b.png" +theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" theme.layout_tile = theme.confdir .. "/icons/tile.png" theme.layout_tilegaps = theme.confdir .. "/icons/tilegaps.png" diff --git a/themes/powerarrow-darker/theme.lua b/themes/powerarrow-darker/theme.lua index ead9123..9e5aac9 100644 --- a/themes/powerarrow-darker/theme.lua +++ b/themes/powerarrow-darker/theme.lua @@ -73,9 +73,7 @@ theme.widget_vol_mute = themes_dir .. "/icons/vol_mute.png" theme.widget_mail = themes_dir .. "/icons/mail.png" theme.widget_mail_on = themes_dir .. "/icons/mail_on.png" +theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" return theme diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 653909c..e77da29 100644 --- a/themes/steamburn/theme.lua +++ b/themes/steamburn/theme.lua @@ -45,10 +45,8 @@ theme.menu_submenu_icon = themes_dir .. "/icons/submenu.png" theme.taglist_squares_sel = themes_dir .. "/icons/square_sel.png" theme.taglist_squares_unsel = themes_dir .. "/icons/square_unsel.png" +theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" -- lain related theme.layout_txt_termfair = "[termfair]"