From 4638ee1d6d4ca6964c8e6263935a122f11a850b2 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Thu, 25 Apr 2024 17:13:43 +0200 Subject: [PATCH] update --- mybindings.lua | 2 +- rules.lua | 147 ++++++++++++++++++++++++------------------- separable/binder.lua | 1 - 3 files changed, 82 insertions(+), 68 deletions(-) diff --git a/mybindings.lua b/mybindings.lua index 0bf70af..cf47f41 100644 --- a/mybindings.lua +++ b/mybindings.lua @@ -136,7 +136,7 @@ local myglobalkeys = awful.util.table.join( if exitcode > 0 then mb.grab{keymap=mpdmap, name="MPD", stay_in_mode=true} else - mb.grab{keymap=mprismap, name="Spotify", stay_in_mode=true} + mb.grab{keymap=mprismap, name="MPRIS", stay_in_mode=true} end end) end), diff --git a/rules.lua b/rules.lua index 4c57064..9bb9b3d 100644 --- a/rules.lua +++ b/rules.lua @@ -9,9 +9,9 @@ local log = require("talkative") -- create a notification when given client becomes urgent local function popup_urgent(client, message) - client:connect_signal("property::urgent", function (c) + client:connect_signal("property::urgent", function(c) if c.urgent and not c.focus then - naughty.notify({ text=message }) + naughty.notify({ text = message }) end end) end @@ -21,12 +21,12 @@ end local screen_main = math.min(localconf.screen.main or 1, screen.count()) local screen_chat = math.min(localconf.screen.chat or screen.count(), screen.count()) local screen_mail = math.min(localconf.screen.mail or screen.count(), screen.count()) -print("Screens: main: ".. screen_main .. ", chat: ".. screen_chat .. ", mail: " .. screen_mail) +print("Screens: main: " .. screen_main .. ", chat: " .. screen_chat .. ", mail: " .. screen_mail) awful.rules.rules = { -- All clients will match this rule. { - rule = { }, + rule = {}, properties = { border_width = beautiful.border_width, border_color = beautiful.border_normal, @@ -37,75 +37,90 @@ awful.rules.rules = { keys = binder.client.keys(), buttons = binder.client.buttons(), screen = awful.screen.preferred, - placement = awful.placement.no_overlap+awful.placement.no_offscreen + placement = awful.placement.no_overlap + awful.placement.no_offscreen, }, -- log name and class of new windows for debugging purposes callback = function(c) log("-----------\nnew client\n") - if (c["name"] ~= nil) then log("name: " .. c["name"]) end - if (c["class"] ~= nil) then log("class: " .. c["class"]) end - if (c["type"] ~= nil) then log("type: " .. c["type"]) end - if (c["instance"] ~= nil) then log("instance: " .. c["instance"]) end - end + if c["name"] ~= nil then + log("name: " .. c["name"]) + end + if c["class"] ~= nil then + log("class: " .. c["class"]) + end + if c["type"] ~= nil then + log("type: " .. c["type"]) + end + if c["instance"] ~= nil then + log("instance: " .. c["instance"]) + end + end, }, - { rule = { class = "qutebrowser" }, properties = { tag = "2" }}, - { rule = { class = "Passprompt" }, - properties = { ontop = true, focus = true}}, - { rule = { class = "Dragon" }, - properties = { ontop = true, sticky = true}}, - { rule = { class = "Sm" }, - properties = { floating = true, size_hints_honor = true, fullscreen = true, }}, - { rule_any = { class = { "pinentry", "Passprompt", "copyq" }}, - properties = { floating = true, size_hints_honor = true }}, - { rule_any = { class = {"Pidgin"}, instance = {"Weechat"}, name = {"Weechat"}}, + { rule = { class = "qutebrowser" }, properties = { tag = "2" } }, + { rule = { class = "Passprompt" }, properties = { ontop = true, focus = true } }, + { rule = { class = "Dragon" }, properties = { ontop = true, sticky = true } }, + { rule = { class = "Sm" }, properties = { floating = true, size_hints_honor = true, fullscreen = true } }, + { + rule_any = { class = { "pinentry", "Passprompt", "copyq" } }, + properties = { floating = true, size_hints_honor = true }, + }, + { + rule_any = { class = { "Pidgin" }, instance = { "Weechat" }, name = { "Weechat" } }, properties = { screen = screen_chat, tag = "3", opacity = 0.8 }, - callback = function(c) popup_urgent(c, "new chat message") end}, - { rule = { role = "buddy_list" }, - callback = awful.client.setmaster}, - { rule = { class = "Steam", name = "Friends" }, + callback = function(c) + popup_urgent(c, "new chat message") + end, + }, + { rule = { role = "buddy_list" }, callback = awful.client.setmaster }, + { + rule = { class = "steam", name = "Friends" }, properties = { screen = screen_chat, tag = "3" }, - callback = awful.client.setmaster}, - { rule = { class = "Steam", name = "Chat" }, + callback = awful.client.setmaster, + }, + { + rule = { class = "steam", name = "Chat" }, properties = { screen = screen_chat, tag = "3" }, - callback = awful.client.setslave }, - { rule = { class = "Steam", name = "Steam" }, - properties = { tag = "F1" }}, - { rule_any = { class = {"Rocket.Chat", "rocketchat"}, instance = {"rocket.chat"}}, - properties = { screen = screen_chat, tag = "5" }}, - { rule_any = { class = {"Element"}, instance = {"element"}}, - properties = { screen = screen_chat, tag = "1" }}, - { rule = { class = "TelegramDesktop" }, + callback = awful.client.setslave, + }, + { rule = { class = "steam", name = "Steam" }, properties = { tag = "F1" } }, + { + rule_any = { class = { "Rocket.Chat", "rocketchat" }, instance = { "rocket.chat" } }, + properties = { screen = screen_chat, tag = "5" }, + }, + { + rule_any = { class = { "Element" }, instance = { "element" } }, + properties = { screen = screen_chat, tag = "1" }, + }, + { + rule = { class = "TelegramDesktop" }, except = { name = "Media viewer" }, - properties = { screen = screen_chat, tag = "3" }}, - { rule = { class = "Telegram", name = "Media viewer" }, - properties = { size_hints_honor = true, floating = true, fullscreen = true }}, - { rule = { class = "TelegramDesktop", name = "Media viewer" }, - properties = { size_hints_honor = true, floating = true, fullscreen = true }}, - { rule_any = { role ={ "conversation" }, instance = { "Weechat" }}, - callback = awful.client.setslave }, - { rule = { class = "Irssi"}, - properties = { tag = "3" } , - callback = awful.client.setslave }, - { rule_any = { instance = {"Gmutt"}, name = {"Gmutt"}}, - properties = { tag = "4", screen = screen_mail }}, - { rule_any = { class = {"Gmpc", "Spotify"}}, - properties = { tag = "6" }}, - { rule = { class = "Pdfpc" }, - properties = { size_hints_honor = true, floating = true, fullscreen = true }}, - { rule = { class = "zoom", instance = "zoom", name = "zoom" }, - properties = { size_hints_honor = true, floating = true, border_width = 0 }}, - { rule_any = { class = {"URxvt", "Alacritty", "GVim", "kitty", "handy" }}, - properties = { opacity = 0.9 }}, - { rule = { name = "Awesomelog" }, - properties = { tag = "F4" }}, - { rule = { class = "Dragon" }, - properties = { sticky = true, ontop = true }}, - { rule = { class = "adobe dng converter.exe" }, - properties = { floating = true, size_hints_honor = true }}, - { rule = { class = "pentablet", type = "normal"}, - properties = { floating = true, size_hints_honor = true}}, - { rule = { class = "pentablet", type = "utility"}, - properties = { floating = true, size_hints_honor = true, focusable = false}}, - { rule = { class = "Onboard" }, - properties = { sticky = true, ontop = true, focusable = false}}, + properties = { screen = screen_chat, tag = "3" }, + }, + { + rule = { class = "Telegram", name = "Media viewer" }, + properties = { size_hints_honor = true, floating = true, fullscreen = true }, + }, + { + rule = { class = "TelegramDesktop", name = "Media viewer" }, + properties = { size_hints_honor = true, floating = true, fullscreen = true }, + }, + { rule_any = { role = { "conversation" }, instance = { "Weechat" } }, callback = awful.client.setslave }, + { rule = { class = "Irssi" }, properties = { tag = "3" }, callback = awful.client.setslave }, + { rule_any = { instance = { "Gmutt" }, name = { "Gmutt" } }, properties = { tag = "4", screen = screen_mail } }, + { rule_any = { class = { "Gmpc", "Spotify" } }, properties = { tag = "6" } }, + { rule = { class = "Pdfpc" }, properties = { size_hints_honor = true, floating = true, fullscreen = true } }, + { + rule = { class = "zoom", instance = "zoom", name = "zoom" }, + properties = { size_hints_honor = true, floating = false, border_width = 0 }, + }, + { rule_any = { class = { "URxvt", "Alacritty", "GVim", "kitty", "handy" } }, properties = { opacity = 0.9 } }, + { rule = { name = "Awesomelog" }, properties = { tag = "F4" } }, + { rule = { class = "Dragon" }, properties = { sticky = true, ontop = true } }, + { rule = { class = "adobe dng converter.exe" }, properties = { floating = true, size_hints_honor = true } }, + { rule = { class = "pentablet", type = "normal" }, properties = { floating = true, size_hints_honor = true } }, + { + rule = { class = "pentablet", type = "utility" }, + properties = { floating = true, size_hints_honor = true, focusable = false }, + }, + { rule = { class = "Onboard" }, properties = { sticky = true, ontop = true, focusable = false } }, } diff --git a/separable/binder.lua b/separable/binder.lua index adea98b..6d85b98 100644 --- a/separable/binder.lua +++ b/separable/binder.lua @@ -135,7 +135,6 @@ awful.key({ modkey, "Shift" }, "h", screen_move_client_wrapdir("left")), awful.key({ modkey, "Shift" }, "l", screen_move_client_wrapdir("right")), awful.key({ modkey, "Control" }, "o", function (c) c.ontop = not c.ontop end), awful.key({ modkey, "Shift" }, "a", function (c) c.sticky = not c.sticky end), -awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end), awful.key({ modkey, }, "Up", function(c) client_opacity_set(c, 1, 1, 0.1) end), awful.key({ modkey, }, "Down", function(c) client_opacity_set(c, 1, 0, -0.1) end), awful.key({ }, "XF86Calculater", awful.client.movetoscreen ),