💄 fix: Change AwesomeWM terminal

.config/awesome/rc.lua

@@ -22,9 +22,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
@@ -32,12 +34,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
@@ -48,7 +54,7 @@ end
 beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "alacritty"
+terminal = "wezterm"
 editor = os.getenv("EDITOR") or "nvim"
 editor_cmd = terminal .. " -e " .. editor
 
@@ -83,20 +89,31 @@ awful.layout.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 },
+mymainmenu = awful.menu({
-                                    { "open terminal", terminal }
+	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
@@ -111,7 +128,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)
@@ -123,8 +142,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(
@@ -132,11 +155,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()
@@ -147,7 +166,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
@@ -177,29 +197,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,
@@ -215,13 +244,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)
 ))
@@ -229,197 +260,183 @@ 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() menubar.show() end,
+	awful.key({ modkey }, "p", function()
-              {description = "show the menubar", group = "launcher"})
+		menubar.show()
+	end, { description = "show the menubar", group = "launcher" })
 )
 
 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
 
@@ -445,20 +462,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.
@@ -474,7 +494,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.
@@ -485,13 +506,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" },
@@ -506,9 +527,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
@@ -528,19 +547,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),
@@ -548,10 +567,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)
 
 -- Enable sloppy focus, so that focus follows mouse.
@@ -559,6 +578,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)
 -- }}}