diff --git a/.Xresources b/.Xresources index 2ebe2fb..30fe3d0 100644 --- a/.Xresources +++ b/.Xresources @@ -1,9 +1,13 @@ xterm*foreground: #bbbbbb xterm*background: #000000 -xterm*faceName: Terminus:size=12:antialias=false -xterm*locale: true +xterm*renderFont: true +xterm*faceName: Terminus +xterm*faceSize: 12 xterm*termName: xterm-256color xterm*saveLines: 409600 xterm*VT100.geometry: 80x32 xterm*bellIsUrgent: true xterm*borderWidth: 0 +xterm*loginShell: true +xterm*utf8Title: true +xterm*allowC1Printable: true diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index a472497..d50d141 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -11,6 +11,15 @@ local beautiful = require("beautiful") local naughty = require("naughty") local menubar = require("menubar") +-- Delightful Widgets (OMG paths...) +--require('widgets.delightful.delightful.widgets.cpu') +require('widgets.delightful.delightful.widgets.datetime') +--require('widgets.delightful.delightful.widgets.imap') +--require('widgets.delightful.delightful.widgets.memory') +--require('widgets.delightful.delightful.widgets.network') +--require('widgets.delightful.delightful.widgets.pulseaudio') +--require('widgets.delightful.delightful.widgets.weather') + -- External programs require("externals") --{{{ Error handling @@ -285,7 +294,28 @@ for s = 1, screen.count() do -- Widgets that are aligned to the right local right_layout = wibox.layout.fixed.horizontal() if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(awful.widget.textclock()) + --right_layout:add(awful.widget.textclock()) + + local delightful_container = { widgets = {}, icons = {} } + local widgets, icons = delightful.widgets.datetime:load() + if widgets then + if not icons then + icons = {} + end + table.insert(delightful_container.widgets, awful.util.table.reverse(widgets)) + table.insert(delightful_container.icons, awful.util.table.reverse(icons)) + end + + for delightful_container_index, delightful_container_data in pairs(delightful_container.widgets) do + for widget_index, widget_data in pairs(delightful_container_data) do + right_layout:add(widget_data) + if delightful_container.icons[delightful_container_index] and delightful_container.icons[delightful_container_index][widget_index] then + right_layout:add(delightful_container.icons[delightful_container_index][widget_index]) + end + end + end + + right_layout:add(mylayoutbox[s]) -- Now bring it all together (with the tasklist in the middle) diff --git a/.xinitrc b/.xinitrc index 820c048..9797d8e 100644 --- a/.xinitrc +++ b/.xinitrc @@ -7,10 +7,16 @@ exec >$LOGS_DIR/awesome.out 2>$LOGS_DIR/awesome.err pulseaudio --start xrdb -merge .Xresources setxkbmap -layout "us,ru" -option "grp:caps_toggle,grp_led:caps,compose:ralt" +xset dpms 600 600 600 xset r rate 290 30 +xset +fp /usr/share/fonts/local +xset fp rehash +xautolock -locker slock & redshift & skype & chromium & psi-plus & +# TODO: disown these to avoid zombies + exec awesome