diff --git a/bindings.lua b/bindings.lua index 882c93a..7f794d4 100644 --- a/bindings.lua +++ b/bindings.lua @@ -69,6 +69,7 @@ progmap = { f = { func = spawnf(conf.cmd.browser), desc = "Browser" }, i = { func = spawnf(conf.cmd.im_client), desc = "IM Client" }, I = { func = spawnf(conf.cmd.irc_client), desc = "IRC" }, + t = { func = spawnf("telegram"), desc = "Telegram" }, m = { func = spawnf(conf.cmd.mail_client), desc = "Mail" }, s = { func = spawnf("steam"), desc = "Steam" } } @@ -154,10 +155,10 @@ function bindings.setup() awful.client.swap.byidx( -1) end), awful.key({ modkey, }, "h", function () - awful.screen.focus_relative( 1) + awful.screen.focus_relative(-1) end), awful.key({ modkey, }, "l", function () - awful.screen.focus_relative(-1) + awful.screen.focus_relative(1) end), --}}} @@ -246,10 +247,10 @@ clientkeys = awful.util.table.join( awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), awful.key({ modkey, }, "o", awful.client.movetoscreen ), awful.key({ modkey, "Shift" }, "h", function (c) - awful.client.movetoscreen(c, mouse.screen + 1) + awful.client.movetoscreen(c, mouse.screen - 1) end), awful.key({ modkey, "Shift" }, "l", function (c) - awful.client.movetoscreen(c, mouse.screen - 1) + awful.client.movetoscreen(c, mouse.screen + 1) end), 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), diff --git a/rules.lua b/rules.lua index ae8379b..8d022d3 100644 --- a/rules.lua +++ b/rules.lua @@ -67,14 +67,6 @@ local function setup(self) floating = false, minimized = false }, }, - { - rule = { class = "Whatsapp", instance = "Navigator" }, - properties = { - tag = tags[rule_screen][3], - floating = false, minimized = false - }, - callback = awful.client.setslave - }, { rule_any = { class = {"Pidgin"}, instance = {"Weechat"} }, properties = { @@ -82,19 +74,6 @@ local function setup(self) }, callback = popup_urgent("new chat message") }, - { - rule = { class = "Skype" }, - properties = { - tag = tags[rule_screen][3], opacity = 0.8 - }, - }, - { - rule = { role = "conversationswindow", class = "skype" }, - properties = { - tag = tags[rule_screen][3], opacity = 0.8 - }, - callback = awful.client.setmaster - }, { rule = { role = "buddy_list" }, properties = { diff --git a/tags.lua b/tags.lua index 7325f00..0f41338 100644 --- a/tags.lua +++ b/tags.lua @@ -43,7 +43,7 @@ end local defaultsetup = { {"1:⚙"}, { name = "2:⌘", layout = layouts[5] }, - { name = "3:☻", layout = layouts[3], mwfact = 0.20, ncol = 2, nmaster = 1}, + { name = "3:☻", layout = layouts[3], mwfact = 0.20, ncol = 2, nmaster = 2}, { name = "4:✉", layout = layouts[5] }, {"5:☑"}, {"6:♫"}, diff --git a/vicious b/vicious index c86be2f..9426e92 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit c86be2f51556dd4e4090b4b8f820bde97edb3119 +Subproject commit 9426e92bf3713462e94d70de25d9bd3249e3b027