update
This commit is contained in:
5 files changed
+102
-106
No files matched your search
@@ -1,7 +1,5 @@
|
||||
vim.g.mapleader = " "
|
||||
|
||||
require("nvchad/options")
|
||||
require("nvchad/mappings")
|
||||
require("lua/options")
|
||||
require("lua/mappings")
|
||||
require("lua/autocmds")
|
||||
require("options")
|
||||
require("mappings")
|
||||
require("autocmds")
|
||||
@@ -1,5 +1,46 @@
|
||||
local map = vim.keymap.set
|
||||
|
||||
map("i", "<C-b>", "<ESC>^i", { desc = "move beginning of line" })
|
||||
map("i", "<C-e>", "<End>", { desc = "move end of line" })
|
||||
map("i", "<C-h>", "<Left>", { desc = "move left" })
|
||||
map("i", "<C-l>", "<Right>", { desc = "move right" })
|
||||
map("i", "<C-j>", "<Down>", { desc = "move down" })
|
||||
map("i", "<C-k>", "<Up>", { desc = "move up" })
|
||||
|
||||
map("n", "<C-h>", "<C-w>h", { desc = "switch window left" })
|
||||
map("n", "<C-l>", "<C-w>l", { desc = "switch window right" })
|
||||
map("n", "<C-j>", "<C-w>j", { desc = "switch window down" })
|
||||
map("n", "<C-k>", "<C-w>k", { desc = "switch window up" })
|
||||
|
||||
map("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })
|
||||
|
||||
map("n", "<C-s>", "<cmd>w<CR>", { desc = "general save file" })
|
||||
map("n", "<C-c>", "<cmd>%y+<CR>", { desc = "general copy whole file" })
|
||||
|
||||
map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "toggle line number" })
|
||||
map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "toggle relative number" })
|
||||
|
||||
map({ "n", "x" }, "<leader>fm", function()
|
||||
require("conform").format { lsp_fallback = true }
|
||||
end, { desc = "general format file" })
|
||||
|
||||
-- global lsp mappings
|
||||
map("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "LSP diagnostic loclist" })
|
||||
|
||||
-- Comment
|
||||
map("n", "<leader>/", "gcc", { desc = "toggle comment", remap = true })
|
||||
map("v", "<leader>/", "gc", { desc = "toggle comment", remap = true })
|
||||
|
||||
-- terminal
|
||||
map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
|
||||
|
||||
-- whichkey
|
||||
map("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
|
||||
|
||||
map("n", "<leader>wk", function()
|
||||
vim.cmd("WhichKey " .. vim.fn.input "WhichKey: ")
|
||||
end, { desc = "whichkey query lookup" })
|
||||
|
||||
|
||||
map('v', '<LeftRelease>', '"+ygv"*ygv', { noremap = true })
|
||||
map('v', '<2-LeftRelease>', '"+ygv"*ygv', { noremap = true })
|
||||
@@ -1,4 +1,60 @@
|
||||
-- add yours here!
|
||||
|
||||
local opt = vim.opt
|
||||
local o = vim.o
|
||||
local g = vim.g
|
||||
|
||||
-------------------------------------- options ------------------------------------------
|
||||
o.laststatus = 3
|
||||
o.showmode = false
|
||||
-- o.splitkeep = "screen"
|
||||
|
||||
o.clipboard = "unnamedplus"
|
||||
o.cursorline = true
|
||||
o.cursorlineopt = "number"
|
||||
|
||||
-- Indenting
|
||||
o.expandtab = true
|
||||
o.shiftwidth = 2
|
||||
o.smartindent = true
|
||||
o.tabstop = 2
|
||||
o.softtabstop = 2
|
||||
|
||||
opt.fillchars = { eob = " " }
|
||||
o.ignorecase = true
|
||||
o.smartcase = true
|
||||
o.mouse = "a"
|
||||
|
||||
-- Numbers
|
||||
o.number = true
|
||||
o.numberwidth = 2
|
||||
o.ruler = false
|
||||
|
||||
-- disable nvim intro
|
||||
opt.shortmess:append "sI"
|
||||
|
||||
o.signcolumn = "yes"
|
||||
o.splitbelow = true
|
||||
o.splitright = true
|
||||
o.timeoutlen = 400
|
||||
o.undofile = true
|
||||
|
||||
-- interval for writing swap file to disk, also used by gitsigns
|
||||
o.updatetime = 250
|
||||
|
||||
-- go to previous/next line with h,l,left arrow and right arrow
|
||||
-- when cursor reaches end/beginning of line
|
||||
opt.whichwrap:append "<>[]hl"
|
||||
|
||||
-- disable some default providers
|
||||
g.loaded_node_provider = 0
|
||||
g.loaded_python3_provider = 0
|
||||
g.loaded_perl_provider = 0
|
||||
g.loaded_ruby_provider = 0
|
||||
|
||||
-- add binaries installed by mason.nvim to path
|
||||
local is_windows = vim.fn.has "win32" ~= 0
|
||||
local sep = is_windows and "\\" or "/"
|
||||
local delim = is_windows and ";" or ":"
|
||||
vim.env.PATH = table.concat({ vim.fn.stdpath "data", "mason", "bin" }, sep) .. delim .. vim.env.PATH
|
||||
|
||||
|
||||
o.clipboard = 'unnamed,unnamedplus'
|
||||
@@ -1,42 +0,0 @@
|
||||
local map = vim.keymap.set
|
||||
|
||||
map("i", "<C-b>", "<ESC>^i", { desc = "move beginning of line" })
|
||||
map("i", "<C-e>", "<End>", { desc = "move end of line" })
|
||||
map("i", "<C-h>", "<Left>", { desc = "move left" })
|
||||
map("i", "<C-l>", "<Right>", { desc = "move right" })
|
||||
map("i", "<C-j>", "<Down>", { desc = "move down" })
|
||||
map("i", "<C-k>", "<Up>", { desc = "move up" })
|
||||
|
||||
map("n", "<C-h>", "<C-w>h", { desc = "switch window left" })
|
||||
map("n", "<C-l>", "<C-w>l", { desc = "switch window right" })
|
||||
map("n", "<C-j>", "<C-w>j", { desc = "switch window down" })
|
||||
map("n", "<C-k>", "<C-w>k", { desc = "switch window up" })
|
||||
|
||||
map("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })
|
||||
|
||||
map("n", "<C-s>", "<cmd>w<CR>", { desc = "general save file" })
|
||||
map("n", "<C-c>", "<cmd>%y+<CR>", { desc = "general copy whole file" })
|
||||
|
||||
map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "toggle line number" })
|
||||
map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "toggle relative number" })
|
||||
|
||||
map({ "n", "x" }, "<leader>fm", function()
|
||||
require("conform").format { lsp_fallback = true }
|
||||
end, { desc = "general format file" })
|
||||
|
||||
-- global lsp mappings
|
||||
map("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "LSP diagnostic loclist" })
|
||||
|
||||
-- Comment
|
||||
map("n", "<leader>/", "gcc", { desc = "toggle comment", remap = true })
|
||||
map("v", "<leader>/", "gc", { desc = "toggle comment", remap = true })
|
||||
|
||||
-- terminal
|
||||
map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
|
||||
|
||||
-- whichkey
|
||||
map("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
|
||||
|
||||
map("n", "<leader>wk", function()
|
||||
vim.cmd("WhichKey " .. vim.fn.input "WhichKey: ")
|
||||
end, { desc = "whichkey query lookup" })
|
||||
@@ -1,57 +0,0 @@
|
||||
local opt = vim.opt
|
||||
local o = vim.o
|
||||
local g = vim.g
|
||||
|
||||
-------------------------------------- options ------------------------------------------
|
||||
o.laststatus = 3
|
||||
o.showmode = false
|
||||
o.splitkeep = "screen"
|
||||
|
||||
o.clipboard = "unnamedplus"
|
||||
o.cursorline = true
|
||||
o.cursorlineopt = "number"
|
||||
|
||||
-- Indenting
|
||||
o.expandtab = true
|
||||
o.shiftwidth = 2
|
||||
o.smartindent = true
|
||||
o.tabstop = 2
|
||||
o.softtabstop = 2
|
||||
|
||||
opt.fillchars = { eob = " " }
|
||||
o.ignorecase = true
|
||||
o.smartcase = true
|
||||
o.mouse = "a"
|
||||
|
||||
-- Numbers
|
||||
o.number = true
|
||||
o.numberwidth = 2
|
||||
o.ruler = false
|
||||
|
||||
-- disable nvim intro
|
||||
opt.shortmess:append "sI"
|
||||
|
||||
o.signcolumn = "yes"
|
||||
o.splitbelow = true
|
||||
o.splitright = true
|
||||
o.timeoutlen = 400
|
||||
o.undofile = true
|
||||
|
||||
-- interval for writing swap file to disk, also used by gitsigns
|
||||
o.updatetime = 250
|
||||
|
||||
-- go to previous/next line with h,l,left arrow and right arrow
|
||||
-- when cursor reaches end/beginning of line
|
||||
opt.whichwrap:append "<>[]hl"
|
||||
|
||||
-- disable some default providers
|
||||
g.loaded_node_provider = 0
|
||||
g.loaded_python3_provider = 0
|
||||
g.loaded_perl_provider = 0
|
||||
g.loaded_ruby_provider = 0
|
||||
|
||||
-- add binaries installed by mason.nvim to path
|
||||
local is_windows = vim.fn.has "win32" ~= 0
|
||||
local sep = is_windows and "\\" or "/"
|
||||
local delim = is_windows and ";" or ":"
|
||||
vim.env.PATH = table.concat({ vim.fn.stdpath "data", "mason", "bin" }, sep) .. delim .. vim.env.PATH
|
||||
Reference in new issue
Block a user