X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/3981b429fc49cbc49f87fcfcb96d6c9869224353..2eb3e2e1c3eb691406263d18ce2667c285c6e943:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 1243771..ed62e81 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -479,9 +479,9 @@ default_tags = gears.table.join(default_tags, {
     master_width_factor = 0.33,
     layout      = layouts.tiled,
     selected    = true,
-    exec_once   = { terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As irc irssi" },
+    exec_once   = { terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh --family=all -- irc-host tmux new -As irc irssi" },
     instance    = { "irc" },
-    targets     = { "catalyst/eDP1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-2" },
+    targets     = { "catalyst1?/eDP-?1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-2" },
   },
   {
     name        = "[m]",
@@ -489,10 +489,10 @@ default_tags = gears.table.join(default_tags, {
     exclusive   = true,
     master_width_factor = 0.67,
     layout      = layouts.tiled,
-    selected    = true,
+    selected    = false,
     exec_once   = { "revolt" },
     instance    = { "Revolt" },
-    targets     = { "catalyst/eDP1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-2" },
+    targets     = { "catalyst1?/eDP-?1", "mtvic1?/eDP-?1", "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     = { "catalyst/DP2-1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" },
+    targets     = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "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     = { "catalyst/DP2-1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI.*" },
+    targets     = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "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     = { "catalyst/DP2-1", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI.*" },
+    targets     = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" },
   },
 })
 
@@ -767,11 +767,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()
-        th.move_to_new_tag(nil, { layout = layouts.maximised },true,true,true)
+        th.move_to_new_tag(nil, nil, { layout = layouts.maximised },true,true,true)
     end,
               {description = "add a volatile tag with the focused client", group = "tag"}),
     awful.key({ modkey, "Shift", "Control" }, "a", function()
-        th.move_to_new_tag(nil, { layout = layouts.maximised },false,true,true)
+        th.move_to_new_tag(nil, nil, { layout = layouts.maximised },false,true,true)
     end,
               {description = "add a permanent tag with the focused client", group = "tag"}),
     awful.key({ modkey, "Mod1"   }, "a", th.copy_tag,
@@ -892,14 +892,14 @@ clientbuttons = gears.table.join(
 globalkeys = awful.util.table.join(globalkeys,
 awful.key({ cmdkey }, "n", function () awful.spawn("firefox") 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 ipython3") 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 }, "f", function () awful.spawn("thunar") end),
-awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As irc irssi") end),
+awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh --family=all -- irc-host tmux new -As irc irssi") end),
 awful.key({ cmdkey }, "x", function ()
     awful.spawn("/usr/bin/xscreensaver -no-capture-stderr")
     os.execute("sleep 5")
@@ -989,7 +989,8 @@ awful.rules.rules = {
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
-                     --floating = false
+                     floating = false,
+                     maximized = false,
                  },
     },
     { rule = { type = "dialog" },
@@ -1008,16 +1009,13 @@ awful.rules.rules = {
     { rule = { instance = "irc" },
       callback = move_to_tag_by_name(nil, "irc"),
     },
-    { rule = { class = "Revolt" },
-      callback = move_to_tag_by_name(nil, "[m]"),
-    },
-    { rule = { class = "Firefox" },
+    { rule_any = { class = { "Firefox", "firefox" } },
       callback = move_to_tag_by_name(nil, "ffx"),
     },
     { rule = { class = "Chromium" },
       callback = move_to_tag_by_name(nil, "chr"),
     },
-    { rule = { class = "Thunderbird" },
+    { rule_any = { class = { "thunderbird", "Thunderbird" } },
       callback = move_to_tag_by_name(nil, "cal"),
     },
     { rule = { instance = "mutt" },
@@ -1031,7 +1029,6 @@ awful.rules.rules = {
       },
     },
     { rule_any = { class = {
-        "Wicd-client.py",
         "Gxmessage",
         "Pinentry"
     }},
@@ -1043,7 +1040,6 @@ awful.rules.rules = {
     },
     { rule_any = { instance = {
         "tridactyl-edit",
-        "libreoffice",
         "pdfshuffler"
     }},
       properties = { floating = true,
@@ -1052,22 +1048,25 @@ awful.rules.rules = {
                      placement = awful.placement.centered,
                    },
     },
---    { rule_any = { class = {
---                        "Gscan2pdf",
---                        "Gimp",
---                    },
---                    instance = {
---                        "libreoffice",
---                    }
---                },
---      properties = { new_tag = {
---                        layout = layouts.maximised,
---                        volatile = true,
---                    },
---                     switchtotag = true,
---                     focus = true,
---                   },
---    },
+    { rule_any = { class = {
+                        "Gscan2pdf",
+                        "Gimp",
+                        "Inkscape",
+                        "Pitivi",
+                    },
+                    instance = {
+                        "libreoffice",
+                    }
+                },
+      except_any = { type = { "dialog" } },
+      properties = { new_tag = {
+                        layout = layouts.maximised,
+                        volatile = true,
+                    },
+                     switchtotag = true,
+                     focus = true,
+                   },
+    },
 --XX--    { rule = { class = "Gscan2pdf" },
 --XX--               properties = {
 --XX--                   switchtotag = true