From ed6562f5d03f678dbf8e84b593e8785fbe0a1611 Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Mon, 18 Nov 2024 23:37:56 -0500 Subject: [PATCH] AutoYADM commit: 2024-11-18 23:37:56 --- .config/nvim/lua/colemak-dh.lua | 38 +---------------- .config/nvim/lua/config/keymaps.lua | 44 ++++++++++---------- .config/nvim/lua/plugins/treesitter.lua | 55 +++++++++++++++++++++++++ .config/nvim/lua/plugins/zen-mode.lua | 25 ----------- 4 files changed, 79 insertions(+), 83 deletions(-) create mode 100644 .config/nvim/lua/plugins/treesitter.lua delete mode 100644 .config/nvim/lua/plugins/zen-mode.lua diff --git a/.config/nvim/lua/colemak-dh.lua b/.config/nvim/lua/colemak-dh.lua index a8131283..e660961a 100644 --- a/.config/nvim/lua/colemak-dh.lua +++ b/.config/nvim/lua/colemak-dh.lua @@ -28,55 +28,21 @@ local wk_presets = { }, motions = { mode = { "o", "x", "n" }, - { "$", desc = "End of line" }, - { "%", desc = "Matching (){}[]" }, - { "0", desc = "Start of line" }, - { "F", desc = "Move to prev char" }, - { "G", desc = "Last line" }, - { "T", desc = "Move before prev char" }, - { "^", desc = "Start of line (non ws)" }, - { "b", desc = "Prev word" }, { "k", desc = "Next end of word" }, - { "f", desc = "Move to next char" }, { "gh", desc = "Prev end of word" }, - { "gg", desc = "First line" }, { "m", desc = "Left" }, { "n", desc = "Down" }, { "e", desc = "Up" }, { "i", desc = "Right" }, - { "t", desc = "Move before next char" }, - { "w", desc = "Next word" }, - { "{", desc = "Prev empty line" }, - { "}", desc = "Next empty line" }, - { ";", desc = "Next ftFT" }, - { ",", desc = "Prev ftFT" }, - { "/", desc = "Search forward" }, - { "?", desc = "Search backward" }, - { "B", desc = "Prev WORD" }, { "H", desc = "Next end of WORD" }, - { "W", desc = "Next WORD" }, }, windows = { mode = { "n", "x" }, - { "", group = "window" }, - { "+", desc = "Increase height" }, - { "-", desc = "Decrease height" }, - { "<", desc = "Decrease width" }, - { "=", desc = "Equally high and wide" }, - { ">", desc = "Increase width" }, - { "T", desc = "Break out into a new tab" }, - { "_", desc = "Max out the height" }, { "m", desc = "Go to the left window" }, { "n", desc = "Go to the down window" }, { "e", desc = "Go to the up window" }, { "i", desc = "Go to the right window" }, { "o", desc = "Close all other windows" }, - { "q", desc = "Quit a window" }, - { "s", desc = "Split window" }, - { "v", desc = "Split window vertically" }, - { "w", desc = "Switch windows" }, - { "x", desc = "Swap current with next" }, - { "|", desc = "Max out the width" }, }, } @@ -103,11 +69,11 @@ M.fix_hjkl = function() map({ "n", "x", "o" }, "e", "v:count == 0 ? 'gk' : 'k'", { expr = true, desc = "Up", remap = false }) map({ "n", "x", "o" }, "", "v:count == 0 ? 'gk' : 'k'", { expr = true, desc = "Up", remap = false }) map({ "n", "x", "o" }, "E", "K", { desc = "Up", remap = false }) - map({ "n", "x", "o" }, "i", "l", { desc = "Right", remap = false }) + map({ "n", "x", "o", "v", "s" }, "i", "l", { desc = "Right", remap = false }) map({ "n", "x", "o" }, "gh", "ge", { remap = false }) map({ "n" }, "I", "bprevious", { desc = "Next Buffer", remap = false }) - map({ "n", "x", "o" }, "l", "i", { desc = "Insert", remap = false }) + map({ "n", "x", "o", "v", "s" }, "l", "i", { desc = "Insert", remap = false }) map({ "n", "x", "o" }, "L", "I", { desc = "Insert Start Of Line", remap = false }) map({ "n", "x", "o" }, "k", "m", { desc = "Marker", remap = false }) map({ "n", "x", "o" }, "K", "M", { desc = "Marker", remap = false }) diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index dd06293a..9d55227d 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -8,44 +8,44 @@ local cmdh = require("colemak-dh") vim.keymap.set({ "i", "n" }, "", "") -- Bind arrows to hjkl to my colemak-dh motions work as expected --- map({ "n", "x" }, "", "k", { desc = "Up", remap = true }) --- map({ "n", "x" }, "", "j", { desc = "Down", remap = true }) --- map({ "n", "x" }, "", "h", { desc = "Left", remap = true }) --- map({ "n", "x" }, "", "l", { desc = "Right", remap = true }) +map({ "n", "x" }, "", "k", { desc = "Up", remap = true }) +map({ "n", "x" }, "", "j", { desc = "Down", remap = true }) +map({ "n", "x" }, "", "h", { desc = "Left", remap = true }) +map({ "n", "x" }, "", "l", { desc = "Right", remap = true }) --- map({ "n", "t", "i" }, "", " TmuxNavigateLeft", { desc = "Switch Window Left", remap = true }) --- map({ "n", "t", "i" }, "", " TmuxNavigateRight", { desc = "Switch Window Right", remap = true }) --- map({ "n", "t", "i" }, "", " TmuxNavigateUp", { remap = true }) --- map({ "n", "t", "i" }, "", " TmuxNavigateDown", { desc = "Switch Window Down", remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateLeft", { desc = "Switch Window Left", remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateRight", { desc = "Switch Window Right", remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateUp", { remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateDown", { desc = "Switch Window Down", remap = true }) map({ "x" }, "", "", { remap = true }) map({ "x" }, "", "", { remap = true }) map({ "n", "x", "v" }, "", "", { remap = true }) map({ "n", "x", "v" }, "", "", { remap = true }) --- map({ "n" }, "", "[b", { desc = "Previous Buffer", remap = true }) --- map({ "n" }, "", "]b", { desc = "Next Buffer", remap = true }) +map({ "n" }, "", "[b", { desc = "Previous Buffer", remap = true }) +map({ "n" }, "", "]b", { desc = "Next Buffer", remap = true }) map({ "n" }, "", "5j", { remap = true }) map({ "n" }, "", "5k", { remap = true }) --- map({ "i" }, "", "", { desc = "Escape insert mode", remap = true }) +map({ "i" }, "", "", { desc = "Escape insert mode", remap = true }) -- better navigation map({ "n" }, "", "zz", { remap = false }) map({ "n" }, "", "zz", { remap = false }) --- map({ "n" }, "n", "nzz", { remap = false }) --- map({ "n" }, "N", "Nzz", { remap = false }) --- map({ "n" }, "", "zz", { remap = false }) --- map({ "n" }, "", "zz", { remap = false }) --- map({ "n", "x" }, "", "$", { remap = false }) --- map({ "n", "x" }, "", "0", { remap = false }) +map({ "n" }, "n", "nzz", { remap = false }) +map({ "n" }, "N", "Nzz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n", "x" }, "", "$", { remap = false }) +map({ "n", "x" }, "", "0", { remap = false }) -- easily access null register map({ "n", "x" }, "n", '"_', { remap = false, silent = true, desc = "Null Register" }) -- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak --- vim.keymap.del({ "n" }, "") --- vim.keymap.del({ "n" }, "") --- map({ "n" }, "", "L", { remap = false }) --- map({ "n" }, "", "H", { remap = false }) +vim.keymap.del({ "n" }, "") +vim.keymap.del({ "n" }, "") +map({ "n" }, "", "L", { remap = false }) +map({ "n" }, "", "H", { remap = false }) -- better delete and put -- better quit @@ -112,4 +112,4 @@ end, { desc = "Obsidian Rename" }) map("n", "oc", "ObsidianTOC", { desc = "Obsidian Table Of Contents" }) -- TODO: Add binds for templates -- cmdh.fix_hjkl() -cmdh.fix_all() +-- cmdh.fix_all() diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 00000000..8e19a42f --- /dev/null +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,55 @@ +return { + "nvim-treesitter/nvim-treesitter", + opts = { + highlight = { enable = true }, + indent = { enable = true }, + ensure_installed = { + "bash", + "c", + "diff", + "html", + "javascript", + "jsdoc", + "json", + "jsonc", + "lua", + "luadoc", + "luap", + "markdown", + "markdown_inline", + "printf", + "python", + "query", + "regex", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "xml", + "yaml", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + keymaps = { + ["lf"] = "@function.inner", + ["lc"] = "@class.inner", + }, + move = { + enable = true, + goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" }, + goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" }, + goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer", ["[a"] = "@parameter.inner" }, + goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" }, + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/zen-mode.lua b/.config/nvim/lua/plugins/zen-mode.lua deleted file mode 100644 index a915e8c1..00000000 --- a/.config/nvim/lua/plugins/zen-mode.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - "folke/zen-mode.nvim", - enabled = false, - opts = { - window = { - options = { - signcolumn = "no", - -- number = false, - -- relativenumber = false, - -- cursorline = false, - foldcolumn = "0", - list = false, - }, - }, - plugins = { - options = {}, - twilight = { enabled = false }, - kitty = { - enabled = false, - -- enabled = true, - font = "+4", - }, - }, - }, -}