diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index e6dd3a45..0152f71d 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -4,8 +4,6 @@ local map = vim.keymap.set local wk = require("which-key") --- unbind ctrl S since it's tmux prefix --- vim.keymap.del({ "i", "n" }, "") vim.keymap.set({ "i", "n" }, "", "") local dirmap = { @@ -13,22 +11,6 @@ local dirmap = { down = "w$", } -local function move_cursor_to(direction) end - --- TODO: finish this --- local function scroll(direction) --- -- current window for now; could extend later --- local win_id = 0 --- -- in form {line, column} --- local current_cursor = vim.api.nvim_win_get_cursor(win_id) --- --- -- this is the height of the window in lines --- local win_height = vim.api.nvim_win_get_height(win_id) --- --- local new_top = vim.fn.line(dirmap[direction]) --- --- end - -- 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 }) @@ -40,11 +22,6 @@ map({ "n", "t", "i" }, "", " TmuxNavigateRight", { desc = "Swi map({ "n", "t", "i" }, "", " TmuxNavigateUp", { remap = true }) map({ "n", "t", "i" }, "", " TmuxNavigateDown", { desc = "Switch Window Down", remap = true }) --- map("n", "^M", function() --- print("testing?") --- Snacks.terminal(nil, { cwd = LazyVim.root() }) --- end, { remap = false, desc = "Terminal (Root Dir)" }) --- map("t", "^M", "close", { remap = false, desc = "Hide Terminal" }) map({ "x" }, "", "", { remap = true }) map({ "x" }, "", "", { remap = true }) map({ "n", "x", "v" }, "", "", { remap = true }) @@ -74,12 +51,6 @@ vim.keymap.del({ "n" }, "") map({ "n" }, "", "L", { remap = false }) map({ "n" }, "", "H", { remap = false }) -- better delete and put --- map({ "n" }, "dT", "dvT", { remap = false }) --- map({ "n", "x" }, "p", '"_p', { remap = false }) --- map({ "n", "x" }, "P", '"_P', { remap = false }) --- map({ "n", "x" }, "d", '"_d', { remap = false }) --- map({ "n", "x" }, "dd", '"_dd', { remap = false }) --- map({ "n", "x" }, "D", '"_D', { remap = false }) -- yank history map({ "n", "x" }, "fp", function() @@ -90,14 +61,6 @@ map({ "n", "x" }, "fp", function() end end, { desc = "Open Yank History", remap = false }) --- - --- Remap spelling suggestions --- map({ "n" }, "z-", "z=", { desc = "Spelling Suggestions", remap = true }) - --- Oil.nvim open parent directory --- map("n", "-", "Oil", { desc = "Open Oil" }) - -- TODO: add leader + y for save current buf, leader + Y to write all map({ "n", "x" }, "y", "w", { desc = "Save" }) map({ "n", "x" }, "Y", "wa", { desc = "Save All" }) @@ -124,10 +87,6 @@ map("n", "on", function() require("command-key").command("ObsidianNew") end, { desc = "Obsidian New Note" }) map("n", "ob", "ObsidianBacklinks", { desc = "Obsidian Backlinks" }) --- map("n", "ot", function() --- require("command-key").command("ObsidianTags") --- end, { desc = "Obsidian Tags" }) - map("n", "ot", "ObsidianTags", { desc = "Obsidian Tags" }) map("n", "olv", "ObsidianFollowLink vsplit", { desc = "Obsidian Follow Link Vsplit" }) map("n", "olh", "ObsidianFollowLink hsplit", { desc = "Obsidian Follow Link Hsplit" }) diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 56eff648..1d88ba2d 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -53,16 +53,8 @@ bind h split-window -v -c "#{pane_current_path}" bind C-x kill-session bind S command-prompt -p "rename session:" "rename-session '%%'" -# bind W command-prompt -p "rename window:" "rename-window '%%'" bind - copy-mode -# bind m next-layout bind -n M-i next-window bind -n M-m previous-window -# Joining and sending -# bind-key j command-prompt -p "join pane from:" "join-pane -s '%%'" -# bind-key s command-prompt -p "send pane to:" "join-pane -t '%%'" -# bind -n S-Left previous-window -# bind -n S-Right next-window - run '/usr/share/tmux-plugin-manager/tpm'