.Xdefaults @@ -12,216 +12,3 @@ Xft.hintstyle: hintslight Xft.rgba: rgb Xft.lcdfilter: lcddefault ! }}} - -! {{{ Xcursor -Xcursor.theme: Neutral_Plus_Inverted -Xcursor.size: 10 -! }}} - -! {{{ URxvt -URxvt.termName: rxvt-unicode -URxvt.imLocale: en_AU.UTF-8 -URxvt.loginShell: true -URxvt.saveLines: 32767 - -URxvt.scrollBar: false -URxvt.secondaryScroll: true - -URxvt.cursorBlink: true -URxvt.cursorColor: #ffffff - -URxvt.skipBuiltinGlyphs: true -URxvt.xftAntialias: true -URxvt.depth: 32 -URxvt.transparent: false -URxvt.inheritPixmap: true -URxvt.shading: 20 -URxvt.tintColor: white - -!URxvt.background: black -!URxvt.foreground: white - -URxvt.visualBell: true -Urxvt.cutchars: "()*,<>[]{}|' - -URxvt.perl-lib: /usr/lib/urxvt/perl/ -URxvt.perl-ext-common: default,matcher -URxvt.urlLauncher: /usr/bin/firefox -URxvt.matcher.button: 1 -URxvt.matcher.pattern.1: \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-] -! }}} - -! {{{ Fonts -URxvt.font: xft:Monaco:pixelsize=11:antialias=true:hinting=true -URxvt.boldFont: xft:Monaco:pixelsize=11:antialias=true:bold:hinting=true -URxvt.italicFont: xft:Monaco:pixelsize=11:antialias=true:italic:autohint=true:hinting=true -URxvt.bolditalicFont: xft:Monaco:pixelsize=11:antialias=true:bold:italic:autohint=true:hinting=true - -!URxvt*font: -xos4-terminus-medium-r-normal--12-*-*-*-*-*-*-u -!URxvt*boldFont: -xos4-terminus-bold-r-normal--12-*-*-*-*-*-*-u -!URxvt*italicFont: -xos4-terminus-medium-r-normal--12-*-*-*-*-*-*-u -!URxvt*boldItalicFont: -xos4-terminus-medium-r-normal--12-*-*-*-*-*-*-u - -!URxvt.font: -*-terminus-medium-r-*-*-12-120-*-*-*-*-*-* -!URxvt.boldFont: -*-terminus-medium-r-*-*-12-120-*-*-*-*-*-* -! }}} - -! {{{ Colours - -! ---| tangoesque scheme |--- {{{ -*background: #1C1C1C -*foreground: #B4B4B4 -*color0: #000000 -*color1: #ff6565 -*color2: #93d44f -*color3: #eab93d -*color4: #204a87 -*color5: #ce5c00 -*color6: #89b6e2 -*color7: #cccccc -*color8: #555753 -*color9: #ff8d8d -*color10: #c8e7a8 -*color11: #ffc123 -*color12: #3465a4 -*color13: #f57900 -*color14: #46a4ff -*color15: #ffffff -!}}} - -! ---| MrElendig |--- {{{ -!URxvt*background: #000000 -!URxvt*foreground: #C7C7C7 - -! black -!URxvt*color0: #000000 -!URxvt*color8: #9999AA - -! red -!URxvt*color1: #DE1923 -!URxvt*color9: #FF6050 - -! green -!URxvt*color2: #559933 -!URxvt*color10: #66D077 - -! yellow -!URxvt*color3: #FF9922 -!URxvt*color11: #FFFFAF - -! blue -!URxvt*color4: #3579A8 -!URxvt*color12: #4EB4FA - -! magenta -!URxvt*color5: #BB88DD -!URxvt*color13: #D7AFD7 - -! cyan -!URxvt*color6: #00BBDD -!URxvt*color14: #0DEBFF - -! white -!URxvt*color7: #C7C7C7 -!URxvt*color15: #D9D9D9 -!}}} - -! ---| Pnevma2 |--- {{{ -!*color0: #2F2E2D -!*color8: #4A4845 -!*color1: #C37561 -!*color9: #D19485 -!*color2: #A0A57E -!*color10: #B6B99D -!*color3: #D1A375 -!*color11: #DEBC9C -!*color4: #7985A3 -!*color12: #98A1B9 -!*color5: #AB716D -!*color13: #BE918E -!*color6: #98B9B1 -!*color14: #CBE6CB -!*color7: #D0D0D0 -!*color15: #EFEFEF -!}}} - -! --- | Phrak - Theme Ten | {{{ -!*background: rgb:1a/1a/1a -!*foreground: rgb:d6/d6/d6 -!*color0: rgb:00/00/00 -!*color1: rgb:98/56/5e -!*color2: rgb:66/82/5d -!*color3: rgb:96/91/76 -!*color4: rgb:4d/65/85 -!*color5: rgb:96/73/95 -!*color6: rgb:5f/7f/7b -!*color7: rgb:b3/b3/b3 -!*color8: rgb:73/73/73 -!*color9: rgb:cf/a3/a9 -!*color10: rgb:ca/f7/bb -!*color11: rgb:ff/f8/bc -!*color12: rgb:83/a3/be -!*color13: rgb:bb/a9/cf -!*color14: rgb:96/cc/cc -!*color15: rgb:ff/ff/ff -!}}} - -! }}} - -! {{{ xpdf -xpdf*enableFreetype: yes -xpdf*antialias: yes -xpdf*foreground: black -xpdf*background: white -xpdf*urlCommand: swiftweasel %s -xpdf*viKeys: on -! }}} - -! ---| xcalc |--- {{{ -xcalc*geometry: 210x275 -xcalc.ti.bevel.background: #111111 -xcalc.ti.bevel.screen.background: #000000 -xcalc.ti.bevel.screen.DEG.background: #000000 -xcalc.ti.bevel.screen.DEG.foreground: LightSeaGreen -xcalc.ti.bevel.screen.GRAD.background: #000000 -xcalc.ti.bevel.screen.GRAD.foreground: LightSeaGreen -xcalc.ti.bevel.screen.RAD.background: #000000 -xcalc.ti.bevel.screen.RAD.foreground: LightSeaGreen -xcalc.ti.bevel.screen.INV.background: #000000 -xcalc.ti.bevel.screen.INV.foreground: Red -xcalc.ti.bevel.screen.LCD.background: #000000 -xcalc.ti.bevel.screen.LCD.foreground: LightSeaGreen -xcalc.ti.bevel.screen.LCD.shadowWidth: 0 -xcalc.ti.bevel.screen.M.background: #000000 -xcalc.ti.bevel.screen.M.foreground: LightSeaGreen -xcalc.ti.bevel.screen.P.background: #000000 -xcalc.ti.bevel.screen.P.foreground: Yellow -xcalc.ti.Command.foreground: White -xcalc.ti.Command.background: #777777 -xcalc.ti.button3.label: SQRT -XCalc*ti.button3.font: -*-verdana-medium-r-normal--11-*-*-*-*-*-*-* -xcalc.ti.button5.background: Orange3 -xcalc.ti.button19.background: #611161 -xcalc.ti.button18.background: #611161 -xcalc.ti.button20.background: #611111 -xcalc.ti.button25.background: #722222 -xcalc.ti.button30.background: #833333 -xcalc.ti.button35.background: #944444 -xcalc.ti.button40.background: #a55555 -xcalc.ti.button22.background: #222262 -xcalc.ti.button23.background: #222262 -xcalc.ti.button24.background: #222272 -xcalc.ti.button27.background: #333373 -xcalc.ti.button28.background: #333373 -xcalc.ti.button29.background: #333373 -xcalc.ti.button32.background: #444484 -xcalc.ti.button33.background: #444484 -xcalc.ti.button34.background: #444484 -xcalc.ti.button37.background: #555595 -xcalc.ti.button38.background: #555595 -xcalc.ti.button39.background: #555595 -XCalc*Cursor: hand2 -XCalc*ShapeStyle: rectangle -XCalc*Font: -*-verdana-medium-r-normal--11-*-*-*-*-*-*-* -XCalc*bevel.screen.LCD.Font: -*-verdana-bold-r-normal--12-*-*-*-*-*-*-* -!}}} .Xresources @@ -1,6 +1,6 @@ --[[ $HOME/.config/awesome/functions.lua Awesome Window Manager configuration functions file by STxza/ST.x - - only works with awesome-git newer than 09/01/2009 + - only works with awesome-git newer than 12/01/2009 ]]-- ---- Functions @@ -84,7 +84,6 @@ function wifiInfo(adapter) text = setFg(beautiful.fg_widg, "Wifi Down! (")..wifiStrength..setFg(beautiful.fg_widg, "% connectivity)"), timeout = 5, position = "top_right", - --fg = beautiful.fg_focus, bg = beautiful.bg_focus }) end @@ -108,12 +107,12 @@ function batteryInfo(adapter) local battery = math.floor(cur * 100 / cap) if sta:match("Charging") then - dir = setFg("#00ff00", "^") - battery = "AC".."("..battery.."%)" + dir = setFg("#00FF00", "^") + battery = battery.."%" elseif sta:match("Discharging") then - dir = setFg("#a52a2a", "v") - if tonumber(battery) >= 25 and tonumber(battery) <= 50 then - battery = setFg("#e6d51d", battery).."%" + dir = setFg("#A52A2A", "v") + if tonumber(battery) > 25 and tonumber(battery) < 50 then + battery = setFg("#E6E51E", battery).."%" elseif tonumber(battery) < 25 then if tonumber(battery) <= 10 then -- Naughtify me when battery gets really low @@ -121,12 +120,12 @@ function batteryInfo(adapter) text = setFg(beautiful.fg_widg, "Battery low!")..spacer..battery..setFg(beautiful.fg_widg, "%")..spacer..setFg(beautiful.fg_widg, "left!"), timeout = 5, position = "top_right", - --fg = beautiful.fg_focus, bg = beautiful.bg_focus }) end - battery = setFg("#ff6565", battery).."%" + battery = setFg("#FF6565", battery).."%" end + battery = battery.."%" else dir = "=" battery = "AC" @@ -161,59 +160,71 @@ function memInfo() end -- }}} +--[[ -- {{{ CPU Usage, CPU & GPU Temps -function cputemp(core) - local command = "sensors coretemp-isa-* | grep 'Core "..tostring(core).."'" - local cpu = io.popen(command):read("*all") +function sysInfo() + -- CPU Temps + local comm0 = "sensors 'coretemp-isa-*' | grep 'Core 0'" + local core0 = io.popen(comm0):read("*all") + local comm1 = "sensors 'coretemp-isa-*' | grep 'Core 1'" + local core1 = io.popen(comm1):read("*all") - if (cpu == nil) then + if ((core0 == nil) or (core1 == nil)) then return '' else - local pos = cpu:find('+')+1 - cpu = string.sub(cpu, pos, pos+3) + local pos0 = core0:find('+')+1 + core0 = string.sub(core0, pos0, pos0+3) + local pos1 = core1:find('+')+1 + core1 = string.sub(core1, pos1, pos1+3) - if tonumber(cpu) >= 45 then - cpu = setFg("#B9DCE7", cpu) + if tonumber(core0) then + core0 = setFg("#B9DCE7", core0) + end + if tonumber(core1) then + core1 = setFg("#B9DCE7", core1) end - cpu = tonumber(cpu) + + 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 - return cpu -end - -function gputemp() - local gT = io.popen("nvidia-settings -q gpucoretemp | grep '):' | awk '{print $4}' | cut -d'.' -f1") - local gpuTemp = gT:read() - gT:close() - + -- GPU Temp + local gpuTemp = io.popen("nvidia-settings -q gpucoretemp | grep '):' | awk '{print $4}' | cut -d'.' -f1"):read("*all") if (gpuTemp == nil) then return '' elseif tonumber(gpuTemp) >= 65 then gpuTemp = setFg("#B9DCE7", gpuTemp) end - - return gpuTemp.."°" -end + gpuTemp = tonumber(gpuTemp).."°" -function perfL() -- pL is the nvidia performance setting thats currently being employed by the driver - local pL = io.popen("nvidia-settings -q GPUCurrentPerfLevel | grep -m1 PerfLevel | cut -d' ' -f6 | cut -d'.' -f1") - local perfL = pL:read() - pL:close() - - return perfL + local perfL = io.popen("nvidia-settings -q GPUCurrentPerfLevel | grep -m1 PerfLevel | cut -d' ' -f6 | cut -d'.' -f1"):read("*all") + if (perfL == nil) then + return '' + end + + local gpu = setFg(beautiful.fg_focus, "G:")..setFg(beautiful.fg_widg, gpuTemp).."("..perfL..")"..spacer + + local sysinfo = core0..core1..gpu + + return (sysinfo) end +-- }}} +]]-- -function sysInfo(widget, args) - local cpufr = io.open("/proc/cpuinfo"):read("*a"):match("cpu MHz%s*:%s*([^%s]*)") - cpufr = " @"..setFg(beautiful.fg_widg, tonumber(cpufr).."MHz") +-- {{{ CPU Usage & Speed +function cpuUsg(widget, args) + local fcpufr = io.open("/proc/cpuinfo") + 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 cpuUsg = cpufr..core1..core2..spacer - local core1 = setFg(beautiful.fg_focus, "C1:")..setFg(beautiful.fg_widg, ""..args[2].."%").." ("..setFg(beautiful.fg_widg, ""..cputemp(0).."°")..")" - local core2 = spacer..setFg(beautiful.fg_focus, "C2:")..setFg(beautiful.fg_widg, ""..args[3].."%").." ("..setFg(beautiful.fg_widg, ""..cputemp(1).."°")..")" - local gpu = spacer..setFg(beautiful.fg_focus, "G:")..setFg(beautiful.fg_widg, gputemp()).."("..perfL()..")" - local sysinfo = core1..core2..cpufr..gpu..spacer - - return sysinfo + return cpuUsg end -- }}} @@ -223,11 +234,11 @@ function getVol() local volume = string.match(status, "(%d?%d?%d)%%") volume = string.format("% 3d", volume) status = string.match(status, "%[(o[^%]]*)%]") - + if string.find(status, "on", 1, true) then volume = volume.."%" else - volume = volume.."M" + volume = volume.."M" end return setFg(beautiful.fg_widg, volume:gsub("^%s*(.-)%s*$", "%1"))..spacer @@ -235,10 +246,10 @@ end -- }}} -- {{{ Pacman Upgrade Query ---[[ +--[[ added sudo function pacinfo() - local puSy = io.popen("pacman -Sy") - local pu = io.popen("pacman -Qu") + local puSy = io.popen("sudo pacman -Sy") + local pu = io.popen("sudo pacman -Qu") local pu_text = pu:read("*a") io.close(pu) io.close(puSy) @@ -249,8 +260,6 @@ function pacinfo() else pacman = setFg(beautiful.fg_urgent, pacup) end - - pacman = "Y" return spacer..pacman end .config/awesome/functions.lua @@ -1,6 +1,6 @@ --[[ $HOME/.config/awesome/rc.lua Awesome Window Manager configuration file by STxza/ST.x - - only works with awesome-git newer than 09/01/2009 + - only works with awesome-git newer than 12/01/2009 ]]-- io.stderr:write("\n\r::: Awesome Loaded @ ", os.date(), " :::\r\n") ------------------------------------------------------------------------------------- @@ -27,7 +27,7 @@ theme_path = os.getenv("HOME").."/.config/awesome/themes/stxza" beautiful.init(theme_path) -- Apps -terminal = "SHELL=/bin/zsh urxvtc" +terminal = "urxvtc" editor = os.getenv("EDITOR") or "vim" editor_cmd = terminal .. " -e " .. editor browser = "/usr/bin/firefox" @@ -76,13 +76,13 @@ apptags = { ["Firefox"] = { screen = 1, tag = 2 }, ["transmission"] = { screen = 1, tag = 2 }, - ["pcmanfm"] = { screen = 1, tag = 4 }, - ["geeqie"] = { screen = 1, tag = 6 }, + ["pcmanfm"] = { screen = 1, tag = 1 }, + ["geeqie"] = { screen = 1, tag = 4 }, ["gvim"] = { screen = 1, tag = 3 }, ["geany"] = { screen = 1, tag = 3 }, ["Gimp"] = { screen = 1, tag = 5 }, ["Eclipse"] = { screen = 1, tag = 3 }, - ["OpenOffice.org 3.0"] = { screen = 1, tag = 6 } + ["OpenOffice.org 3.0"] = { screen = 1, tag = 4 } } -- Define if we want to use titlebar on all applications. @@ -92,40 +92,44 @@ use_titlebar = false ------------------------------------------------------------------------------------- -- {{{ Tags -tag_names = { - { name = "main" }, - { name = "www" }, - { name = "dev" } -} +tag_properties = { { name = "main" + , layout = layouts[1] + , mwfact = 0.618033988769 + } + , { name = "www" + , layout = layouts[7] + , nmaster = 1 + } + , { name = "dev" + , layout = layouts[5] + , ncols = 2 + } + , { name = "4" + , layout = layouts[1] + } + , { name = "5" + , layout = layouts[9] + } + , { name = "6" + , layout = layouts[9] + } + } -- Define tags table. tags = {} -for s = 1, screen.count() do - -- Each screen has its own tag table. - tags[s] = {} - for tagnumber = 1, 3 do - tags[s][tagnumber] = tag(tag_names[tagnumber].name) - tags[s][tagnumber].screen = s - -- Set mwfacts - awful.tag.setmwfact(0.618033988769, tags[s][tagnumber]) - end - for tagnumber = 4, 6 do - tags[s][tagnumber] = tag(tagnumber) - tags[s][tagnumber].screen = s - -- Set mwfacts - awful.tag.setmwfact(0.618033988769, tags[s][tagnumber]) +for s = 1, screen.count() do + tags[s] = { } + for i, v in ipairs(tag_properties) do + tags[s][i] = tag(v.name) + tags[s][i].screen = s + awful.tag.setproperty(tags[s][i], "layout", v.layout) + awful.tag.setproperty(tags[s][i], "mwfact", v.mwfact) + awful.tag.setproperty(tags[s][i], "nmaster", v.nmaster) + awful.tag.setproperty(tags[s][i], "ncols", v.ncols) end - -- Select at least one tag tags[s][1].selected = true end --- Layout presets -awful.layout.set(awful.layout.suit.tile.bottom, tags[1][1]) -awful.layout.set(awful.layout.suit.tiled, tags[1][2]) -awful.layout.set(awful.layout.suit.max, tags[1][4]) -awful.layout.set(awful.layout.suit.floating, tags[1][5]) -awful.layout.set(awful.layout.suit.max, tags[1][6]) - -- }}} ------------------------------------------------------------------------------------- -- {{{ Wibox @@ -201,6 +205,22 @@ memic.resize = false -- 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 + +--[[ +-- 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 +]]-- + -- Create the File Sys Usage widget fswidget = widget({ type = "textbox", align = "right" }) wicked.register(fswidget, wicked.widgets.fs, @@ -210,16 +230,10 @@ fsic = widget({ type = "imagebox", align = "right" }) fsic.image = image(beautiful.fsic) fsic.resize = false --- Create the CPU Usage, CPU Temps, GPU Temp widget -syswidget = widget({ type = "textbox", align = "right" }) -wicked.register(syswidget, 'cpu', sysInfo, 25, nil, 2) -tempic = widget({ type = "imagebox", align = "right" }) -tempic.image = image(beautiful.tempic) -tempic.resize = false - -- Create the volume widget +-- maybe make it a normal widget instead of wickedwidget volumewidget = widget({ type = "textbox", align = "right" }) -wicked.register(volumewidget, getVol, "$1", 40) +wicked.register(volumewidget, getVol, "$1", 30) volic = widget({ type = "imagebox", align = "right" }) volic.image = image(beautiful.volic) volic.resize = false @@ -275,6 +289,7 @@ for s = 1, screen.count() do if c == client.focus then return spacer..setFg(beautiful.fg_focus, c.name)..spacer end + --return awful.widget.tasklist.label.currenttags(c, s) end, tasklist.buttons) -- Create the wibox @@ -292,8 +307,10 @@ for s = 1, screen.count() do taglist[s], tasklist[s], promptbox[s], - tempic, - syswidget, + cpuic, + usgwidget, + --tempic, + --tempwidget, memic, memwidget, fsic, @@ -383,18 +400,21 @@ 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 () client.focus:kill() end)) -table.insert(globalkeys, key({ modkey, "Shift" } , "r" , function () client.focus:redraw() end)) +table.insert(globalkeys, key({ modkey } , "c" , function (c) client.focus: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" } , "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 () +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(globalkeys, key({ modkey } , "u" , awful.client.urgent.jumpto)) + -- Awesome control table.insert(globalkeys, key({ modkey, "Control" } , "r" , function () promptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) end)) @@ -420,10 +440,10 @@ table.insert(globalkeys, key({ modkey, "Control" } , "l" , function () a -- Shows or hides the statusbar table.insert(globalkeys, key({ modkey }, "b", function () - if wibox[mouse.screen].screen == nil then - wibox[mouse.screen].screen = mouse.screen + if mywibox[mouse.screen].screen == nil then + mywibox[mouse.screen].screen = mouse.screen else - wibox[mouse.screen].screen = nil + mywibox[mouse.screen].screen = nil end end)) @@ -433,8 +453,7 @@ table.insert(globalkeys, key({ modkey, "Control" }, "z", revelation.revelation)) -- Rotate clients and focus master table.insert(globalkeys, key({ modkey }, "Tab", function () - local allclients = awful.client.visible(client.focus.screen) - + local allclients = awful.client.visible(client.focus.screen) for i,v in ipairs(allclients) do if allclients[i+1] then allclients[i+1]:swap(v) @@ -492,19 +511,17 @@ awful.hooks.manage.register(function (c, startup) if not startup and awful.client.focus.filter(c) then c.screen = mouse.screen end - + if use_titlebar then -- Add a titlebar awful.titlebar.add(c, { modkey = modkey }) end - -- Add mouse bindings c:buttons({ button({ }, 1, function (c) client.focus = c; c:raise() end), button({ modkey }, 1, awful.mouse.client.move), button({ modkey }, 3, awful.mouse.client.resize) }) - -- New client may not receive focus -- if they're not focusable, so set border anyway. c.border_width = beautiful.border_width @@ -542,7 +559,7 @@ awful.hooks.manage.register(function (c, startup) awful.client.setslave(c) -- Honor size hints: if you want to drop the gaps between windows, set this to false. - c.honorsizehints = false + c.size_hints_honor = false end) -- Hook function to execute when arranging the screen. .config/awesome/rc.lua @@ -42,6 +42,7 @@ arch_icon = /home/stxza/.config/awesome/icons/arch_10x10.png pacic = /home/stxza/.config/awesome/icons/pacman.png sepic = /home/stxza/.config/awesome/icons/separators/link14.png wifiic = /home/stxza/.config/awesome/icons/wifi.png +cpuic = /home/stxza/.config/awesome/icons/cpu.png tempic = /home/stxza/.config/awesome/icons/temp.png memic = /home/stxza/.config/awesome/icons/mem.png batic = /home/stxza/.config/awesome/icons/bat.png @@ -49,7 +50,7 @@ volic = /home/stxza/.config/awesome/icons/vol.png fsic = /home/stxza/.config/awesome/icons/accordion.png # Wall -wallpaper_cmd = awsetbg -f /home/stxza/pics/Walls/ARCHWalls/thinknew.jpg +wallpaper_cmd = awsetbg -f /home/stxza/pics/Walls/td.png # Layout Icons layout_fairh = /usr/share/awesome/themes/default/layouts/fairhw.png .config/awesome/themes/stxza @@ -1,16 +1,7 @@ -" Basics -syntax on " enable syntax highlighting -set showmatch " show matching brackets (),{},[] -set number -set nocompatible -set background=dark -set encoding=utf-8 -set guifont=Monaco\ 9 -filetype on - -" Theme +" {{{ GVIM let &guicursor = &guicursor . ",a:blinkon0" -colorscheme xoria256 +colorscheme xoria256 +set guifont=Monaco\ 9 set guioptions-=T "set guioptions+=g "set guioptions-=t @@ -22,21 +13,40 @@ set guioptions-=R set guitablabel=%t " set label for tab to just file name set anti " Antialias font "set transparency=0 +" {{{ GVIM + +" Basics +syntax on " enable syntax highlighting +set showmatch " show matching brackets (),{},[] +set number +set nocompatible +set background=dark +set encoding=utf-8 +filetype on +set complete=k " global autocompletion +set completeopt+=longest " Indenting, Folding.. set tabstop=4 " numbers of spaces of tab character set shiftwidth=4 " numbers of spaces to (auto)indent +set softtabstop=4 " counts n spaces when DELETE or BCKSPCE is used set expandtab " insert spaces instead of tab chars set autoindent " always set autoindenting on -set cindent " cindent +set nosmartindent " intelligent indenting -- DEPRECATED by cindent +set nocindent " set C style indenting off set foldenable set foldmethod=marker + +" searching set hlsearch " highlight all search results +set incsearch " increment search +set ignorecase " case-insensitive search +set smartcase " upper-case sensitive search set laststatus=2 " occasions to show status line, 2=always. set cmdheight=1 " command line height -" set ruler " ruler display in status line -" set showmode " show mode at bottom of screen +set ruler " ruler display in status line +set showmode " show mode at bottom of screen " set previewheight=5 " Set taglist plugin options .gvimrc @@ -2,7 +2,7 @@ # /home/stxza/.nvidia-settings-rc # # Configuration file for nvidia-settings - the NVIDIA X Server Settings utility -# Generated on Mon Jan 12 06:17:41 2009 +# Generated on Wed Jan 14 14:50:10 2009 # # ConfigProperties: .nvidia-settings-rc @@ -6,6 +6,8 @@ set nocompatible set background=dark set encoding=utf-8 filetype on +set complete=k " global autocompletion +set completeopt+=longest set t_Co=256 set mouse=a @@ -15,17 +17,24 @@ set termencoding=utf-8 " Indenting, Folding.. set tabstop=4 " numbers of spaces of tab character set shiftwidth=4 " numbers of spaces to (auto)indent +set softtabstop=4 " counts n spaces when DELETE or BCKSPCE is used set expandtab " insert spaces instead of tab chars set autoindent " always set autoindenting on -set cindent " cindent +set nosmartindent " intelligent indenting -- DEPRECATED by cindent +set nocindent " set C style indenting off set foldenable set foldmethod=marker + +" searching set hlsearch " highlight all search results +set incsearch " increment search +set ignorecase " case-insensitive search +set smartcase " upper-case sensitive search set laststatus=2 " occasions to show status line, 2=always. set cmdheight=1 " command line height -" set ruler " ruler display in status line -" set showmode " show mode at bottom of screen +set ruler " ruler display in status line +set showmode " show mode at bottom of screen " set previewheight=5 " Set taglist plugin options @@ -99,3 +108,22 @@ set t_vb= " highlight redundant whitespaces and tabs. " highlight RedundantSpaces ctermbg=red guibg=red " match RedundantSpaces /\s\+$\| \+\ze\t\|\t/ + + +" GVIM +if has('gui_running') + let &guicursor = &guicursor . ",a:blinkon0" + colorscheme xoria256 + set guifont=Monaco\ 9 + set guioptions-=T + "set guioptions+=g + "set guioptions-=t + "set guioptions-=m + set guioptions-=L + set guioptions-=l + set guioptions-=r + set guioptions-=R + set guitablabel=%t " set label for tab to just file name + set anti " Antialias font + "set transparency=0 +endif .vimrc @@ -3,10 +3,10 @@ # ~/.xinitrc # Executed by startx (run your window manager from here) xrdb -merge $HOME/.Xresources & -nvidia-settings --load-config-only & -xsetroot -cursor_name left_ptr -solid "#090909" & xmodmap $HOME/.Xmodmap & xbindkeys & -urxvtd -o -q -f & +xsetroot -cursor_name left_ptr & +nvidia-settings --load-config-only & +urxvtd -q -o -f & parcellite & exec awesome > $HOME/.awesome.log 2>&1 .xinitrc @@ -7,20 +7,25 @@ typeset -U path path=(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /home/stxza/bin $path) -# Dircolors -eval `dircolors -b ~/.dir_colors` - export LC_ALL=en_AU.UTF-8 export LC_COLLATE="C" -export LESS="-R" export LANG=en_AU.UTF-8 export LOCALE=en_AU.UTF-8 +export LESS="-R" + +# Export default pkg-config path +PKG_CONFIG_PATH="/usr/lib/pkgconfig" +export PKG_CONFIG_PATH + export EDITOR=vim export BROWSER=firefox # export OOO_FORCE_DESKTOP=gnome # Firefox tweak export MOZ_DISABLE_PANGO=1 +# Dircolors +eval `dircolors -b ~/.dir_colors` + # Make framebuffer colors look like in X #if [ "$TERM" = "linux" ]; then # echo -en "\e]P0222222" #black .zshenv @@ -4,6 +4,11 @@ # Author: Seynthan "ST.x" Thanapalan <seynthan.tx@gmail.com> # #------------------------------------------------------------------# +# {{{ Autoload +autoload -U compinit +compinit +# }}} + # {{{ History HISTFILE=~/.zsh_history HISTSIZE=5000 @@ -13,12 +18,6 @@ setopt SHARE_HISTORY setopt HIST_IGNORE_ALL_DUPS # }}} -# {{{ Autoload -autoload -U compinit -compinit -autoload -U zcalc # Math -# }}} - # {{{ other opts setopt NO_BG_NICE # don't nice background tasks setopt nobeep @@ -117,7 +116,7 @@ bindkey "\e[7~" beginning-of-line # }}} # {{{ Aliases -alias startx='SHELL=/bin/sh startx' +#alias startx='SHELL=/bin/sh startx' alias ll='ls --color=auto -a -lhX' alias egrep='egrep --color=auto' alias shutdownhome='sudo netcfg2 -d wifihome && sleep 3 && sudo shutdown -hP now' .zshrc @@ -8,11 +8,11 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3' - 'http::/usr/bin/wget -c -t 3 --waitretry=3' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate' - 'rsync::/usr/bin/rsync -z' - 'scp::/usr/bin/scp -C') +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'rsync::/usr/bin/rsync -z %u %o' + 'scp::/usr/bin/scp -C %u %o') # Other common tools: # /usr/bin/snarf @@ -29,7 +29,7 @@ CHOST="x86_64-pc-linux-gnu" #-- Exclusive: will only run on -march=x86-64 # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="-march=core2 -O2 -pipe" +CFLAGS="-march=native -O2 -pipe" CXXFLAGS="${CFLAGS}" #-- Make Flags: change this for DistCC/SMP systems MAKEFLAGS="-j3" @@ -58,20 +58,23 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip !docs libtool emptydirs) +# Default: OPTIONS=(strip docs libtool emptydirs zipman) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries #-- docs: Save doc and info directories #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manpages with gzip # -OPTIONS=(strip !docs libtool emptydirs) +OPTIONS=(strip docs libtool emptydirs zipman) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Info and doc directories to remove (if option set correctly above) DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) +#-- Directories to be searched for the strip option (if option set correctly above) +STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) ######################################################################### # PACKAGE OUTPUT @@ -83,10 +86,8 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) #PKGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached #SRCDEST=/home/sources -#-- Source root: specify location where PKGBUILDs are located for '--builddeps' -#SRCROOT=/home/pkgbuilds #-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe <john@doe.com>" +PACKAGER="Seynthan Thanapalan <seynthan.tx@gmail.com>" ######################################################################### # BUILDSCRIPT/EXTENSION DEFAULTS system/etc/makepkg.conf 50caf3197e270bb77dceb182b2f4b577a6979824 stxza seynthan.tx@gmail.com http://github.com/stxza/arch-linux-configs/commit/49fb6df2dfe270902f49f0740dbaebb5527c54c7 49fb6df2dfe270902f49f0740dbaebb5527c54c7 2009-01-14T03:53:03-08:00 2009-01-14T03:53:03-08:00 Many small changes, temp widgets broken.. 5b2e1ca8e13112b726a4d4e974d951344914e79b stxza seynthan.tx@gmail.com