Skip to content

Commit

Permalink
small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
theprimeagen committed Jun 20, 2024
1 parent ac393a2 commit e148c2c
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 9 deletions.
50 changes: 44 additions & 6 deletions lua/theprimeagen/lazy/colors.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,55 @@
function ColorMyPencils(color)
color = color or "rose-pine"
color = color or "rose-pine-moon"
vim.cmd.colorscheme(color)

vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })

end

return {

{
"erikbackman/brightburn.vim",
},

{
"folke/tokyonight.nvim",
lazy = false,
opts = {},
config = function()
ColorMyPencils()
end
},
{
"ellisonleao/gruvbox.nvim",
name = "gruvbox",
config = function()
require("gruvbox").setup({
terminal_colors = true, -- add neovim terminal colors
undercurl = true,
underline = false,
bold = true,
italic = {
strings = false,
emphasis = false,
comments = false,
operators = false,
folds = false,
},
strikethrough = true,
invert_selection = false,
invert_signs = false,
invert_tabline = false,
invert_intend_guides = false,
inverse = true, -- invert background for search, diffs, statuslines and errors
contrast = "", -- can be "hard", "soft" or empty string
palette_overrides = {},
overrides = {},
dim_inactive = false,
transparent_mode = false,
})
end,
},
{
"folke/tokyonight.nvim",
config = function()
Expand Down Expand Up @@ -40,10 +82,6 @@ return {
italic = false,
},
})

vim.cmd("colorscheme rose-pine")

ColorMyPencils()
end
},

Expand Down
21 changes: 18 additions & 3 deletions lua/theprimeagen/lazy/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,36 @@ return {
},
handlers = {
function(server_name) -- default handler (optional)

require("lspconfig")[server_name].setup {
capabilities = capabilities
}
end,

zls = function()
local lspconfig = require("lspconfig")
lspconfig.zls.setup({
root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
settings = {
zls = {
enable_inlay_hints = true,
enable_snippets = true,
warn_style = true,
},
},
})
vim.g.zig_fmt_parse_errors = 0
vim.g.zig_fmt_autosave = 0

end,
["lua_ls"] = function()
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup {
capabilities = capabilities,
settings = {
Lua = {
runtime = { version = "Lua 5.1" },
runtime = { version = "Lua 5.1" },
diagnostics = {
globals = { "vim", "it", "describe", "before_each", "after_each" },
globals = { "bit", "vim", "it", "describe", "before_each", "after_each" },
}
}
}
Expand Down
1 change: 1 addition & 0 deletions lua/theprimeagen/remap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vim.keymap.set("n", "<C-d>", "<C-d>zz")
vim.keymap.set("n", "<C-u>", "<C-u>zz")
vim.keymap.set("n", "n", "nzzzv")
vim.keymap.set("n", "N", "Nzzzv")
vim.keymap.set("n", "<leader>zig", "<cmd>LspRestart<cr>")

vim.keymap.set("n", "<leader>vwm", function()
require("vim-with-me").StartVimWithMe()
Expand Down

0 comments on commit e148c2c

Please sign in to comment.