diff --git a/dot_bashrc b/dot_bashrc index ec67e1c..bf00d34 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -128,6 +128,6 @@ export PATH=$PATH:$CARGO_HOME/bin export XDG_CONFIG_HOME=$HOME/.config export PATH=$PATH:$XDG_CONFIG_HOME # - export CHIPS_LAB_HOME=$HOME/projects/homelab/services +export CHIPS_LAB_HOME=$HOME/projects/homelab/services -joke -c programming | cowsay -f tux +# joke -c programming | cowsay -f tux diff --git a/private_dot_config/awesome/rc.lua b/private_dot_config/awesome/rc.lua index bc70073..a48d7c3 100644 --- a/private_dot_config/awesome/rc.lua +++ b/private_dot_config/awesome/rc.lua @@ -20,28 +20,28 @@ local hotkeys_popup = require("awful.hotkeys_popup") -- Check if awesome encountered an error during startup and fell back to -- another config (This code will only ever execute for the fallback config) if awesome.startup_errors then - naughty.notify({ - preset = naughty.config.presets.critical, - title = "Oops, there were errors during startup!", - text = awesome.startup_errors - }) + naughty.notify({ + preset = naughty.config.presets.critical, + title = "Oops, there were errors during startup!", + text = awesome.startup_errors + }) end -- Handle runtime errors after startup do - local in_error = false - awesome.connect_signal("debug::error", function(err) - -- Make sure we don't go into an endless error loop - if in_error then return end - in_error = true + local in_error = false + awesome.connect_signal("debug::error", function(err) + -- Make sure we don't go into an endless error loop + if in_error then return end + in_error = true - naughty.notify({ - preset = naughty.config.presets.critical, - title = "Oops, an error happened!", - text = tostring(err) - }) - in_error = false - end) + naughty.notify({ + preset = naughty.config.presets.critical, + title = "Oops, an error happened!", + text = tostring(err) + }) + in_error = false + end) end -- }}} @@ -64,44 +64,44 @@ modkey = "Mod1" -- Table of layouts to cover with awful.layout.inc, order matters. awful.layout.layouts = { - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, - awful.layout.suit.tile.bottom, - awful.layout.suit.tile.top, - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, - awful.layout.suit.spiral, - awful.layout.suit.spiral.dwindle, - awful.layout.suit.max, - awful.layout.suit.max.fullscreen, - awful.layout.suit.magnifier, - awful.layout.suit.corner.nw, - -- awful.layout.suit.corner.ne, - -- awful.layout.suit.corner.sw, - -- awful.layout.suit.corner.se, + awful.layout.suit.floating, + awful.layout.suit.tile, + awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, + awful.layout.suit.tile.top, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + awful.layout.suit.spiral, + awful.layout.suit.spiral.dwindle, + awful.layout.suit.max, + awful.layout.suit.max.fullscreen, + awful.layout.suit.magnifier, + awful.layout.suit.corner.nw, + awful.layout.suit.corner.ne, + awful.layout.suit.corner.sw, + awful.layout.suit.corner.se, } -- }}} -- {{{ Menu -- Create a launcher widget and a main menu myawesomemenu = { - { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end }, - { "manual", terminal .. " -e man awesome" }, - { "edit config", editor_cmd .. " " .. awesome.conffile }, - { "restart", awesome.restart }, - { "quit", function() awesome.quit() end }, + { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end }, + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awesome.conffile }, + { "restart", awesome.restart }, + { "quit", function() awesome.quit() end }, } mymainmenu = awful.menu({ - items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } - } + items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal } + } }) mylauncher = awful.widget.launcher({ - image = beautiful.awesome_icon, - menu = mymainmenu + image = beautiful.awesome_icon, + menu = mymainmenu }) -- Menubar configuration @@ -117,246 +117,253 @@ mytextclock = wibox.widget.textclock() -- Create a wibox for each screen and add it local taglist_buttons = gears.table.join( - awful.button({}, 1, function(t) t:view_only() end), - awful.button({ modkey }, 1, function(t) - if client.focus then - client.focus:move_to_tag(t) - end - end), - awful.button({}, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, function(t) - if client.focus then - client.focus:toggle_tag(t) - end - end), - awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end), - awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end) + awful.button({}, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), + awful.button({}, 3, awful.tag.viewtoggle), + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end) ) local tasklist_buttons = gears.table.join( - awful.button({}, 1, function(c) - if c == client.focus then - c.minimized = true - else - c:emit_signal( - "request::activate", - "tasklist", - { raise = true } - ) - end - end), - awful.button({}, 3, function() - awful.menu.client_list({ theme = { width = 250 } }) - end), - awful.button({}, 4, function() - awful.client.focus.byidx(1) - end), - awful.button({}, 5, function() - awful.client.focus.byidx(-1) - end)) + awful.button({}, 1, function(c) + if c == client.focus then + c.minimized = true + else + c:emit_signal( + "request::activate", + "tasklist", + { raise = true } + ) + end + end), + awful.button({}, 3, function() + awful.menu.client_list({ theme = { width = 250 } }) + end), + awful.button({}, 4, function() + awful.client.focus.byidx(1) + end), + awful.button({}, 5, function() + awful.client.focus.byidx(-1) + end)) -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) -- screen.connect_signal("property::geometry", set_wallpaper) awful.screen.connect_for_each_screen(function(s) - -- Each screen has its own tag table. - awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8" }, s, awful.layout.layouts[2]) + -- Each screen has its own tag table. + awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8" }, s, awful.layout.layouts[3]) - -- Create a promptbox for each screen - s.mypromptbox = awful.widget.prompt() - -- Create an imagebox widget which will contain an icon indicating which layout we're using. - -- We need one layoutbox per screen. - s.mylayoutbox = awful.widget.layoutbox(s) - s.mylayoutbox:buttons(gears.table.join( - awful.button({}, 1, function() awful.layout.inc(1) end), - awful.button({}, 3, function() awful.layout.inc(-1) end), - awful.button({}, 4, function() awful.layout.inc(1) end), - awful.button({}, 5, function() awful.layout.inc(-1) end))) - -- Create a taglist widget - s.mytaglist = awful.widget.taglist { - screen = s, - filter = awful.widget.taglist.filter.all, - buttons = taglist_buttons - } + -- Create a promptbox for each screen + s.mypromptbox = awful.widget.prompt() + -- Create an imagebox widget which will contain an icon indicating which layout we're using. + -- We need one layoutbox per screen. + s.mylayoutbox = awful.widget.layoutbox(s) + s.mylayoutbox:buttons(gears.table.join( + awful.button({}, 1, function() awful.layout.inc(1) end), + awful.button({}, 3, function() awful.layout.inc(-1) end), + awful.button({}, 4, function() awful.layout.inc(1) end), + awful.button({}, 5, function() awful.layout.inc(-1) end))) + -- Create a taglist widget + s.mytaglist = awful.widget.taglist { + screen = s, + filter = awful.widget.taglist.filter.all, + buttons = taglist_buttons + } - -- Create a tasklist widget - s.mytasklist = awful.widget.tasklist { - screen = s, - filter = awful.widget.tasklist.filter.currenttags, - buttons = tasklist_buttons - } + -- Create a tasklist widget + s.mytasklist = awful.widget.tasklist { + screen = s, + filter = awful.widget.tasklist.filter.currenttags, + buttons = tasklist_buttons + } end) -- }}} -- {{{ Mouse bindings root.buttons(gears.table.join( - awful.button({}, 3, function() mymainmenu:toggle() end) + awful.button({}, 3, function() mymainmenu:toggle() end) )) -- }}} -- {{{ Key bindings globalkeys = gears.table.join( - awful.key({ modkey, "Control" }, "r", awesome.restart, - { description = "reload awesome", group = "awesome" }), - awful.key({ modkey, "Shift" }, "q", awesome.quit, - { description = "quit awesome", group = "awesome" }), - awful.key({ modkey, }, "s", hotkeys_popup.show_help, - { description = "show help", group = "awesome" }), - awful.key({ modkey, }, "w", function() mymainmenu:show() end, - { description = "show main menu", group = "awesome" }), + awful.key({ modkey, "Control" }, "r", awesome.restart, + { description = "reload awesome", group = "awesome" }), + awful.key({ modkey, "Shift" }, "q", awesome.quit, + { description = "quit awesome", group = "awesome" }), + awful.key({ modkey, }, "s", hotkeys_popup.show_help, + { description = "show help", group = "awesome" }), + awful.key({ modkey, }, "w", function() mymainmenu:show() end, + { description = "show main menu", group = "awesome" }), - -- Layout manipulation - awful.key({ modkey, }, "j", - function() - awful.client.focus.byidx(1) - end, - { description = "focus next by index", group = "client" } - ), - awful.key({ modkey, }, "k", - function() - awful.client.focus.byidx(-1) - end, - { description = "focus previous by index", group = "client" } - ), - awful.key({ modkey, "Shift" }, "j", function() awful.client.swap.byidx(1) end, - { description = "swap with next client by index", group = "client" }), - awful.key({ modkey, "Shift" }, "k", function() awful.client.swap.byidx(-1) end, - { description = "swap with previous client by index", group = "client" }), - awful.key({ modkey, }, "=", function() awful.tag.incmwfact(0.05) end, - { description = "increase master width factor", group = "layout" }), - awful.key({ modkey, }, "-", function() awful.tag.incmwfact(-0.05) end, - { description = "decrease master width factor", group = "layout" }), - awful.key({ modkey, "Shift" }, "h", function() awful.tag.incnmaster(1, nil, true) end, - { description = "increase the number of master clients", group = "layout" }), - awful.key({ modkey, "Shift" }, "l", function() awful.tag.incnmaster(-1, nil, true) end, - { description = "decrease the number of master clients", group = "layout" }), - awful.key({ modkey, "Control" }, "h", function() awful.tag.incncol(1, nil, true) end, - { description = "increase the number of columns", group = "layout" }), - awful.key({ modkey, "Control" }, "l", function() awful.tag.incncol(-1, nil, true) end, - { description = "decrease the number of columns", group = "layout" }), - awful.key({ modkey, }, "space", function() awful.layout.inc(1) end, - { description = "select next", group = "layout" }), - awful.key({ modkey, "Shift" }, "space", function() awful.layout.inc(-1) end, - { description = "select previous", group = "layout" }), + -- Layout manipulation + awful.key({ modkey, }, "j", + function() + awful.client.focus.byidx(1) + end, + { description = "focus next by index", group = "client" } + ), + awful.key({ modkey, }, "k", + function() + awful.client.focus.byidx(-1) + end, + { description = "focus previous by index", group = "client" } + ), + awful.key({ modkey, "Shift" }, "j", function() awful.client.swap.byidx(1) end, + { description = "swap with next client by index", group = "client" }), + awful.key({ modkey, "Shift" }, "k", function() awful.client.swap.byidx(-1) end, + { description = "swap with previous client by index", group = "client" }), + awful.key({ modkey, }, "=", function() awful.tag.incmwfact(0.05) end, + { description = "increase master width factor", group = "layout" }), + awful.key({ modkey, }, "-", function() awful.tag.incmwfact(-0.05) end, + { description = "decrease master width factor", group = "layout" }), + awful.key({ modkey, "Shift" }, "h", function() awful.tag.incnmaster(1, nil, true) end, + { description = "increase the number of master clients", group = "layout" }), + awful.key({ modkey, "Shift" }, "l", function() awful.tag.incnmaster(-1, nil, true) end, + { description = "decrease the number of master clients", group = "layout" }), + awful.key({ modkey, "Control" }, "h", function() awful.tag.incncol(1, nil, true) end, + { description = "increase the number of columns", group = "layout" }), + awful.key({ modkey, "Control" }, "l", function() awful.tag.incncol(-1, nil, true) end, + { description = "decrease the number of columns", group = "layout" }), + awful.key({ modkey, }, "space", function() awful.layout.inc(1) end, + { description = "select next", group = "layout" }), + awful.key({ modkey, "Shift" }, "space", function() awful.layout.inc(-1) end, + { description = "select previous", group = "layout" }), - -- Applications - awful.key({ modkey }, "r", function() awful.spawn.with_shell('rofi -show run') end, - { description = "run prompt", group = "apps" }), - awful.key({ modkey, }, "Return", function() awful.spawn(terminal) end, - { description = "open a terminal", group = "apps" }), - awful.key({ modkey, }, "c", function() awful.spawn.spawn("calibre") end, - { description = "open calibre", group = "apps" }), - awful.key({ modkey, }, "b", function() awful.spawn.spawn("firefox") end, - { description = "open firefox", group = "apps" }), + -- Applications + awful.key({ modkey }, "r", function() awful.spawn.with_shell('rofi -show run') end, + { description = "run prompt", group = "apps" }), + awful.key({ modkey, }, "Return", function() awful.spawn(terminal) end, + { description = "open a terminal", group = "apps" }), + awful.key({ modkey, }, "c", function() awful.spawn.spawn("calibre") end, + { description = "open calibre", group = "apps" }), + awful.key({ modkey, }, "b", function() awful.spawn.spawn("firefox") end, + { description = "open firefox", group = "apps" }), - -- Volume - awful.key({ modkey }, "]", - function() awful.spawn.with_shell('pactl set-sink-volume `pactl get-default-sink` +5%') end, - { description = "increase the volume", group = "volume" }), - awful.key({ modkey }, "[", - function() awful.spawn.with_shell('pactl set-sink-volume `pactl get-default-sink` -5%') end, - { description = "decrease the volume", group = "volume" }), + -- Volume + awful.key({ modkey }, "]", + function() awful.spawn.with_shell('pactl set-sink-volume `pactl get-default-sink` +5%') end, + { description = "increase the volume", group = "volume" }), + awful.key({ modkey }, "[", + function() awful.spawn.with_shell('pactl set-sink-volume `pactl get-default-sink` -5%') end, + { description = "decrease the volume", group = "volume" }), - -- Monitor change - awful.key({ modkey, "Control" }, "m", - function() - awful.spawn.spawn('/home/chips/.local/bin/chdp') - awesome.restart() - end, - { description = "change active monitor", group = "display" }), + -- Monitor change + awful.key({ modkey, "Control" }, "m", + function() + awful.spawn.spawn('/home/chips/.local/bin/chdp') + awesome.restart() + end, + { description = "change active monitor", group = "display" }), - -- Lock screen - awful.key({ modkey }, "q", function() awful.spawn.with_shell('dm-tool lock') end, - { description = "lock", group = "power" }), + awful.key({ modkey, "Control" }, "l", + function() + local xrandr = require("xrandr") + xrandr.xrandr() + end, + { description = "change active monitor", group = "display" }), - -- Polybar - awful.key({ modkey }, "p", function() awful.spawn.with_shell('polybar-msg cmd toggle') end, - { description = "toggle polybar", group = "system" }) + -- Lock screen + awful.key({ modkey }, "q", function() awful.spawn.with_shell('dm-tool lock') end, + { description = "lock", group = "power" }), + + -- Polybar + awful.key({ modkey }, "p", function() awful.spawn.with_shell('polybar-msg cmd toggle') end, + { description = "toggle polybar", group = "system" }) ) clientkeys = gears.table.join( - awful.key( - { modkey }, "f", - function(c) - c.fullscreen = not c.fullscreen - c:raise() - end, - { description = "toggle fullscreen", group = "client" }), - awful.key({ modkey, "Shift" }, "m", - function(c) - c.maximized_horizontal = false - c.maximized_vertical = false - c.maximized = false - c.floating = false - end), + awful.key( + { modkey }, "f", + function(c) + c.fullscreen = not c.fullscreen + c:raise() + end, + { description = "toggle fullscreen", group = "client" }), + awful.key({ modkey, "Shift" }, "m", + function(c) + c.maximized_horizontal = false + c.maximized_vertical = false + c.maximized = false + c.floating = false + end), - awful.key({modkey, "Shift"}, 'n', - function () - for c in awful.client.iterate( - function(c) - return true - end) do - c.minimized = false - end - end, - {description = "min/max all windows", group = "client"}), - - awful.key( - { modkey, "Shift" }, "w", + awful.key({ modkey, "Shift" }, 'n', + function() + for c in awful.client.iterate( function(c) - c:kill() - end, - { description = "close", group = "client" }) + return true + end) do + c.minimized = false + end + end, + { description = "min/max all windows", group = "client" }), + + awful.key( + { modkey, "Shift" }, "w", + function(c) + c:kill() + end, + { description = "close", group = "client" }) ) -- Bind all key numbers to tags. -- Be careful: we use keycodes to make it work on any keyboard layout. -- This should map on the top row of your keyboard, usually 1 to 9. for i = 1, 9 do - local screen = awful.screen.focused() - local tag = screen.tags[i] - if not tag then - goto continue - end - globalkeys = gears.table.join(globalkeys, - awful.key( - { modkey }, "#" .. tag.name + 9, - function() - if tag then - tag:view_only() - end - end, - { description = "view tag #" .. i, group = "tag" }), + local screen = awful.screen.focused() + local tag = screen.tags[i] + if not tag then + goto continue + end + globalkeys = gears.table.join(globalkeys, + awful.key( + { modkey }, "#" .. tag.name + 9, + function() + if tag then + tag:view_only() + end + end, + { description = "view tag #" .. i, group = "tag" }), - -- Move client to tag. - awful.key( - { modkey, "Shift" }, "#" .. tag.name + 9, - function() - if client.focus then - local tag = client.focus.screen.tags[i] - if tag then - client.focus:move_to_tag(tag) - tag:view_only() - end - end - end, - { description = "move focused client to tag #" .. i, group = "tag" }) - ) - ::continue:: + -- Move client to tag. + awful.key( + { modkey, "Shift" }, "#" .. tag.name + 9, + function() + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:move_to_tag(tag) + tag:view_only() + end + end + end, + { description = "move focused client to tag #" .. i, group = "tag" }) + ) + ::continue:: end clientbuttons = gears.table.join( - awful.button({}, 1, function(c) - c:emit_signal("request::activate", "mouse_click", { raise = true }) - end), - awful.button({ modkey }, 1, function(c) - c:emit_signal("request::activate", "mouse_click", { raise = true }) - awful.mouse.client.move(c) - end), - awful.button({ modkey }, 3, function(c) - c:emit_signal("request::activate", "mouse_click", { raise = true }) - awful.mouse.client.resize(c) - end) + awful.button({}, 1, function(c) + c:emit_signal("request::activate", "mouse_click", { raise = true }) + end), + awful.button({ modkey }, 1, function(c) + c:emit_signal("request::activate", "mouse_click", { raise = true }) + awful.mouse.client.move(c) + end), + awful.button({ modkey }, 3, function(c) + c:emit_signal("request::activate", "mouse_click", { raise = true }) + awful.mouse.client.resize(c) + end) ) local screen = awful.screen.focused() @@ -368,135 +375,135 @@ root.keys(globalkeys) -- {{{ Rules -- Rules to apply to new clients (through the "manage" signal). awful.rules.rules = { - -- All clients will match this rule. - { - rule = {}, - properties = { - border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = awful.client.focus.filter, - raise = true, - keys = clientkeys, - buttons = clientbuttons, - screen = awful.screen.preferred, - placement = awful.placement.no_overlap + awful.placement.no_offscreen - } - }, + -- All clients will match this rule. + { + rule = {}, + properties = { + border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = awful.client.focus.filter, + raise = true, + keys = clientkeys, + buttons = clientbuttons, + screen = awful.screen.preferred, + placement = awful.placement.no_overlap + awful.placement.no_offscreen + } + }, - -- Floating clients. - { - rule_any = { - instance = { - "DTA", -- Firefox addon DownThemAll. - "copyq", -- Includes session name in class. - "pinentry", - }, - class = { - "Arandr", - "Blueman-manager", - "Gpick", - "Kruler", - "MessageWin", -- kalarm. - "Sxiv", - "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size. - "Wpa_gui", - "veromix", - "xtightvncviewer" }, - -- Note that the name property shown in xprop might be set slightly after creation of the client - -- and the name shown there might not match defined rules here. - name = { - "Event Tester", -- xev. - }, - role = { - "AlarmWindow", -- Thunderbird's calendar. - "ConfigManager", -- Thunderbird's about:config. - "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. - } - }, - properties = { floating = true } + -- Floating clients. + { + rule_any = { + instance = { + "DTA", -- Firefox addon DownThemAll. + "copyq", -- Includes session name in class. + "pinentry", + }, + class = { + "Arandr", + "Blueman-manager", + "Gpick", + "Kruler", + "MessageWin", -- kalarm. + "Sxiv", + "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size. + "Wpa_gui", + "veromix", + "xtightvncviewer" }, + -- Note that the name property shown in xprop might be set slightly after creation of the client + -- and the name shown there might not match defined rules here. + name = { + "Event Tester", -- xev. + }, + role = { + "AlarmWindow", -- Thunderbird's calendar. + "ConfigManager", -- Thunderbird's about:config. + "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. + } }, + properties = { floating = true } + }, - -- Do not titlebars to normal clients and dialogs - { - rule_any = { - type = { - "normal", "dialog" - } - }, - properties = { - titlebars_enabled = false - } + -- Do not titlebars to normal clients and dialogs + { + rule_any = { + type = { + "normal", "dialog" + } }, + properties = { + titlebars_enabled = false + } + }, - { - rule = { class = "Firefox" }, - properties = { screen = 1, tag = screen.tags[3] } - }, + { + rule = { class = "Firefox" }, + properties = { screen = 1, tag = screen.tags[3] } + }, } -- }}} -- {{{ Signals -- Signal function to execute when a new client appears. 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 + -- 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 awesome.startup - and not c.size_hints.user_position - and not c.size_hints.program_position then - -- Prevent clients from being unreachable after screen count changes. - awful.placement.no_offscreen(c) - end + if awesome.startup + and not c.size_hints.user_position + and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count changes. + awful.placement.no_offscreen(c) + end end) -- Add a titlebar if titlebars_enabled is set to true in the rules. client.connect_signal("request::titlebars", function(c) - -- buttons for the titlebar - local buttons = gears.table.join( - awful.button({}, 1, function() - c:emit_signal("request::activate", "titlebar", { raise = true }) - awful.mouse.client.move(c) - end), - awful.button({}, 3, function() - c:emit_signal("request::activate", "titlebar", { raise = true }) - awful.mouse.client.resize(c) - end) - ) + -- buttons for the titlebar + local buttons = gears.table.join( + awful.button({}, 1, function() + c:emit_signal("request::activate", "titlebar", { raise = true }) + awful.mouse.client.move(c) + end), + awful.button({}, 3, function() + c:emit_signal("request::activate", "titlebar", { raise = true }) + awful.mouse.client.resize(c) + end) + ) - awful.titlebar(c):setup { - { - -- Left - awful.titlebar.widget.iconwidget(c), - buttons = buttons, - layout = wibox.layout.fixed.horizontal - }, - { - -- Middle - { - -- Title - align = "center", - widget = awful.titlebar.widget.titlewidget(c) - }, - buttons = buttons, - layout = wibox.layout.flex.horizontal - }, - { - -- Right - awful.titlebar.widget.floatingbutton(c), - awful.titlebar.widget.maximizedbutton(c), - awful.titlebar.widget.stickybutton(c), - awful.titlebar.widget.ontopbutton(c), - awful.titlebar.widget.closebutton(c), - layout = wibox.layout.fixed.horizontal() - }, - layout = wibox.layout.align.horizontal - } + awful.titlebar(c):setup { + { + -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { + -- Middle + { + -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c) + }, + buttons = buttons, + layout = wibox.layout.flex.horizontal + }, + { + -- Right + awful.titlebar.widget.floatingbutton(c), + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.stickybutton(c), + awful.titlebar.widget.ontopbutton(c), + awful.titlebar.widget.closebutton(c), + layout = wibox.layout.fixed.horizontal() + }, + layout = wibox.layout.align.horizontal + } end) -- Enable sloppy focus, so that focus follows mouse. client.connect_signal("mouse::enter", function(c) - c:emit_signal("request::activate", "mouse_enter", { raise = false }) + c:emit_signal("request::activate", "mouse_enter", { raise = false }) end) client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) diff --git a/private_dot_config/wezterm/wezterm.lua b/private_dot_config/wezterm/wezterm.lua index ed06bf0..38ff984 100644 --- a/private_dot_config/wezterm/wezterm.lua +++ b/private_dot_config/wezterm/wezterm.lua @@ -46,14 +46,27 @@ config.colors = { local act = wezterm.action config.keys = { - { key = '}', mods = 'SHIFT|CTRL', action = act.SplitVertical { domain = 'CurrentPaneDomain' } }, - { key = '|', mods = 'SHIFT|CTRL', action = act.SplitHorizontal { domain = 'CurrentPaneDomain' } }, - { key = '"', mods = 'SHIFT|CTRL', action = act.SplitVertical { domain = 'CurrentPaneDomain' } }, - { key = 'T', mods = 'SHIFT|CTRL', action = act.SpawnTab 'CurrentPaneDomain' }, - { key = 'z', mods = 'CTRL', action = act.TogglePaneZoomState }, - { key = 'w', mods = 'CTRL', action = act.CloseCurrentPane { confirm = true } }, - { key = 'H', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Left' }, - { key = 'L', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Right' }, + { key = '}', mods = 'SHIFT|CTRL', action = act.SplitVertical { domain = 'CurrentPaneDomain' } }, + { key = '|', mods = 'SHIFT|CTRL', action = act.SplitHorizontal { domain = 'CurrentPaneDomain' } }, + { key = 'T', mods = 'SHIFT|CTRL', action = act.SpawnTab 'CurrentPaneDomain' }, + { key = 'z', mods = 'CTRL', action = act.TogglePaneZoomState }, + { key = 'w', mods = 'CTRL', action = act.CloseCurrentPane { confirm = true } }, + { + key = 'H', + mods = 'SHIFT|CTRL', + action = act.Multiple { + act.ActivatePaneDirection 'Left', + act.SetPaneZoomState(true), + } + }, + { + key = 'L', + mods = 'SHIFT|CTRL', + action = act.Multiple { + act.ActivatePaneDirection 'Right', + act.SetPaneZoomState(true), + } + }, { key = 'K', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Up' }, { key = 'J', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Down' }, { key = 'LeftArrow', mods = 'SHIFT|CTRL', action = act.AdjustPaneSize { 'Left', 5 } }, @@ -61,6 +74,7 @@ config.keys = { { key = 'UpArrow', mods = 'SHIFT|CTRL', action = act.AdjustPaneSize { 'Up', 5 } }, { key = 'DownArrow', mods = 'SHIFT|CTRL', action = act.AdjustPaneSize { 'Down', 5 } }, } + config.use_fancy_tab_bar = false config.show_tabs_in_tab_bar = true config.show_new_tab_button_in_tab_bar = false