From b82f62e32e5be41e082d2aa4f9eee3a6029f5ec4 Mon Sep 17 00:00:00 2001 From: Evann Regnault Date: Wed, 12 Jun 2024 10:10:49 +0200 Subject: [PATCH] Initial Commit --- .gitignore | 1 + after/plugin/colors.lua | 11 ++++++++ after/plugin/fugitive.lua | 1 + after/plugin/harpoon.lua | 12 +++++++++ after/plugin/lsp.lua | 42 +++++++++++++++++++++++++++++ after/plugin/telescope.lua | 7 +++++ after/plugin/treesitter.lua | 8 ++++++ after/plugin/undotree.lua | 1 + init.lua | 1 + lua/estym/init.lua | 3 +++ lua/estym/packer.lua | 54 +++++++++++++++++++++++++++++++++++++ lua/estym/remap.lua | 2 ++ 12 files changed, 143 insertions(+) create mode 100644 .gitignore create mode 100644 after/plugin/colors.lua create mode 100644 after/plugin/fugitive.lua create mode 100644 after/plugin/harpoon.lua create mode 100644 after/plugin/lsp.lua create mode 100644 after/plugin/telescope.lua create mode 100644 after/plugin/treesitter.lua create mode 100644 after/plugin/undotree.lua create mode 100644 init.lua create mode 100644 lua/estym/init.lua create mode 100644 lua/estym/packer.lua create mode 100644 lua/estym/remap.lua diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c84aa4a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +plugin/packer_compiled.lua diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua new file mode 100644 index 0000000..f6736f3 --- /dev/null +++ b/after/plugin/colors.lua @@ -0,0 +1,11 @@ +require("catppuccin").setup({ + transparent_background = true +}) +function Color(color) + color = color or "catppuccin" + vim.cmd.colorscheme(color) + vim.api.nvim_set_hl(0, "Normal", {bg = "none"}) + vim.api.nvim_set_hl(0, "NormalFloat", {bg = "none"}) +end + +Color() diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua new file mode 100644 index 0000000..80c9070 --- /dev/null +++ b/after/plugin/fugitive.lua @@ -0,0 +1 @@ +vim.keymap.set("n", "gs", vim.cmd.Git) diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua new file mode 100644 index 0000000..801c70d --- /dev/null +++ b/after/plugin/harpoon.lua @@ -0,0 +1,12 @@ +local harpoon = require("harpoon") + +harpoon:setup() + +vim.keymap.set("n", "a", function() harpoon:list():add() end) +vim.keymap.set("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) + + +vim.keymap.set("n", "", function() harpoon:list():select(1) end) +vim.keymap.set("n", "", function() harpoon:list():select(2) end) +vim.keymap.set("n", "", function() harpoon:list():select(3) end) +vim.keymap.set("n", "", function() harpoon:list():select(4) end) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua new file mode 100644 index 0000000..f424339 --- /dev/null +++ b/after/plugin/lsp.lua @@ -0,0 +1,42 @@ +local lsp = require("lsp-zero") +local lspconfig = require("lspconfig") +lsp.on_attach(function(client, bufnr) + lsp.default_keymaps({buffer = bufnr}) + vim.keymap.set('n', 'K', function() vim.lsp.buf.hover() end) +end) + +local cmp = require('cmp') + +cmp.setup({ + sources = { + {name = 'nvim_lsp'}, + {name = 'nvim_lua'} + }, + mapping = { + [''] = cmp.mapping.confirm({select = false}), + [''] = cmp.mapping.confirm({select = false}), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + }, + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, +}) + +require('mason').setup({}) +require('mason-lspconfig').setup({ + ensure_installed = { "rust_analyzer"}, + handlers = { + function(server_name) + lspconfig[server_name].setup({}) + end + } +}) + +lspconfig.gleam.setup({ + cmd = { "gleam", "lsp" }, + filetypes = { "gleam" }, + root_dir = lspconfig.util.root_pattern("gleam.toml", ".git"), +}) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua new file mode 100644 index 0000000..cfe2d2b --- /dev/null +++ b/after/plugin/telescope.lua @@ -0,0 +1,7 @@ +local builtin = require('telescope.builtin') +vim.keymap.set('n', 'pf', builtin.find_files, {}) +vim.keymap.set('n', 'pg', builtin.live_grep, {}) +vim.keymap.set('n', 'pG', builtin.git_files, {}) +vim.keymap.set('n', 'ps', function() + builtin.grep_string({search = vim.fn.input("Grep > ")}) +end) diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua new file mode 100644 index 0000000..f1b416c --- /dev/null +++ b/after/plugin/treesitter.lua @@ -0,0 +1,8 @@ +require'nvim-treesitter.configs'.setup { + ensure_installed = { "c", "javascript", "typescript", "lua", "rust" }, + sync_install = false, + auto_install = true, + highlight = { + enable = true, + }, +} diff --git a/after/plugin/undotree.lua b/after/plugin/undotree.lua new file mode 100644 index 0000000..b6b9276 --- /dev/null +++ b/after/plugin/undotree.lua @@ -0,0 +1 @@ +vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..c134722 --- /dev/null +++ b/init.lua @@ -0,0 +1 @@ +require("estym") diff --git a/lua/estym/init.lua b/lua/estym/init.lua new file mode 100644 index 0000000..8e1e865 --- /dev/null +++ b/lua/estym/init.lua @@ -0,0 +1,3 @@ +require("estym.remap") +require("estym.packer") + diff --git a/lua/estym/packer.lua b/lua/estym/packer.lua new file mode 100644 index 0000000..44d5d78 --- /dev/null +++ b/lua/estym/packer.lua @@ -0,0 +1,54 @@ +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.6', + requires = { {'nvim-lua/plenary.nvim'} } + } + + use { + 'catppuccin/nvim', + config = function() + vim.cmd('colorscheme catppuccin') + end + } + + use { + 'nvim-treesitter/nvim-treesitter', + run = ":TSUpdate" + } + + use { + 'nvim-treesitter/playground' + } + + use { + "ThePrimeagen/harpoon", + branch = "harpoon2", + requires = { {"nvim-lua/plenary.nvim"} } + } + + use { + "mbbill/undotree" + } + + use { + "tpope/vim-fugitive" + } + + use { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v3.x', + requires = { + {'williamboman/mason.nvim'}, + {'williamboman/mason-lspconfig.nvim'}, + {'neovim/nvim-lspconfig'}, + {'hrsh7th/nvim-cmp'}, + {'hrsh7th/cmp-nvim-lsp'}, + {'L3MON4D3/LuaSnip'}, + } + } +end) diff --git a/lua/estym/remap.lua b/lua/estym/remap.lua new file mode 100644 index 0000000..b760350 --- /dev/null +++ b/lua/estym/remap.lua @@ -0,0 +1,2 @@ +vim.g.mapleader = " " +vim.keymap.set("n", "pv", vim.cmd.Ex)