diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index f1c5b1f..a8087ca 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -70,7 +70,7 @@
     dev.enable = true;
     man = {
       enable = true;
-      generateCaches = true;
+      cache.enable = true;
     };
     info.enable = true;
     nixos.enable = true;
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
index 0839d40..1793f90 100644
--- a/modules/gui/default.nix
+++ b/modules/gui/default.nix
@@ -5,8 +5,8 @@
 }: {
   environment.systemPackages = with pkgs;
     lib.optionals pkgs.stdenv.isx86_64 [
-      wineWowPackages.stable
-      wineWowPackages.waylandFull
+      wineWow64Packages.stable
+      wineWow64Packages.waylandFull
       winetricks
     ];
   programs.gamescope = {
diff --git a/modules/wm/default.nix b/modules/wm/default.nix
index 4947f05..3f318ab 100644
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -38,6 +38,7 @@
   environment.systemPackages = with pkgs; [
     gnome-bluetooth
     polkit_gnome
+    blueberry
   ];
 
   security.pam.services.hyprlock = {};
diff --git a/nvim/lua/plugins/motions.lua b/nvim/lua/plugins/motions.lua
index 5bcecd1..38320f4 100644
--- a/nvim/lua/plugins/motions.lua
+++ b/nvim/lua/plugins/motions.lua
@@ -1,12 +1,4 @@
 return {
-	{
-		"nvim-surround",
-		event = "DeferredUIEnter",
-		after = function()
-			require("nvim-surround").setup({})
-		end,
-	},
-
 	{
 		"vim-wordmotion",
 		keys = {
diff --git a/nvim/lua/plugins/opencode.lua b/nvim/lua/plugins/opencode.lua
index 643da19..3aa2f11 100644
--- a/nvim/lua/plugins/opencode.lua
+++ b/nvim/lua/plugins/opencode.lua
@@ -11,22 +11,35 @@ return {
 		keys = {
 			{
 				"<leader>l",
-				function() require("opencode").toggle() end,
+				function()
+					require("opencode").toggle()
+				end,
 				desc = "Opencode",
 				mode = { "n", "v" },
 			},
 			{
 
 				"gl",
-				function() return require("opencode").operator("@this ") end,
+				function()
+					return require("opencode").operator("@this ")
+				end,
 				desc = "Add range to opencode",
 				mode = { "n", "x" },
 			},
 			{
 				"gll",
-				function() return require("opencode").operator("@this ") .. "_" end,
+				function()
+					return require("opencode").operator("@this ") .. "_"
+				end,
 				desc = "Add line to opencode",
 			},
+			{
+				"gL",
+				function()
+					return require("opencode").prompt("@buffer ")
+				end,
+				desc = "Add buffer to opencode"
+			},
 		},
 	},
 }