Merge branch 'master' into arch-laptop

This commit is contained in:
Michael Chalupiak 2024-12-15 13:17:39 -05:00
commit b048c4fdfa
7 changed files with 40 additions and 9 deletions

View File

@ -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

View File

@ -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", "<leader>vws", vim.lsp.buf.workspace_symbol, opts)

View File

@ -1 +1 @@
require("config")
config = require("config")

View File

@ -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',

View File

@ -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", "<C-->", 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

View File

@ -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

View File

@ -54,3 +54,4 @@
:pre-build ("make" "install")))
(package! dylan)
(package! dime)
(package! vlf)