diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index cdfd1d0..5d1a45b 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -127,25 +127,66 @@ mykeyboardlayout = awful.widget.keyboardlayout() -- Create a textclock widget mytextclock = wibox.widget.textclock() +local spr_right = wibox.widget.imagebox(beautiful.spr_right) +local cpuicon = wibox.widget.imagebox(beautiful.cpu_icon,true) local cpu = lain.widget.cpu({ settings = function() - widget:set_markup(markup.fontfg(beautiful.font, "#e33a6e", cpu_now.usage .. "% ")) + widget:set_markup(markup.fontfg(beautiful.font,beautiful.fg_normal, cpu_now.usage .. "% ")) end }) +local mymem = lain.widget.mem({ + settings = function() + widget:set_markup(markup.fontfg(beautiful.font,beautiful.fg_normal, mem_now.perc .. "% ")) + end +}) + -- Net -local netdownicon = wibox.widget.imagebox(beautiful.widget_netdown) +local netdownicon = wibox.widget.imagebox(beautiful.net_down) local netdowninfo = wibox.widget.textbox() -local netupicon = wibox.widget.imagebox(beautiful.widget_netup) +local netupicon = wibox.widget.imagebox(beautiful.net_up) local netupinfo = lain.widget.net({ settings = function() - + widget:set_markup(markup.fontfg(beautiful.font, "#e54c62", net_now.sent .. " ")) netdowninfo:set_markup(markup.fontfg(beautiful.font, "#87af5f", net_now.received .. " ")) end }) -local mpdicon = wibox.widget.imagebox() +---redshift widget +local myredshift = wibox.widget{ + checked = false, + check_color = "#EB8F8F", + border_color = "#EB8F8F", + border_width = 1, + shape = gears.shape.square, + widget = wibox.widget.checkbox +} + +local myredshift_text = wibox.widget{ + align = "center", + widget = wibox.widget.textbox, +} + +local myredshift_stack = wibox.widget{ + myredshift, + myredshift_text, + layout = wibox.layout.stack +} + +lain.widget.contrib.redshift:attach( + myredshift, + function (active) + if active then + myredshift_text:set_markup(markup(beautiful.bg_normal, "R")) + else + myredshift_text:set_markup(markup(beautiful.fg_normal, "R")) + end + myredshift.checked = active + end +) + +local mpdicon = wibox.widget.imagebox(beautiful.mpd) local mpd = lain.widget.mpd({ settings = function() mpd_notification_preset = { @@ -252,18 +293,24 @@ awful.screen.connect_for_each_screen(function(s) mylauncher, s.mytaglist, s.mypromptbox, + spr_right, mpdicon, mpd.widget }, nil -- Middle widget ,{ -- Right widgets layout = wibox.layout.fixed.horizontal, + --myredshift_stack, netdownicon, netdowninfo, netupicon, netupinfo.widget, cpuicon, cpu , + mymemicon, + mymem, + baticon, + bat, mykeyboardlayout, wibox.widget.systray(), mytextclock, @@ -632,3 +679,5 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n --include autorun file awful.spawn.with_shell("~/.config/awesome/autorun.sh") +--debug variable: +--naughty.notify({preset=naughty.config.presets.normal, title="debug", text=beautiful.cpu_icon}) diff --git a/awesome/.config/awesome/themes/default/icons/cpu.png b/awesome/.config/awesome/themes/default/icons/cpu.png new file mode 100644 index 0000000..1ce87eb Binary files /dev/null and b/awesome/.config/awesome/themes/default/icons/cpu.png differ diff --git a/awesome/.config/awesome/themes/default/icons/mpd.png b/awesome/.config/awesome/themes/default/icons/mpd.png new file mode 100644 index 0000000..efa8ec3 Binary files /dev/null and b/awesome/.config/awesome/themes/default/icons/mpd.png differ diff --git a/awesome/.config/awesome/themes/default/icons/net_down.png b/awesome/.config/awesome/themes/default/icons/net_down.png new file mode 100644 index 0000000..d5075a1 Binary files /dev/null and b/awesome/.config/awesome/themes/default/icons/net_down.png differ diff --git a/awesome/.config/awesome/themes/default/icons/net_up.png b/awesome/.config/awesome/themes/default/icons/net_up.png new file mode 100644 index 0000000..66dfb54 Binary files /dev/null and b/awesome/.config/awesome/themes/default/icons/net_up.png differ diff --git a/awesome/.config/awesome/themes/default/icons/spr_right.png b/awesome/.config/awesome/themes/default/icons/spr_right.png new file mode 100644 index 0000000..5cca795 Binary files /dev/null and b/awesome/.config/awesome/themes/default/icons/spr_right.png differ diff --git a/awesome/.config/awesome/themes/default/theme.lua b/awesome/.config/awesome/themes/default/theme.lua index 79d30fa..53fecd8 100644 --- a/awesome/.config/awesome/themes/default/theme.lua +++ b/awesome/.config/awesome/themes/default/theme.lua @@ -7,13 +7,14 @@ local xresources = require("beautiful.xresources") local dpi = xresources.apply_dpi local gfs = require("gears.filesystem") -local themes_path = gfs.get_themes_dir() +local themes_path =os.getenv("HOME") .. "/.config/awesome/themes/default/" +local icon_dir = themes_path .. "icons/" local theme = {} -theme.font = "sans 8" +theme.font = "Roboto Bold 10" -theme.bg_normal = "#222222" +theme.bg_normal = "#242424" theme.bg_focus = "#535d6c" theme.bg_urgent = "#ff0000" theme.bg_minimize = "#444444" @@ -32,7 +33,7 @@ theme.border_marked = "#91231c" -theme.wibar_height = dpi(25) +theme.wibar_height = dpi(28) -- There are other variable sets -- overriding the default one when -- defined, the sets are: @@ -120,6 +121,17 @@ theme.layout_cornerne = themes_path.."default/layouts/cornernew.png" theme.layout_cornersw = themes_path.."default/layouts/cornersww.png" theme.layout_cornerse = themes_path.."default/layouts/cornersew.png" + + +--icon + +theme.cpu_icon = icon_dir.."cpu.png" +theme.net_up = icon_dir .. "net_up.png" +theme.net_down = icon_dir .. "net_down.png" +theme.spr_right = icon_dir .. "spr_right.png" + +theme.mpd = icon_dir .. "mpd.png" + -- Generate Awesome icon: theme.awesome_icon = theme_assets.awesome_icon( theme.menu_height, theme.bg_focus, theme.fg_focus diff --git a/wm/.xinitrc b/wm/.xinitrc index 7639119..16e623f 100644 --- a/wm/.xinitrc +++ b/wm/.xinitrc @@ -16,8 +16,8 @@ export SSH_AUTH_SOCK numlockx & compton -b & #config pad -xinput set-prop 13 283 1 & -xinput set-prop 13 291 1 & +xinput set-prop 13 289 1 & +xinput set-prop 13 297 1 & # exec dbus-launch i3 case $1 in i3 ) exec dbus-launch i3;;