同步 awesome 主题配置
This commit is contained in:
@@ -10,22 +10,17 @@
|
||||
* 将 awesome 配置文件链接到配置目录下
|
||||
#+begin_src sh
|
||||
dir=$(pwd)
|
||||
# 链接配置
|
||||
ln -s "${dir}/rc.lua" ~/.config/awesome/
|
||||
# 链接定制快捷键
|
||||
ln -s "${dir}/pravitekeys.lua" ~/.config/awesome/
|
||||
# 链接定制主题
|
||||
ln -s "${dir}/multicolor-theme.lua" ~/.config/awesome/themes/multicolor/theme-personal.lua
|
||||
#+end_src
|
||||
|
||||
* 修改 =awesome-copycats= 代码
|
||||
修改 =awesome-copycats= 代码的原因有两个：
|
||||
* 定制 =multicolor= 主题
|
||||
定制 =multicolor= 主题的原因有两个：
|
||||
1. 下拉终端使用 =st= ，=awesome-copycats= 实现下拉终端时需要设置 =st= 终端的窗口名，
|
||||
=st= 设置窗口名的命令行参数为 /-n/ 而非 =xterm= 和 =rxvt-unicode= 使用的 /-name/ 。
|
||||
2. 在我们自定义的配置中，会根据显示器数量设置不同的 *tag名称* ，=awesome-copycats= 默认
|
||||
的每个屏幕的 =tag= 都相同。
|
||||
|
||||
实现该功能无需手动修改代码，直接使用[[./multicolor-config.patch][该补丁]]即可，命令如下：
|
||||
#+begin_src sh
|
||||
dir=$(pwd)
|
||||
file="${dir}/multicolor-config.patch"
|
||||
|
||||
cd ~/.config/awesome/
|
||||
git apply $file
|
||||
#+end_src
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua
|
||||
index df22666..749d82f 100644
|
||||
--- a/themes/multicolor/theme.lua
|
||||
+++ b/themes/multicolor/theme.lua
|
||||
@@ -253,7 +253,7 @@ theme.mpd = lain.widget.mpd({
|
||||
|
||||
function theme.at_screen_connect(s)
|
||||
-- Quake application
|
||||
- s.quake = lain.util.quake({ app = awful.util.terminal })
|
||||
+ s.quake = lain.util.quake({ app = awful.util.terminal, argname = "-n %s" })
|
||||
|
||||
-- If wallpaper is a function, call it with the screen
|
||||
local wallpaper = theme.wallpaper
|
||||
@@ -263,7 +263,7 @@ function theme.at_screen_connect(s)
|
||||
gears.wallpaper.maximized(wallpaper, s, true)
|
||||
|
||||
-- Tags
|
||||
- awful.tag(awful.util.tagnames, s, awful.layout.layouts)
|
||||
+ -- awful.tag(awful.util.tagnames, s, awful.layout.layouts)
|
||||
|
||||
-- Create a promptbox for each screen
|
||||
s.mypromptbox = awful.widget.prompt()
|
||||
360
awesome/multicolor-theme.lua
Normal file
360
awesome/multicolor-theme.lua
Normal file
@@ -0,0 +1,360 @@
|
||||
--[[
|
||||
|
||||
Multicolor Awesome WM theme 2.0
|
||||
github.com/lcpz
|
||||
|
||||
--]]
|
||||
|
||||
local gears = require("gears")
|
||||
local lain = require("lain")
|
||||
local awful = require("awful")
|
||||
local wibox = require("wibox")
|
||||
local dpi = require("beautiful.xresources").apply_dpi
|
||||
|
||||
local os = os
|
||||
local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility
|
||||
|
||||
local theme = {}
|
||||
theme.confdir = os.getenv("HOME") .. "/.config/awesome/themes/multicolor"
|
||||
theme.wallpaper = theme.confdir .. "/wall.png"
|
||||
theme.font = "Terminus 8"
|
||||
theme.menu_bg_normal = "#000000"
|
||||
theme.menu_bg_focus = "#000000"
|
||||
theme.bg_normal = "#000000"
|
||||
theme.bg_focus = "#000000"
|
||||
theme.bg_urgent = "#000000"
|
||||
theme.fg_normal = "#aaaaaa"
|
||||
theme.fg_focus = "#ff8c00"
|
||||
theme.fg_urgent = "#af1d18"
|
||||
theme.fg_minimize = "#ffffff"
|
||||
theme.border_width = dpi(1)
|
||||
theme.border_normal = "#1c2022"
|
||||
theme.border_focus = "#606060"
|
||||
theme.border_marked = "#3ca4d8"
|
||||
theme.menu_border_width = 0
|
||||
theme.menu_width = dpi(130)
|
||||
theme.menu_submenu_icon = theme.confdir .. "/icons/submenu.png"
|
||||
theme.menu_fg_normal = "#aaaaaa"
|
||||
theme.menu_fg_focus = "#ff8c00"
|
||||
theme.menu_bg_normal = "#050505dd"
|
||||
theme.menu_bg_focus = "#050505dd"
|
||||
theme.widget_temp = theme.confdir .. "/icons/temp.png"
|
||||
theme.widget_uptime = theme.confdir .. "/icons/ac.png"
|
||||
theme.widget_cpu = theme.confdir .. "/icons/cpu.png"
|
||||
theme.widget_weather = theme.confdir .. "/icons/dish.png"
|
||||
theme.widget_fs = theme.confdir .. "/icons/fs.png"
|
||||
theme.widget_mem = theme.confdir .. "/icons/mem.png"
|
||||
theme.widget_note = theme.confdir .. "/icons/note.png"
|
||||
theme.widget_note_on = theme.confdir .. "/icons/note_on.png"
|
||||
theme.widget_netdown = theme.confdir .. "/icons/net_down.png"
|
||||
theme.widget_netup = theme.confdir .. "/icons/net_up.png"
|
||||
theme.widget_mail = theme.confdir .. "/icons/mail.png"
|
||||
theme.widget_batt = theme.confdir .. "/icons/bat.png"
|
||||
theme.widget_clock = theme.confdir .. "/icons/clock.png"
|
||||
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.useless_gap = 0
|
||||
theme.layout_tile = theme.confdir .. "/icons/tile.png"
|
||||
theme.layout_tilegaps = theme.confdir .. "/icons/tilegaps.png"
|
||||
theme.layout_tileleft = theme.confdir .. "/icons/tileleft.png"
|
||||
theme.layout_tilebottom = theme.confdir .. "/icons/tilebottom.png"
|
||||
theme.layout_tiletop = theme.confdir .. "/icons/tiletop.png"
|
||||
theme.layout_fairv = theme.confdir .. "/icons/fairv.png"
|
||||
theme.layout_fairh = theme.confdir .. "/icons/fairh.png"
|
||||
theme.layout_spiral = theme.confdir .. "/icons/spiral.png"
|
||||
theme.layout_dwindle = theme.confdir .. "/icons/dwindle.png"
|
||||
theme.layout_max = theme.confdir .. "/icons/max.png"
|
||||
theme.layout_fullscreen = theme.confdir .. "/icons/fullscreen.png"
|
||||
theme.layout_magnifier = theme.confdir .. "/icons/magnifier.png"
|
||||
theme.layout_floating = theme.confdir .. "/icons/floating.png"
|
||||
theme.titlebar_close_button_normal = theme.confdir .. "/icons/titlebar/close_normal.png"
|
||||
theme.titlebar_close_button_focus = theme.confdir .. "/icons/titlebar/close_focus.png"
|
||||
theme.titlebar_minimize_button_normal = theme.confdir .. "/icons/titlebar/minimize_normal.png"
|
||||
theme.titlebar_minimize_button_focus = theme.confdir .. "/icons/titlebar/minimize_focus.png"
|
||||
theme.titlebar_ontop_button_normal_inactive = theme.confdir .. "/icons/titlebar/ontop_normal_inactive.png"
|
||||
theme.titlebar_ontop_button_focus_inactive = theme.confdir .. "/icons/titlebar/ontop_focus_inactive.png"
|
||||
theme.titlebar_ontop_button_normal_active = theme.confdir .. "/icons/titlebar/ontop_normal_active.png"
|
||||
theme.titlebar_ontop_button_focus_active = theme.confdir .. "/icons/titlebar/ontop_focus_active.png"
|
||||
theme.titlebar_sticky_button_normal_inactive = theme.confdir .. "/icons/titlebar/sticky_normal_inactive.png"
|
||||
theme.titlebar_sticky_button_focus_inactive = theme.confdir .. "/icons/titlebar/sticky_focus_inactive.png"
|
||||
theme.titlebar_sticky_button_normal_active = theme.confdir .. "/icons/titlebar/sticky_normal_active.png"
|
||||
theme.titlebar_sticky_button_focus_active = theme.confdir .. "/icons/titlebar/sticky_focus_active.png"
|
||||
theme.titlebar_floating_button_normal_inactive = theme.confdir .. "/icons/titlebar/floating_normal_inactive.png"
|
||||
theme.titlebar_floating_button_focus_inactive = theme.confdir .. "/icons/titlebar/floating_focus_inactive.png"
|
||||
theme.titlebar_floating_button_normal_active = theme.confdir .. "/icons/titlebar/floating_normal_active.png"
|
||||
theme.titlebar_floating_button_focus_active = theme.confdir .. "/icons/titlebar/floating_focus_active.png"
|
||||
theme.titlebar_maximized_button_normal_inactive = theme.confdir .. "/icons/titlebar/maximized_normal_inactive.png"
|
||||
theme.titlebar_maximized_button_focus_inactive = theme.confdir .. "/icons/titlebar/maximized_focus_inactive.png"
|
||||
theme.titlebar_maximized_button_normal_active = theme.confdir .. "/icons/titlebar/maximized_normal_active.png"
|
||||
theme.titlebar_maximized_button_focus_active = theme.confdir .. "/icons/titlebar/maximized_focus_active.png"
|
||||
|
||||
local markup = lain.util.markup
|
||||
|
||||
-- Textclock
|
||||
os.setlocale(os.getenv("LANG")) -- to localize the clock
|
||||
local clockicon = wibox.widget.imagebox(theme.widget_clock)
|
||||
local mytextclock = wibox.widget.textclock(markup("#7788af", "%A %d %B ") .. markup("#ab7367", ">") .. markup("#de5e1e", " %H:%M "))
|
||||
mytextclock.font = theme.font
|
||||
|
||||
-- Calendar
|
||||
theme.cal = lain.widget.cal({
|
||||
attach_to = { mytextclock },
|
||||
notification_preset = {
|
||||
font = "Terminus 10",
|
||||
fg = theme.fg_normal,
|
||||
bg = theme.bg_normal
|
||||
}
|
||||
})
|
||||
|
||||
-- Weather
|
||||
--[[ to be set before use
|
||||
local weathericon = wibox.widget.imagebox(theme.widget_weather)
|
||||
theme.weather = lain.widget.weather({
|
||||
city_id = 2643743, -- placeholder (London)
|
||||
notification_preset = { font = "Terminus 10", fg = theme.fg_normal },
|
||||
weather_na_markup = markup.fontfg(theme.font, "#eca4c4", "N/A "),
|
||||
settings = function()
|
||||
descr = weather_now["weather"][1]["description"]:lower()
|
||||
units = math.floor(weather_now["main"]["temp"])
|
||||
widget:set_markup(markup.fontfg(theme.font, "#eca4c4", descr .. " @ " .. units .. "°C "))
|
||||
end
|
||||
})
|
||||
--]]
|
||||
|
||||
-- / fs
|
||||
--[[ commented because it needs Gio/Glib >= 2.54
|
||||
local fsicon = wibox.widget.imagebox(theme.widget_fs)
|
||||
theme.fs = lain.widget.fs({
|
||||
notification_preset = { font = "Terminus 10", fg = theme.fg_normal },
|
||||
settings = function()
|
||||
widget:set_markup(markup.fontfg(theme.font, "#80d9d8", string.format("%.1f", fs_now["/"].used) .. "% "))
|
||||
end
|
||||
})
|
||||
--]]
|
||||
|
||||
-- Mail IMAP check
|
||||
--[[ to be set before use
|
||||
local mailicon = wibox.widget.imagebox()
|
||||
theme.mail = lain.widget.imap({
|
||||
timeout = 180,
|
||||
server = "server",
|
||||
mail = "mail",
|
||||
password = "keyring get mail",
|
||||
settings = function()
|
||||
if mailcount > 0 then
|
||||
mailicon:set_image(theme.widget_mail)
|
||||
widget:set_markup(markup.fontfg(theme.font, "#cccccc", mailcount .. " "))
|
||||
else
|
||||
widget:set_text("")
|
||||
--mailicon:set_image() -- not working in 4.0
|
||||
mailicon._private.image = nil
|
||||
mailicon:emit_signal("widget::redraw_needed")
|
||||
mailicon:emit_signal("widget::layout_changed")
|
||||
end
|
||||
end
|
||||
})
|
||||
--]]
|
||||
|
||||
-- CPU
|
||||
local cpuicon = wibox.widget.imagebox(theme.widget_cpu)
|
||||
local cpu = lain.widget.cpu({
|
||||
settings = function()
|
||||
widget:set_markup(markup.fontfg(theme.font, "#e33a6e", cpu_now.usage .. "% "))
|
||||
end
|
||||
})
|
||||
|
||||
-- Coretemp
|
||||
local tempicon = wibox.widget.imagebox(theme.widget_temp)
|
||||
local temp = lain.widget.temp({
|
||||
settings = function()
|
||||
widget:set_markup(markup.fontfg(theme.font, "#f1af5f", coretemp_now .. "°C "))
|
||||
end
|
||||
})
|
||||
|
||||
-- Battery
|
||||
local baticon = wibox.widget.imagebox(theme.widget_batt)
|
||||
local bat = lain.widget.bat({
|
||||
settings = function()
|
||||
local perc = bat_now.perc ~= "N/A" and bat_now.perc .. "%" or bat_now.perc
|
||||
|
||||
if bat_now.ac_status == 1 then
|
||||
perc = perc .. " plug"
|
||||
end
|
||||
|
||||
widget:set_markup(markup.fontfg(theme.font, theme.fg_normal, perc .. " "))
|
||||
end
|
||||
})
|
||||
|
||||
-- ALSA volume
|
||||
local volicon = wibox.widget.imagebox(theme.widget_vol)
|
||||
-- theme.volume = lain.widget.alsa({
|
||||
-- settings = function()
|
||||
-- if volume_now.status == "off" then
|
||||
-- volume_now.level = volume_now.level .. "M"
|
||||
-- end
|
||||
|
||||
-- widget:set_markup(markup.fontfg(theme.font, "#7493d2", volume_now.level .. "% "))
|
||||
-- end
|
||||
-- })
|
||||
-- PulseAudio volume
|
||||
theme.volume = lain.widget.pulse({
|
||||
settings = function()
|
||||
vlevel = volume_now.left .. "-" .. volume_now.right .. "%|" .. volume_now.device
|
||||
if volume_now.muted == "yes" then
|
||||
vlevel = vlevel .. " M"
|
||||
end
|
||||
widget:set_markup(markup.fontfg(theme.font, "#7493d2", vlevel))
|
||||
end
|
||||
})
|
||||
|
||||
-- Net
|
||||
local netdownicon = wibox.widget.imagebox(theme.widget_netdown)
|
||||
local netdowninfo = wibox.widget.textbox()
|
||||
local netupicon = wibox.widget.imagebox(theme.widget_netup)
|
||||
local netupinfo = lain.widget.net({
|
||||
settings = function()
|
||||
--[[ uncomment if using the weather widget
|
||||
if iface ~= "network off" and
|
||||
string.match(theme.weather.widget.text, "N/A")
|
||||
then
|
||||
theme.weather.update()
|
||||
end
|
||||
--]]
|
||||
|
||||
widget:set_markup(markup.fontfg(theme.font, "#e54c62", net_now.sent .. " "))
|
||||
netdowninfo:set_markup(markup.fontfg(theme.font, "#87af5f", net_now.received .. " "))
|
||||
end
|
||||
})
|
||||
|
||||
-- MEM
|
||||
local memicon = wibox.widget.imagebox(theme.widget_mem)
|
||||
local memory = lain.widget.mem({
|
||||
settings = function()
|
||||
widget:set_markup(markup.fontfg(theme.font, "#e0da37", mem_now.used .. "M "))
|
||||
end
|
||||
})
|
||||
|
||||
-- MPD
|
||||
local mpdicon = wibox.widget.imagebox()
|
||||
theme.mpd = lain.widget.mpd({
|
||||
settings = function()
|
||||
mpd_notification_preset = {
|
||||
text = string.format("%s [%s] - %s\n%s", mpd_now.artist,
|
||||
mpd_now.album, mpd_now.date, mpd_now.title)
|
||||
}
|
||||
|
||||
if mpd_now.state == "play" then
|
||||
artist = mpd_now.artist .. " > "
|
||||
title = mpd_now.title .. " "
|
||||
mpdicon:set_image(theme.widget_note_on)
|
||||
elseif mpd_now.state == "pause" then
|
||||
artist = "mpd "
|
||||
title = "paused "
|
||||
else
|
||||
artist = ""
|
||||
title = ""
|
||||
--mpdicon:set_image() -- not working in 4.0
|
||||
mpdicon._private.image = nil
|
||||
mpdicon:emit_signal("widget::redraw_needed")
|
||||
mpdicon:emit_signal("widget::layout_changed")
|
||||
end
|
||||
widget:set_markup(markup.fontfg(theme.font, "#e54c62", artist) .. markup.fontfg(theme.font, "#b2b2b2", title))
|
||||
end
|
||||
})
|
||||
|
||||
function theme.at_screen_connect(s)
|
||||
-- Quake application
|
||||
s.quake = lain.util.quake({ app = awful.util.terminal, argname = "-n %s" })
|
||||
|
||||
-- If wallpaper is a function, call it with the screen
|
||||
local wallpaper = theme.wallpaper
|
||||
if type(wallpaper) == "function" then
|
||||
wallpaper = wallpaper(s)
|
||||
end
|
||||
gears.wallpaper.maximized(wallpaper, s, true)
|
||||
|
||||
-- Tags
|
||||
-- awful.tag(awful.util.tagnames, s, awful.layout.layouts)
|
||||
|
||||
-- Create a promptbox for each screen
|
||||
s.mypromptbox = awful.widget.prompt()
|
||||
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
||||
-- We need one layoutbox per screen.
|
||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||
s.mylayoutbox:buttons(my_table.join(
|
||||
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||
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, awful.util.taglist_buttons)
|
||||
|
||||
-- Create a tasklist widget
|
||||
s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons)
|
||||
|
||||
-- Create the wibox
|
||||
s.mywibox = awful.wibar({ position = "top", screen = s, height = dpi(19), bg = theme.bg_normal, fg = theme.fg_normal })
|
||||
|
||||
-- Add widgets to the wibox
|
||||
s.mywibox:setup {
|
||||
layout = wibox.layout.align.horizontal,
|
||||
{ -- Left widgets
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
--s.mylayoutbox,
|
||||
s.mytaglist,
|
||||
s.mypromptbox,
|
||||
mpdicon,
|
||||
theme.mpd.widget,
|
||||
},
|
||||
--s.mytasklist, -- Middle widget
|
||||
nil,
|
||||
{ -- Right widgets
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
wibox.widget.systray(),
|
||||
--mailicon,
|
||||
--theme.mail.widget,
|
||||
netdownicon,
|
||||
netdowninfo,
|
||||
netupicon,
|
||||
netupinfo.widget,
|
||||
volicon,
|
||||
theme.volume.widget,
|
||||
memicon,
|
||||
memory.widget,
|
||||
cpuicon,
|
||||
cpu.widget,
|
||||
--fsicon,
|
||||
--theme.fs.widget,
|
||||
--weathericon,
|
||||
--theme.weather.widget,
|
||||
tempicon,
|
||||
temp.widget,
|
||||
baticon,
|
||||
bat.widget,
|
||||
clockicon,
|
||||
mytextclock,
|
||||
},
|
||||
}
|
||||
|
||||
-- Create the bottom wibox
|
||||
s.mybottomwibox = awful.wibar({ position = "bottom", screen = s, border_width = 0, height = dpi(20), bg = theme.bg_normal, fg = theme.fg_normal })
|
||||
|
||||
-- Add widgets to the bottom wibox
|
||||
s.mybottomwibox:setup {
|
||||
layout = wibox.layout.align.horizontal,
|
||||
{ -- Left widgets
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
},
|
||||
s.mytasklist, -- Middle widget
|
||||
{ -- Right widgets
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
s.mylayoutbox,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
return theme
|
||||
@@ -57,7 +57,7 @@ local function run_once(cmd_arr)
|
||||
end
|
||||
end
|
||||
|
||||
run_once({ "unclutter -root" }) -- entries must be separated by commas
|
||||
run_once({ "unclutter -root", "pulseaudio --start" }) -- entries must be separated by commas
|
||||
|
||||
-- This function implements the XDG autostart specification
|
||||
--[[
|
||||
@@ -246,6 +246,7 @@ lain.layout.cascade.tile.nmaster = 5
|
||||
lain.layout.cascade.tile.ncol = 2
|
||||
|
||||
beautiful.init(string.format("%s/.config/awesome/themes/%s/theme.lua", os.getenv("HOME"), chosen_theme))
|
||||
-- beautiful.init(string.format("%s/.config/awesome/themes/%s/theme-personal.lua", os.getenv("HOME"), chosen_theme))
|
||||
-- }}}
|
||||
|
||||
-- {{{ Menu
|
||||
|
||||
Reference in New Issue
Block a user