diff --git a/lain b/lain index 8207714..28b9a0b 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 8207714a8b362ecbae1a2a2a676ffb5922a419c2 +Subproject commit 28b9a0b91312e080f352c6bde89bbc3718215b30 diff --git a/rc.lua.copland b/rc.lua.copland index 9fab18d..056f88a 100755 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -361,7 +361,7 @@ for s = 1, screen.count() do -- Now bring it all together (with the tasklist in the middle) local layout = wibox.layout.align.horizontal() layout:set_left(left_layout) - --layout:set_middle(mytasklist[s]) + layout:set_middle(mytasklist[s]) layout:set_right(right_layout) mywibox[s]:set_widget(layout) diff --git a/rc.lua.steamburn b/rc.lua.steamburn index ee19b8e..3a01dd4 100755 --- a/rc.lua.steamburn +++ b/rc.lua.steamburn @@ -1,6 +1,6 @@ --[[ - Steamburn Awesome WM config 2.0 + Steamburn Awesome WM config 3.0 github.com/copycat-killer --]] @@ -73,13 +73,17 @@ browser2 = "iron" gui_editor = "gvim" graphics = "gimp" +-- lain +lain.layout.termfair.nmaster = 3 +lain.layout.termfair.ncol = 1 + local layouts = { awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.top, - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, - awful.layout.suit.spiral.dwindle, + lain.layout.uselessfair.horizontal, + lain.layout.uselesstile, + lain.layout.uselessfair, + lain.layout.termfair, + lain.layout.uselesspiral.dwindle } -- }}} @@ -115,9 +119,8 @@ mytextclock = awful.widget.textclock(" %H:%M ") -- Calendar lain.widgets.calendar:attach(mytextclock) ---[[ Mail IMAP check --- commented because it needs to be set before use -mailwidget = lain.widgets.imap({ +-- Mail IMAP check +aimailwidget = lain.widgets.imap({ timeout = 180, server = "server", mail = "mail", @@ -127,14 +130,13 @@ mailwidget = lain.widgets.imap({ count = "" if mailcount > 0 then - mail = "Arch " + mail = "Mail " count = mailcount .. " " end widget:set_markup(markup(gray, mail) .. count) end }) -]] -- MPD mpdwidget = lain.widgets.mpd({ @@ -168,6 +170,11 @@ memwidget = lain.widgets.mem({ end }) +-- /home fs +fshomeupd = lain.widgets.fs({ + partition = "/home" +}) + -- Battery batwidget = lain.widgets.bat({ settings = function() @@ -424,6 +431,7 @@ globalkeys = awful.util.table.join( -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar:show(7) end), + awful.key({ altkey, }, "h", function () fshomeupd.show(7) end), awful.key({ altkey, }, "w", function () yawn.show(7) end), -- ALSA volume control diff --git a/themes/steamburn/icons/square_sel.png b/themes/steamburn/icons/square_sel.png index 9714653..2bcabb8 100644 Binary files a/themes/steamburn/icons/square_sel.png and b/themes/steamburn/icons/square_sel.png differ diff --git a/themes/steamburn/icons/square_unsel.png b/themes/steamburn/icons/square_unsel.png index a4584d9..604d68b 100644 Binary files a/themes/steamburn/icons/square_unsel.png and b/themes/steamburn/icons/square_unsel.png differ diff --git a/themes/steamburn/icons/submenu.png b/themes/steamburn/icons/submenu.png index 10ca014..12b97c6 100644 Binary files a/themes/steamburn/icons/submenu.png and b/themes/steamburn/icons/submenu.png differ diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 4f4db01..653909c 100644 --- a/themes/steamburn/theme.lua +++ b/themes/steamburn/theme.lua @@ -1,6 +1,7 @@ + --[[ - Steamburn Awesome WM config 2.0 + Steamburn Awesome WM config 3.0 github.com/copycat-killer --]] @@ -11,19 +12,19 @@ themes_dir = os.getenv("HOME") .. "/.config/awesome/the theme.wallpaper = themes_dir .. "/wall.png" theme.font = "Tamsyn 10.5" -theme.fg_normal = "#cdcdcd" -theme.fg_focus = "#d79d38" +theme.fg_normal = "#e2ccb0" +theme.fg_focus = "#d88166" theme.fg_urgent = "#CC9393" theme.bg_normal = "#140c0b" theme.bg_focus = "#140c0b" theme.bg_urgent = "#2a1f1e" -theme.border_width = "1" -theme.border_normal = "#140c0f" -theme.border_focus = "#915543" +theme.border_width = 1 +theme.border_normal = "#302627" +theme.border_focus = "#c2745b" theme.border_marked = "#CC9393" -theme.taglist_fg_focus = "#d47456" +theme.taglist_fg_focus = "#d88166" theme.tasklist_bg_focus = "#140c0b" -theme.tasklist_fg_focus = "#d47456" +theme.tasklist_fg_focus = "#d88166" theme.menu_height = "16" theme.menu_width = "140" @@ -49,4 +50,11 @@ theme.tasklist_floating = "" theme.tasklist_maximized_horizontal = "" theme.tasklist_maximized_vertical = "" +-- lain related +theme.layout_txt_termfair = "[termfair]" +theme.layout_txt_uselessfair = "[ufv]" +theme.layout_txt_uselessfairh = "[ufh]" +theme.layout_txt_uselessdwindle = "[ud]" +theme.layout_txt_uselesstile = "[ut]" + return theme diff --git a/themes/steamburn/wall.png b/themes/steamburn/wall.png index 40278ba..21efa45 100644 Binary files a/themes/steamburn/wall.png and b/themes/steamburn/wall.png differ