From 90b9dcd2eddbbdee50f6ed3b974450706142f16a Mon Sep 17 00:00:00 2001
From: Tim Keller <tjkeller.xyz>
Date: Sat, 12 Apr 2025 20:35:43 -0500
Subject: fix floating layout and classiclayout module

---
 buttons.lua                | 2 +-
 func/sloppyfocus.lua       | 3 ++-
 keybindings.lua            | 1 +
 layouts.lua                | 3 ---
 widgets/classiclayouts.lua | 2 ++
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/buttons.lua b/buttons.lua
index ff87aae..bce8442 100644
--- a/buttons.lua
+++ b/buttons.lua
@@ -22,7 +22,7 @@ client_buttons = gears.table.join(
 
 -- wibar widgets
 layout_buttons = gears.table.join(
-	awful.button({ }, 1, function() awful.layout.inc(1, awful.screen.focused().tags[0]) end),
+	awful.button({ }, 1, function() awful.layout.inc(1, awful.screen.focused(), awful.layout.layouts) end),
 	awful.button({ }, 2, function() if client.focus and not client.focus.prevent_kill then client.focus:kill() end end)
 )
 
diff --git a/func/sloppyfocus.lua b/func/sloppyfocus.lua
index d044498..298059b 100644
--- a/func/sloppyfocus.lua
+++ b/func/sloppyfocus.lua
@@ -1,4 +1,5 @@
 -- Enable sloppy focus, so that focus follows mouse.
 client.connect_signal("mouse::enter", function(c)
-	c:emit_signal("request::activate", "mouse_enter", { raise = true })
+	--c:emit_signal("request::activate", "mouse_enter", { raise = true })
+	c:emit_signal("request::activate", "mouse_enter")
 end)
diff --git a/keybindings.lua b/keybindings.lua
index b6bd76d..611e1ff 100644
--- a/keybindings.lua
+++ b/keybindings.lua
@@ -64,6 +64,7 @@ globalkeys = gears.table.join(
 	key(w , "m",      function () awful.layout.set(awful.layout.suit.max)         end, { group = "layout"  , description = "change to max layout" }),
 	key(w , "t",      function () awful.layout.set(awful.layout.suit.tile)        end, { group = "layout"  , description = "change to tile layout" }),
 	key(w , "b",      function () awful.layout.set(awful.layout.suit.tile.bottom) end, { group = "layout"  , description = "change to tile bottom layout" }),
+	key(w , "f",      function () awful.layout.set(awful.layout.suit.floating)    end, { group = "layout"  , description = "change to floating layout" }),
 	key(w , "r",      function () awful.screen.focused().mypromptbox:run()        end, { group = "launcher", description = "run prompt" }),
 	key(w , "p",      function () menubar.show()                                  end, { group = "launcher", description = "show the menubar" }),
 	-- PC Controls
diff --git a/layouts.lua b/layouts.lua
index 67fd31d..fb291b3 100644
--- a/layouts.lua
+++ b/layouts.lua
@@ -5,9 +5,6 @@ awful.layout.layouts = {
 	awful.layout.suit.tile,
 	awful.layout.suit.tile.bottom,
 	awful.layout.suit.max,
-	awful.layout.suit.floating,
-
-
 --	awful.layout.suit.floating,
 --	awful.layout.suit.tile,
 --	awful.layout.suit.tile.left,
diff --git a/widgets/classiclayouts.lua b/widgets/classiclayouts.lua
index 515e66c..1f71698 100644
--- a/widgets/classiclayouts.lua
+++ b/widgets/classiclayouts.lua
@@ -1,6 +1,7 @@
 local wibox = require("wibox")
 local layout = require("awful.layout")
 local beautiful = require("beautiful")
+local naughty = require("naughty")
 
 local screen_widgets = {} -- need one widget per screen
 
@@ -43,6 +44,7 @@ function update(screen_index)
 	elseif w.layout == l then
 		return
 	end
+	w.layout = l
 
 	-- set widget
 	local name = layout.getname(l)
-- 
cgit v1.2.3