diff options
Diffstat (limited to '.config/nvim/lua/config')
| -rw-r--r-- | .config/nvim/lua/config/colemak.lua | 32 | ||||
| -rw-r--r-- | .config/nvim/lua/config/keymaps.lua | 53 | ||||
| -rw-r--r-- | .config/nvim/lua/config/options.lua | 107 |
3 files changed, 0 insertions, 192 deletions
diff --git a/.config/nvim/lua/config/colemak.lua b/.config/nvim/lua/config/colemak.lua deleted file mode 100644 index e6ce33b..0000000 --- a/.config/nvim/lua/config/colemak.lua +++ /dev/null @@ -1,32 +0,0 @@ -local function map(mode, lhs, rhs, opts) - local options = { noremap = true, silent = true } - if opts then - options = vim.tbl_extend("force", options, opts) - end - vim.keymap.set(mode, lhs, rhs, options) -end - -map("", "n", "j") -map("", "e", "k") -map("", "i", "l") -map("", "j", "n") -map("", "k", "e") -map("", "l", "i") -map("", "K", "E") -map("", "N", "J") -map("", "E", "K") -- As in 'Explore' documentation -map("", "L", "I") -map("", "I", "L") -map("", "J", "N") - -map("n", "<c-w>h", "<c-w>h") -map("n", "<c-w>n", "<c-w>j") -map("n", "<c-w>e", "<c-w>k") -map("n", "<C-w>i", "<c-w>l") - -map ("", "gn", "gj") -map ("", "ge", "gk") - --- Kakoune Holdover -map ("", "gh", "0") -map ("", "gi", "$") diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua deleted file mode 100644 index f30283e..0000000 --- a/.config/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,53 +0,0 @@ -vim.g.mapleader = " " -vim.keymap.set("n", "<leader>bk", vim.cmd.bdelete, - { desc = "Kill Buffer" }) -vim.keymap.set("n", "<leader>bn", vim.cmd.bnext, - { desc = "Next Buffer" }) -vim.keymap.set("n", "<leader>bp", vim.cmd.bprev, - { desc = "Previous Buffer" }) - -vim.keymap.set("n", "E", vim.lsp.buf.hover) -vim.keymap.set("n", "<C-e>", vim.diagnostic.open_float) -vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition, - { desc = "Go to Definition" }) -vim.keymap.set("n", "<leader>lt", vim.lsp.buf.type_definition, - { desc = "Go to Type Definition"} ) -vim.keymap.set("n", "<leader>li", vim.lsp.buf.implementation, - { desc = "Go to Implementation" }) -vim.keymap.set("n", "<leader>la", vim.lsp.buf.code_action, - { desc = "Show Code Actions" }) -vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, - { desc = "Format Document" }) -vim.keymap.set("n", "<leader>lr", vim.lsp.buf.rename, - { desc = "Rename" }) -vim.keymap.set("n", "<leader>le", function() - vim.diagnostic.jump({ count = 1, float = true }) -end, - { desc = "Next Error" }) --- vim.keymap.set("n", "<leader>lh", vim.lsp.buf.hover, --- { desc = "Hover Diagnostics" }) - -vim.keymap.set("n", "<leader>wh", vim.cmd.split, - { desc = "Split Window Horizontally" }) -vim.keymap.set("n", "<leader>wv", vim.cmd.vsplit, - { desc = "Split Window Vertically" }) -vim.keymap.set("n", "<leader>wc", "<C-w>q", - { desc = "Close Window" }) -vim.keymap.set("n", "<leader>ww", "<C-w>w", - { desc = "Next Window" }) - -vim.keymap.set("n", "<leader>foc", function() - vim.cmd('edit ~/.config/nvim/init.lua') -end, { desc = "Open Config File" }) - -vim.keymap.set("n", "<leader>fot", function() - vim.cmd('edit ~/Documents/TODO.org') -end, { desc = "Open Todo File" }) - -vim.keymap.set("n", "<leader>fon", function() - vim.cmd('edit ~/Documents/Notes.org') -end, { desc = "Open Notes File" }) - -vim.keymap.set('n', '<Tab>', '==', { noremap = true, silent = true }) - -vim.keymap.set('n', 'q:', ':q<CR>', { noremap = true }) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua deleted file mode 100644 index 559f4c7..0000000 --- a/.config/nvim/lua/config/options.lua +++ /dev/null @@ -1,107 +0,0 @@ -vim.opt.nu = true -vim.opt.rnu = true - -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 -vim.opt.expandtab = true -vim.opt.autoindent = true - -vim.opt.smartindent = true - -vim.opt.wrap = false - -vim.opt.swapfile = false -vim.opt.backup = false -vim.opt.undodir = os.getenv("HOME") .. "/.nvim/undodir" -vim.opt.undofile = true - -vim.opt.hlsearch = false -vim.opt.incsearch = true - -vim.opt.termguicolors = true - -vim.opt.scrolloff = 12 - -vim.opt.updatetime = 50 - -vim.opt.splitbelow = true -vim.opt.splitright = true - -vim.opt.encoding = "utf-8" - -vim.opt.shell = "bash" - -vim.opt.mouse = "a" - -vim.opt.ignorecase = true -vim.opt.smartcase = true -vim.opt.incsearch = true - --- vim.opt.cursorline = true - -vim.opt.title = true - -vim.opt.clipboard = "unnamedplus" - -vim.opt.colorcolumn = "80" - -vim.opt.signcolumn = 'no' - -vim.cmd "set showtabline=0 | set laststatus=0" - -vim.wo.fillchars='eob: ' - -vim.opt.conceallevel = 3 - --- Window Borders -vim.o.winborder = 'single' - --- Remove Whitespaces on File Save -vim.api.nvim_create_autocmd({ "BufWritePre" }, { - pattern = { "*" }, - command = [[%s/\s\+$//e]], -}) - --- Define highlight groups for line numbers with diagnostics -vim.api.nvim_set_hl(0, "LineNrDiagnosticError", { bg = "#3f1d1d", fg = "#ff6c6b" }) -vim.api.nvim_set_hl(0, "LineNrDiagnosticWarn", { bg = "#3f311d", fg = "#ECBE7B" }) -vim.api.nvim_set_hl(0, "LineNrDiagnosticInfo", { bg = "#1d2d3f", fg = "#51afef" }) -vim.api.nvim_set_hl(0, "LineNrDiagnosticHint", { bg = "#1d3f2d", fg = "#98be65" }) - -local function set_line_number_highlight() - -- Clear existing highlights - vim.fn.sign_unplace("LineNrDiagnostics") - - -- Get diagnostics per buffer - for _, diag in ipairs(vim.diagnostic.get(0)) do - local hl_group = nil - if diag.severity == vim.diagnostic.severity.ERROR then - hl_group = "LineNrDiagnosticError" - elseif diag.severity == vim.diagnostic.severity.WARN then - hl_group = "LineNrDiagnosticWarn" - elseif diag.severity == vim.diagnostic.severity.INFO then - hl_group = "LineNrDiagnosticInfo" - elseif diag.severity == vim.diagnostic.severity.HINT then - hl_group = "LineNrDiagnosticHint" - end - - if hl_group then - vim.fn.sign_place(0, "LineNrDiagnostics", hl_group, vim.api.nvim_get_current_buf(), { - lnum = diag.lnum + 1, -- diagnostics are 0-indexed - priority = 10, - }) - end - end -end - --- Create the sign definitions -vim.fn.sign_define("LineNrDiagnosticError", { text = "", texthl = "LineNrDiagnosticError", numhl = "LineNrDiagnosticError" }) -vim.fn.sign_define("LineNrDiagnosticWarn", { text = "", texthl = "LineNrDiagnosticWarn", numhl = "LineNrDiagnosticWarn" }) -vim.fn.sign_define("LineNrDiagnosticInfo", { text = "", texthl = "LineNrDiagnosticInfo", numhl = "LineNrDiagnosticInfo" }) -vim.fn.sign_define("LineNrDiagnosticHint", { text = "", texthl = "LineNrDiagnosticHint", numhl = "LineNrDiagnosticHint" }) - --- Update line numbers when diagnostics change -vim.api.nvim_create_autocmd({ "DiagnosticChanged", "BufEnter", "CursorHold" }, { - callback = set_line_number_highlight, -}) |
