X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/db29013ebd9bd334d676787d6b584f42f46b5cd6..e765b4a1619d3c6fa79c25cd85e6f1989cfa5b0e:/.config/awesome/rc.lua?ds=inline;pf=etc diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 74a1621..6bdfad1 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -329,9 +329,10 @@ awful.screen.connect_for_each_screen(function(s) end) -- }}} -- {{{ autorandr integration -local function find_screen_by_name(name) +local function find_screen_by_pattern(pattern) for s in screen do - if s.name == name then + print(s.name .. " :: " .. pattern) + if s.name:match(pattern) then return s end end @@ -350,7 +351,7 @@ local function get_target_screen_for_tag(tag) if tag.targets then if type(tag.targets) == "table" then for _,target in ipairs(tag.targets) do - local s = find_screen_by_name(target) + local s = find_screen_by_pattern(target:gsub('%-', '%%-')) if s then print(" → screen " .. s.name) return s @@ -478,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]", @@ -488,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", @@ -507,8 +508,8 @@ default_tags = gears.table.join(default_tags, { exclusive = true, layout = layouts.default, exec_once = { "thunderbird" }, - class = { "Thunderbird" }, - targets = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1" }, + class = { "thunderbird" }, + targets = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1" }, }, { name = "chr", @@ -517,7 +518,7 @@ default_tags = gears.table.join(default_tags, { layout = layouts.default, exec_once = { "chromium" }, class = { "Chromium" }, - targets = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI1" }, + targets = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" }, }, { name = "ffx", @@ -526,7 +527,7 @@ default_tags = gears.table.join(default_tags, { layout = layouts.default, exec_once = { "firefox" }, class = { "Firefox" }, - targets = { "catalyst/DP2-2", "mtvic/eDP1", "gauting/eDP1", "lehel/DisplayPort-1", "present/HDMI1" }, + targets = { "catalyst1?/DP-?[12]-1", "mtvic1?/eDP-?1", "gauting/eDP-?1", "lehel/DisplayPort-1", "present/HDMI.*" }, }, }) @@ -766,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,nil,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,nil,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, @@ -891,14 +892,13 @@ 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") @@ -906,16 +906,18 @@ awful.key({ cmdkey }, "x", function () 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), -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, "XF86Display", function () awful.spawn("autorandr --change --force"); initialise_to_autorandr_profile() end), @@ -924,6 +926,7 @@ 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, "XF86Favorites", function () awful.spawn("systemctl suspend") end), awful.key({ cmdkey }, "Left", function () awful.spawn("xmms2 prev") end), awful.key({ cmdkey }, "Right", function () awful.spawn("xmms2 next") end), @@ -985,7 +988,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" }, @@ -1004,21 +1008,26 @@ 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" }, + properties = { + new_tag = { + name = "mutt", + layout = awful.layout.suit.fair.horizontal, + volatile = true + }, + switchtotag = true, + }, + }, { rule_any = { class = { - "MuPDF", - "Wicd-client.py", "Gxmessage", "Pinentry" }}, @@ -1030,7 +1039,6 @@ awful.rules.rules = { }, { rule_any = { instance = { "tridactyl-edit", - "libreoffice", "pdfshuffler" }}, properties = { floating = true, @@ -1039,22 +1047,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 @@ -1091,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 + 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