X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/53ac76acf46b1d77a9d80b343892450d1b493f27..db29013ebd9bd334d676787d6b584f42f46b5cd6:/.config/awesome/rc.lua?ds=sidebyside

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 982aabd..74a1621 100644
--- 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")
+local fxwidgets = require("forex_widgets")
 local clocksarray = require("clocksarray")
 local dbg = require("debugfunc")
 local th = require("taghelpers")
@@ -299,17 +300,19 @@ awful.screen.connect_for_each_screen(function(s)
         layout = wibox.layout.fixed.horizontal,
     })
 
-    if s == screen.primary then
+--    if s == screen.primary then
         right_widgets = gears.table.join({
             make_spacer(" "),
             ccwidgets.btc_widget,
             make_spacer(),
             ccwidgets.eth_widget,
             make_spacer(),
+            fxwidgets.ecb_widget,
+            make_spacer(),
             lain_bat.widget,
             make_spacer(),
         }, right_widgets)
-    end
+--    end
 
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
@@ -384,7 +387,7 @@ tag.connect_signal("request::screen", function(t)
     end
     naughty.notify({
         title = "Screen removed",
-        text = "Salvaged tab " .. t.name .. " onto screen " .. t.screen.name,
+        text = "Salvaged tab " .. t.name,
     })
 end)
 
@@ -505,7 +508,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "thunderbird" },
     class       = { "Thunderbird" },
-    targets     = { "catalyst/HDMI1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" },
+    targets     = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" },
   },
   {
     name        = "chr",
@@ -514,7 +517,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "chromium" },
     class       = { "Chromium" },
-    targets     = { "catalyst/HDMI1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" },
+    targets     = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI1" },
   },
   {
     name        = "ffx",
@@ -523,7 +526,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "firefox" },
     class       = { "Firefox" },
-    targets     = { "catalyst/HDMI1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" },
+    targets     = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI1" },
   },
 })
 
@@ -609,6 +612,10 @@ globalkeys = gears.table.join(
               {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"}),
 
@@ -883,9 +890,10 @@ clientbuttons = gears.table.join(
 -- 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 }, "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),
@@ -910,14 +918,28 @@ awful.key(nil, "XF86AudioMicMute", function () awful.spawn("pactl set-source-mut
 awful.key({ cmdkey }, "Home", function () awful.spawn("pactl set-source-mute 1 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, "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, "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)
 -- }}}
@@ -1008,7 +1030,8 @@ awful.rules.rules = {
     },
     { rule_any = { instance = {
         "tridactyl-edit",
-        "libreoffice"
+        "libreoffice",
+        "pdfshuffler"
     }},
       properties = { floating = true,
                      maximized = false,