more config

5 files changed, 74 insertions, 21 deletions

diff --git a/Xresources b/Xresources
index 0595894..75b66a8 100644
--- a/Xresources
+++ b/Xresources
@@ -1,5 +1,5 @@
 ! XFT
-!Xft.dpi:		120
+#Xft.dpi:		120
 !Xft.dpi:		96
 
 ! XTerm
@@ -68,4 +68,4 @@ URxvt.matcher.button: 3
 
 ! URxvt.cutchars: "!\"$%'()*+,;.:<=>[\]^`{|}~@&#»­/"
 URxvt.pastableTabs: False
-URxvt.cutchars: "!\`\"'$&()*,;<=>?@[]^{|}:/·»"
+URxvt.cutchars: "!\`\"'$&()*,;<=>?@[]^{|}:/·»-"
diff --git a/config/awesome/battery.lua b/config/awesome/battery.lua
index 100d77b..9d78172 100644
--- a/config/awesome/battery.lua
+++ b/config/awesome/battery.lua
@@ -1,3 +1,4 @@
+-- TODO: switch to async IO: https://github.com/Elv13/awesome-configs/blob/master/widgets/battery.lua
 local naughty = require("naughty")
 local beautiful = require("beautiful")
 
diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 9daf950..e6056fa 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -123,7 +123,7 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 
 -- {{{ Wibox
 -- Create a textclock widget
-mytextclock = awful.widget.textclock()
+mytextclock = awful.widget.textclock(nil, 5)
 
 -- Create a wibox for each screen and add it
 mywibox = {}
@@ -153,7 +153,7 @@ mytasklist.buttons = awful.util.table.join(
                                                   -- This will also un-minimize
                                                   -- the client, if needed
                                                   client.focus = c
-                                                  c:raise()
+                                                  -- c:raise()
                                               end
                                           end),
                      awful.button({ }, 3, function ()
@@ -238,12 +238,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),
 
@@ -333,6 +333,9 @@ globalkeys = awful.util.table.join(
     -- awful.key({ "Control", "Mod1"}, "l", function () awful.util.spawn("xdg-screensaver lock") end),
     --KDE--awful.key({ "Control", "Mod1"}, "l", function () awful.util.spawn("loginctl lock-session") end),
     --KDE--awful.key({ "Control", "Mod1"}, "End", function () awful.util.spawn_with_shell("systemctl suspend -i; xdg-screensaver reset; loginctl unlock-session; xdg-screensaver reset") end),
+    -- awful.key({ "Control", "Mod1"}, "End", function () awful.util.spawn_with_shell("xscreensaver-command -lock; sleep 1; systemctl suspend") end),
+    -- awful.key({ "Control", "Mod1"}, "End", function () awful.util.spawn_with_shell("loginctl lock-session && systemctl suspend -i") end),
+    -- awful.key({ "Shift", "Control", "Mod1"}, "End", function () awful.util.spawn_with_shell("loginctl lock-session && systemctl suspend -i") end),
 
     -- awful.key( {"Ctrl"}, "Tab", revelation),
 
@@ -353,10 +356,10 @@ globalkeys = awful.util.table.join(
         end
     end
     globalkeys = awful.util.table.join(globalkeys,
-    awful.key({ modkey,           }, "Left" , function () viewidx_no_wrap (5,  0, -1) end ),
-        awful.key({ modkey,           }, "Right", function () viewidx_no_wrap (5,  0,  1) end ),
-        awful.key({ modkey,           }, "Up"   , function () viewidx_no_wrap (5, -1,  0) end ),
-        awful.key({ modkey,           }, "Down" , function () viewidx_no_wrap (5,  1,  0) end )
+    awful.key({ modkey2,           }, "Left" , function () viewidx_no_wrap (5,  0, -1) end ),
+        awful.key({ modkey2,           }, "Right", function () viewidx_no_wrap (5,  0,  1) end ),
+        awful.key({ modkey2,           }, "Up"   , function () viewidx_no_wrap (5, -1,  0) end ),
+        awful.key({ modkey2,           }, "Down" , function () viewidx_no_wrap (5,  1,  0) end )
     )
 
 
@@ -427,11 +430,11 @@ clientkeys = awful.util.table.join(
     --        c.maximized_horizontal = not c.maximized_horizontal
     --        c.maximized_vertical   = not c.maximized_vertical
     --    end),
-    awful.key({ modkey2,          }, "m",
-        function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end),
+    --awful.key({ modkey2,          }, "m",
+    --    function (c)
+    --        c.maximized_horizontal = not c.maximized_horizontal
+    --        c.maximized_vertical   = not c.maximized_vertical
+    --    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),
@@ -440,11 +443,37 @@ clientkeys = awful.util.table.join(
             if c.maximized_vertical then
                 c.maximized_horizontal = false
                 c.maximized_vertical   = false
+                -- if not c.floating then
+                --  c.ontop = false
+                --end
             else
                 c.maximized_horizontal = true
                 c.maximized_vertical   = true
+                --if not c.floating then
+                --  c.ontop = true
+                --end
+                c:raise()
             end
         end),
+    awful.key({ modkey,          }, "w",
+        function (c)
+            -- local drawable, size = awful.titlebar(c)
+            -- if size == 0 then
+            --     c.border_width = 0
+            -- else
+            --     c.border_width = beautiful.border_width
+            -- end
+            if c.border_width == 0 then
+                c.border_width = beautiful.border_width
+            else
+                c.border_width = 0
+            end
+            awful.titlebar.toggle(c)
+            -- then awful.titlebar.remove(c)
+            -- if c.titlebar then awful.titlebar.remove(c)
+            -- else setup_titlebar(c)
+            -- end
+        end),
 
     awful.key({ "Mod1"            }, "Up"   , function (c) c:raise() end),
     awful.key({ "Mod1"            }, "Down" , function (c) c:lower() end),
@@ -468,9 +497,24 @@ clientkeys = awful.util.table.join(
 )
 
 clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-    awful.button({ modkey }, 1, awful.mouse.client.move),
-    awful.button({ modkey }, 3, awful.mouse.client.resize))
+    awful.button({ }, 1,
+        function (c)
+            client.focus = c
+            -- c:raise()
+        end),
+    awful.button({ modkey }, 1,
+        function (c)
+            awful.mouse.client.move ()
+            c:raise()
+        end),
+    awful.button({ modkey }, 3,
+        function (c)
+            -- c.maximized_horizontal = false
+            -- c.maximized_vertical   = false
+            -- XXX: set window size/geometry to current(maximized) size/geometry
+            awful.mouse.client.resize ()
+        end)
+    )
     -- awful.button({ "Mod1" }, 1, awful.mouse.client.move),
     -- awful.button({ "Mod1" }, 3, awful.mouse.client.resize))
 
@@ -609,6 +653,7 @@ awful.util.spawn_with_shell("pkill -x -f nm-applet; nm-applet")
 -- awful.util.spawn("xscreensaver -no-splash")
 --KDE--awful.util.spawn("X-screensaver")
 awful.util.spawn_with_shell("pkill -x -f clipit; clipit")
+-- awful.util.spawn_with_shell("pkill -x -f dnssec-trigger-panel; dnssec-trigger-panel")
 awful.util.spawn_with_shell("pkill -x -f 'alsa-volume-monitor hw:0'; alsa-volume-monitor hw:0")
 
 -- vim:set softtabstop=4:ts=4:shiftwidth=4:et=1:
diff --git a/config/awesome/themes/weasel/theme.lua b/config/awesome/themes/weasel/theme.lua
index c88a704..243cae5 100644
--- a/config/awesome/themes/weasel/theme.lua
+++ b/config/awesome/themes/weasel/theme.lua
@@ -22,7 +22,7 @@ theme.border_focus  = "#009966"
 theme.tasklist_bg_urgent  = "#773333"
 theme.tasklist_bg_focus   = "#363d4c"
 
-theme.wallpaper = "/usr/share/wallpapers/joy/contents/images/1920x1200.png"
+theme.wallpaper = "/usr/share/wallpapers/Joy/contents/images/1920x1200.svg"
 
 
 
diff --git a/config/awesome/weasel-rules.lua b/config/awesome/weasel-rules.lua
index 481506d..5a0a1ae 100644
--- a/config/awesome/weasel-rules.lua
+++ b/config/awesome/weasel-rules.lua
@@ -10,12 +10,19 @@ function get_weasel_rules()
         { rule = { class = "URxvt" , name = "FURxvt" },
           properties = { floating = true } },
 
+        { rule = { class = "ipe" },
+          properties = { floating = true } },
+
         { rule = { class = "Firefox" , name = "Mozilla Firefox" },
-          properties = { tag = tags[browser_screen][7] } },
+          properties = { tag = tags[browser_screen][7],
+                         --border_width = 0
+                         } },
         { rule = { class = "Firefox" },
           properties = { tag = tags[browser_screen][7] } },
         { rule = { class = "chromium"  }, -- , name = "New Tab - Chromium" },
-          properties = { tag = tags[browser_screen][8] } },
+          properties = { tag = tags[browser_screen][8],
+                         -- border_width = 0
+                         } },
         { rule = { class = "Tor Browser" , name = "Tor Browser" },
           properties = { tag = tags[browser_screen][12], floating = true } },
         { rule = { class = "Tor Browser" },