From 3fab06c7710da6ee7021e384635e09e617f2b5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Gon=C3=A7alves?= Date: Sat, 10 Feb 2024 21:31:33 -0300 Subject: [PATCH] feat: neorg and haskell stuff --- .config/nvim/lazy-lock.json | 16 +++++++++++++++ .config/nvim/lua/config/init.lua | 35 +++++++++++++++++++++++++++++++- .config/nvim/lua/config/opt.lua | 3 +++ .config/nvim/lua/config/plg.lua | 11 +++++++++- 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 .config/nvim/lazy-lock.json diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..63f739c --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,16 @@ +{ + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "e14aa165d820fc8943704c273e27fbce4a96b29f" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "neorg": { "branch": "main", "commit": "7cf5382821f661aee958bcaf7bc4111c11e6863a" }, + "neorg-telescope": { "branch": "main", "commit": "6a7a677c40fa3c348924a4e2a06a513e0b34c056" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, + "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" } +} \ No newline at end of file diff --git a/.config/nvim/lua/config/init.lua b/.config/nvim/lua/config/init.lua index 0a733d8..d23ba1c 100644 --- a/.config/nvim/lua/config/init.lua +++ b/.config/nvim/lua/config/init.lua @@ -11,6 +11,39 @@ vim.cmd("colorscheme gruvbox") -- ensure highlighting require("nvim-treesitter.configs").setup({ - ensure_installed = { "c", "lua", "go", "bash", "make", "html", "css" } + ensure_installed = { "haskell", "c", "lua", "go", "bash", "make", "html", "css" } }) +-- neorg +require("neorg").setup { + load = { + ["core.defaults"] = {}, + ["core.concealer"] = {}, + ["core.integrations.telescope"] = {}, + ["core.dirman"] = { + config = { + workspaces = { + notes = "~/docs/notes", + }, + default_workspace = "notes", + }, + }, + }, +} + +-- lsp-zero +local lsp_zero = require('lsp-zero') + +lsp_zero.on_attach(function(client, bufnr) + lsp_zero.default_keymaps({buffer = bufnr}) +end) +require('mason').setup({}) +require('mason-lspconfig').setup({ + ensure_installed = { "hls", "gopls" }, + handlers = { + gopls = function() + require("lspconfig").gopls.setup({}) + end, + lsp_zero.default_setup, + }, +}) diff --git a/.config/nvim/lua/config/opt.lua b/.config/nvim/lua/config/opt.lua index ab65cd5..14f67d9 100644 --- a/.config/nvim/lua/config/opt.lua +++ b/.config/nvim/lua/config/opt.lua @@ -25,3 +25,6 @@ opt.cursorline = true opt.splitright = true opt.splitbelow = true + +opt.foldlevel = 99 +opt.conceallevel = 2 diff --git a/.config/nvim/lua/config/plg.lua b/.config/nvim/lua/config/plg.lua index d1b9871..2997005 100644 --- a/.config/nvim/lua/config/plg.lua +++ b/.config/nvim/lua/config/plg.lua @@ -15,7 +15,16 @@ vim.opt.rtp:prepend(lazypath) local plugins = { { "ellisonleao/gruvbox.nvim", priority = 1000 , config = true, opts = ...}, { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, - { 'nvim-telescope/telescope.nvim', tag = '0.1.5', dependencies = { 'nvim-lua/plenary.nvim' } } + { "nvim-telescope/telescope.nvim", tag = "0.1.5", dependencies = { "nvim-lua/plenary.nvim" } }, + { "nvim-neorg/neorg", build = ":Neorg sync-parsers", dependencies = { "nvim-lua/plenary.nvim", "nvim-neorg/neorg-telescope" } }, + {'williamboman/mason.nvim'}, + {'williamboman/mason-lspconfig.nvim'}, + + {'VonHeikemen/lsp-zero.nvim', branch = 'v3.x'}, + {'neovim/nvim-lspconfig'}, + {'hrsh7th/cmp-nvim-lsp'}, + {'hrsh7th/nvim-cmp'}, + {'L3MON4D3/LuaSnip'}, } require("lazy").setup(plugins, {})