Commits

Adam Olsen committed e598077

today's changes?

Comments (0)

Files changed (3)

 alias mplayer='mplayer -softvol -softvol-max 800'
 alias ls='ls --color'
 export TERM=xterm-color
+alias pacman="packer --noedit"

.config/awesome/rc.lua

 require("revelation")
 require("vicious")
 
+
+-- {{{ Local Config
+modkey = "Mod4"
+cpumax = 1
+interface = "eth0"
+showbattery = true
+screensaver = "xscreensaver-command -lock"
+terminal = "urxvt -geometry 80x20"
+editor = os.getenv("EDITOR") or "vim"
+editor_cmd = terminal .. " -e " .. editor
+f, err = loadfile("/home/synic/.config/awesome/localconfig.lua")
+if f then f() end
+-- }}}
+
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 -- Themes define colours, icons, and wallpapers
 beautiful.init("/home/synic/.config/awesome/themes/zenburn/theme.lua")
 
--- This is used later as the default terminal and editor to run.
-terminal = "urxvt -geometry 80x20"
-editor = os.getenv("EDITOR") or "vim"
-editor_cmd = terminal .. " -e " .. editor
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
---ctrl = "Control"
---alt = "Mod1"
-screensaver = "xscreensaver-command -lock"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
+-- Table of layouts to cover with awful.layout.inc, order matters. {{{
 layouts =
 {
     awful.layout.suit.floating,
 
 -- }}}
 
--- {{{ Menu
--- Create a laucher widget and a main menu
-myawesomemenu = {
-   { "restart", awesome.restart },
-   { "quit", awesome.quit }
-}
-
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
-
-mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
-                                     menu = mymainmenu })
--- }}}
-
 -- {{{ Wibox
 -- Create a textclock widget
 
 -- Create a systray
 mysystray = widget({ type = "systray" })
 
-pacwidget = widget({ type = "textbox" })
-
-pacwidget_t = awful.tooltip({ objects = { pacwidget},})
-
-vicious.register(pacwidget, vicious.widgets.pkg,
-                function(widget,args)
-                    local io = { popen = io.popen }
-                    local s = io.popen("pacman -Qu")
-                    local str = ''
-
-                    for line in s:lines() do
-                        str = str .. line .. "\n"
-                    end
-                    pacwidget_t:set_text(str)
-                    s:close()
-                    return "U:" .. args[1]
-                end, 1800, "Arch")
-
-                --'1800' means check every 30 minutes
 
 -- Initialize widget
 cpuwidget = awful.widget.graph()
 -- Graph properties
 cpuwidget:set_width(35)
 cpuwidget:set_background_color("#494B4F")
-cpuwidget:set_color("#AECF96")
+cpuwidget:set_color("#96CACF")
+cpuwidget:set_scale(true)
+cpuwidget:set_max_value(cpumax)
 --cpuwidget:set_gradient_colors({ "#FF5656", "#88A175", "#AECF96" })
 
-
 -- Register widget
 vicious.register(cpuwidget, vicious.widgets.cpu, "$1")
 
--- Network Interface Monitor
-netwidget = widget({
-    type = 'textbox',
-    name = 'netwidget',
-    align = 'right'
-})
-
-vicious.register(netwidget, vicious.widgets.net,
-'${eth0 down_kb}/${eth0 up_kb}', nil, nil, 3)
-
 -- Initialize widget
 memwidget = awful.widget.progressbar()
 -- Progressbar properties
 memwidget:set_vertical(true)
 memwidget:set_background_color("#494B4F")
 memwidget:set_border_color(nil)
-memwidget:set_color("#AECF96")
+memwidget:set_color("#CF96AE")
 --memwidget:set_gradient_colors({ "#AECF96", "#88A175", "#FF5656" })
 -- Register widget
 vicious.register(memwidget, vicious.widgets.mem, "$1", 13)
 batwidget:set_vertical(true)
 batwidget:set_background_color("#494B4F")
 batwidget:set_border_color(nil)
-batwidget:set_color("#AECF96")
+batwidget:set_color("#9B96CF")
 --batwidget:set_gradient_colors({ "#AECF96", "#88A175", "#FF5656" })
 vicious.register(batwidget, vicious.widgets.bat, "$2", 61, "BAT0")
-
+batterywidget = batwidget.widget
+if showbattery == false then
+    batterywidget = nil
+end
 
 volmute = widget({ type = "textbox" })
 
         blank,
         mytextclock,
         blank,
-        batwidget.widget,
+        s == 1 and mysystray or nil,
+        blank,
 --        spacer,
         cpuwidget.widget,
 --        spacer,
+        batterywidget,
         memwidget.widget,
 --        spacer,
         volwidget.widget,
         weatherwidget,
         --spacer,
         --pacwidget,
-        blank,
-        s == 1 and mysystray or nil,
         mytasklist[s],
         layout = awful.widget.layout.horizontal.rightleft
     }
             awful.client.focus.byidx(-1)
             if client.focus then client.focus:raise() end
         end),
-    awful.key({ modkey,           }, "w", function () mymainmenu:show({keygrabber=true}) end),
 
     -- Layout manipulation
     awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
     awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
     awful.key({ modkey, "Control" }, "r", awesome.restart),
     awful.key({ modkey, "Shift"   }, "q", awesome.quit),
-    awful.key({modkey }, "p", function() awful.util.spawn( "dmenu_run" ) end),
+    awful.key({modkey }, "p", function() awful.util.spawn( "dmenu_run", false ) end),
     awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+", false) end),
     awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 5%-", false) end),
     awful.key({ }, "XF86AudioMute", function() awful.util.spawn("amixer set Master toggle", false) end),
 clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
     awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
+    awful.key({ "Mod1",           }, "F4",     function (c) c:kill()                         end),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
     awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
     { rule = { class = "gimp" },
       properties = { floating = true } },
 
-    { rule = { class = "exaile" },
-      properties = { floating = true, tag = tags[1][3] }},
+    { rule = { class = "Exaile" },
+      properties = { floating = true, tag = tags[2][2] }},
+    { rule = { class = "chromium" },
+        properties = { floating = true, tag = tags[1][1] }},
     -- Set Firefox to always map on tags number 2 of screen 1.
     -- { rule = { class = "Firefox" },
     --   properties = { tag = tags[1][2] } },
 run_once("xscreensaver -no-splash")
 --
 -- }}}
+--
+-- vim: foldmethod=marker
 set show-all-if-ambiguous on
 set show-all-if-unmodified on
 set visible-stats on
+set mark-symlinked-directories on
 
 # Useful stuff for UTF-8
 set meta-flag on
 # IPython needs this to appear at the bottom of the
 # file for clear-screen to work
 set keymap vi
+set bell-style audible