1
0
Fork 0
mirror of https://github.com/lcpz/awesome-copycats.git synced 2024-12-23 03:32:30 +00:00

submodules updated

This commit is contained in:
copycat-killer 2017-01-09 20:25:21 +01:00
parent 06b1b16ecf
commit c854b7feca
23 changed files with 30 additions and 33 deletions

@ -1 +1 @@
Subproject commit 76da49886064f1df87b30f9fe969af9704745132 Subproject commit 23528cf6857cc4af1558f4e8f177c62745752982

2
lain

@ -1 +1 @@
Subproject commit d5fb6326d2e48d7a1b00d8acf9e37f9174322bb2 Subproject commit 5d892e0ceb9d4dece6d2d61b2e5c4046bbc91e9f

View file

@ -15,7 +15,7 @@ local beautiful = require("beautiful")
local naughty = require("naughty") local naughty = require("naughty")
local lain = require("lain") local lain = require("lain")
--local menubar = require("menubar") --local menubar = require("menubar")
local freedesktop = require"(freedesktop") local freedesktop = require("freedesktop")
local hotkeys_popup = require("awful.hotkeys_popup").widget local hotkeys_popup = require("awful.hotkeys_popup").widget
-- }}} -- }}}
@ -172,6 +172,7 @@ mpdwidget = lain.widgets.mpd({
-- /home fs -- /home fs
fshome = lain.widgets.fs({ fshome = lain.widgets.fs({
partition = "/home", partition = "/home",
options = "--exclude-type=tmpfs",
settings = function() settings = function()
fs_header = "" fs_header = ""
fs_p = "" fs_p = ""
@ -197,8 +198,6 @@ batwidget = lain.widgets.bat({
-- ALSA volume -- ALSA volume
volume = lain.widgets.alsa({ volume = lain.widgets.alsa({
settings = function() settings = function()
separators = lain.util.separators
separators = lain.util.separators
header = " Vol " header = " Vol "
level = volume_now.level level = volume_now.level
@ -216,7 +215,7 @@ myweather = lain.widgets.weather({
city_id = 123456, -- placeholder city_id = 123456, -- placeholder
settings = function() settings = function()
units = math.floor(weather_now["main"]["temp"]) units = math.floor(weather_now["main"]["temp"])
widget:set_text(" " .. units .. " ") widget:set_markup(" " .. units .. " ")
end end
}) })
@ -280,6 +279,14 @@ local function set_wallpaper(s)
end end
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) -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
screen.connect_signal("property::geometry", set_wallpaper) 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({ }, 4, function () awful.layout.inc( 1) end),
awful.button({ }, 5, function () awful.layout.inc(-1) end))) awful.button({ }, 5, function () awful.layout.inc(-1) end)))
-- Create a taglist widget -- 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 -- 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 -- 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 -- Add widgets to the wibox
s.mywibox:setup { s.mywibox:setup {
@ -489,7 +497,7 @@ globalkeys = awful.util.table.join(
-- Widgets popups -- Widgets popups
awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), 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), awful.key({ altkey, }, "w", function () myweather.show(7) end),
-- ALSA volume control -- ALSA volume control

View file

@ -243,6 +243,7 @@ fsbar = wibox.widget {
} }
fshome = lain.widgets.fs({ fshome = lain.widgets.fs({
partition = "/home", partition = "/home",
options = "--exclude-type=tmpfs",
settings = function() settings = function()
if fs_now.used < 90 then if fs_now.used < 90 then
fsbar:set_color(beautiful.fg_normal) fsbar:set_color(beautiful.fg_normal)
@ -562,7 +563,7 @@ globalkeys = awful.util.table.join(
-- Widgets popups -- Widgets popups
awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), 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), awful.key({ altkey, }, "w", function () myweather.show(7) end),
-- ALSA volume control -- ALSA volume control

View file

@ -176,6 +176,7 @@ mpdwidget = lain.widgets.mpd({
-- /home fs -- /home fs
fshome = lain.widgets.fs({ fshome = lain.widgets.fs({
partition = "/home", partition = "/home",
options = "--exclude-type=tmpfs",
notification_preset = { fg = white }, notification_preset = { fg = white },
settings = function() settings = function()
fs_header = "" fs_header = ""
@ -489,7 +490,7 @@ globalkeys = awful.util.table.join(
-- Widgets popups -- Widgets popups
awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), 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), awful.key({ altkey, }, "w", function () myweather.show(7) end),
-- ALSA volume control -- ALSA volume control

View file

@ -159,6 +159,7 @@ myweather = lain.widgets.weather({
-- / fs -- / fs
fsicon = wibox.widget.imagebox(beautiful.widget_fs) fsicon = wibox.widget.imagebox(beautiful.widget_fs)
fsroot = lain.widgets.fs({ fsroot = lain.widgets.fs({
options = "--exclude-type=tmpfs",
settings = function() settings = function()
widget:set_markup(markup("#80d9d8", fs_now.used .. "% ")) widget:set_markup(markup("#80d9d8", fs_now.used .. "% "))
end end

View file

@ -125,7 +125,7 @@ mytextclock = lain.widgets.abase({
timeout = 60, timeout = 60,
cmd = "date +'%a %d %b %R'", cmd = "date +'%a %d %b %R'",
settings = function() settings = function()
widget:set_text(" " .. output) widget:set_markup(" " .. output)
end end
}) })

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

View file

@ -50,6 +50,7 @@ theme.layout_fullscreen = theme.dir .. "/icons/fullscreen.png"
theme.layout_magnifier = theme.dir .. "/icons/magnifier.png" theme.layout_magnifier = theme.dir .. "/icons/magnifier.png"
theme.layout_floating = theme.dir .. "/icons/floating.png" theme.layout_floating = theme.dir .. "/icons/floating.png"
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = true theme.tasklist_disable_icon = true
theme.useless_gap = 0 theme.useless_gap = 0

View file

@ -29,11 +29,6 @@ theme.titlebar_bg_focus = "#262626"
theme.menu_height = 16 theme.menu_height = 16
theme.menu_width = 130 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.tasklist_disable_icon = true
theme.awesome_icon = theme.dir .."/icons/awesome.png" theme.awesome_icon = theme.dir .."/icons/awesome.png"

View file

@ -47,10 +47,8 @@ theme.layout_fullscreen = theme.dir .. "/icons/fullscreen.png"
theme.layout_magnifier = theme.dir .. "/icons/magnifier.png" theme.layout_magnifier = theme.dir .. "/icons/magnifier.png"
theme.layout_floating = theme.dir .. "/icons/floating.png" theme.layout_floating = theme.dir .. "/icons/floating.png"
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = true theme.tasklist_disable_icon = true
theme.tasklist_floating = ""
theme.tasklist_maximized_horizontal = ""
theme.tasklist_maximized_vertical = ""
theme.useless_gap = 10 theme.useless_gap = 10

View file

@ -78,10 +78,8 @@ theme.layout_fullscreen = theme.icon_dir .. "/fullscreen.png"
theme.layout_magnifier = theme.icon_dir .. "/magnifier.png" theme.layout_magnifier = theme.icon_dir .. "/magnifier.png"
theme.layout_floating = theme.icon_dir .. "/floating.png" theme.layout_floating = theme.icon_dir .. "/floating.png"
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = true theme.tasklist_disable_icon = true
theme.tasklist_floating = ""
theme.tasklist_maximized_horizontal = ""
theme.tasklist_maximized_vertical = ""
-- lain related -- lain related
theme.useless_gap_width = 10 theme.useless_gap_width = 10

View file

@ -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_sel = theme.confdir .. "/icons/square_a.png"
theme.taglist_squares_unsel = theme.confdir .. "/icons/square_b.png" theme.taglist_squares_unsel = theme.confdir .. "/icons/square_b.png"
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = 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_tile = theme.confdir .. "/icons/tile.png"
theme.layout_tilegaps = theme.confdir .. "/icons/tilegaps.png" theme.layout_tilegaps = theme.confdir .. "/icons/tilegaps.png"

View file

@ -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 = themes_dir .. "/icons/mail.png"
theme.widget_mail_on = themes_dir .. "/icons/mail_on.png" theme.widget_mail_on = themes_dir .. "/icons/mail_on.png"
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = true theme.tasklist_disable_icon = true
theme.tasklist_floating = ""
theme.tasklist_maximized_horizontal = ""
theme.tasklist_maximized_vertical = ""
return theme return theme

View file

@ -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_sel = themes_dir .. "/icons/square_sel.png"
theme.taglist_squares_unsel = themes_dir .. "/icons/square_unsel.png" theme.taglist_squares_unsel = themes_dir .. "/icons/square_unsel.png"
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = true theme.tasklist_disable_icon = true
theme.tasklist_floating = ""
theme.tasklist_maximized_horizontal = ""
theme.tasklist_maximized_vertical = ""
-- lain related -- lain related
theme.layout_txt_termfair = "[termfair]" theme.layout_txt_termfair = "[termfair]"