mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-02-04 16:41:43 +05:30
- Nvim Theme changed to github-dark-dimmed - keeps it in sync with the kitty theme
- Reorged multiple nvim settings (using LazyVim as primary now)
This commit is contained in:
Pratik Tripathy
3
common/.config/nvim/lua/config/autocmds.lua
Normal file
3
common/.config/nvim/lua/config/autocmds.lua
Normal file
@@ -0,0 +1,3 @@
|
||||
-- Autocmds are automatically loaded on the VeryLazy event
|
||||
-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
|
||||
-- Add any additional autocmds here
|
||||
132
common/.config/nvim/lua/config/keymaps.lua
Normal file
132
common/.config/nvim/lua/config/keymaps.lua
Normal file
@@ -0,0 +1,132 @@
|
||||
-- Keymaps are automatically loaded on the VeryLazy event
|
||||
-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
|
||||
-- Add any additional keymaps here
|
||||
|
||||
-- Load Keybindings from VIM
|
||||
local vim_mappings = os.getenv("HOME") .. "/.vim/key_maps.vim"
|
||||
if vim.loop.fs_stat(vim_mappings) then
|
||||
vim.cmd("source " .. vim_mappings)
|
||||
end
|
||||
|
||||
-- Delete Lazyvim.keymap that I don't like
|
||||
vim.keymap.del("n", "<S-h>")
|
||||
vim.keymap.del("n", "<S-l>")
|
||||
vim.keymap.del("n", "[b")
|
||||
vim.keymap.del("n", "]b")
|
||||
vim.keymap.del("n", "<leader>bb")
|
||||
vim.keymap.del("n", "<leader>,")
|
||||
vim.keymap.del("n", "<leader>`")
|
||||
vim.keymap.del("n", "<leader>qq")
|
||||
vim.keymap.del("n", "<leader>cd")
|
||||
vim.keymap.del("n", "<leader>l")
|
||||
vim.keymap.del("i", ",")
|
||||
vim.keymap.del("i", ".")
|
||||
vim.keymap.del("i", ";")
|
||||
vim.keymap.del("n", "<leader>ur")
|
||||
vim.keymap.del("n", "<leader>ww")
|
||||
vim.keymap.del("n", "<leader>wd")
|
||||
vim.keymap.del("n", "<leader>w-")
|
||||
vim.keymap.del("n", "<leader>w|")
|
||||
vim.keymap.del("n", "<leader>-")
|
||||
vim.keymap.del("n", "<leader>|")
|
||||
vim.keymap.del("n", "<leader><tab>l")
|
||||
vim.keymap.del("n", "<leader><tab>f")
|
||||
vim.keymap.del("n", "<leader><tab><tab>")
|
||||
vim.keymap.del("n", "<leader><tab>]")
|
||||
vim.keymap.del("n", "<leader><tab>d")
|
||||
vim.keymap.del("n", "<leader><tab>[")
|
||||
|
||||
vim.keymap.set({ "n" }, "<C-c>", "<cmd> %y+ <CR>", { desc = "Copy entire content of the current buffer" })
|
||||
vim.keymap.set("n", "<leader>fn", "<cmd>enew<CR>", { desc = "Create new file/buffer" })
|
||||
|
||||
-- Following are copied from LazyVim - will use them elsewhere as well
|
||||
-----------------------------------------------------------------------
|
||||
-- Better up/down
|
||||
vim.keymap.set({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||
vim.keymap.set({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||
|
||||
-- Move to window using the <ctrl> hjkl keys
|
||||
vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Go to left window", remap = true })
|
||||
vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Go to lower window", remap = true })
|
||||
vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Go to upper window", remap = true })
|
||||
vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Go to right window", remap = true })
|
||||
|
||||
-- Resize window using <ctrl> arrow keys
|
||||
vim.keymap.set("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
|
||||
vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
|
||||
vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
|
||||
vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
|
||||
|
||||
-- Move Lines
|
||||
vim.keymap.set("n", "<A-j>", "<cmd>m .+1<cr>==", { desc = "Move line down" })
|
||||
vim.keymap.set("n", "<A-k>", "<cmd>m .-2<cr>==", { desc = "Move line up" })
|
||||
vim.keymap.set("v", "<A-j>", ":m '>+1<cr>gv=gv", { desc = "Move line down" })
|
||||
vim.keymap.set("v", "<A-k>", ":m '<-2<cr>gv=gv", { desc = "Move line up" })
|
||||
|
||||
-- Traverse Buffer
|
||||
vim.keymap.set("n", "<Tab>", "<cmd>bnext<CR>", { desc = "Switch to next buffer" })
|
||||
vim.keymap.set("n", "<S-Tab>", "<cmd>bprevious<CR>", { desc = "Switch to previous buffer" })
|
||||
|
||||
-- Save file
|
||||
vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
|
||||
vim.keymap.set({ "i", "x", "n", "s" }, "<C-q>", "<cmd>wqa<cr><esc>", { desc = "Save all files and Quit Neovim" })
|
||||
|
||||
-- Traverse quickfix
|
||||
vim.keymap.set("n", "[q", vim.cmd.cprev, { desc = "Previous quickfix" })
|
||||
vim.keymap.set("n", "]q", vim.cmd.cnext, { desc = "Next quickfix" })
|
||||
|
||||
-- Clear search with <esc>
|
||||
vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
|
||||
|
||||
vim.keymap.set("n", "n", "'Nn'[v:searchforward].'zv'", { expr = true, desc = "Next search result" })
|
||||
vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
||||
vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
||||
vim.keymap.set("n", "N", "'nN'[v:searchforward].'zv'", { expr = true, desc = "Prev search result" })
|
||||
vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
||||
vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
||||
|
||||
-- Clear search, diff update and redraw
|
||||
vim.keymap.set(
|
||||
"n",
|
||||
"<leader>/",
|
||||
"<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
|
||||
{ desc = "Redraw / clear hlsearch / diff update" }
|
||||
)
|
||||
|
||||
-- TODO: Remember the default keymaps that are difficult to change right now
|
||||
-- https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
|
||||
--
|
||||
-- map("n", "<leader>xl", "<cmd>lopen<cr>", { desc = "Location List" })
|
||||
-- map("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" })
|
||||
-- map({ "n", "v" }, "<leader>cf", function() Util.format({ force = true }) end, { desc = "Format" })
|
||||
-- map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
|
||||
-- map("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
|
||||
-- map("n", "[d", diagnostic_goto(false), { desc = "Prev Diagnostic" })
|
||||
-- map("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error" })
|
||||
-- map("n", "[e", diagnostic_goto(false, "ERROR"), { desc = "Prev Error" })
|
||||
-- map("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
|
||||
-- map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
|
||||
-- map("n", "<leader>uf", function() Util.format.toggle() end, { desc = "Toggle auto format (global)" })
|
||||
-- map("n", "<leader>uF", function() Util.format.toggle(true) end, { desc = "Toggle auto format (buffer)" })
|
||||
-- map("n", "<leader>us", function() Util.toggle("spell") end, { desc = "Toggle Spelling" })
|
||||
-- map("n", "<leader>uw", function() Util.toggle("wrap") end, { desc = "Toggle Word Wrap" })
|
||||
-- map("n", "<leader>uL", function() Util.toggle("relativenumber") end, { desc = "Toggle Relative Line Numbers" })
|
||||
-- map("n", "<leader>ul", function() Util.toggle.number() end, { desc = "Toggle Line Numbers" })
|
||||
-- map("n", "<leader>ud", function() Util.toggle.diagnostics() end, { desc = "Toggle Diagnostics" })
|
||||
-- map("n", "<leader>uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" })
|
||||
-- map( "n", "<leader>uh", function() Util.toggle.inlay_hints() end, { desc = "Toggle Inlay Hints" })
|
||||
-- map("n", "<leader>uT", function() if vim.b.ts_highlight then vim.treesitter.stop() else vim.treesitter.start() end end, { desc = "Toggle Treesitter Highlight" })
|
||||
-- map("n", "<leader>gg", function() Util.terminal({ "lazygit" }, { cwd = Util.root(), esc_esc = false, ctrl_hjkl = false }) end, { desc = "Lazygit (root dir)" })
|
||||
-- map("n", "<leader>gG", function() Util.terminal({ "lazygit" }, {esc_esc = false, ctrl_hjkl = false}) end, { desc = "Lazygit (cwd)" })
|
||||
-- map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
|
||||
-- map("n", "<leader>ft", lazyterm, { desc = "Terminal (root dir)" })
|
||||
-- map("n", "<leader>fT", function() Util.terminal() end, { desc = "Terminal (cwd)" })
|
||||
-- map("n", "<c-/>", lazyterm, { desc = "Terminal (root dir)" })
|
||||
-- map("n", "<c-_>", lazyterm, { desc = "which_key_ignore" })
|
||||
-- map("t", "<esc><esc>", "<c-\\><c-n>", { desc = "Enter Normal Mode" })
|
||||
-- map("t", "<C-h>", "<cmd>wincmd h<cr>", { desc = "Go to left window" })
|
||||
-- map("t", "<C-j>", "<cmd>wincmd j<cr>", { desc = "Go to lower window" })
|
||||
-- map("t", "<C-k>", "<cmd>wincmd k<cr>", { desc = "Go to upper window" })
|
||||
-- map("t", "<C-l>", "<cmd>wincmd l<cr>", { desc = "Go to right window" })
|
||||
-- map("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" })
|
||||
-- map("t", "<c-_>", "<cmd>close<cr>", { desc = "which_key_ignore" })
|
||||
50
common/.config/nvim/lua/config/lazy.lua
Normal file
50
common/.config/nvim/lua/config/lazy.lua
Normal file
@@ -0,0 +1,50 @@
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
-- bootstrap lazy.nvim
|
||||
-- stylua: ignore
|
||||
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
|
||||
end
|
||||
vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
|
||||
|
||||
require("lazy").setup({
|
||||
change_detection = {
|
||||
enabled = true,
|
||||
notify = false,
|
||||
},
|
||||
spec = {
|
||||
-- add LazyVim and import its plugins
|
||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||
-- import any extras modules here
|
||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
|
||||
-- import/override with your plugins
|
||||
{ import = "plugins" },
|
||||
},
|
||||
defaults = {
|
||||
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
|
||||
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
|
||||
lazy = false,
|
||||
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
|
||||
-- have outdated releases, which may break your Neovim install.
|
||||
version = false, -- always use the latest git commit
|
||||
-- version = "*", -- try installing the latest stable version for plugins that support semver
|
||||
},
|
||||
install = { colorscheme = { "tokyonight" } },
|
||||
--checker = { enabled = true }, -- automatically check for plugin updates
|
||||
performance = {
|
||||
rtp = {
|
||||
-- disable some rtp plugins
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
"matchit",
|
||||
"matchparen",
|
||||
"netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"tutor",
|
||||
"zipPlugin",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
15
common/.config/nvim/lua/config/options.lua
Normal file
15
common/.config/nvim/lua/config/options.lua
Normal file
@@ -0,0 +1,15 @@
|
||||
-- Options are automatically loaded before lazy.nvim startup
|
||||
-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
|
||||
-- Add any additional options here
|
||||
|
||||
-- Load configs from VIM
|
||||
local vim_configs = os.getenv("HOME") .. "/.vim/configs.vim"
|
||||
if vim.loop.fs_stat(vim_configs) then
|
||||
vim.cmd("source " .. vim_configs)
|
||||
end
|
||||
|
||||
vim.opt.undodir = vim.fn.stdpath("config") .. "/undo"
|
||||
vim.opt.backupdir = vim.fn.stdpath("config") .. "/backup/"
|
||||
|
||||
vim.opt.wrap = true
|
||||
vim.opt.cursorline = true
|
||||
Reference in New Issue
Block a user