From 86d8fa773c3fc4bde29a7687e230bceaa78bb28e Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Tue, 3 Dec 2024 23:12:06 -0500 Subject: [PATCH 1/2] codelens --- config/.config/nvim/after/plugin/lsp.lua | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/config/.config/nvim/after/plugin/lsp.lua b/config/.config/nvim/after/plugin/lsp.lua index 885ea7d..ebeb313 100755 --- a/config/.config/nvim/after/plugin/lsp.lua +++ b/config/.config/nvim/after/plugin/lsp.lua @@ -29,6 +29,8 @@ lsp_config.nim_langserver.setup{ lsp_config.hls.setup{} +lsp_config.clojure_lsp.setup{} + local cmp = require("cmp") local cmp_select = {behavior = cmp.SelectBehavior.Select} local cmp_mappings = lsp.defaults.cmp_mappings({ @@ -40,7 +42,7 @@ local cmp_mappings = lsp.defaults.cmp_mappings({ cmp.setup { sources = { - -- { name = 'conjure' }, + { name = 'conjure' }, { name = 'nvim_lsp_signature_help' }, { name = 'nvim_lsp' }, { name = 'luasnip' }, @@ -55,6 +57,12 @@ lsp.setup_nvim_cmp({ mapping = cmp_mappings }) +vim.api.nvim_create_autocmd('User', { + pattern = 'LspAttached', + once = true, + callback = vim.lsp.codelens.refresh, +}) + lsp.on_attach(function(client, bufnr) local opts = {buffer = bufnr, remap = false} @@ -66,6 +74,14 @@ lsp.on_attach(function(client, bufnr) capabilities = capabilities end + vim.api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, { + buffer = bufnr, + callback = vim.lsp.codelens.refresh, + }) + -- trigger codelens refresh + vim.api.nvim_exec_autocmds('User', { pattern = 'LspAttached' }) + + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) vim.keymap.set("n", "vws", vim.lsp.buf.workspace_symbol, opts) From 34eb7ee038d2a66b1d379bdfa3d8c356f49f26d0 Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Sun, 15 Dec 2024 13:17:00 -0500 Subject: [PATCH 2/2] neovide --- config/.config/nvim/after/plugin/colors.lua | 11 +++++++---- config/.config/nvim/init.lua | 2 +- config/.config/nvim/lua/config/packer.lua | 10 +++++++++- config/.config/nvim/lua/config/set.lua | 5 ++++- config/.config/sxhkd/sxhkdrc | 2 +- config/.doom.d/packages.el | 1 + 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/config/.config/nvim/after/plugin/colors.lua b/config/.config/nvim/after/plugin/colors.lua index ade5c83..200124e 100755 --- a/config/.config/nvim/after/plugin/colors.lua +++ b/config/.config/nvim/after/plugin/colors.lua @@ -1,6 +1,6 @@ function colors(color, theme) - color = os.getenv("BASE16_THEME") - alt_color = 'rose-pine' or color + color = os.getenv("BASE16_THEME") + alt_color = 'everforest' or color -- Available values: `'hard'`, `'medium'`, `'soft'` vim.g.gruvbox_material_background = 'medium' -- Available values: `'material'`, `'mix'`, `'original'` @@ -15,10 +15,13 @@ function colors(color, theme) elseif color == 'gruvbox-dark-soft' then color = 'gruvbox-material' vim.g.gruvbox_material_background = 'soft' + elseif color == 'everforest-dark-hard' then + vim.g.everforest_background = 'hard' + color = 'everforest' end - if theme then + if theme then vim.cmd.colorscheme(alt_color) - elseif not pcall(vim.cmd.colorscheme, color) then + elseif not pcall(vim.cmd.colorscheme, color) or color == nil then vim.cmd.colorscheme(alt_color) end end diff --git a/config/.config/nvim/init.lua b/config/.config/nvim/init.lua index dbc863e..6cd714e 100755 --- a/config/.config/nvim/init.lua +++ b/config/.config/nvim/init.lua @@ -1 +1 @@ -require("config") +config = require("config") diff --git a/config/.config/nvim/lua/config/packer.lua b/config/.config/nvim/lua/config/packer.lua index fc1d307..8dd77ec 100755 --- a/config/.config/nvim/lua/config/packer.lua +++ b/config/.config/nvim/lua/config/packer.lua @@ -33,6 +33,14 @@ return require('packer').startup(function(use) -- end }) + use { + "mireq/large_file", + config = function() + require("large_file").setup() + end + } + + use 'tanvirtin/monokai.nvim' use 'arzg/vim-colors-xcode' @@ -77,7 +85,7 @@ return require('packer').startup(function(use) use "lewpoly/sherbet.nvim" - use 'xiyaowong/transparent.nvim' + -- use 'xiyaowong/transparent.nvim' use { 'nvim-treesitter/nvim-treesitter', diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua index c7d3a40..80fe11e 100755 --- a/config/.config/nvim/lua/config/set.lua +++ b/config/.config/nvim/lua/config/set.lua @@ -40,6 +40,8 @@ vim.opt.splitbelow = true vim.g.mapleader = " " vim.g.neovide_scale_factor = 1.0 +vim.g.neovide_theme = 'auto' +vim.g.neovide_transparency = 1.0 function ChangeScaleFactor(delta) vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta end @@ -51,6 +53,7 @@ vim.keymap.set("n", "", function() ChangeScaleFactor(1 / 1.25) end) -vim.opt.guifont = { "Cascadia Code", ":h12" } +vim.opt.guifont = { "Olympe Mono Hacked", ":h12" } +vim.opt.termguicolors = true vim.g.netrw_keepdir = 0 diff --git a/config/.config/sxhkd/sxhkdrc b/config/.config/sxhkd/sxhkdrc index 42bb70b..4ce4da7 100644 --- a/config/.config/sxhkd/sxhkdrc +++ b/config/.config/sxhkd/sxhkdrc @@ -31,7 +31,7 @@ super + p dmenu_run # Terminal super + Return - st + neovide +term # Screenshot super + shift + s scrot -s -e 'xclip -selection clipboard -t image/png -i $f' ~/Pictures/screenshots/%Y-%m-%d-%T-screenshot.png diff --git a/config/.doom.d/packages.el b/config/.doom.d/packages.el index eaa9d28..4909130 100644 --- a/config/.doom.d/packages.el +++ b/config/.doom.d/packages.el @@ -54,3 +54,4 @@ :pre-build ("make" "install"))) (package! dylan) (package! dime) +(package! vlf)