still trying to resolve merge conflict

glasshouse-laptop/home/nixvim/config/keymaps.nix

@@ -0,0 +1,29 @@
+{
+	keymaps = [
+		{
+			action = "<C-W>W";
+			key = "<S-Tab>";
+			mode = "n";
+		}
+		{
+			action = "<C-w>w";
+			key = "<Tab>";
+			mode = "n";
+		}
+		{
+			action = "<cmd>FloatermToggle shadeterm<CR>";
+			key = "<F2>";
+			mode = "n";
+		}
+		{
+			action = "<cmd>NvimTreeToggle<CR>";
+			key = "<F3>";
+			mode = "n";
+		}
+		{
+			action = "<cmd>FloatermToggle shadeterm<CR>";
+			key = "<F2>";
+			mode = "t";
+		}
+	];
+}