Skip to content

Commit

Permalink
[nvim] fix nvim plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
@nomutin
nomutin committed Jul 26, 2024
1 parent 4bcbf6c commit 9a0d168
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 116 deletions.
11 changes: 7 additions & 4 deletions xdg_config/mise/config.toml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[tools]
jq = "latest"
lazygit = "latest"
neovim = "nightly"
node = "20"
ripgrep = "latest"
neovim = "nightly"
zellij = "latest"
rust = "latest"
rye = "latest"
jq = "latest"
lazygit = "latest"
shfmt = "latest"
stylua = "latest"
zellij = "latest"
164 changes: 52 additions & 112 deletions xdg_config/nvim/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@
-- ====== OPTIONS ======
vim.loader.enable()
vim.g.mapleader = " "
vim.g.netrw_banner = 0
vim.g.netrw_liststyle = 3
vim.g.netrw_browse_split = 4
vim.g.showhide = 1
vim.g.netrw_altv = 1
vim.g.netrw_winsize = -28
vim.g.netrw_keepdir = 1
vim.opt.title = true
vim.opt.termguicolors = true
vim.opt.clipboard = "unnamedplus"
vim.opt.completeopt = { "menuone", "noselect", "popup"}
vim.opt.completeopt = { "menuone", "noselect" }
vim.opt.ignorecase = true
vim.opt.pumheight = 10
vim.opt.showtabline = 2
Expand All @@ -22,128 +29,61 @@ vim.opt.scrolloff = 8
vim.opt.sidescrolloff = 8
vim.opt.laststatus = 3
vim.opt.list = true

-- ====== KEYMAP ======
vim.keymap.set("i", "jk", "<ESC>", { desc = "Restore from insert mode" })
vim.keymap.set("t", "fd", [[<C-\><C-n>]], { desc = "Restore from terminal mode" })
vim.keymap.set("n", "<leader>n", ":Lexplore<CR>", { desc = "Open Netrw" })

-- ====== NETRW ======
vim.g.netrw_banner = 0
vim.g.netrw_liststyle = 3
vim.g.netrw_showhide = 1
vim.g.netrw_browse_split = 4
vim.g.netrw_altv = 1
vim.g.netrw_winsize = -28
vim.g.netrw_keepdir = 1

-- ====== COLORS ======
vim.api.nvim_set_hl(0, "Function", { fg = "NvimLightBlue" })
vim.api.nvim_set_hl(0, "Identifier", { fg = "NvimLightBlue" })
vim.api.nvim_set_hl(0, "Constant", { fg = "NvimLightCyan" })
vim.api.nvim_set_hl(0, "Statement", { fg = "NvimLightBlue", bold = true })
vim.api.nvim_set_hl(0, "Special", { link = "Constant" })
vim.api.nvim_set_hl(0, "@string.documentation", { fg = "NvimLightGreen", bold = true })
vim.api.nvim_set_hl(0, "@variable.parameter", { fg = "NvimLightCyan", italic = true })

-- ====== Git Gutter ======
local function place_signs(name, start, lines, buffer)
for lnum = start, start + lines - 1 do
vim.fn.sign_place(0, '', name, buffer, { lnum = lnum })
end
end

local function put_signs(diff)
local _, old_lines, new_start, new_lines = unpack(diff)
local buffer = vim.api.nvim_get_current_buf()
if old_lines == 0 then
place_signs('HunkSignAdd', new_start, new_lines, buffer)
elseif new_lines == 0 then
place_signs('HunkSignDel', new_start, old_lines, buffer)
else
place_signs('HunkSignUpd', new_start, math.min(old_lines, new_lines), buffer)
place_signs('HunkSignDel', new_start + new_lines, old_lines - new_lines, buffer)
place_signs('HunkSignAdd', new_start + old_lines, new_lines - old_lines, buffer)
end
end

local function show_hunk()
vim.fn.sign_define('HunkSignAdd', { text = '+', texthl = 'DiffAdd' })
vim.fn.sign_define('HunkSignDel', { text = '-', texthl = "DiffDelete" })
vim.fn.sign_define('HunkSignUpd', { text = '~', texthl = "DiffChange" })
local cmd = 'git --no-pager diff -U0 --no-color --no-ext-diff ' .. vim.fn.expand('%')
.. ' | grep "^@@" '
.. ' | sed -r "s/[-+]([0-9]+) /\\1,1,/g" '
.. ' | sed -r "s/^[-@ ]*([0-9]+,[0-9]+)[ ,+]+([0-9]+,[0-9]+)[, ].*/\\1,\\2/"'
local output = vim.fn.systemlist(cmd)
for _, line in ipairs(output) do
put_signs(vim.split(line, ','))
end
end
vim.api.nvim_create_autocmd( {"BufReadPost", "BufWritePost"}, { callback = show_hunk })

-- ====== COMPLETION ======
vim.api.nvim_create_autocmd("LspAttach", {
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client and client.supports_method('textDocument/completion') then
vim.lsp.completion.enable(true, client.id, args.buf, { autotrigger = true })
end
local function trigger_completion_and_insert_space()
vim.lsp.completion.trigger()
vim.api.nvim_feedkeys(" ", "n", true)
end
vim.keymap.set("i", " ", trigger_completion_and_insert_space)
vim.keymap.set("i", "<C-j>", vim.lsp.completion.trigger )
end,
})
-- ====== KEYMAP ======
vim.keymap.set("i", "jk", "<ESC>", { desc = "Return to normal mode" })
vim.keymap.set("t", "fd", [[<C-\><C-n>]], { desc = "Return to normal mode" })
vim.keymap.set("n", "<leader>n", "<cmd>Lexplore<cr>", { desc = "Open file explorer" })
vim.keymap.set("n", "<leader>e", "<cmd>Telescope find_files<cr>", { desc = "Find files" })
vim.keymap.set({ "n", "x", "o" }, "s", "<cmd>lua require('flash').jump()<cr>", { desc = "Jump" })
vim.keymap.set({ "n", "x", "o" }, "S", "<cmd>lua require('flash').treesitter()<cr>", { desc = "Select" })

-- ====== PLUGIN ======
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
if not vim.loop.fs_stat(lazypath) then
vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
end
vim.opt.runtimepath:prepend(lazypath)
vim.opt.rtp:prepend(lazypath)

require("lazy").setup({
defaults = { lazy = true },
spec = {
{ "github/copilot.vim", event = "BufRead" },
{
"folke/flash.nvim",
keys = {
{ "s", mode = { "n", "x", "o" }, "<cmd>lua require('flash').jump()<cr>" },
{ "S", mode = { "n", "x", "o" }, "<cmd>lua require('flash').treesitter()<cr>" },
},
},
{ "nvim-lualine/lualine.nvim", event = "BufRead", opts = {} },
{
"nvim-lspconfig",
event = "BufRead",
config = function()
local server_names = {
"bashls", "biome", "cssls", "dockerls", "html", "jsonls", "luals",
"marksman", "pyright", "ruff", "rust_analyzer", "taplo", "tsserver", "yamlls",
}
for _, server_name in ipairs(server_names) do
require("lspconfig")[server_name].setup({})
end
end,
},
{
"nvim-treesitter/nvim-treesitter",
event = "BufRead",
main = "nvim-treesitter.configs",
opts = { highlight = { enable = true }, indent = { enable = true } },
},
{
"nvim-telescope/telescope.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
keys = {
{"<leader>ff", mode = "n", "<cmd>Telescope find_files<cr>" },
{"<leader>fg", mode = "n", "<cmd>Telescope live_grep<cr>" },
},
{ "github/copilot.vim", event = "BufRead" },
{ "folke/flash.nvim" },
{ "lewis6991/gitsigns.nvim", event = "BufRead", opts = {} },
{ "nvim-lualine/lualine.nvim", event = "BufRead", opts = {} },
{
"williamboman/mason.nvim",
event = "BufRead",
dependencies = {
"williamboman/mason-lspconfig.nvim",
"neovim/nvim-lspconfig",
"hrsh7th/nvim-cmp",
"hrsh7th/cmp-nvim-lsp",
},
config = function()
require("mason").setup()
require("mason-lspconfig").setup()
require("mason-lspconfig").setup_handlers({
function(server_name)
require("lspconfig")[server_name].setup({
capabilities = require("cmp_nvim_lsp").default_capabilities(),
})
end,
})
local cmp = require("cmp")
cmp.setup({
mapping = cmp.mapping.preset.insert({}),
sources = cmp.config.sources({ { name = "nvim_lsp" } }),
})
end,
},
{
"nvim-treesitter/nvim-treesitter",
event = "BufRead",
main = "nvim-treesitter.configs",
opts = { highlight = { enable = true }, indent = { enable = true } },
},
{ "nvim-telescope/telescope.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
defaults = { lazy = true },
})

0 comments on commit 9a0d168

Please sign in to comment.