[nvim] Plugin changes

This must have happened from my touching this file for the first time
after installing LazyVim

awesome/autorun.sh

@@ -4,8 +4,7 @@
 # AwesomeWM startup items
 
 run() {
-  if ! pgrep -f "$1" ;
+  if ! pgrep -f "$1"; then
-  then
     "$@" &
   fi
 }
@@ -20,6 +19,7 @@ run "keepassxc"
 /usr/sbin/nextcloud --background &
 /usr/sbin/pasystray --key-grabbing --notify=all &
 /usr/sbin/xscreensaver -no-splash &
+/usr/sbin/clipcatd &
 /usr/sbin/sleep 4
 
 # This seems to broken specifically for wezterm & btop at startup

awesome/rc.lua

@@ -24,9 +24,11 @@ require("awful.hotkeys_popup.keys")
 -- 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,
+	naughty.notify({
+		preset = naughty.config.presets.critical,
 		title = "Oops, there were errors during startup!",
-        text = awesome.startup_errors })
+		text = awesome.startup_errors,
+	})
 end
 
 -- Handle runtime errors after startup
@@ -34,12 +36,16 @@ 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
+		if in_error then
+			return
+		end
 		in_error = true
 
-        naughty.notify({ preset = naughty.config.presets.critical,
+		naughty.notify({
+			preset = naughty.config.presets.critical,
 			title = "Oops, an error happened!",
-            text = tostring(err) })
+			text = tostring(err),
+		})
 		in_error = false
 	end)
 end
@@ -61,7 +67,8 @@ terminal = function()
         return "/usr/sbin/alacritty msg --socket /run/user/1000/alacritty-main.sock create-window"
     end
 end
-]]--
+]]
+--
 local terminal = function()
 	local is_running = os.execute("pgrep wezterm")
 	if is_running == nil then
@@ -106,22 +113,31 @@ awful.layout.append_default_layouts({
 -- {{{ Menu
 -- Create a launcher widget and a main menu
 myawesomemenu = {
-    { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) 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 },
+	{
+		"quit",
+		function()
+			awesome.quit()
+		end,
+	},
 }
 
 mymainmenu = awful.menu({
 	items = {
 		{ "awesome", myawesomemenu, beautiful.awesome_icon },
 		{ "open terminal", terminal() },
-    }
+	},
 })
 
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu })
-    menu = mymainmenu })
 
 -- Menubar configuration
 menubar.utils.terminal = terminal() -- Set the terminal for applications that require it
@@ -136,7 +152,9 @@ 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({}, 1, function(t)
+		t:view_only()
+	end),
 	awful.button({ modkey }, 1, function(t)
 		if client.focus then
 			client.focus:move_to_tag(t)
@@ -148,8 +166,12 @@ local taglist_buttons = gears.table.join(
 			client.focus:toggle_tag(t)
 		end
 	end),
-    awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
+	awful.button({}, 4, function(t)
-    awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
+		awful.tag.viewnext(t.screen)
+	end),
+	awful.button({}, 5, function(t)
+		awful.tag.viewprev(t.screen)
+	end)
 )
 
 local tasklist_buttons = gears.table.join(
@@ -157,11 +179,7 @@ local tasklist_buttons = gears.table.join(
 		if c == client.focus then
 			c.minimized = true
 		else
-            c:emit_signal(
+			c:emit_signal("request::activate", "tasklist", { raise = true })
-                "request::activate",
-                "tasklist",
-                {raise = true}
-            )
 		end
 	end),
 	awful.button({}, 3, function()
@@ -172,7 +190,8 @@ local tasklist_buttons = gears.table.join(
 	end),
 	awful.button({}, 5, function()
 		awful.client.focus.byidx(-1)
-    end))
+	end)
+)
 
 local function set_wallpaper(s)
 	-- Wallpaper
@@ -211,7 +230,7 @@ end)
 -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
 screen.connect_signal("property::geometry", set_wallpaper)
 
-local mymem = lain.widget.mem {
+local mymem = lain.widget.mem({
 	settings = function()
 		local mem_spacer = ""
 		local swp_spacer = ""
@@ -223,24 +242,24 @@ local mymem = lain.widget.mem {
 			swp_spacer = " "
 		end
 		widget:set_markup(" mem " .. mem_spacer .. mem_now.perc .. " swp " .. swp_spacer .. swp_display .. "  ")
-    end
+	end,
-}
+})
 
-local mycpu = lain.widget.cpu {
+local mycpu = lain.widget.cpu({
 	settings = function()
 		local cpu_spacer = ""
 		if cpu_now.usage < 10 then
 			cpu_spacer = " "
 		end
 		widget:set_markup(" cpu " .. cpu_spacer .. cpu_now.usage)
-    end
+	end,
-}
+})
 
 local myweather = lain.widget.weather({
 	APPID = "f6497dd133dd22b541abc8bbe8360f3b",
 	lat = 40.651,
 	lon = -73.949,
-    units = 'imperial',
+	units = "imperial",
 	notification_text_fun = function(wn)
 		local day = os.date("%a %d", wn["dt"])
 		local temp = math.floor(wn["main"]["temp"])
@@ -250,7 +269,7 @@ local myweather = lain.widget.weather({
 	settings = function()
 		units = math.floor(weather_now["main"]["temp"])
 		widget:set_markup(" " .. units .. " ")
-    end
+	end,
 })
 
 awful.screen.connect_for_each_screen(function(s)
@@ -266,29 +285,38 @@ awful.screen.connect_for_each_screen(function(s)
 	-- 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({}, 1, function()
-        awful.button({ }, 3, function () awful.layout.inc(-1) end),
+			awful.layout.inc(1)
-        awful.button({ }, 4, function () awful.layout.inc( 1) end),
+		end),
-        awful.button({ }, 5, 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 {
+	s.mytaglist = awful.widget.taglist({
 		screen = s,
 		filter = awful.widget.taglist.filter.all,
-        buttons = taglist_buttons
+		buttons = taglist_buttons,
-    }
+	})
 
 	-- Create a tasklist widget
-    s.mytasklist = awful.widget.tasklist {
+	s.mytasklist = awful.widget.tasklist({
 		screen = s,
 		filter = awful.widget.tasklist.filter.currenttags,
-        buttons = tasklist_buttons
+		buttons = tasklist_buttons,
-    }
+	})
 
 	-- Create the wibox
 	s.mywibox = awful.wibar({ position = "top", screen = s })
 
 	-- Add widgets to the wibox
-    s.mywibox:setup {
+	s.mywibox:setup({
 		layout = wibox.layout.align.horizontal,
 		{ -- Left widgets
 			layout = wibox.layout.fixed.horizontal,
@@ -307,13 +335,15 @@ awful.screen.connect_for_each_screen(function(s)
 			mytextclock,
 			s.mylayoutbox,
 		},
-    }
+	})
 end)
 -- }}}
 
 -- {{{ Mouse bindings
 root.buttons(gears.table.join(
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
+	awful.button({}, 3, function()
+		mymainmenu:toggle()
+	end),
 	awful.button({}, 4, awful.tag.viewnext),
 	awful.button({}, 5, awful.tag.viewprev)
 ))
@@ -321,199 +351,189 @@ root.buttons(gears.table.join(
 
 -- {{{ Key bindings
 globalkeys = gears.table.join(
-    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
+	awful.key({ modkey }, "s", hotkeys_popup.show_help, { description = "show help", group = "awesome" }),
-        {description="show help", group="awesome"}),
+	awful.key({ modkey }, "Left", awful.tag.viewprev, { description = "view previous", group = "tag" }),
-    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
+	awful.key({ modkey }, "Right", awful.tag.viewnext, { description = "view next", group = "tag" }),
-        {description = "view previous", group = "tag"}),
+	awful.key({ modkey }, "Escape", awful.tag.history.restore, { description = "go back", group = "tag" }),
-    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
-        {description = "view next", group = "tag"}),
-    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
-        {description = "go back", group = "tag"}),
 
-    awful.key({ modkey,           }, "j",
+	awful.key({ modkey }, "j", function()
-        function ()
 		awful.client.focus.byidx(1)
-        end,
+	end, { description = "focus next by index", group = "client" }),
-        {description = "focus next by index", group = "client"}
+	awful.key({ modkey }, "k", function()
-    ),
-    awful.key({ modkey,           }, "k",
-        function ()
 		awful.client.focus.byidx(-1)
-        end,
+	end, { description = "focus previous by index", group = "client" }),
-        {description = "focus previous by index", group = "client"}
+	awful.key({ modkey }, "w", function()
-    ),
+		mymainmenu:show()
-    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
+	end, { description = "show main menu", group = "awesome" }),
-        {description = "show main menu", group = "awesome"}),
 
 	-- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
+	awful.key({ modkey, "Shift" }, "j", function()
-        {description = "swap with next client by index", group = "client"}),
+		awful.client.swap.byidx(1)
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
+	end, { description = "swap with next client by index", group = "client" }),
-        {description = "swap with previous client by index", group = "client"}),
+	awful.key({ modkey, "Shift" }, "k", function()
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
+		awful.client.swap.byidx(-1)
-        {description = "focus the next screen", group = "screen"}),
+	end, { description = "swap with previous client by index", group = "client" }),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
+	awful.key({ modkey, "Control" }, "j", function()
-        {description = "focus the previous screen", group = "screen"}),
+		awful.screen.focus_relative(1)
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
+	end, { description = "focus the next screen", group = "screen" }),
-        {description = "jump to urgent client", group = "client"}),
+	awful.key({ modkey, "Control" }, "k", function()
-    awful.key({ modkey,           }, "Tab",
+		awful.screen.focus_relative(-1)
-        function ()
+	end, { description = "focus the previous screen", group = "screen" }),
+	awful.key({ modkey }, "u", awful.client.urgent.jumpto, { description = "jump to urgent client", group = "client" }),
+	awful.key({ modkey }, "Tab", function()
 		awful.client.focus.history.previous()
 		if client.focus then
 			client.focus:raise()
 		end
-        end,
+	end, { description = "go back", group = "client" }),
-        {description = "go back", group = "client"}),
 
 	-- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal()) end,
+	awful.key({ modkey }, "Return", function()
-        {description = "open a terminal", group = "launcher"}),
+		awful.spawn(terminal())
-    awful.key({ modkey, "Control" }, "r", awesome.restart,
+	end, { description = "open a terminal", group = "launcher" }),
-        {description = "reload awesome", group = "awesome"}),
+	awful.key({ modkey, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome" }),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit,
+	awful.key({ modkey, "Shift" }, "q", awesome.quit, { description = "quit awesome", group = "awesome" }),
-        {description = "quit awesome", group = "awesome"}),
 
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,
+	awful.key({ modkey }, "l", function()
-        {description = "increase master width factor", group = "layout"}),
+		awful.tag.incmwfact(0.05)
-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,
+	end, { description = "increase master width factor", group = "layout" }),
-        {description = "decrease master width factor", group = "layout"}),
+	awful.key({ modkey }, "h", function()
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
+		awful.tag.incmwfact(-0.05)
-        {description = "increase the number of master clients", group = "layout"}),
+	end, { description = "decrease master width factor", group = "layout" }),
-    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,
+	awful.key({ modkey, "Shift" }, "h", function()
-        {description = "decrease the number of master clients", group = "layout"}),
+		awful.tag.incnmaster(1, nil, true)
-    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,
+	end, { description = "increase the number of master clients", group = "layout" }),
-        {description = "increase the number of columns", group = "layout"}),
+	awful.key({ modkey, "Shift" }, "l", function()
-    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,
+		awful.tag.incnmaster(-1, nil, true)
-        {description = "decrease the number of columns", group = "layout"}),
+	end, { description = "decrease the number of master clients", group = "layout" }),
-    awful.key({ modkey,           }, "space", function () awful.layout.inc( 1)                end,
+	awful.key({ modkey, "Control" }, "h", function()
-        {description = "select next", group = "layout"}),
+		awful.tag.incncol(1, nil, true)
-    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,
+	end, { description = "increase the number of columns", group = "layout" }),
-        {description = "select previous", 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" }),
 
-    awful.key({ modkey, "Control" }, "n",
+	awful.key({ modkey, "Control" }, "n", function()
-        function ()
 		local c = awful.client.restore()
 		-- Focus restored client
 		if c then
-                c:emit_signal(
+			c:emit_signal("request::activate", "key.unminimize", { raise = true })
-                    "request::activate", "key.unminimize", {raise = true}
-                )
 		end
-        end,
+	end, { description = "restore minimized", group = "client" }),
-        {description = "restore minimized", group = "client"}),
 
 	-- Prompt
-    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
+	awful.key({ modkey }, "r", function()
-        {description = "run prompt", group = "launcher"}),
+		awful.screen.focused().mypromptbox:run()
+	end, { description = "run prompt", group = "launcher" }),
 
-    awful.key({ modkey }, "x",
+	awful.key({ modkey }, "x", function()
-        function ()
+		awful.prompt.run({
-            awful.prompt.run {
 			prompt = "Run Lua code: ",
 			textbox = awful.screen.focused().mypromptbox.widget,
 			exe_callback = awful.util.eval,
-                history_path = awful.util.get_cache_dir() .. "/history_eval"
+			history_path = awful.util.get_cache_dir() .. "/history_eval",
-            }
+		})
-        end,
+	end, { description = "lua execute prompt", group = "awesome" }),
-        {description = "lua execute prompt", group = "awesome"}),
 	-- Menubar
-    awful.key({ modkey }, "p", function() os.execute("dmenu_run") end,
+	awful.key({ modkey }, "p", function()
-        {description = "show the menubar", group = "launcher"}),
+		os.execute("dmenu_run")
-    awful.key({ }, "XF86MonBrightnessUp", function() awful.spawn("xbacklight -inc 10") end, { description = "Brighten the screen", group = "monitor" }),
+	end, { description = "show the menubar", group = "launcher" }),
-    awful.key({ }, "XF86MonBrightnessDown", function() awful.spawn("xbacklight -dec 10") end, { description = "Brighten the screen", group = "monitor" })
+	awful.key({}, "XF86MonBrightnessUp", function()
+		awful.spawn("xbacklight -inc 10")
+	end, { description = "Brighten the screen", group = "monitor" }),
+	awful.key({}, "XF86MonBrightnessDown", function()
+		awful.spawn("xbacklight -dec 10")
+	end, { description = "Brighten the screen", group = "monitor" })
 )
 
 clientkeys = gears.table.join(
-    awful.key({ modkey,           }, "f",
+	awful.key({ modkey }, "f", function(c)
-        function (c)
 		c.fullscreen = not c.fullscreen
 		c:raise()
-        end,
+	end, { description = "toggle fullscreen", group = "client" }),
-        {description = "toggle fullscreen", group = "client"}),
+	awful.key({ modkey, "Shift" }, "c", function(c)
-    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,
+		c:kill()
-        {description = "close", group = "client"}),
+	end, { description = "close", group = "client" }),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
+	awful.key(
-        {description = "toggle floating", group = "client"}),
+		{ modkey, "Control" },
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
+		"space",
-        {description = "move to master", group = "client"}),
+		awful.client.floating.toggle,
-    awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
+		{ description = "toggle floating", group = "client" }
-        {description = "move to screen", group = "client"}),
+	),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
+	awful.key({ modkey, "Control" }, "Return", function(c)
-        {description = "toggle keep on top", group = "client"}),
+		c:swap(awful.client.getmaster())
-    awful.key({ modkey,           }, "n",
+	end, { description = "move to master", group = "client" }),
-        function (c)
+	awful.key({ modkey }, "o", function(c)
+		c:move_to_screen()
+	end, { description = "move to screen", group = "client" }),
+	awful.key({ modkey }, "t", function(c)
+		c.ontop = not c.ontop
+	end, { description = "toggle keep on top", group = "client" }),
+	awful.key({ modkey }, "n", function(c)
 		-- The client currently has the input focus, so it cannot be
 		-- minimized, since minimized clients can't have the focus.
 		c.minimized = true
-        end ,
+	end, { description = "minimize", group = "client" }),
-        {description = "minimize", group = "client"}),
+	awful.key({ modkey }, "m", function(c)
-    awful.key({ modkey,           }, "m",
-        function (c)
 		c.maximized = not c.maximized
 		c:raise()
-        end ,
+	end, { description = "(un)maximize", group = "client" }),
-        {description = "(un)maximize", group = "client"}),
+	awful.key({ modkey, "Control" }, "m", function(c)
-    awful.key({ modkey, "Control" }, "m",
-        function (c)
 		c.maximized_vertical = not c.maximized_vertical
 		c:raise()
-        end ,
+	end, { description = "(un)maximize vertically", group = "client" }),
-        {description = "(un)maximize vertically", group = "client"}),
+	awful.key({ modkey, "Shift" }, "m", function(c)
-    awful.key({ modkey, "Shift"   }, "m",
-        function (c)
 		c.maximized_horizontal = not c.maximized_horizontal
 		c:raise()
-        end ,
+	end, { description = "(un)maximize horizontally", group = "client" })
-        {description = "(un)maximize horizontally", 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
-    globalkeys = gears.table.join(globalkeys,
+	globalkeys = gears.table.join(
+		globalkeys,
 		-- View tag only.
-        awful.key({ modkey }, "#" .. i + 9,
+		awful.key({ modkey }, "#" .. i + 9, function()
-            function ()
 			local screen = awful.screen.focused()
 			local tag = screen.tags[i]
 			if tag then
 				tag:view_only()
 			end
-            end,
+		end, { description = "view tag #" .. i, group = "tag" }),
-            {description = "view tag #"..i, group = "tag"}),
 		-- Toggle tag display.
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
+		awful.key({ modkey, "Control" }, "#" .. i + 9, function()
-            function ()
 			local screen = awful.screen.focused()
 			local tag = screen.tags[i]
 			if tag then
 				awful.tag.viewtoggle(tag)
 			end
-            end,
+		end, { description = "toggle tag #" .. i, group = "tag" }),
-            {description = "toggle tag #" .. i, group = "tag"}),
 		-- Move client to tag.
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
+		awful.key({ modkey, "Shift" }, "#" .. i + 9, function()
-            function ()
 			if client.focus then
 				local tag = client.focus.screen.tags[i]
 				if tag then
 					client.focus:move_to_tag(tag)
 				end
 			end
-            end,
+		end, { description = "move focused client to tag #" .. i, group = "tag" }),
-            {description = "move focused client to tag #"..i, group = "tag"}),
 		-- Toggle tag on focused client.
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+		awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function()
-            function ()
 			if client.focus then
 				local tag = client.focus.screen.tags[i]
 				if tag then
 					client.focus:toggle_tag(tag)
 				end
 			end
-            end,
+		end, { description = "toggle focused client on tag #" .. i, group = "tag" })
-            {description = "toggle focused client on tag #" .. i, group = "tag"})
 	)
 end
 
@@ -539,20 +559,23 @@ root.keys(globalkeys)
 -- 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,
+		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
+			placement = awful.placement.no_overlap + awful.placement.no_offscreen,
-        }
+		},
 	},
 
 	-- Floating clients.
-    { rule_any = {
+	{
+		rule_any = {
 			instance = {
 				"DTA", -- Firefox addon DownThemAll.
 				"copyq", -- Includes session name in class.
@@ -568,7 +591,8 @@ awful.rules.rules = {
 				"Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
 				"Wpa_gui",
 				"veromix",
-            "xtightvncviewer"},
+				"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.
@@ -579,13 +603,13 @@ awful.rules.rules = {
 				"AlarmWindow", -- Thunderbird's calendar.
 				"ConfigManager", -- Thunderbird's about:config.
 				"pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
-        }
+			},
-    }, properties = { floating = true }},
+		},
+		properties = { floating = true },
+	},
 
 	-- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
+	{ rule_any = { type = { "normal", "dialog" } }, properties = { titlebars_enabled = true } },
-    }, properties = { titlebars_enabled = true }
-    },
 
 	-- Set Firefox to always map on the tag named "2" on screen 1.
 	-- { rule = { class = "Firefox" },
@@ -605,9 +629,7 @@ client.connect_signal("manage", function (c)
 	-- 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
+	if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
-        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
@@ -627,19 +649,19 @@ client.connect_signal("request::titlebars", function(c)
 		end)
 	)
 
-    awful.titlebar(c) : setup {
+	awful.titlebar(c):setup({
 		{ -- Left
 			awful.titlebar.widget.iconwidget(c),
 			buttons = buttons,
-            layout  = wibox.layout.fixed.horizontal
+			layout = wibox.layout.fixed.horizontal,
 		},
 		{ -- Middle
 			{ -- Title
 				align = "center",
-                widget = awful.titlebar.widget.titlewidget(c)
+				widget = awful.titlebar.widget.titlewidget(c),
 			},
 			buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
+			layout = wibox.layout.flex.horizontal,
 		},
 		{ -- Right
 			awful.titlebar.widget.floatingbutton(c),
@@ -647,10 +669,10 @@ client.connect_signal("request::titlebars", function(c)
 			awful.titlebar.widget.stickybutton(c),
 			awful.titlebar.widget.ontopbutton(c),
 			awful.titlebar.widget.closebutton(c),
-            layout = wibox.layout.fixed.horizontal()
+			layout = wibox.layout.fixed.horizontal(),
 		},
-        layout = wibox.layout.align.horizontal
+		layout = wibox.layout.align.horizontal,
-    }
+	})
 end)
 
 -- Autostart items
@@ -661,6 +683,10 @@ client.connect_signal("mouse::enter", function(c)
 	c:emit_signal("request::activate", "mouse_enter", { raise = false })
 end)
 
-client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("focus", function(c)
-client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+	c.border_color = beautiful.border_focus
+end)
+client.connect_signal("unfocus", function(c)
+	c.border_color = beautiful.border_normal
+end)
 -- }}}

nvim/lazy-lock.json

@@ -1,46 +1,41 @@
 {
-  "LazyVim": { "branch": "main", "commit": "2bea40c447b72e54ffb2d5cddc98d7798990796f" },
+  "LazyVim": { "branch": "main", "commit": "45d94b3197eaf3f35754b8ecb7adebfcebe5160d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "bb52c530698654355bbddb9f0035dc35cea401a5" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "97b08f928d355bd6d5dee595fdf667b5bfb6329f" },
   "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
+  "catppuccin": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" },
-  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
+  "conform.nvim": { "branch": "master", "commit": "59088eb6fea54e5a27e719df160329a0ead86b5c" },
-  "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" },
+  "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" },
-  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "fzf-lua": { "branch": "main", "commit": "e68d21bf23f27fae4bb395760e3eb10b8768ea2c" },
+  "fzf-lua": { "branch": "main", "commit": "562593abac4f2796d0cf622876527cfb8d274639" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2bc3b472bbc2484214549af4d9f38c127b886a55" },
-  "grug-far.nvim": { "branch": "main", "commit": "635e69adf3a714621bd0a289314bc23c5848babb" },
+  "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
   "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
   "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "805c31ec6bfb557975143712ecff6956d3227141" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
+  "mini.ai": { "branch": "main", "commit": "6e01c0e5a15554852546fac9853960780ac52ed4" },
-  "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
+  "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
-  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
+  "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
-  "mini.starter": { "branch": "main", "commit": "a816f50ac99a6fa1f21e0f07ee13f975444dd4a1" },
+  "mini.starter": { "branch": "main", "commit": "4f46dc11e1dd9f62310794121405853be8d6b13f" },
-  "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
+  "neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" },
-  "neo-tree.nvim": { "branch": "main", "commit": "e752d224f914f1ffa18260fecfbfac233d3ca461" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
-  "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
+  "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" },
-  "nvim-treesitter": { "branch": "master", "commit": "f3d7c0dafcbc86c4d63f765649c884a03bc1360a" },
+  "nvim-treesitter": { "branch": "master", "commit": "6d957c22cb48a734b009a69d03c18d20042c4754" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
   "nvlime": { "branch": "master", "commit": "228e4fa8c7d10b1ed07b1649a63743613b77a828" },
   "paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" },
   "parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
   "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
-  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" },
+  "snacks.nvim": { "branch": "main", "commit": "32803e19459d773a3344b998e2c24c6c801583f1" },
-  "rustaceanvim": { "branch": "master", "commit": "e15c262f81e8adb139ef3e3de775493d377919a2" },
-  "snacks.nvim": { "branch": "main", "commit": "b96bd540f785c725289f9f15f0147b1b2dac5a35" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "tokyonight.nvim": { "branch": "main", "commit": "c3ab53c3f544e4a04f2a05d43451fd9bedff51b4" },
+  "tokyonight.nvim": { "branch": "main", "commit": "84ea0b5f4651afdf50ececaf6f110fe9d9dc9458" },
-  "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
-  "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" }
+  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
 }

nvim/lazyvim.json

@@ -1,16 +1,10 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.coding.mini-surround",
+
-    "lazyvim.plugins.extras.lang.go",
-    "lazyvim.plugins.extras.lang.markdown",
-    "lazyvim.plugins.extras.lang.python",
-    "lazyvim.plugins.extras.lang.rust",
-    "lazyvim.plugins.extras.lang.toml",
-    "lazyvim.plugins.extras.lang.yaml",
-    "lazyvim.plugins.extras.vscode"
   ],
+  "install_version": 7,
   "news": {
     "NEWS.md": "10960"
   },
-  "version": 7
+  "version": 8
 }