]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

changes
authormartin f. krafft <madduck@madduck.net>
Wed, 25 Jun 2008 17:37:07 +0000 (18:37 +0100)
committermartin f. krafft <madduck@madduck.net>
Wed, 25 Jun 2008 17:37:07 +0000 (18:37 +0100)
.awesomerc.lua

index efe4f9460f84500d96f43f1cc02dfc405860cd2e..688d175f6182a0d770c3fb9296ab74e627c7c231 100644 (file)
@@ -1,7 +1,7 @@
 -- awesome 3 configuration file
 
 AWESOME_DATADIR = "/home/madduck/code"
 -- awesome 3 configuration file
 
 AWESOME_DATADIR = "/home/madduck/code"
-package.path = AWESOME_DATADIR .. "/awesome/?.lua;" .. package.path
+package.path = AWESOME_DATADIR .. "/awesome/lib/?.lua;" .. package.path
 
 -- Include awesome library, with lots of useful function!
 require("awful")
 
 -- Include awesome library, with lots of useful function!
 require("awful")
@@ -36,7 +36,7 @@ layouts =
 }
 
 -- Color & Appearance definitions, we use these later to display things
 }
 
 -- Color & Appearance definitions, we use these later to display things
-font = "RotisSansSerif 8"
+font = "RotisSansSerif 10"
 border_width = 1
 
 bg_normal = "#222222"
 border_width = 1
 
 bg_normal = "#222222"
@@ -64,7 +64,8 @@ for s = 1, screen.count() do
     for tagnumber = 1, 9 do
         tags[s][tagnumber] = tag.new({ name = tagnumber })
         -- Add tags to screen one by one
     for tagnumber = 1, 9 do
         tags[s][tagnumber] = tag.new({ name = tagnumber })
         -- Add tags to screen one by one
-        tags[s][tagnumber]:mwfact_set(0.618033988769)
+        -- split at 0.5/50% exactly
+        tags[s][tagnumber]:mwfact_set(0.5)
         tags[s][tagnumber]:add(s)
     end
     -- I'm sure you want to see at least one tag.
         tags[s][tagnumber]:add(s)
     end
     -- I'm sure you want to see at least one tag.
@@ -94,11 +95,7 @@ mytasklist:set("text_focus", "<bg color='"..bg_focus.."'/> <span color='"..fg_fo
 mytextbox = widget.new({ type = "textbox", name = "mytextbox", align = "right" })
 -- Set the default text in textbox
 mytextbox:set("text", "<b><small> awesome " .. AWESOME_VERSION .. " </small></b>")
 mytextbox = widget.new({ type = "textbox", name = "mytextbox", align = "right" })
 -- Set the default text in textbox
 mytextbox:set("text", "<b><small> awesome " .. AWESOME_VERSION .. " </small></b>")
-mymenubox = widget.new({ type = "textbox", name = "mytextbox", align = "left" })
-
--- Create an iconbox widget
-myiconbox = widget.new({ type = "iconbox", name = "myiconbox", align = "left" })
-myiconbox:set("image", AWESOME_DATADIR .. "/awesome/icons/awesome16.png")
+mymenubox = widget.new({ type = "textbox", name = "mymenubox", align = "left" })
 
 -- Create a systray
 mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" })
 
 -- Create a systray
 mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" })
@@ -107,7 +104,7 @@ mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" }
 -- We need one layoutbox per screen.
 mylayoutbox = {}
 for s = 1, screen.count() do
 -- We need one layoutbox per screen.
 mylayoutbox = {}
 for s = 1, screen.count() do
-    mylayoutbox[s] = widget.new({ type = "iconbox", name = "myiconbox", align = "right" })
+    mylayoutbox[s] = widget.new({ type = "iconbox", name = "mylayoutbox", align = "right" })
     mylayoutbox[s]:mouse_add(mouse.new({ }, 1, function () awful.layout.inc(layouts, 1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 3, function () awful.layout.inc(layouts, -1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 4, function () awful.layout.inc(layouts, 1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 1, function () awful.layout.inc(layouts, 1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 3, function () awful.layout.inc(layouts, -1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 4, function () awful.layout.inc(layouts, 1) end))
@@ -121,12 +118,12 @@ for s = 1, screen.count() do
     mystatusbar[s] = statusbar.new({ position = "top", name = "mystatusbar" .. s,
                                    fg = fg_normal, bg = bg_normal })
     -- Add widgets to the statusbar - order matters
     mystatusbar[s] = statusbar.new({ position = "top", name = "mystatusbar" .. s,
                                    fg = fg_normal, bg = bg_normal })
     -- Add widgets to the statusbar - order matters
+    -- #TODO order is not really taken into account
     mystatusbar[s]:widget_add(mytaglist)
     mystatusbar[s]:widget_add(mytaglist)
-    mystatusbar[s]:widget_add(myiconbox)
     mystatusbar[s]:widget_add(mytasklist)
     mystatusbar[s]:widget_add(mytasklist)
+    mystatusbar[s]:widget_add(mylayoutbox[s])
     mystatusbar[s]:widget_add(mymenubox)
     mystatusbar[s]:widget_add(mytextbox)
     mystatusbar[s]:widget_add(mymenubox)
     mystatusbar[s]:widget_add(mytextbox)
-    mystatusbar[s]:widget_add(mylayoutbox[s])
     mystatusbar[s]:add(s)
 end
 mystatusbar[screen.count()]:widget_add(mysystray)
     mystatusbar[s]:add(s)
 end
 mystatusbar[screen.count()]:widget_add(mysystray)
@@ -188,14 +185,15 @@ keybinding.new({ modkey, "Control" }, "r", awesome.restart):add()
 keybinding.new({ modkey, "Shift" }, "q", awesome.quit):add()
 
 -- Client manipulation
 keybinding.new({ modkey, "Shift" }, "q", awesome.quit):add()
 
 -- Client manipulation
-keybinding.new({ modkey, "Shift" }, "c", function () client.focus_get():kill() end):add()
-keybinding.new({ modkey }, "j", function () awful.client.focus(1); client.focus_get():raise() end):add()
-keybinding.new({ modkey }, "k", function () awful.client.focus(-1);  client.focus_get():raise() end):add()
-keybinding.new({ modkey, "Shift" }, "j", function () awful.client.swap(1) end):add()
-keybinding.new({ modkey, "Shift" }, "k", function () awful.client.swap(-1) end):add()
-keybinding.new({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add()
-keybinding.new({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add()
+keybinding.new({ modkey }, "Escape", function () client.focus_get():kill() end):add()
+keybinding.new({ modkey }, "k", function () awful.client.focus(1); client.focus_get():raise() end):add()
+keybinding.new({ modkey }, "j", function () awful.client.focus(-1);  client.focus_get():raise() end):add()
+keybinding.new({ modkey, "Shift" }, "k", function () awful.client.swap(1) end):add()
+keybinding.new({ modkey, "Shift" }, "j", function () awful.client.swap(-1) end):add()
+keybinding.new({ modkey, "Control" }, "k", function () awful.screen.focus(1) end):add()
+keybinding.new({ modkey, "Control" }, "j", function () awful.screen.focus(-1) end):add()
 keybinding.new({ modkey, "Control" }, "space", awful.client.togglefloating):add()
 keybinding.new({ modkey, "Control" }, "space", awful.client.togglefloating):add()
+keybinding.new({ modkey, "Control" }, "Return", function () client.focus_get():swap(awful.client.master()) end):add()
 keybinding.new({ modkey }, "o", awful.client.movetoscreen):add()
 
 -- Layout manipulation
 keybinding.new({ modkey }, "o", awful.client.movetoscreen):add()
 
 -- Layout manipulation
@@ -209,8 +207,12 @@ keybinding.new({ modkey }, "space", function () awful.layout.inc(layouts, 1) end
 keybinding.new({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add()
 
 -- Menu
 keybinding.new({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add()
 
 -- Menu
-keybinding.new({ modkey }, "F1", function () awful.menu("Run: ", mymenubox, awful.spawn) end):add()
-keybinding.new({ modkey }, "F4", function () awful.menu("Run Lua code: ", mymenubox, awful.eval) end):add()
+keybinding.new({ modkey }, "F1", function ()
+                                     awful.menu({ prompt = "Run: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mymenubox, awful.spawn)
+                                 end):add()
+keybinding.new({ modkey }, "F4", function ()
+                                     awful.menu({ prompt = "Run Lua code: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mymenubox, awful.eval)
+                                 end):add()
 
 --- Tabulous, tab manipulation
 keybinding.new({ modkey, "Control" }, "y", function ()
 
 --- Tabulous, tab manipulation
 keybinding.new({ modkey, "Control" }, "y", function ()
@@ -318,6 +320,15 @@ function hook_manage(c)
     if c:name_get():lower():find("mplayer") then
         c:floating_set(true)
     end
     if c:name_get():lower():find("mplayer") then
         c:floating_set(true)
     end
+    if c:name_get():find("pinentry") then
+        c:floating_set(true)
+    end
+    if c:name_get():lower():find("twinkle") then
+        c:floating_set(true)
+    end
+    if c:name_get():find("GIMP") then
+        c:floating_set(true)
+    end
 end
 
 -- Hook function to execute when arranging the screen
 end
 
 -- Hook function to execute when arranging the screen