X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/21add8471400ccaf96416116590130d403c3eed5..66743a518f57886f50c6aa0317d1d4b702fd620f:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index c727e78..70e885c 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -199,7 +199,7 @@ local lain_bat = lain.widget.bat({
 
 -- Create a textclock widget
 clocksarray = clocksarray.get_clocksarray("%a %d %b %H:%M:%S %Z", {
-        ["NZ"] = "Pacific/Auckland",
+--        ["NZ"] = "Pacific/Auckland",
         ["DE"] = "Europe/Berlin"
     }, make_spacer())
 
@@ -481,7 +481,7 @@ default_tags = gears.table.join(default_tags, {
     selected    = true,
     exec_once   = { terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh --family=all -- irc-host tmux new -As irc irssi" },
     instance    = { "irc" },
-    targets     = { "catalyst1?/eDP-?1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-2" },
+    targets     = { "gauting/eDP-?1", "lehel/DisplayPort-2" },
   },
   {
     name        = "[m]",
@@ -492,7 +492,7 @@ default_tags = gears.table.join(default_tags, {
     selected    = false,
     exec_once   = { "revolt" },
     instance    = { "Revolt" },
-    targets     = { "catalyst1?/eDP-?1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-2" },
+    targets     = { "gauting/eDP-?1", "lehel/DisplayPort-2" },
   },
   {
     name        = "dflt",
@@ -509,7 +509,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "thunderbird" },
     class       = { "thunderbird" },
-    targets     = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1" },
+    targets     = { "gauting/eDP-?1", "lehel/DisplayPort-1" },
   },
   {
     name        = "chr",
@@ -518,7 +518,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "chromium" },
     class       = { "Chromium" },
-    targets     = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" },
+    targets     = { "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" },
   },
   {
     name        = "ffx",
@@ -527,7 +527,7 @@ default_tags = gears.table.join(default_tags, {
     layout      = layouts.default,
     exec_once   = { "firefox" },
     class       = { "Firefox" },
-    targets     = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" },
+    targets     = { "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" },
   },
 })
 
@@ -816,6 +816,8 @@ clientkeys = gears.table.join(
               {description = "toggle floating", group = "client"}),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
               {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "z",      function (c) c:move_to_screen() end,
+              {description = "move to screen", group = "client"}),
     awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
               {description = "toggle keep on top", group = "client"}),
     awful.key({ modkey,           }, "n",
@@ -931,7 +933,8 @@ awful.key(nil, "XF86LaunchA", function () awful.spawn("") end),
 awful.key(nil, "XF86Explorer", function () awful.spawn("") end),
 awful.key(nil, "XF86Favorites", function () awful.spawn("systemctl suspend") end),
 
-awful.key({ cmdkey }, "Multi_key", function () run_output_notify("flameshot gui") end),
+awful.key({ cmdkey }, "Multi_key", function () run_output_notify("flameshot gui", "Output") end),
+awful.key({ cmdkey, "Shift" }, "Multi_key", function () run_output_notify("flameshot full --delay 2000 --clipboard", "Output") end),
 
 awful.key({ cmdkey }, "Up", function () awful.spawn("pap prev") end),
 awful.key({ cmdkey }, "Left", function () awful.spawn("pap seek -10") end),
@@ -940,16 +943,18 @@ awful.key({ cmdkey }, "Down", function () awful.spawn("pap next") end),
 awful.key({ cmdkey }, "Right", function () awful.spawn("pap seek +10") end),
 awful.key({ cmdkey, "Shift" }, "Right", function () awful.spawn("pap seek +60") end),
 awful.key({ cmdkey }, "space", function () awful.spawn("pap pause") end),
-awful.key({ cmdkey }, "\\", function () run_output_notify("pap info") end),
-awful.key({ cmdkey }, "]", function () run_output_notify("pap list") end)
+awful.key({ cmdkey }, "\\", function () run_output_notify("pap info", "Track info") end),
+awful.key({ cmdkey }, "]", function () run_output_notify("pap list", "Playlist") end)
 )
 
-function run_output_notify(cmd)
+function run_output_notify(cmd, title)
     awful.spawn.easy_async(cmd, function(stdout, stderr, reason, exit_code)
-        naughty.notify({
-            preset = naughty.config.presets.low,
-            title = "Playlist",
-            text = stdout})
+        if #stdout > 1 then
+            naughty.notify({
+                preset = naughty.config.presets.low,
+                title = title,
+                text = stdout})
+            end
         end)
 end
 
@@ -1136,12 +1141,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
-    if not awesome.startup then
-        local t = awful.screen.focused().selected_tag
-        if t.name == "xmutt" then
-            awful.client.setslave(c)
-        end
-    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