From fe2dfa6c32bc99c5835722bd3784c106b3246398 Mon Sep 17 00:00:00 2001 From: Mans Ziesel Date: Thu, 9 Mar 2023 17:47:12 +0100 Subject: [PATCH] configure git --- .config/nvim/after/plugin/colors.lua | 4 +- .config/nvim/after/plugin/harpoon.lua | 10 ++++ .config/nvim/after/plugin/lsp.lua | 6 +++ .config/nvim/after/plugin/treesitter.lua | 7 +-- .config/nvim/lua/mans/init.lua | 4 +- .config/nvim/lua/mans/packer.lua | 53 +++++++++++++------ .config/nvim/lua/mans/remap.lua | 6 +++ .config/nvim/lua/mans/remaps.lua | 2 - .config/nvim/lua/mans/set.lua | 26 ++++++++++ .config/nvim/plugin/packer_compiled.lua | 65 ++++++++++++++++++++++++ 10 files changed, 157 insertions(+), 26 deletions(-) create mode 100644 .config/nvim/after/plugin/harpoon.lua create mode 100644 .config/nvim/after/plugin/lsp.lua create mode 100644 .config/nvim/lua/mans/remap.lua delete mode 100644 .config/nvim/lua/mans/remaps.lua create mode 100644 .config/nvim/lua/mans/set.lua diff --git a/.config/nvim/after/plugin/colors.lua b/.config/nvim/after/plugin/colors.lua index 9816cc3..2c84be3 100644 --- a/.config/nvim/after/plugin/colors.lua +++ b/.config/nvim/after/plugin/colors.lua @@ -2,8 +2,8 @@ function SetColors(color) color = color or "rose-pine" vim.cmd.colorscheme(color) - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + --vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + --vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) end SetColors() diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua new file mode 100644 index 0000000..eed35ed --- /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..74af5c2 --- /dev/null +++ b/.config/nvim/after/plugin/lsp.lua @@ -0,0 +1,6 @@ +local lsp = require('lsp-zero').preset({ + name = 'recommended', + suggest_lsp_servers = true, +}) + +lsp.setup() diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index b426ed6..07c6661 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -9,13 +9,8 @@ require'nvim-treesitter.configs'.setup { -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally auto_install = true, - -- List of parsers to ignore installing (for "all") - ignore_install = { "javascript" }, - - ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) - -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! - highlight = { enable = true, + additional_vim_regex_highlighting = false, }, } diff --git a/.config/nvim/lua/mans/init.lua b/.config/nvim/lua/mans/init.lua index 37cdf3c..f123f4c 100644 --- a/.config/nvim/lua/mans/init.lua +++ b/.config/nvim/lua/mans/init.lua @@ -1 +1,3 @@ -require("mans.remaps") +require("mans.remap") +require("mans.set") +require("mans.packer") diff --git a/.config/nvim/lua/mans/packer.lua b/.config/nvim/lua/mans/packer.lua index 6657a85..855c9c6 100644 --- a/.config/nvim/lua/mans/packer.lua +++ b/.config/nvim/lua/mans/packer.lua @@ -4,19 +4,42 @@ 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.1', - -- or , branch = '0.1.x', - requires = { {'nvim-lua/plenary.nvim'} } - } - use({ - 'rose-pine/neovim', - as = 'rose-pine', - config = function() - vim.cmd('colorscheme rose-pine') - end - }) - use( 'nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) + -- Packer can manage itself + use 'wbthomason/packer.nvim' + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.1', + -- or , branch = '0.1.x', + requires = { {'nvim-lua/plenary.nvim'} } + } + use({ + 'rose-pine/neovim', + as = 'rose-pine', + config = function() + vim.cmd('colorscheme rose-pine') + end + }) + use( 'nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) + use( 'theprimeagen/harpoon' ) + use { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v1.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 + {'hrsh7th/cmp-buffer'}, -- Optional + {'hrsh7th/cmp-path'}, -- Optional + {'saadparwaiz1/cmp_luasnip'}, -- Optional + {'hrsh7th/cmp-nvim-lua'}, -- Optional + + -- Snippets + {'L3MON4D3/LuaSnip'}, -- Required + {'rafamadriz/friendly-snippets'}, -- Optional + } + } end) diff --git a/.config/nvim/lua/mans/remap.lua b/.config/nvim/lua/mans/remap.lua new file mode 100644 index 0000000..8d511bf --- /dev/null +++ b/.config/nvim/lua/mans/remap.lua @@ -0,0 +1,6 @@ +vim.g.mapleader = " " + +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +vim.keymap.set("n", "pv", vim.cmd.Ex) diff --git a/.config/nvim/lua/mans/remaps.lua b/.config/nvim/lua/mans/remaps.lua deleted file mode 100644 index b760350..0000000 --- a/.config/nvim/lua/mans/remaps.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.g.mapleader = " " -vim.keymap.set("n", "pv", vim.cmd.Ex) diff --git a/.config/nvim/lua/mans/set.lua b/.config/nvim/lua/mans/set.lua new file mode 100644 index 0000000..b63d74d --- /dev/null +++ b/.config/nvim/lua/mans/set.lua @@ -0,0 +1,26 @@ +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.hlsearch = false +vim.opt.incsearch = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 + +vim.opt.updatetime = 50 + +vim.opt.colorcolumn = "80" + +vim.opt.signcolumn = 'yes' diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index ff3873a..d3bb15a 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -74,6 +74,71 @@ end time([[try_loadstring definition]], false) time([[Defining packer_plugins]], true) _G.packer_plugins = { + LuaSnip = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["cmp-buffer"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-nvim-lua"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + url = "https://github.com/hrsh7th/cmp-nvim-lua" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + cmp_luasnip = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, + ["friendly-snippets"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/friendly-snippets", + url = "https://github.com/rafamadriz/friendly-snippets" + }, + harpoon = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/harpoon", + url = "https://github.com/theprimeagen/harpoon" + }, + ["lsp-zero.nvim"] = { + loaded = true, + path = "/home/mans/.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/mans/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/mans/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, ["nvim-treesitter"] = { loaded = true, path = "/home/mans/.local/share/nvim/site/pack/packer/start/nvim-treesitter",