more awesome stuff

2 files changed, 74 insertions, 11 deletions

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 1477f51..b26cdeb 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -67,8 +67,8 @@ local layouts =
     -- 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.fair,
+    -- awful.layout.suit.fair.horizontal,
     -- awful.layout.suit.spiral,
     -- awful.layout.suit.spiral.dwindle,
     awful.layout.suit.max,
@@ -186,6 +186,7 @@ for s = 1, screen.count() do
                            awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
                            awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
     -- Create a taglist widget
+    -- mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons, nil, nil, wibox.layout.fixed.horizontal())
     mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
 
     -- Create a tasklist widget
@@ -235,12 +236,12 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "j",
         function ()
             awful.client.focus.byidx( 1)
-            if client.focus then client.focus:raise() end
+            -- if client.focus then client.focus:raise() end
         end),
     awful.key({ modkey,           }, "k",
         function ()
             awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
+            -- if client.focus then client.focus:raise() end
         end),
     -- awful.key({ modkey,           }, "w", function () mymainmenu:show() end),
 
@@ -253,9 +254,9 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "Tab",
         function ()
             awful.client.focus.history.previous()
-            if client.focus then
-                client.focus:raise()
-            end
+            -- if client.focus then
+            --     client.focus:raise()
+            -- end
         end),
 
     -- Standard program
@@ -295,6 +296,11 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey, "Shift" }, "m", function () awful.util.spawn_with_shell("xterm-mail-cosy") end),
     awful.key({ modkey          }, "i", function () awful.util.spawn_with_shell("xterm-irc") end),
 
+    awful.key({ modkey,         }, "F1",    function () awful.layout.set(awful.layout.suit.floating) end),
+    awful.key({ modkey,         }, "F2",    function () awful.layout.set(awful.layout.suit.tile) end),
+    awful.key({ modkey,         }, "F3",    function () awful.layout.set(awful.layout.suit.tile.bottom) end),
+    awful.key({ modkey,         }, "F4",    function () awful.layout.set(awful.layout.suit.max) end),
+
     awful.key({ }, "XF86AudioRaiseVolume", function ()
        awful.util.spawn("amixer -q -D default sset Master 5%+", false) end),
     awful.key({ }, "XF86AudioLowerVolume", function ()
@@ -342,8 +348,8 @@ globalkeys = awful.util.table.join(
         "1", "2", "3", "4", "5",
         "q", "w", "e", "r", "t",
         "a", "s", "d", "f", "g" }
-    -- local modkeytag = modkey2
-    local modkeytag = modkey
+    local modkeytag = modkey2
+    -- local modkeytag = modkey
     for i = 1, #tag_keys do
         globalkeys = awful.util.table.join(globalkeys,
             -- View tag only.
@@ -387,7 +393,7 @@ clientkeys = awful.util.table.join(
     -- awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
 
     -- weasel
-    awful.key({ modkey            }, "q", function (c)
+    awful.key({ "Mod1"            }, "q", function (c)
         if c.sticky then
             local screen = mouse.screen
             -- local tags = awful.tag.selectedlist(screen)
@@ -409,7 +415,27 @@ clientkeys = awful.util.table.join(
             c.maximized_horizontal = not c.maximized_horizontal
             c.maximized_vertical   = not c.maximized_vertical
         end),
-    awful.key({ modkey            }, "Escape", function (c) c:kill()                         end)
+
+    awful.key({ modkey,          }, "q", function (c) c.maximized_horizontal = not c.maximized_horizontal end),
+    awful.key({ modkey,          }, "a", function (c) c.maximized_vertical = not c.maximized_vertical end),
+    awful.key({ modkey,          }, "z",
+        function (c)
+            if c.maximized_vertical then
+                c.maximized_horizontal = false
+                c.maximized_vertical   = false
+            else
+                c.maximized_horizontal = true
+                c.maximized_vertical   = true
+            end
+        end),
+
+    awful.key({ "Mod1"            }, "Up"   , function (c) c:raise() end),
+    awful.key({ "Mod1"            }, "Down" , function (c) c:lower() end),
+    awful.key({ modkey            }, ";"    , function (c) c:raise() end),
+    awful.key({ modkey            }, "/"    , function (c) c:lower() end),
+
+    awful.key({ modkey            }, "Escape", function (c) c:kill() end)
+
 
     --awful.key({ modkey,           }, "n",
     --    function (c)
diff --git a/config/awesome/weasel-rules.lua b/config/awesome/weasel-rules.lua
new file mode 100644
index 0000000..b645df3
--- /dev/null
+++ b/config/awesome/weasel-rules.lua
@@ -0,0 +1,37 @@
+function get_weasel_rules()
+    local sn = screen.count()
+
+    local rules = {
+        { rule = { class = "URxvt" , name = "FURxvt" },
+          properties = { floating = true } },
+
+        { rule = { class = "Firefox" , name = "Mozilla Firefox" },
+          properties = { tag = tags[sn][6] } },
+        { rule = { class = "Firefox" },
+          properties = { tag = tags[sn][6] } },
+        { rule = { class = "chromium" , name = "New Tab - Chromium" },
+          properties = { tag = tags[sn][7] } },
+        { rule = { class = "Tor Browser" , name = "Tor Browser" },
+          properties = { tag = tags[sn][8], floating = true } },
+        { rule = { class = "Tor Browser" },
+          properties = { tag = tags[sn][8], floating = true } },
+
+        { rule = { class = "URxvt" , name = "IRC" },
+          properties = { tag = tags[sn][11] } },
+        { rule = { class = "URxvt" , name = "Mail" },
+          properties = { tag = tags[sn][12] } },
+        { rule = { class = "URxvt" , name = "Mail COSY" },
+          properties = { tag = tags[sn][12] } },
+
+        { rule = { class = "chromium" , name = "Signal Private Messenger" },
+          properties = { tag = tags[sn][13] } },
+
+        --{ rule = { maximized_horizontal = true }, -- these two should remove window borders from maximized windows because they get in the way
+        --  properties = { border_width = 0 } },
+        --{ rule = { maximized_vertical = true },
+        --  properties = { border_width = 0 } },
+    }
+    return rules
+end
+
+-- vim:set softtabstop=4:ts=4:shiftwidth=4:et=1: