From a4df65ee70f00dee00b0cb03115f1c4ecd89a662 Mon Sep 17 00:00:00 2001 From: lulusilly Date: Tue, 26 Aug 2025 22:07:55 -0400 Subject: [PATCH] Modified Neovim config, removed excess Emacs files in lisp folder --- .config/nvim/init.lua | 43 +++++++++++++------ .emacs.d/lisp/keyfreq.el:Zone.Identifier | 0 .emacs.d/lisp/xah-fly-keys.el:Zone.Identifier | 0 3 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 .emacs.d/lisp/keyfreq.el:Zone.Identifier delete mode 100644 .emacs.d/lisp/xah-fly-keys.el:Zone.Identifier diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index f07a18a..65a5920 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,14 +1,17 @@ -- =================================== -- | General Neovim Configuration | -- =================================== -vim.opt.number = true -- Show line numbers -vim.opt.relativenumber = true -- Show relative line numbers -vim.opt.tabstop = 4 -- A tab is 4 spaces -vim.opt.shiftwidth = 4 -- Indent is 4 spaces -vim.opt.expandtab = true -- Use spaces instead of tabs -vim.opt.termguicolors = true -- Enable terminal colors -vim.opt.scrolloff = 8 -- Lines above/below cursor -vim.opt.signcolumn = "yes" -- Always show the sign column +-- I won't lie to you, I vibecoded the boilerplate for this stuff. +-- Aside from Emacs, I don't really like having to configure my editors +-- very much. Basic understanding of the config is all I really prioritize. +vim.opt.number = true -- Show line numbers +vim.opt.relativenumber = true -- Show relative line numbers +vim.opt.tabstop = 2 -- A tab is 2 spaces +vim.opt.shiftwidth = 2 -- Indent is 2 spaces +vim.opt.expandtab = true -- Use spaces instead of tabs +vim.opt.termguicolors = true -- Enable terminal colors +vim.opt.scrolloff = 8 -- Lines above/below cursor +vim.opt.signcolumn = "yes" -- Always show the sign column -- Set the leader key to space. This is a crucial step for custom mappings. vim.g.mapleader = " " @@ -67,7 +70,6 @@ require("lazy").setup({ -- Treesitter configuration. require("nvim-treesitter.configs").setup({ highlight = { enable = true }, - -- auto_install = false, -- You can specify languages to install with `ensure_installed`. -- e.g., ensure_installed = { "lua", "python", "javascript" }, }) @@ -93,11 +95,30 @@ cmp.setup({ require('mini.pairs').setup({}) -- =================================== --- | Custom Keymaps | +-- | Custom Keymaps | -- =================================== -- Keymaps are custom commands mapped to a specific key combination. -- The "" prefix will be replaced with your leader key, which is "space". +-- Split creation keymaps +vim.keymap.set('n', 'sv', ':vsplit', { desc = 'Create a vertical split' }) +vim.keymap.set('n', 'ss', ':split', { desc = 'Create a horizontal split' }) + +-- Buffer navigation +-- bh/j/k/l to navigate between buffers +vim.keymap.set('n', 'bh', ':bprev', { desc = 'Go to previous buffer' }) +vim.keymap.set('n', 'bl', ':bnext', { desc = 'Go to next buffer' }) +-- The following mappings are less common, but fulfill your request. +vim.keymap.set('n', 'bj', ':bnext', { desc = 'Go to next buffer' }) +vim.keymap.set('n', 'bk', ':bprev', { desc = 'Go to previous buffer' }) + +-- Split navigation +-- sh/j/k/l to move between splits +vim.keymap.set('n', 'sh', 'h', { desc = 'Move to left split' }) +vim.keymap.set('n', 'sj', 'j', { desc = 'Move to split below' }) +vim.keymap.set('n', 'sk', 'k', { desc = 'Move to split above' }) +vim.keymap.set('n', 'sl', 'l', { desc = 'Move to right split' }) + -- Normal mode keymaps -- Save the current file. vim.keymap.set('n', 'w', ':w', { desc = 'Save file' }) @@ -119,5 +140,3 @@ vim.keymap.set('n', 'e', ':NvimTreeToggle', { desc = 'Toggle file tr -- Select the entire file content. vim.keymap.set('n', 'a', 'ggVG', { desc = 'Select entire file' }) - --- You can add more keymaps here as you get more comfortable! diff --git a/.emacs.d/lisp/keyfreq.el:Zone.Identifier b/.emacs.d/lisp/keyfreq.el:Zone.Identifier deleted file mode 100644 index e69de29..0000000 diff --git a/.emacs.d/lisp/xah-fly-keys.el:Zone.Identifier b/.emacs.d/lisp/xah-fly-keys.el:Zone.Identifier deleted file mode 100644 index e69de29..0000000