From 30620d5b2c35c211216015d1c59363dd28556fdc Mon Sep 17 00:00:00 2001 From: xHyroM Date: Tue, 15 Aug 2023 23:08:10 +0200 Subject: [PATCH] nvim cfg still wip, primeagen thx --- .config/nvim/after/plugin/catppuccin.lua | 8 ++ .config/nvim/after/plugin/fugitive.lua | 1 + .config/nvim/after/plugin/harpoon.lua | 10 ++ .config/nvim/after/plugin/lsp.lua | 61 ++++++++ .config/nvim/after/plugin/telescope.lua | 12 ++ .config/nvim/after/plugin/treesitter.lua | 21 +++ .config/nvim/after/plugin/undotree.lua | 1 + .config/nvim/init.lua | 1 + .config/nvim/lua/hyrik/init.lua | 2 + .config/nvim/lua/hyrik/packer.lua | 43 ++++++ .config/nvim/lua/hyrik/remap.lua | 16 +++ .config/nvim/lua/hyrik/set.lua | 28 ++++ .config/nvim/plugin/packer_compiled.lua | 174 +++++++++++++++++++++++ 13 files changed, 378 insertions(+) create mode 100644 .config/nvim/after/plugin/catppuccin.lua create mode 100644 .config/nvim/after/plugin/fugitive.lua create mode 100644 .config/nvim/after/plugin/harpoon.lua create mode 100644 .config/nvim/after/plugin/lsp.lua create mode 100644 .config/nvim/after/plugin/telescope.lua create mode 100644 .config/nvim/after/plugin/treesitter.lua create mode 100644 .config/nvim/after/plugin/undotree.lua create mode 100644 .config/nvim/init.lua create mode 100644 .config/nvim/lua/hyrik/init.lua create mode 100644 .config/nvim/lua/hyrik/packer.lua create mode 100644 .config/nvim/lua/hyrik/remap.lua create mode 100644 .config/nvim/lua/hyrik/set.lua create mode 100644 .config/nvim/plugin/packer_compiled.lua diff --git a/.config/nvim/after/plugin/catppuccin.lua b/.config/nvim/after/plugin/catppuccin.lua new file mode 100644 index 0000000..3677e86 --- /dev/null +++ b/.config/nvim/after/plugin/catppuccin.lua @@ -0,0 +1,8 @@ +require("catppuccin").setup { + background = { + light = "mocha", + dark = "mocha" + } +} + +vim.cmd.colorscheme "catppuccin" diff --git a/.config/nvim/after/plugin/fugitive.lua b/.config/nvim/after/plugin/fugitive.lua new file mode 100644 index 0000000..80c9070 --- /dev/null +++ b/.config/nvim/after/plugin/fugitive.lua @@ -0,0 +1 @@ +vim.keymap.set("n", "gs", vim.cmd.Git) diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua new file mode 100644 index 0000000..a425bb1 --- /dev/null +++ b/.config/nvim/after/plugin/harpoon.lua @@ -0,0 +1,10 @@ +local mark = require "harpoon.mark" +local ui = require "harpoon.ui" + +vim.keymap.set("n", "a", mark.add_file) +vim.keymap.set("n", "", ui.toggle_quick_menu) + +vim.keymap.set("n", "", function() ui.nav_file(1) end) +vim.keymap.set("n", "", function() ui.nav_file(2) end) +vim.keymap.set("n", "", function() ui.nav_file(3) end) +vim.keymap.set("n", "", function() ui.nav_file(4) end) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua new file mode 100644 index 0000000..530ed0d --- /dev/null +++ b/.config/nvim/after/plugin/lsp.lua @@ -0,0 +1,61 @@ +local lsp = require("lsp-zero") + +lsp.preset("recommended") + +lsp.ensure_installed({ + "zls", + "lua_ls", + "cmake", + "rust_analyzer", +}) + +-- Fix Undefined global "vim" +lsp.nvim_workspace() + + +local cmp = require("cmp") +local cmp_select = {behavior = cmp.SelectBehavior.Select} +local cmp_mappings = lsp.defaults.cmp_mappings({ + [""] = cmp.mapping.select_prev_item(cmp_select), + [""] = cmp.mapping.select_next_item(cmp_select), + [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete(), +}) + +cmp_mappings[""] = nil +cmp_mappings[""] = nil + +lsp.setup_nvim_cmp({ + mapping = cmp_mappings +}) + +lsp.set_preferences({ + suggest_lsp_servers = false, + sign_icons = { + error = "E", + warn = "W", + hint = "H", + info = "I" + } +}) + +lsp.on_attach(function(client, bufnr) + local opts = {buffer = bufnr, remap = false} + + vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) + vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) + vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) + vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) + vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) + vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) + vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) + vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) +end) + +lsp.setup() + +vim.diagnostic.config({ + virtual_text = true +}) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua new file mode 100644 index 0000000..4d360a8 --- /dev/null +++ b/.config/nvim/after/plugin/telescope.lua @@ -0,0 +1,12 @@ +local builtin = require("telescope.builtin") + +-- find files +vim.keymap.set("n", "pf", builtin.find_files, {}) + +-- git files +vim.keymap.set("n", "", builtin.git_files, {}) + +-- project search +vim.keymap.set("n", "ps", function() + builtin.grep_string({ search = vim.fn.input("Grep > ") }) +end) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua new file mode 100644 index 0000000..9905445 --- /dev/null +++ b/.config/nvim/after/plugin/treesitter.lua @@ -0,0 +1,21 @@ +require("nvim-treesitter.configs").setup { + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "vimdoc", "javascript", "typescript", "java", "zig", "c", "lua" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + highlight = { + enable = true, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +} diff --git a/.config/nvim/after/plugin/undotree.lua b/.config/nvim/after/plugin/undotree.lua new file mode 100644 index 0000000..b6b9276 --- /dev/null +++ b/.config/nvim/after/plugin/undotree.lua @@ -0,0 +1 @@ +vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..6196b91 --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1 @@ +require "hyrik" diff --git a/.config/nvim/lua/hyrik/init.lua b/.config/nvim/lua/hyrik/init.lua new file mode 100644 index 0000000..ede2b48 --- /dev/null +++ b/.config/nvim/lua/hyrik/init.lua @@ -0,0 +1,2 @@ +require "hyrik.remap" +require "hyrik.set" diff --git a/.config/nvim/lua/hyrik/packer.lua b/.config/nvim/lua/hyrik/packer.lua new file mode 100644 index 0000000..b81e883 --- /dev/null +++ b/.config/nvim/lua/hyrik/packer.lua @@ -0,0 +1,43 @@ +-- This file can be loaded by calling `lua require("plugins")` from your init.vim + +-- Only required if you have packer configured as `opt` +vim.cmd [[packadd packer.nvim]] + +return require("packer").startup(function(use) + -- Packer can manage itself + use "wbthomason/packer.nvim" + + use { + "nvim-telescope/telescope.nvim", tag = "0.1.2", + -- or , branch = "0.1.x", + requires = { {"nvim-lua/plenary.nvim"} } + } + + use { "catppuccin/nvim", as = "catppuccin" } + + use ( + "nvim-treesitter/nvim-treesitter", + { run = ":TSUpdate" } + ) + use "nvim-treesitter/playground" + + use "theprimeagen/harpoon" + use "mbbill/undotree" + use "tpope/vim-fugitive" + + use { + "VonHeikemen/lsp-zero.nvim", + branch = "v2.x", + requires = { + -- LSP Support + {"neovim/nvim-lspconfig"}, -- Required + {"williamboman/mason.nvim"}, -- Optional + {"williamboman/mason-lspconfig.nvim"}, -- Optional + + -- Autocompletion + {"hrsh7th/nvim-cmp"}, -- Required + {"hrsh7th/cmp-nvim-lsp"}, -- Required + {"L3MON4D3/LuaSnip"}, -- Required + } + } +end) diff --git a/.config/nvim/lua/hyrik/remap.lua b/.config/nvim/lua/hyrik/remap.lua new file mode 100644 index 0000000..0d2a2e4 --- /dev/null +++ b/.config/nvim/lua/hyrik/remap.lua @@ -0,0 +1,16 @@ +vim.g.mapleader = " " + +-- go to netwrk +vim.keymap.set("n", "pv", vim.cmd.Ex) + +vim.keymap.set("n", "J", "mzJ`z") + +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "zz") + +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") + +vim.keymap.set("x", "p", "\"_dP") + + diff --git a/.config/nvim/lua/hyrik/set.lua b/.config/nvim/lua/hyrik/set.lua new file mode 100644 index 0000000..0863312 --- /dev/null +++ b/.config/nvim/lua/hyrik/set.lua @@ -0,0 +1,28 @@ +vim.opt.nu = true +vim.opt.relativenumber = true + +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = true + +vim.opt.smartindent = true + +vim.opt.wrap = false + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" + +vim.opt.hlsearch = false +vim.opt.incsearch = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.isframe:append "@-@" + +vim.opt.updatetime = 50 + +vim.opt.colorcolumn = "80" diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua new file mode 100644 index 0000000..bce6553 --- /dev/null +++ b/.config/nvim/plugin/packer_compiled.lua @@ -0,0 +1,174 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/hyro/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/hyro/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/hyro/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/hyro/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/hyro/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + LuaSnip = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + catppuccin = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + harpoon = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/harpoon", + url = "https://github.com/theprimeagen/harpoon" + }, + ["lsp-zero.nvim"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + url = "https://github.com/VonHeikemen/lsp-zero.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + playground = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/playground", + url = "https://github.com/nvim-treesitter/playground" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + undotree = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/undotree", + url = "https://github.com/mbbill/undotree" + }, + ["vim-fugitive"] = { + loaded = true, + path = "/home/hyro/.local/share/nvim/site/pack/packer/start/vim-fugitive", + url = "https://github.com/tpope/vim-fugitive" + } +} + +time([[Defining packer_plugins]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end