@@ -5,6 +5,13 @@ ---- Functions +-- {{{ getlayouticon(layout) +function getlayouticon(s) + if not awful.layout.get(s) then return " " end + return layout_icons[awful.layout.getname(awful.layout.get(s))] +end +-- }}} + -- {{{ Markup functions function setBg(bgcolor, text) if text ~= nil then .config/awesome/functions.lua @@ -7,25 +7,25 @@ -- {{{ Markup functions function setBg(bgcolor, text) - if text then + if text ~= nil then return string.format('<bg color="%s" />%s', bgcolor, text) end end function setFg(fgcolor, text) - if text then + if text ~= nil then return string.format('%s', fgcolor, text) end end function setBgFg(bgcolor, fgcolor, text) - if text then + if text ~= nil then return string.format('<bg color="%s"/>%s', bgcolor, fgcolor, text) end end function setFont(font, text) - if text then + if text ~= nil then return string.format('%s', font, text) end end @@ -61,10 +61,10 @@ function add_calendar(inc_offset) local cal = awful.util.pread("cal -m " .. datespec) cal = string.gsub(cal, "^%s*(.-)%s*$", "%1") calendar = naughty.notify({ - text = string.format('%s', "monaco", + text = string.format('%s', "Terminus", setFg(beautiful.fg_focus, os.date("%a, %d %B %Y")) .. "\n" .. setFg(beautiful.fg_widg, cal)), timeout = 0, hover_timeout = 0.5, - width = 125, + width = 145, position = "top_right", bg = beautiful.bg_focus }) @@ -88,7 +88,7 @@ function wifiInfo(adapter) }) end - wifiwidget.text = setFg(beautiful.fg_widg, ""..wifiStrength.."%")..spacer + wifiwidget.text = setFg(beautiful.fg_widg, wifiStrength).."%"..spacer end -- }}} @@ -107,7 +107,7 @@ function batteryInfo(adapter) local battery = math.floor(cur * 100 / cap) if sta:match("Charging") then - dir = setFg("#00FF00", "^") + dir = setFg("#90EE90", "^") battery = battery.."%" elseif sta:match("Discharging") then dir = setFg("#A52A2A", "v") @@ -125,9 +125,8 @@ function batteryInfo(adapter) end battery = setFg("#FF6565", battery).."%" end - battery = battery.."%" else - dir = "=" + dir = "" battery = "AC" end @@ -138,7 +137,7 @@ end -- {{{ Memory function memInfo() local f = io.open("/proc/meminfo") - + for line in f:lines() do if line:match("^MemTotal.*") then memTotal = math.floor(tonumber(line:match("(%d+)")) / 1024) @@ -151,68 +150,67 @@ function memInfo() end end f:close() - + memFree = memFree + memBuffers + memCached memInUse = memTotal - memFree memUsePct = math.floor(memInUse / memTotal * 100) + + if tonumber(memUsePct) >= 15 and tonumber(memInUse) >= 306 then + memUsePct = setFg("#FF6565", memUsePct) + memInUse = setFg("#FF6565", memInUse) + else + memUsePct = setFg(beautiful.fg_widg, memUsePct) + memInUse = setFg(beautiful.fg_widg, ""..memInUse.."M") + end - memwidget.text = setFg(beautiful.fg_widg, ""..memUsePct.."%").."("..setFg(beautiful.fg_widg,""..memInUse.."M")..")"..spacer + --memwidget.text = setFg(beautiful.fg_widg, ""..memUsePct.."%").."("..setFg(beautiful.fg_widg,""..memInUse.."M")..")"..spacer + memwidget.text = memUsePct.."%".."("..memInUse..")"..spacer end -- }}} ---[[ -- {{{ CPU Usage, CPU & GPU Temps function sysInfo() -- CPU Temps - local comm0 = "sensors 'coretemp-isa-*' | grep 'Core 0'" + local comm0 = 'sensors \'coretemp-isa-*\' | grep \'Core 0\'' local core0 = io.popen(comm0):read("*all") - local comm1 = "sensors 'coretemp-isa-*' | grep 'Core 1'" + local comm1 = 'sensors \'coretemp-isa-*\' | grep \'Core 1\'' local core1 = io.popen(comm1):read("*all") if ((core0 == nil) or (core1 == nil)) then return '' else local pos0 = core0:find('+')+1 - core0 = string.sub(core0, pos0, pos0+3) + core0 = string.sub(core0, pos0, pos0+1) local pos1 = core1:find('+')+1 - core1 = string.sub(core1, pos1, pos1+3) + core1 = string.sub(core1, pos1, pos1+1) - if tonumber(core0) then + if tonumber(core0) >= 40 then core0 = setFg("#B9DCE7", core0) end - if tonumber(core1) then + if tonumber(core1) >= 40 then core1 = setFg("#B9DCE7", core1) end - - core0 = tonumber(core0) - core1 = tonumber(core1) end core0 = setFg(beautiful.fg_focus, "C:")..setFg(beautiful.fg_widg, ""..core0.."°").."/" core1 = setFg(beautiful.fg_widg, ""..core1.."°")..spacer - -- GPU Temp - local gpuTemp = io.popen("nvidia-settings -q gpucoretemp | grep '):' | awk '{print $4}' | cut -d'.' -f1"):read("*all") - if (gpuTemp == nil) then + --[[ GPU Temp + --local comm2 = 'nvidia-settings -q gpucoretemp | grep \'Attribute\' | sed \'s/[^1-9]//g\'' + --local comm2 = io.popen('/home/stxza/bin/nvidTemp.sh') + --local gpuTemp = comm2:read() + --comm2:close() + + if gpuTemp == nil then return '' - elseif tonumber(gpuTemp) >= 65 then - gpuTemp = setFg("#B9DCE7", gpuTemp) - end - gpuTemp = tonumber(gpuTemp).."°" - - -- pL is the nvidia performance setting thats currently being employed by the driver - local perfL = io.popen("nvidia-settings -q GPUCurrentPerfLevel | grep -m1 PerfLevel | cut -d' ' -f6 | cut -d'.' -f1"):read("*all") - if (perfL == nil) then - return '' + else + --local gpu = setFg(beautiful.fg_focus, "G:")..setFg(beautiful.fg_widg, gpuTemp)..spacer + local gpu = gpuTemp..spacer end - - local gpu = setFg(beautiful.fg_focus, "G:")..setFg(beautiful.fg_widg, gpuTemp).."("..perfL..")"..spacer - - local sysinfo = core0..core1..gpu - - return (sysinfo) + ]]-- + + return core0..core1 end -- }}} -]]-- -- {{{ CPU Usage & Speed function cpuUsg(widget, args) @@ -220,8 +218,8 @@ function cpuUsg(widget, args) local cpufr = fcpufr:read("*a"):match("cpu MHz%s*:%s*([^%s]*)") fcpufr:close() cpufr = setFg(beautiful.fg_widg, tonumber(cpufr).."MHz")..spacer - local core1 = setFg(beautiful.fg_focus, "C1:")..setFg(beautiful.fg_widg, ""..args[2].."%") - local core2 = spacer..setFg(beautiful.fg_focus, "C2:")..setFg(beautiful.fg_widg, ""..args[3].."%") + local core1 = setFg(beautiful.fg_focus, "C1:")..setFg(beautiful.fg_widg, args[2]).."%" + local core2 = spacer..setFg(beautiful.fg_focus, "C2:")..setFg(beautiful.fg_widg, args[3]).."%" local cpuUsg = cpufr..core1..core2..spacer return cpuUsg .config/awesome/functions.stable.lua @@ -40,19 +40,29 @@ channel = "Master" -- Default modkey. modkey = "Mod4" +-- {{{ layouts -- Table of layouts to cover with awful.layout.inc, order matters. layouts = -{ - awful.layout.suit.tile, +{ awful.layout.suit.tile, awful.layout.suit.tile.left, awful.layout.suit.tile.bottom, awful.layout.suit.tile.top, awful.layout.suit.fair, awful.layout.suit.fair.horizontal, awful.layout.suit.max, - awful.layout.suit.magnifier, - awful.layout.suit.floating + awful.layout.suit.floating, +} +layout_icons = +{ ["tile"] = "[]=", + ["tileleft"] = "=[]", + ["tilebottom"] = "[v]", + ["tiletop"] = "[^]", + ["fairv"] = "[|]", + ["fairh"] = "[-]", + ["max"] = "[x]", + ["floating"] = "[~]" } +-- }}} -- Table of clients that should be set floating. floatapps = @@ -109,10 +119,10 @@ tag_properties = { { name = "main" , layout = layouts[1] } , { name = "5" - , layout = layouts[9] + , layout = layouts[8] } , { name = "6" - , layout = layouts[9] + , layout = layouts[8] } } @@ -272,13 +282,17 @@ for s = 1, screen.count() do -- Create an imagebox widget which will contains an icon indicating which layout we're using. -- We need one layoutbox per screen. - layoutbox[s] = widget({ type = "imagebox", align = "right" }) - layoutbox[s].resize = true - layoutbox[s]:buttons({ button({ }, 1, function () awful.layout.inc(layouts, 1) end), - button({ }, 3, function () awful.layout.inc(layouts, -1) end), - button({ }, 4, function () awful.layout.inc(layouts, 1) end), - button({ }, 5, function () awful.layout.inc(layouts, -1) end) - }) + -- layout box + layoutbox[s] = widget({ type = "textbox", name = "layoutbox", align = "left" }) + layoutbox[s]:buttons({ + button({ }, 1, function () awful.layout.inc(layouts, 1) end), + button({ }, 3, function () awful.layout.inc(layouts, -1) end), + button({ }, 4, function () awful.layout.inc(layouts, 1) end), + button({ }, 5, function () awful.layout.inc(layouts, -1) end) + }) + layoutbox[s].text = getlayouticon(s) + layoutbox[s].fg = beautiful.fg_focus + layoutbox[s].bg = beautiful.bg_normal -- Create a taglist widget taglist[s] = awful.widget.taglist.new(s, awful.widget.taglist.label.all, taglist.buttons) @@ -288,7 +302,7 @@ for s = 1, screen.count() do tasklist[s] = awful.widget.tasklist.new( function(c) if c == client.focus and c ~= nil then - return setFg(beautiful.fg_focus, c.name) + return spacer..setFg(beautiful.fg_focus, c.name) end --return awful.widget.tasklist.label.currenttags(c, s) end, tasklist.buttons) @@ -306,6 +320,7 @@ for s = 1, screen.count() do -- Add widgets to the wibox - order matters mywibox[s].widgets = { --launcher, taglist[s], + layoutbox[s], tasklist[s], promptbox[s], cpuic, @@ -324,8 +339,7 @@ for s = 1, screen.count() do volumewidget, separatorR, clockwidget, - s == 1 and systray or nil, - layoutbox[s] + s == 1 and systray or nil } mywibox[s].screen = s end @@ -409,7 +423,7 @@ table.insert(clientkeys, key({ modkey, "Control" } , "f" , function (c) table.insert(clientkeys, key({ modkey } , "m" , function (c) c.maximized_horizontal = not c.maximized_horizontal c.maximized_vertical = not c.maximized_vertical end)) --- Rotat client focus +-- Rotate client focus table.insert(globalkeys, key({ modkey } , "j" , function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end)) table.insert(globalkeys, key({ modkey } , "k" , function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end)) @@ -421,7 +435,8 @@ table.insert(globalkeys, key({ modkey, "Control" } , "j" , function () a table.insert(globalkeys, key({ modkey, "Control" } , "k" , function () awful.screen.focus(-1) end)) -- Awesome control -table.insert(globalkeys, key({ modkey, "Control" } , "r" , function () promptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) end)) +--table.insert(globalkeys, key({ modkey, "Control" } , "r" , function () promptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) end)) +table.insert(globalkeys, key({ modkey, "Control" } , "r" , awesome.restart)) table.insert(globalkeys, key({ modkey, "Shift" } , "q" , awesome.quit)) -- Prompt @@ -478,6 +493,7 @@ root.keys(globalkeys) awful.hooks.focus.register(function (c) if not awful.client.ismarked(c) then c.border_color = beautiful.border_focus + c.opacity = 1 end end) @@ -485,6 +501,7 @@ end) awful.hooks.unfocus.register(function (c) if not awful.client.ismarked(c) then c.border_color = beautiful.border_normal + c.opacity = 0.6 end end) @@ -569,12 +586,7 @@ end) -- Hook function to execute when arranging the screen. -- (tag switch, new client, etc) awful.hooks.arrange.register(function (screen) - local layout = awful.layout.getname(awful.layout.get(screen)) - if layout and beautiful["layout_" ..layout] then - layoutbox[screen].image = image(beautiful["layout_" .. layout]) - else - layoutbox[screen].image = nil - end + layoutbox[screen].text = getlayouticon(screen) -- Give focus to the latest client in history if no window has focus -- or if the current window is a desktop or a dock one. .config/awesome/rc.lua @@ -97,7 +97,8 @@ tag_properties = { { name = "main" , mwfact = 0.618033988769 } , { name = "www" - , layout = layouts[7] + , layout = layouts[1] + , mwfact = 0.65 , nmaster = 1 } , { name = "dev" @@ -161,10 +162,11 @@ awful.menu.new({ -- Launcher menu launcher = awful.widget.launcher({ - image = image(beautiful.arch_icon), - menu = mainmenu + image = image(beautiful.awesome_icon), + menu = mainmenu, + align = "left" }) -launcher.resize = false +launcher.resize = true -- Create a systray systray = widget({ type = "systray", align = "right" }) @@ -173,98 +175,96 @@ systray = widget({ type = "systray", align = "right" }) spacer = " " -- Separator icon -separator = widget({ type = "imagebox", align = "right" }) -separator.image = image(beautiful.sepic) +separatorR = widget({ type = "imagebox", align = "right" }) +separatorR.image = image(beautiful.sepic) + +separatorL = widget({ type = "imagebox", align = "left" }) +separatorL.image = image(beautiful.sepic) -- Create the clock widget clockwidget = widget({ type = "textbox", align = "right" }) -- Run it once so we don't have to wait for the hooks to see our clock -clockInfo("%d/%m/%Y", "%T") +clockInfo("%H:%M") -- Create the wifi widget -wifiwidget = widget({ type = "textbox", align = "right" }) wifiic = widget({ type = "imagebox", align = "right" }) wifiic.image = image(beautiful.wifiic) wifiic.resize = false +wifiwidget = widget({ type = "textbox", align = "right" }) -- Run it once so we don't have to wait for the hooks to see our signal strength wifiInfo("wlan0") -- Create the battery widget -batterywidget = widget({ type = "textbox", align = "right" }) batic = widget({ type = "imagebox", align = "right" }) batic.image = image(beautiful.batic) batic.resize = false +batterywidget = widget({ type = "textbox", align = "right" }) -- Run it once so we don't have to wait for the hooks to see our percentage batteryInfo("BAT0") -- Create the memory widget -memwidget = widget({ type = "textbox", align = "right" }) memic = widget({ type = "imagebox", align = "right" }) memic.image = image(beautiful.memic) memic.resize = false +memwidget = widget({ type = "textbox", align = "right" }) -- Run it once so we don't have to wait for the hooks to see our memory usage memInfo() -- Create the CPU Usage widget -usgwidget = widget({ type = "textbox", align = "right" }) -wicked.register(usgwidget, wicked.widgets.cpu, cpuUsg, 15, nil, 2) cpuic = widget({ type = "imagebox", align = "right" }) cpuic.image = image(beautiful.cpuic) cpuic.resize = false +usgwidget = widget({ type = "textbox", align = "right" }) +wicked.register(usgwidget, wicked.widgets.cpu, cpuUsg, 15, nil, 2) ---[[ -- Create CPU Temps, GPU Temp widget -tempwidget = widget({ type = "textbox", align = "right" }) -wicked.register(tempwidget, sysInfo, "$1", 25) tempic = widget({ type = "imagebox", align = "right" }) tempic.image = image(beautiful.tempic) tempic.resize = false -]]-- +tempwidget = widget({ type = "textbox", align = "right" }) +wicked.register(tempwidget, sysInfo, "$1", 35) -- Create the File Sys Usage widget -fswidget = widget({ type = "textbox", align = "right" }) -wicked.register(fswidget, wicked.widgets.fs, - setFg(beautiful.fg_focus, "/:")..setFg(beautiful.fg_widg, '${/ usep}%')..spacer..setFg(beautiful.fg_focus, "~:")..setFg(beautiful.fg_widg, '${/home usep}%')..spacer, -25) fsic = widget({ type = "imagebox", align = "right" }) fsic.image = image(beautiful.fsic) fsic.resize = false +fswidget = widget({ type = "textbox", align = "right" }) +wicked.register(fswidget, wicked.widgets.fs, + setFg(beautiful.fg_focus, "/:")..setFg(beautiful.fg_widg, '${/ usep}').."%"..spacer..setFg(beautiful.fg_focus, "~:")..setFg(beautiful.fg_widg, '${/home usep}').."%"..spacer, +30) -- Create the volume widget --- maybe make it a normal widget instead of wickedwidget -volumewidget = widget({ type = "textbox", align = "right" }) -wicked.register(volumewidget, getVol, "$1", 30) volic = widget({ type = "imagebox", align = "right" }) volic.image = image(beautiful.volic) volic.resize = false +volumewidget = widget({ type = "textbox", align = "right" }) +wicked.register(volumewidget, getVol, "$1", 30) --TODO: -- Create the Pacman Upgrade Query widget ---pacwidget = widget({ type = "textbox", name = "pacwidget", align = "right" }) ---wicked.register(pacwidget, pacinfo, "$1", 1800) --pacic = widget({ type = "imagebox", align = "right" }) --pacic.image = image(beautiful.pacic) +--pacic.resize = false +--pacwidget = widget({ type = "textbox", name = "pacwidget", align = "right" }) +--wicked.register(pacwidget, pacinfo, "$1", 1800) -- Create a wibox for each screen and add it mywibox = {} promptbox = {} layoutbox = {} - taglist = {} -taglist.buttons = { button({ }, 1, awful.tag.viewonly), - button({ modkey }, 1, awful.client.movetotag), - button({ }, 3, function (tag) tag.selected = not tag.selected end), - button({ modkey }, 3, awful.client.toggletag), - button({ }, 4, awful.tag.viewnext), - button({ }, 5, awful.tag.viewprev) - } - +taglist = {} +taglist.buttons = { button({ }, 1, awful.tag.viewonly), + button({ modkey }, 1, awful.client.movetotag), + button({ }, 3, function (tag) tag.selected = not tag.selected end), + button({ modkey }, 3, awful.client.toggletag), + button({ }, 4, awful.tag.viewnext), + button({ }, 5, awful.tag.viewprev) } tasklist = {} -tasklist.buttons = { button({ }, 1, function (c) client.focus = c; c:raise() end), - button({ }, 3, function () if instance then instance:hide() end instance = awful.menu.clients({ width=250 }) end), - button({ }, 4, function () awful.client.focus.byidx(1) end), - button({ }, 5, function () awful.client.focus.byidx(-1) end) - } +tasklist.buttons = { button({ }, 1, function (c) client.focus = c; c:raise() end), + button({ }, 3, function () if instance then instance:hide() end instance = awful.menu.clients({ width=250 }) end), + button({ }, 4, function () awful.client.focus.byidx(1) end), + button({ }, 5, function () awful.client.focus.byidx(-1) end) } for s = 1, screen.count() do -- Create a promptbox for each screen @@ -273,6 +273,7 @@ for s = 1, screen.count() do -- Create an imagebox widget which will contains an icon indicating which layout we're using. -- We need one layoutbox per screen. layoutbox[s] = widget({ type = "imagebox", align = "right" }) + layoutbox[s].resize = true layoutbox[s]:buttons({ button({ }, 1, function () awful.layout.inc(layouts, 1) end), button({ }, 3, function () awful.layout.inc(layouts, -1) end), button({ }, 4, function () awful.layout.inc(layouts, 1) end), @@ -286,8 +287,8 @@ for s = 1, screen.count() do -- Mod: Only display currently focused client in tasklist tasklist[s] = awful.widget.tasklist.new( function(c) - if c == client.focus then - return spacer..setFg(beautiful.fg_focus, c.name)..spacer + if c == client.focus and c ~= nil then + return setFg(beautiful.fg_focus, c.name) end --return awful.widget.tasklist.label.currenttags(c, s) end, tasklist.buttons) @@ -295,7 +296,7 @@ for s = 1, screen.count() do -- Create the wibox mywibox[s] = wibox({ position = "top", - height = 14.7, + height = 14.8, fg = beautiful.fg_normal, bg = beautiful.bg_normal, border_color = beautiful.border_wibox, @@ -309,8 +310,8 @@ for s = 1, screen.count() do promptbox[s], cpuic, usgwidget, - --tempic, - --tempwidget, + tempic, + tempwidget, memic, memwidget, fsic, @@ -321,10 +322,10 @@ for s = 1, screen.count() do batterywidget, volic, volumewidget, - separator, + separatorR, clockwidget, s == 1 and systray or nil, - layoutbox[s] + layoutbox[s] } mywibox[s].screen = s end @@ -400,21 +401,24 @@ table.insert(globalkeys, key({ modkey } , "e" , function () a table.insert(globalkeys, key({ modkey } , "o" , function () awful.util.spawn("soffice") end)) -- Client control -table.insert(globalkeys, key({ modkey } , "c" , function (c) client.focus:kill() end)) +table.insert(clientkeys, key({ modkey } , "c" , function (c) c:kill() end)) table.insert(clientkeys, key({ modkey, "Shift" } , "r" , function (c) c:redraw() end)) -table.insert(globalkeys, key({ modkey, "Control" } , "space" , awful.client.floating.toggle)) +table.insert(clientkeys, key({ modkey, "Control" } , "space" , awful.client.floating.toggle)) table.insert(clientkeys, key({ modkey, "Control" } , "Return" , function (c) c:swap(awful.client.getmaster()) end)) table.insert(clientkeys, key({ modkey, "Control" } , "f" , function (c) c.fullscreen = not c.fullscreen end)) -table.insert(globalkeys, key({ modkey } , "u" , awful.client.urgent.jumpto)) -table.insert(globalkeys, key({ modkey } , "j" , function () awful.client.focus.byidx(1); client.focus:raise() end)) -table.insert(globalkeys, key({ modkey } , "k" , function () awful.client.focus.byidx(-1); client.focus:raise() end)) -table.insert(globalkeys, key({ modkey } , "m" , function (c) - if client.focus then - client.focus.maximized_horizontal = not client.focus.maximized_horizontal - client.focus.maximized_vertical = not client.focus.maximized_vertical - end - end)) - +table.insert(clientkeys, key({ modkey } , "m" , function (c) c.maximized_horizontal = not c.maximized_horizontal + c.maximized_vertical = not c.maximized_vertical end)) + +-- Rotate client focus +table.insert(globalkeys, key({ modkey } , "j" , function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end)) +table.insert(globalkeys, key({ modkey } , "k" , function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end)) + +-- Rotate clients position +table.insert(globalkeys, key({ modkey, "Shift" } , "j" , function () awful.client.swap.byidx(1) end)) +table.insert(globalkeys, key({ modkey, "Shift" } , "k" , function () awful.client.swap.byidx(-1) end)) + +table.insert(globalkeys, key({ modkey, "Control" } , "j" , function () awful.screen.focus(1) end)) +table.insert(globalkeys, key({ modkey, "Control" } , "k" , function () awful.screen.focus(-1) end)) -- Awesome control table.insert(globalkeys, key({ modkey, "Control" } , "r" , function () promptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) end)) @@ -436,6 +440,7 @@ table.insert(globalkeys, key({ modkey, "Shift" } , "h" , function () a table.insert(globalkeys, key({ modkey, "Shift" } , "l" , function () awful.tag.incnmaster(-1) end)) table.insert(globalkeys, key({ modkey, "Control" } , "h" , function () awful.tag.incncol(1) end)) table.insert(globalkeys, key({ modkey, "Control" } , "l" , function () awful.tag.incncol(-1) end)) +table.insert(globalkeys, key({ modkey } , "u" , awful.client.urgent.jumpto)) -- Shows or hides the statusbar table.insert(globalkeys, @@ -459,8 +464,7 @@ table.insert(globalkeys, key({ modkey }, "Tab", allclients[i+1]:swap(v) end end - -- dont want currently - want to keep focus of currently focused client - --awful.client.focus.byidx(-1) + awful.client.focus.byidx(1) end)) -- Set keys @@ -556,7 +560,7 @@ awful.hooks.manage.register(function (c, startup) -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. - awful.client.setslave(c) + --awful.client.setslave(c) -- Honor size hints: if you want to drop the gaps between windows, set this to false. c.size_hints_honor = false @@ -597,12 +601,12 @@ clockwidget:buttons({ -- Timed hooks for the widget functions -- 1 second -awful.hooks.timer.register(1, function () - clockInfo("%T") +awful.hooks.timer.register(60, function () + clockInfo("%H:%M") end) -- 25 seconds -awful.hooks.timer.register(25, function() +awful.hooks.timer.register(35, function() wifiInfo("wlan0") end) .config/awesome/rc.stable.lua @@ -6,9 +6,9 @@ font = Terminus Bold 6 # BG -bg_normal = #12121288 -bg_focus = #5a5a5a88 -bg_urgent = #ffc0cb88 +bg_normal = #121212 +bg_focus = #5a5a5a +bg_urgent = #ffc0cb # FG fg_normal = #5a5a5a .config/awesome/themes/stxza @@ -108,6 +108,8 @@ EXEC 01;32 # image formats .jpg 01;35 .jpeg 01;35 +.JPEG 01;35 +.JPG 01;35 .gif 01;35 .bmp 01;35 .pbm 01;35 @@ -119,6 +121,7 @@ EXEC 01;32 .tif 01;35 .tiff 01;35 .png 01;35 +.PNG 01;35 .mng 01;35 .pcx 01;35 @@ -173,9 +176,31 @@ EXEC 01;32 .py 00;36 .sh 00;36 .vim 00;36 +.rb 00;36 +.m 00;36 +.pl 00;36 # Objects .o 00;33 .so 00;33 .a 00;33 .ko 00;33 + +# octave files. +.m 01;35 + +# Custom coolness +*akefile 0;35 +*tags 01;32 +*~ 01;30 +.swp 01;30 +*README 01;31 +*README.* 01;31 +*readme 00;31 +.tex 01;31 +.htm 01;31 +.html 01;31 +.pdf 00;31 +.PDF 00;31 +.ps 00;31 +.PS 00;31 .dir_colors @@ -2,7 +2,7 @@ # The parser is also very primitive, and not human-friendly. # (I know, it's in the todo list). fields=0 48 17 61 18 38 39 40 2 46 47 49 1 -sort_key=46 +sort_key=47 sort_direction=1 hide_threads=0 hide_kernel_threads=1 .htoprc @@ -2,7 +2,7 @@ # /home/stxza/.nvidia-settings-rc # # Configuration file for nvidia-settings - the NVIDIA X Server Settings utility -# Generated on Thu Jan 15 23:14:59 2009 +# Generated on Sat Jan 17 23:47:47 2009 # # ConfigProperties: @@ -13,8 +13,8 @@ DisplayStatusBar = Yes SliderTextEntries = Yes IncludeDisplayNameInConfigFile = No ShowQuitDialog = Yes -Timer = PowerMizer_Monitor_(GPU_0),Yes,1000 Timer = Thermal_Monitor_(GPU_0),Yes,1000 +Timer = PowerMizer_Monitor_(GPU_0),Yes,1000 # Attributes: .nvidia-settings-rc @@ -5,7 +5,7 @@ xrdb -merge $HOME/.Xresources & xmodmap $HOME/.Xmodmap & xbindkeys & -xsetroot -bg black -cursor_name left_ptr & +#xsetroot -bg black -cursor_name left_ptr & nvidia-settings --load-config-only & urxvtd -q -o -f & # parcellite & .xinitrc @@ -5,7 +5,9 @@ #------------------------------------------------------------------# # {{{ Autoload +autoload -U zutil autoload -U compinit +autoload -U complist compinit # }}} @@ -76,11 +78,20 @@ setprompt () { autoload -U colors zsh/terminfo # Used in the colour alias below colors setopt prompt_subst - - PROMPT="%{$fg_bold[grey]%}[%{$fg_bold[white]%}%~%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%}-%{$fg_bold[red]%}»%{$reset_color%} " - RPROMPT="%{$fg[cyan]%}%D{%H:%M}%{$reset_color%}" + + # username@Machine ~/dev/dir[master]$ # clean working directory + # username@Machine ~/dev/dir[master☠]$ # dirty working directory + function parse_git_dirty { + [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "☠" + } + function parse_git_branch { + git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* $.*$/[\1$(parse_git_dirty)]/" + } + + PROMPT='%{$fg_bold[grey]%}[%{$fg_bold[white]%}%~%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%}%{$fg_bold[blue]%}$(parse_git_branch)%{$reset_color%} +-%{$fg_bold[red]%}»%{$reset_color%} ' + RPROMPT='%{$fg[cyan]%}%D{%H:%M}%{$reset_color%}' } - setprompt # }}} @@ -127,7 +138,7 @@ alias nvtemp='echo "$(nvidia-settings -q gpucoretemp | grep Attribute | sed "s/ # }}} # {{{ URXVT workaround - stop first line completion bug in tiling WMs -if test "$TERM" = "rxvt-unicode"; then +if test "$TERM" = "rxvt-256color"; then sleep 0.1 && clear fi # }}} .zshrc 3eb0ad7200c13021f5c87e60c7a017e08e995823 stxza seynthan.tx@gmail.com http://github.com/stxza/arch-linux-configs/commit/43f1f1d4fa14cd453623949c9ade678c38f2b589 43f1f1d4fa14cd453623949c9ade678c38f2b589

2009-01-18T11:15:29-08:00

awesome, dir colours, zsh f8945c84e560bbbf7f33c3b246158121fb9a563f stxza seynthan.tx@gmail.com