From 79005e5771cc6854b640cd2f66c6d755ac510392 Mon Sep 17 00:00:00 2001 From: Piotr Antczak Date: Mon, 4 Mar 2024 10:17:42 +0100 Subject: [PATCH] Added plugins --- init.lua | 24 ++++++++++++++++-------- lazy-lock.json | 32 ++++++++++++++++++++++++++++++++ lazyvim.json | 9 +++++++++ lua/custom/plugins/obsidian.lua | 29 +++++++++++++++++++++++++++++ lua/custom/plugins/statuscol.lua | 23 +++++++++++++++++++++++ lua/custom/plugins/theme.lua | 17 +++++++++++++++++ lua/mundy/config.lua | 1 + lua/mundy/eyecandy.lua | 9 +++++++++ lua/mundy/init.lua | 3 +++ lua/mundy/remap.lua | 2 ++ 10 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 lazy-lock.json create mode 100644 lazyvim.json create mode 100644 lua/custom/plugins/obsidian.lua create mode 100644 lua/custom/plugins/statuscol.lua create mode 100644 lua/custom/plugins/theme.lua create mode 100644 lua/mundy/config.lua create mode 100644 lua/mundy/eyecandy.lua create mode 100644 lua/mundy/init.lua create mode 100644 lua/mundy/remap.lua diff --git a/init.lua b/init.lua index fd4567d9..9e578811 100644 --- a/init.lua +++ b/init.lua @@ -1,14 +1,20 @@ +--Personal telescope +vim.keymap.set('v', 'p', '"_dP', { desc = 'Go to previous diagnostic message' }) --[[ ===================================================================== ==================== READ THIS BEFORE CONTINUING ==================== +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) ===================================================================== -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. +===================================================================== +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', 'p', '\"_dP', { desc = 'Go to previous diagnostic message' }) Once you've done that, you should start exploring, configuring and tinkering to explore Neovim! @@ -66,6 +72,7 @@ vim.opt.rtp:prepend(lazypath) -- -- You can also configure plugins after the setup call, -- as they will be available in your neovim runtime. +require('mundy') require('lazy').setup({ -- NOTE: First, some plugins that don't require any configuration @@ -208,7 +215,7 @@ require('lazy').setup({ config = function() require('onedark').setup { -- Set a style preset. 'dark' is default. - style = 'dark', -- dark, darker, cool, deep, warm, warmer, light + style = 'deep', -- dark, darker, cool, deep, warm, warmer, light } require('onedark').load() end, @@ -282,7 +289,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, {}) -- [[ Setting options ]] @@ -439,7 +446,7 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = vim.defer_fn(function() require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' }, + ensure_installed = { 'go', 'lua', 'vimdoc', 'vim', 'bash', 'hcl', 'terraform' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, @@ -678,6 +685,7 @@ cmp.setup { { name = 'luasnip' }, { name = 'path' }, }, + LineNumberColors() } -- The line beneath this is called `modeline`. See `:help modeline` diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 00000000..9bd5da06 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,32 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LazyVim": { "branch": "main", "commit": "91126b9896bebcea9a21bce43be4e613e7607164" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "catppuccin": { "branch": "main", "commit": "c0de3b46811fe1ce3912e2245a9dfbea6b41c300" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "fidget.nvim": { "branch": "main", "commit": "ad8873c16faa123fe3f9fd6539c41dfb0f97a9e9" }, + "friendly-snippets": { "branch": "main", "commit": "5cc1f45c6aac699ad008fb85f6ae03236062667d" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "neodev.nvim": { "branch": "main", "commit": "a09881379ac7abddb8091c5edd292805a53ccf18" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lspconfig": { "branch": "master", "commit": "e655c96cf00f7b783871b3787187ed3fa25ff64e" }, + "nvim-treesitter": { "branch": "master", "commit": "10d79b5dbbdffc3edf307b189284fb62e2e79a3e" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, + "obsidian.nvim": { "branch": "main", "commit": "9ede6c86b1f47afe00442a6e84fa1f5b00153742" }, + "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "vim-fugitive": { "branch": "master", "commit": "9f92ff14d9d1169e08f197a2250fcaea88e9c767" }, + "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, + "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file diff --git a/lazyvim.json b/lazyvim.json new file mode 100644 index 00000000..ff6a1393 --- /dev/null +++ b/lazyvim.json @@ -0,0 +1,9 @@ +{ + "extras": [ + + ], + "news": { + "NEWS.md": "2123" + }, + "version": 2 +} \ No newline at end of file diff --git a/lua/custom/plugins/obsidian.lua b/lua/custom/plugins/obsidian.lua new file mode 100644 index 00000000..fdf6431a --- /dev/null +++ b/lua/custom/plugins/obsidian.lua @@ -0,0 +1,29 @@ +return { + "epwalsh/obsidian.nvim", + version = "*", -- recommended, use latest release instead of latest commit + lazy = true, + ft = "markdown", + -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: + -- event = { + -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. + -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/**.md" + -- "BufReadPre path/to/my-vault/**.md", + -- "BufNewFile path/to/my-vault/**.md", + -- }, + dependencies = { + -- Required. + "nvim-lua/plenary.nvim", + + -- see below for full list of optional dependencies 👇 + }, + opts = { + workspaces = { + { + name = "LifeOfPain", + path = "~/Documents/Private/LifeOfPain", + }, + }, + + -- see below for full list of options 👇 + }, +} diff --git a/lua/custom/plugins/statuscol.lua b/lua/custom/plugins/statuscol.lua new file mode 100644 index 00000000..46208b9e --- /dev/null +++ b/lua/custom/plugins/statuscol.lua @@ -0,0 +1,23 @@ +return { + { + "luukvbaal/statuscol.nvim", config = function() + -- local builtin = require("statuscol.builtin") + require("statuscol").setup({ + -- configuration goes here, for example: + relculright = true, + -- segments = { + -- { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, + -- { + -- sign = { name = { "Diagnostic" }, maxwidth = 2, auto = true }, + -- click = "v:lua.ScSa" + -- }, + -- { text = { builtin.lnumfunc }, click = "v:lua.ScLa", }, + -- { + -- sign = { name = { ".*" }, maxwidth = 2, colwidth = 1, auto = true, wrap = true }, + -- click = "v:lua.ScSa" + -- }, + -- } + }) + end, + } +} diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua new file mode 100644 index 00000000..f5d7ad69 --- /dev/null +++ b/lua/custom/plugins/theme.lua @@ -0,0 +1,17 @@ +return { + { + "catppuccin/nvim", + name = "catppuccin", + opts = { + flavour = "mocha", + } + -- require("catppuccin").setup({ + -- }) + }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin", + }, + }, +} diff --git a/lua/mundy/config.lua b/lua/mundy/config.lua new file mode 100644 index 00000000..d6fc7bb9 --- /dev/null +++ b/lua/mundy/config.lua @@ -0,0 +1 @@ +vim.opt.conceallevel = 2 diff --git a/lua/mundy/eyecandy.lua b/lua/mundy/eyecandy.lua new file mode 100644 index 00000000..6577772d --- /dev/null +++ b/lua/mundy/eyecandy.lua @@ -0,0 +1,9 @@ +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "number" + +function LineNumberColors() + vim.api.nvim_set_hl(0, 'LineNrAbove', { fg='grey', bold=false }) -- '#F0DBAF' + vim.api.nvim_set_hl(0, 'LineNr', { fg='white', bold=true }) + vim.api.nvim_set_hl(0, 'LineNrBelow', { fg='grey', bold=false }) +end diff --git a/lua/mundy/init.lua b/lua/mundy/init.lua new file mode 100644 index 00000000..71a9cef3 --- /dev/null +++ b/lua/mundy/init.lua @@ -0,0 +1,3 @@ +require('mundy.remap') +require('mundy.eyecandy') +require('mundy.config') diff --git a/lua/mundy/remap.lua b/lua/mundy/remap.lua new file mode 100644 index 00000000..2a876dfd --- /dev/null +++ b/lua/mundy/remap.lua @@ -0,0 +1,2 @@ +vim.keymap.set('n', 'pv', vim.cmd.Ex,{ desc = 'Open Netrw Directory Listing' }) +