switch to new awful.widgets.watch from lain

[etc/awesome.git] / .config / awesome / rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 4a1632905614c2d3dcf5bc6df3a4c9f4821ac7e0..43a843e3aec1e330ac311cee546c6706a5fd6533 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -24,6 +24,7 @@ local has_fdo, freedesktop = pcall(require, "freedesktop")
 -- Other libraries
 local lain = require("lain")
 local ccwidgets = require("cryptocoin_widgets")
 -- Other libraries
 local lain = require("lain")
 local ccwidgets = require("cryptocoin_widgets")

+local fxwidgets = require("forex_widgets")

 local clocksarray = require("clocksarray")
 local dbg = require("debugfunc")
 local th = require("taghelpers")
 local clocksarray = require("clocksarray")
 local dbg = require("debugfunc")
 local th = require("taghelpers")


@@ -77,7 +78,9 @@ cmdkey = "Mod3"
 -- Table of layouts to cover with awful.layout.inc, order matters.
 local layouts = {
     default = awful.layout.suit.fair,
 -- Table of layouts to cover with awful.layout.inc, order matters.
 local layouts = {
     default = awful.layout.suit.fair,

+    default_horiz = awful.layout.suit.fair.horizontal,

     tiled = awful.layout.suit.tile,
     tiled = awful.layout.suit.tile,

+    tiled_horiz = awful.layout.suit.tile.top,

     floating = awful.layout.suit.floating,
     maximised = awful.layout.suit.max
 }
     floating = awful.layout.suit.floating,
     maximised = awful.layout.suit.max
 }


@@ -86,6 +89,8 @@ awful.layout.layouts = {
     layouts.tiled,
     layouts.maximised,
     layouts.floating,
     layouts.tiled,
     layouts.maximised,
     layouts.floating,

+    layouts.default_horiz,
+    layouts.tiled_horiz,

 }
 -- }}}
 
 }
 -- }}}
 


@@ -173,8 +178,11 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 --    forced_width = 4,
 --    widget = wibox.widget.separator
 --}
 --    forced_width = 4,
 --    widget = wibox.widget.separator
 --}

-local spacer = wibox.widget.textbox()
-spacer:set_text(" │ ")
+local function make_spacer(text)
+    local spacer = wibox.widget.textbox()
+    spacer:set_text(text or " │ ")
+    return spacer
+end

 
 -- Keyboard map indicator and switcher
 mykeyboardlayout = awful.widget.keyboardlayout()
 
 -- Keyboard map indicator and switcher
 mykeyboardlayout = awful.widget.keyboardlayout()


@@ -193,7 +201,7 @@ local lain_bat = lain.widget.bat({
 clocksarray = clocksarray.get_clocksarray("%a %d %b %H:%M:%S %Z", {
         ["NZ"] = "Pacific/Auckland",
         ["DE"] = "Europe/Berlin"
 clocksarray = clocksarray.get_clocksarray("%a %d %b %H:%M:%S %Z", {
         ["NZ"] = "Pacific/Auckland",
         ["DE"] = "Europe/Berlin"

-    }, spacer)
+    }, make_spacer())

 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(


@@ -286,34 +294,33 @@ awful.screen.connect_for_each_screen(function(s)
 
     -- Add widgets to the wibox
     local right_widgets = gears.table.join(clocksarray, {
 
     -- Add widgets to the wibox
     local right_widgets = gears.table.join(clocksarray, {

-        spacer,
-        --spacing = 4,
-        --spacing_widget = spacer,
+        make_spacer(" "),
+        wibox.widget.systray(),

         s.mylayoutbox,
         layout = wibox.layout.fixed.horizontal,
     })
 
         s.mylayoutbox,
         layout = wibox.layout.fixed.horizontal,
     })
 

-    if s == screen.primary then
+--    if s == screen.primary then

         right_widgets = gears.table.join({
         right_widgets = gears.table.join({

-            wibox.widget.systray(),
-            spacer,
+            make_spacer(" "),

             ccwidgets.btc_widget,
             ccwidgets.btc_widget,

-            spacer,
+            make_spacer(),

             ccwidgets.eth_widget,
             ccwidgets.eth_widget,

-            spacer,
+            make_spacer(),
+            fxwidgets.ecb_widget,
+            make_spacer(),

             lain_bat.widget,
             lain_bat.widget,

-            spacer,
+            make_spacer(),

         }, right_widgets)
         }, right_widgets)

-    end
+--    end

 
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
 
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
         { -- Left widgets

-            spacing = 4,
-            spacing_widget = spacer,

             layout = wibox.layout.fixed.horizontal,
             --s.namebox,
             s.mytaglist,
             layout = wibox.layout.fixed.horizontal,
             --s.namebox,
             s.mytaglist,

+            make_spacer(" "),

             s.mypromptbox,
         },
         s.mytasklist, -- Middle widget
             s.mypromptbox,
         },
         s.mytasklist, -- Middle widget


@@ -380,7 +387,7 @@ tag.connect_signal("request::screen", function(t)
     end
     naughty.notify({
         title = "Screen removed",
     end
     naughty.notify({
         title = "Screen removed",

-        text = "Salvaged tab " .. t.name .. " onto screen " .. t.screen.name,
+        text = "Salvaged tab " .. t.name,

     })
 end)
 
     })
 end)
 


@@ -409,10 +416,11 @@ end
 
 local function initialise_to_autorandr_profile()
     local profile
 
 local function initialise_to_autorandr_profile()
     local profile

+    profile = nil

 
     local function process_line(line)
         if profile then return end
 
     local function process_line(line)
         if profile then return end

-        local match = string.match(line, "^([^%s]+) %(detected%)$")
+        local match = string.match(line, "^([^%s]+) %(detected%)")

         if match then
             profile = match
         end
         if match then
             profile = match
         end


@@ -433,7 +441,7 @@ local function initialise_to_autorandr_profile()
     end
 
     awful.spawn.with_line_callback('autorandr', {
     end
 
     awful.spawn.with_line_callback('autorandr', {

-        stderr = process_line,
+        stdout = process_line,

         output_done = output_done,
         exit = handle_exit
     })
         output_done = output_done,
         exit = handle_exit
     })


@@ -472,7 +480,7 @@ default_tags = gears.table.join(default_tags, {
     selected    = true,
     exec_once   = { terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As irc irssi" },
     instance    = { "irc" },
     selected    = true,
     exec_once   = { terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As irc irssi" },
     instance    = { "irc" },

-    targets     = { "catalyst/eDP1", "mtvic/eDP1" },
+    targets     = { "catalyst/eDP1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-2" },

   },
   {
     name        = "[m]",
   },
   {
     name        = "[m]",


@@ -483,7 +491,7 @@ default_tags = gears.table.join(default_tags, {
     selected    = true,
     exec_once   = { "revolt" },
     instance    = { "Revolt" },
     selected    = true,
     exec_once   = { "revolt" },
     instance    = { "Revolt" },

-    targets     = { "catalyst/eDP1", "mtvic/eDP1" },
+    targets     = { "catalyst/eDP1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-2" },

   },
   {
     name        = "dflt",
   },
   {
     name        = "dflt",


@@ -500,7 +508,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "thunderbird" },
     class       = { "Thunderbird" },
     layout      = layouts.default,
     exec_once   = { "thunderbird" },
     class       = { "Thunderbird" },

-    targets     = { "catalyst/HDMI1", "mtvic/eDP1" },
+    targets     = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" },

   },
   {
     name        = "chr",
   },
   {
     name        = "chr",


@@ -509,7 +517,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "chromium" },
     class       = { "Chromium" },
     layout      = layouts.default,
     exec_once   = { "chromium" },
     class       = { "Chromium" },

-    targets     = { "catalyst/HDMI1", "mtvic/eDP1" },
+    targets     = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI1" },

   },
   {
     name        = "ffx",
   },
   {
     name        = "ffx",


@@ -518,7 +526,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "firefox" },
     class       = { "Firefox" },
     layout      = layouts.default,
     exec_once   = { "firefox" },
     class       = { "Firefox" },

-    targets     = { "catalyst/HDMI1", "mtvic/eDP1" },
+    targets     = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI1" },

   },
 })
 
   },
 })
 


@@ -604,6 +612,10 @@ globalkeys = gears.table.join(
               {description = "view previous", group = "tag"}),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
               {description = "view next", group = "tag"}),
               {description = "view previous", group = "tag"}),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
               {description = "view next", group = "tag"}),

+    awful.key({ modkey, "Shift" }, "Left", function () awful.screen.focus_relative( 1) end,
+              {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Shift" }, "Right", function () awful.screen.focus_relative(-1) end,
+              {description = "focus the previous screen", group = "screen"}),

     awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
               {description = "go back", group = "tag"}),
 
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
               {description = "go back", group = "tag"}),
 


@@ -695,6 +707,7 @@ globalkeys = gears.table.join(
                     bg_cursor    = '#ff0000',
                     textbox      = widget,
                     history_path = awful.util.get_cache_dir() .. "/history",
                     bg_cursor    = '#ff0000',
                     textbox      = widget,
                     history_path = awful.util.get_cache_dir() .. "/history",

+                    completion_callback = awful.completion.shell,

                     hooks = {
                         -- Replace the 'normal' Return with a custom one
                         {{         }, 'Return', function(command)
                     hooks = {
                         -- Replace the 'normal' Return with a custom one
                         {{         }, 'Return', function(command)


@@ -753,11 +766,11 @@ globalkeys = gears.table.join(
     awful.key({ modkey,           }, "d", th.delete_tag,
               {description = "delete the current tag", group = "tag"}),
     awful.key({ modkey, "Shift",           }, "a", function()
     awful.key({ modkey,           }, "d", th.delete_tag,
               {description = "delete the current tag", group = "tag"}),
     awful.key({ modkey, "Shift",           }, "a", function()

-        move_to_new_tag(nil,nil,true,true,true)
+        th.move_to_new_tag(nil,nil,true,true,true)

     end,
               {description = "add a volatile tag with the focused client", group = "tag"}),
     awful.key({ modkey, "Shift", "Control" }, "a", function()
     end,
               {description = "add a volatile tag with the focused client", group = "tag"}),
     awful.key({ modkey, "Shift", "Control" }, "a", function()

-        move_to_new_tag(nil,nil,false,true,true)
+        th.move_to_new_tag(nil,nil,false,true,true)

     end,
               {description = "add a permanent tag with the focused client", group = "tag"}),
     awful.key({ modkey, "Mod1"   }, "a", th.copy_tag,
     end,
               {description = "add a permanent tag with the focused client", group = "tag"}),
     awful.key({ modkey, "Mod1"   }, "a", th.copy_tag,


@@ -877,9 +890,10 @@ clientbuttons = gears.table.join(
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,
 awful.key({ cmdkey }, "n", function () awful.spawn("firefox") end),
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,
 awful.key({ cmdkey }, "n", function () awful.spawn("firefox") end),

-awful.key({ cmdkey }, "m", function () awful.spawn("chromium --enable-remote-extensions") end),
+awful.key({ cmdkey }, "c", function () awful.spawn("chromium --enable-remote-extensions") end),

 awful.key({ cmdkey }, "y", function () awful.spawn(terminal .. " -e python") end),
 awful.key({ cmdkey }, "y", function () awful.spawn(terminal .. " -e python") end),

-awful.key({ cmdkey }, "c", function () awful.spawn("thunderbird") end),
+awful.key({ cmdkey }, "m", function () awful.spawn(terminal .. " -name mutt -e mutt") end),
+awful.key({ cmdkey }, "t", function () awful.spawn("thunderbird") end),

 awful.key({ cmdkey }, "g", function () awful.spawn("gscan2pdf") end),
 awful.key({ cmdkey }, "v", function () awful.spawn("virt-manager") end),
 awful.key({ cmdkey }, "l", function () awful.spawn("libreoffice") end),
 awful.key({ cmdkey }, "g", function () awful.spawn("gscan2pdf") end),
 awful.key({ cmdkey }, "v", function () awful.spawn("virt-manager") end),
 awful.key({ cmdkey }, "l", function () awful.spawn("libreoffice") end),


@@ -892,26 +906,42 @@ awful.key({ cmdkey }, "x", function ()
 end),
 awful.key({ cmdkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end),
 
 end),
 awful.key({ cmdkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end),
 

+awful.key({ cmdkey }, "BackSpace", function () awful.spawn("pkill -USR1 offlineimap") end),
+

 -- function keys
 awful.key(nil, "XF86ScreenSaver", function () awful.spawn("xset dpms force off") end),
 -- function keys
 awful.key(nil, "XF86ScreenSaver", function () awful.spawn("xset dpms force off") end),

-awful.key(nil, "XF86AudioMute", function () awful.spawn("pactl set-sink-mute 0 toggle") end),
-awful.key({ cmdkey }, "End", function () awful.spawn("pactl set-sink-mute 0 toggle") end),
-awful.key(nil, "XF86AudioLowerVolume", function () awful.spawn("pactl set-sink-volume 0 -2%") end),
-awful.key({ cmdkey }, "Next", function () awful.spawn("pactl set-sink-volume 0 -2%") end),
-awful.key(nil, "XF86AudioRaiseVolume", function () awful.spawn("pactl set-sink-volume 0 +2%") end),
-awful.key({ cmdkey }, "Prior", function () awful.spawn("pactl set-sink-volume 0 +2%") end),
-awful.key(nil, "XF86AudioMicMute", function () awful.spawn("pactl set-source-mute 1 toggle") end),
-awful.key({ cmdkey }, "Home", function () awful.spawn("pactl set-source-mute 1 toggle") end),
+awful.key(nil, "XF86AudioMute", function () awful.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle") end),
+awful.key({ cmdkey }, "End", function () awful.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle") end),
+awful.key(nil, "XF86AudioLowerVolume", function () awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ -2%") end),
+awful.key({ cmdkey }, "Next", function () awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ -2%") end),
+awful.key(nil, "XF86AudioRaiseVolume", function () awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ +2%") end),
+awful.key({ cmdkey }, "Prior", function () awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ +2%") end),
+awful.key(nil, "XF86AudioMicMute", function () awful.spawn("pactl set-source-mute @DEFAULT_SOURCE@ toggle") end),
+awful.key({ cmdkey }, "Home", function () awful.spawn("pactl set-source-mute @DEFAULT_SOURCE@ toggle") end),

 awful.key(nil, "XF86MonBrightnessDown", function () awful.spawn("xbacklight -dec 5%") end),
 awful.key(nil, "XF86MonBrightnessUp", function () awful.spawn("xbacklight -inc 5%") end),
 awful.key(nil, "XF86MonBrightnessDown", function () awful.spawn("xbacklight -dec 5%") end),
 awful.key(nil, "XF86MonBrightnessUp", function () awful.spawn("xbacklight -inc 5%") end),

-awful.key(nil, "XF86Display", function () awful.spawn("") end),
+awful.key(nil, "XF86Display", function () awful.spawn("autorandr --change --force"); initialise_to_autorandr_profile() end),

 awful.key(nil, "XF86WLAN", function () awful.spawn("") end),
 awful.key(nil, "XF86Tools", function () awful.spawn("") end),
 awful.key(nil, "XF86Search", function () awful.spawn("") end),
 awful.key(nil, "XF86LaunchA", function () awful.spawn("") end),
 awful.key(nil, "XF86WLAN", function () awful.spawn("") end),
 awful.key(nil, "XF86Tools", function () awful.spawn("") end),
 awful.key(nil, "XF86Search", function () awful.spawn("") end),
 awful.key(nil, "XF86LaunchA", function () awful.spawn("") end),

-awful.key(nil, "XF86Explorer", function () awful.spawn("") end)
+awful.key(nil, "XF86Explorer", function () awful.spawn("") end),
+
+awful.key({ cmdkey }, "Left", function () awful.spawn("xmms2 prev") end),
+awful.key({ cmdkey }, "Right", function () awful.spawn("xmms2 next") end),
+awful.key({ cmdkey }, "space", function () awful.spawn("xmms2 toggle") end),
+awful.key({ cmdkey }, "\\", function () run_output_notify("xmms2 list") end)

 )
 
 )
 

+function run_output_notify(cmd)
+    awful.spawn.easy_async(cmd, function(stdout, stderr, reason, exit_code)
+        naughty.notify({
+            preset = naughty.config.presets.low,
+            title = "XMMS2 playlist",
+            text = stdout})
+        end)
+end
+

 -- Set keys
 root.keys(globalkeys)
 -- }}}
 -- Set keys
 root.keys(globalkeys)
 -- }}}


@@ -973,7 +1003,7 @@ awful.rules.rules = {
     { rule = { class = "URxvt" },
       properties = { size_hints_honor = false, }
     },
     { rule = { class = "URxvt" },
       properties = { size_hints_honor = false, }
     },

-    { rule = { instance =  "irc" },
+    { rule = { instance = "irc" },

       callback = move_to_tag_by_name(nil, "irc"),
     },
     { rule = { class = "Revolt" },
       callback = move_to_tag_by_name(nil, "irc"),
     },
     { rule = { class = "Revolt" },


@@ -988,33 +1018,54 @@ awful.rules.rules = {
     { rule = { class = "Thunderbird" },
       callback = move_to_tag_by_name(nil, "cal"),
     },
     { rule = { class = "Thunderbird" },
       callback = move_to_tag_by_name(nil, "cal"),
     },

+    { rule = { instance = "mutt" },
+      properties = {
+          new_tag = {
+              name = "mutt",
+              layout = awful.layout.suit.fair.horizontal,
+              volatile = true
+          },
+          switchtotag = true,
+      },
+    },

     { rule_any = { class = {
     { rule_any = { class = {

-        "MuPDF",

         "Wicd-client.py",
         "Wicd-client.py",

+        "Gxmessage",
+        "Pinentry"

     }},
       properties = { floating = true,
     }},
       properties = { floating = true,

+                     maximized = false,

                      focus = true,
                      focus = true,

-                     placement = function(c)
-                         float_client_in_the_middle_with_margins(c, 50, 25)
-                     end,
+                     placement = awful.placement.centered,

                    },
     },
                    },
     },

-    { rule_any = { class = {
-                        "Gscan2pdf",
-                        "Gimp",
-                    },
-                    instance = {
-                        "libreoffice",
-                    }
-                },
-      properties = { new_tag = {
-                        layout = layouts.maximised,
-                        volatile = true,
-                    },
-                     switchtotag = true,
+    { rule_any = { instance = {
+        "tridactyl-edit",
+        "libreoffice",
+        "pdfshuffler"
+    }},
+      properties = { floating = true,
+                     maximized = false,

                      focus = true,
                      focus = true,

+                     placement = awful.placement.centered,

                    },
     },
                    },
     },

+--    { rule_any = { class = {
+--                        "Gscan2pdf",
+--                        "Gimp",
+--                    },
+--                    instance = {
+--                        "libreoffice",
+--                    }
+--                },
+--      properties = { new_tag = {
+--                        layout = layouts.maximised,
+--                        volatile = true,
+--                    },
+--                     switchtotag = true,
+--                     focus = true,
+--                   },
+--    },

 --XX--    { rule = { class = "Gscan2pdf" },
 --XX--               properties = {
 --XX--                   switchtotag = true
 --XX--    { rule = { class = "Gscan2pdf" },
 --XX--               properties = {
 --XX--                   switchtotag = true


@@ -1051,6 +1102,12 @@ client.connect_signal("manage", function (c)
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- if not awesome.startup then awful.client.setslave(c) end
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- if not awesome.startup then awful.client.setslave(c) end

+    if not awesome.startup then
+        local t = awful.screen.focused().selected_tag
+        if t.name == "xmutt" then
+            awful.client.setslave(c)
+        end
+    end

 
     if awesome.startup and
       not c.size_hints.user_position
 
     if awesome.startup and
       not c.size_hints.user_position


@@ -1138,10 +1195,10 @@ client.connect_signal("request::activate", function(c, context, hints)
     }, context) then
         gears.timer.delayed_call(function()
             -- we need a delayed call so that we execute *after layout changes
     }, context) then
         gears.timer.delayed_call(function()
             -- we need a delayed call so that we execute *after layout changes

-            centre_mouse_on_area(client.focus)
+            if hints.raise and c == client.focus and client.focus:isvisible() then
+                move_mouse_to_area(client.focus)
+            end

         end)
         end)

-    else
-        dbg.dump(c, context, hints)

     end
 end)
 
     end
 end)