From 7af7475ebbb47e376286866accb9c1822237e6de Mon Sep 17 00:00:00 2001 From: Benjamin Chausse Date: Sun, 24 Sep 2023 09:00:56 -0400 Subject: V4 of my lua config --- lua/ben/plugins/alpha.lua | 8 ++++ lua/ben/plugins/blamer.lua | 4 ++ lua/ben/plugins/colorscheme.lua | 29 ++++++------ lua/ben/plugins/copilot.lua | 7 +++ lua/ben/plugins/lsp/mason.lua | 101 ++++++++++++++++++++-------------------- lua/ben/plugins/orgmode.lua | 20 ++++++++ lua/ben/plugins/telescope.lua | 14 +++++- 7 files changed, 117 insertions(+), 66 deletions(-) create mode 100644 lua/ben/plugins/alpha.lua (limited to 'lua/ben/plugins') diff --git a/lua/ben/plugins/alpha.lua b/lua/ben/plugins/alpha.lua new file mode 100644 index 0000000..62a1cb8 --- /dev/null +++ b/lua/ben/plugins/alpha.lua @@ -0,0 +1,8 @@ +return { + priority = 1000, + "goolord/alpha-nvim", + dependencies = "nvim-tree/nvim-web-devicons", + config = function() + require("alpha").setup(require("alpha.themes.theta").config) + end, +} diff --git a/lua/ben/plugins/blamer.lua b/lua/ben/plugins/blamer.lua index daf37cf..1a8217a 100644 --- a/lua/ben/plugins/blamer.lua +++ b/lua/ben/plugins/blamer.lua @@ -1,4 +1,5 @@ return { + enabled = false, "APZelos/blamer.nvim", config = function() vim.g.blamer_enabled = 1 @@ -6,4 +7,7 @@ return { vim.g.blamer_template = ", • " vim.g.blamer_prefix = ">" end, + cond = function() + return vim.fn.has("linux") == 1 + end, } diff --git a/lua/ben/plugins/colorscheme.lua b/lua/ben/plugins/colorscheme.lua index fce5735..9d58a17 100644 --- a/lua/ben/plugins/colorscheme.lua +++ b/lua/ben/plugins/colorscheme.lua @@ -1,8 +1,21 @@ return { + -- Treesitter optimized colorscheme + { + "neanias/everforest-nvim", + priority = 1000, + version = false, + config = function() + require("everforest").setup({}) + vim.cmd([[set tgc]]) -- Terminal GUI Colors + vim.cmd([[set lz]]) -- Lazy redraw + vim.cmd([[set t_Co=256]]) -- 256 Colors + vim.cmd([[colorscheme everforest]]) + end, + }, -- My very own colorscheme { "ChausseBenjamin/friffle-vim", - priority = 1000, + lazy = true, config = function() vim.cmd([[syntax on]]) -- Enable vim syntax vim.cmd([[set tgc]]) -- Terminal GUI Colors @@ -24,18 +37,4 @@ return { "djpohly/elly.vim", lazy = true, }, - -- Treesitter optimized colorscheme - { - "neanias/everforest-nvim", - version = false, - lazy = true, - config = function() - require("everforest").setup({}) - end, - }, - -- Syntax for SXHKD - { - "kovetskiy/sxhkd-vim", - ft = "sxhkdrc", - }, } diff --git a/lua/ben/plugins/copilot.lua b/lua/ben/plugins/copilot.lua index 2347f29..c62a8f5 100644 --- a/lua/ben/plugins/copilot.lua +++ b/lua/ben/plugins/copilot.lua @@ -1,3 +1,10 @@ return { "github/copilot.vim", + event = "VeryLazy", + config = function() + vim.cmd([[Copilot enable]]) + end, + build = function() + vim.cmd([[Copilot setup]]) + end, } diff --git a/lua/ben/plugins/lsp/mason.lua b/lua/ben/plugins/lsp/mason.lua index c1a3c10..6ea32cc 100644 --- a/lua/ben/plugins/lsp/mason.lua +++ b/lua/ben/plugins/lsp/mason.lua @@ -1,57 +1,58 @@ return { - "williamboman/mason.nvim", - dependencies = { - "williamboman/mason-lspconfig.nvim", - "jayp0521/mason-null-ls.nvim", - }, - config = function() - -- import mason - local mason = require("mason") + "williamboman/mason.nvim", + event = "VeryLazy", + dependencies = { + "williamboman/mason-lspconfig.nvim", + "jayp0521/mason-null-ls.nvim", + }, + config = function() + -- import mason + local mason = require("mason") - -- import mason-lspconfig - local mason_lspconfig = require("mason-lspconfig") + -- import mason-lspconfig + local mason_lspconfig = require("mason-lspconfig") - -- import mason-null-ls - local mason_null_ls = require("mason-null-ls") + -- import mason-null-ls + local mason_null_ls = require("mason-null-ls") - -- enable mason and configure icons - mason.setup({ - ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗" - } - } - }) + -- enable mason and configure icons + mason.setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗", + }, + }, + }) - mason_lspconfig.setup({ - -- list of servers for mason to install - ensure_installed = { - "tsserver", - "html", - "cssls", - "tailwindcss", - "svelte", - "lua_ls", - "graphql", - "emmet_ls", - "prismals", - "pyright" - }, - -- auto-install configured servers (with lspconfig) - automatic_installation = true, -- not the same as ensure_installed - }) + mason_lspconfig.setup({ + -- list of servers for mason to install + ensure_installed = { + "tsserver", + "html", + "cssls", + "tailwindcss", + "svelte", + "lua_ls", + "graphql", + "emmet_ls", + "prismals", + "pyright", + }, + -- auto-install configured servers (with lspconfig) + automatic_installation = true, -- not the same as ensure_installed + }) - mason_null_ls.setup({ - -- list of formatters & linters for mason to install - ensure_installed = { - "prettier", -- ts/js formatter - "stylua", -- lua formatter - "eslint_d", -- ts/js linter - }, - -- auto-install configured servers (with lspconfig) - automatic_installation = true, - }) - end, + mason_null_ls.setup({ + -- list of formatters & linters for mason to install + ensure_installed = { + "prettier", -- ts/js formatter + "stylua", -- lua formatter + "eslint_d", -- ts/js linter + }, + -- auto-install configured servers (with lspconfig) + automatic_installation = true, + }) + end, } diff --git a/lua/ben/plugins/orgmode.lua b/lua/ben/plugins/orgmode.lua index 1007b0a..8a0c023 100644 --- a/lua/ben/plugins/orgmode.lua +++ b/lua/ben/plugins/orgmode.lua @@ -2,6 +2,26 @@ return { "nvim-orgmode/orgmode", dependencies = { { "nvim-treesitter/nvim-treesitter", lazy = true }, + { "dhruvasagar/vim-table-mode", lazy = true }, + { + "akinsho/org-bullets.nvim", + enable = false, + lazy = true, + config = function() + require("org-bullets").setup({ + symbols = { + concealcursor = false, + list = "", + headlines = { "◉", "○", "󰮍", "󱥸" }, + checkboxes = { + half = { "", "OrgTSCheckboxHalfChecked" }, + done = { "", "OrgTSCheckboxDone" }, + todo = { "", "OrgTSCheckboxTODO" }, + }, + }, + }) + end, + }, }, event = "VeryLazy", config = function() diff --git a/lua/ben/plugins/telescope.lua b/lua/ben/plugins/telescope.lua index f5857cd..d6b4b88 100644 --- a/lua/ben/plugins/telescope.lua +++ b/lua/ben/plugins/telescope.lua @@ -1,7 +1,16 @@ return { "nvim-telescope/telescope.nvim", branch = "0.1.x", - dependencies = { "nvim-lua/plenary.nvim" }, + dependencies = { + "nvim-lua/plenary.nvim", + { + "joaomsa/telescope-orgmode.nvim", + event = "VeryLazy", + config = function() + require("telescope").load_extension("orgmode") + end, + }, + }, keys = { -- LazyLoad telescope when it's actually needed -- F.ind F.iles @@ -21,5 +30,8 @@ return { -- F.ind C.olor S.cheme { "fcs", 'lua require("telescope.builtin").colorscheme()' }, + + -- F.ing O.rgmode + { "fo", 'lua require("telescope").extensions.orgmode.seach_headings()' }, }, } -- cgit v1.2.3