From 5e2d7e184b9d097c683792a8e5daed50a395cb0b Mon Sep 17 00:00:00 2001
From: RulentWave <49258216+RulentWave@users.noreply.github.com>
Date: Mon, 24 Mar 2025 15:33:53 -0400
Subject: [PATCH 1/2] changed Conform's format_on_save lambda so that buffers
 that match disable_filetypes return nil. This allows you to enable a
 formatter for langages in the disable_filetypes table to have a formatter
 that can be run manually with Leader-f but doesnt enable format_on_save for
 them (#1395)

---
 init.lua | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/init.lua b/init.lua
index 1427b6c7..fe030ddf 100644
--- a/init.lua
+++ b/init.lua
@@ -749,16 +749,14 @@ require('lazy').setup({
         -- have a well standardized coding style. You can add additional
         -- languages here or re-enable it for the disabled ones.
         local disable_filetypes = { c = true, cpp = true }
-        local lsp_format_opt
         if disable_filetypes[vim.bo[bufnr].filetype] then
-          lsp_format_opt = 'never'
+          return nil
         else
-          lsp_format_opt = 'fallback'
+          return {
+            timeout_ms = 500,
+            lsp_format = 'fallback',
+          }
         end
-        return {
-          timeout_ms = 500,
-          lsp_format = lsp_format_opt,
-        }
       end,
       formatters_by_ft = {
         lua = { 'stylua' },

From e947649cb0ee5ac3c75593288df04d4f58359106 Mon Sep 17 00:00:00 2001
From: Sander <info@mesander.com>
Date: Mon, 24 Mar 2025 20:34:57 +0100
Subject: [PATCH 2/2] feat(keymap): move windows without `<C-w>` (#1368)

---
 init.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/init.lua b/init.lua
index fe030ddf..cbf9ff65 100644
--- a/init.lua
+++ b/init.lua
@@ -194,6 +194,12 @@ vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right win
 vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
 vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
 
+-- NOTE: Some terminals have coliding keymaps or are not able to send distinct keycodes
+-- vim.keymap.set("n", "<C-S-h>", "<C-w>H", { desc = "Move window to the left" })
+-- vim.keymap.set("n", "<C-S-l>", "<C-w>L", { desc = "Move window to the right" })
+-- vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" })
+-- vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" })
+
 -- [[ Basic Autocommands ]]
 --  See `:help lua-guide-autocommands`