updated theme
This commit is contained in:
+12
-12
@@ -2,10 +2,11 @@ require("mini.deps").setup()
|
||||
local add = MiniDeps.add
|
||||
|
||||
-- UI & Theming
|
||||
add({ source = "catppuccin/nvim", name = "catppuccin" })
|
||||
-- The colourscheme is local (colors/takemi.lua), so there is no theme plugin.
|
||||
add({ source = "nvim-lualine/lualine.nvim" })
|
||||
add({ source = "lewis6991/gitsigns.nvim" })
|
||||
add({ source = "folke/which-key.nvim" })
|
||||
add({ source = "mpas/marp-nvim" })
|
||||
|
||||
-- Utility & Editing
|
||||
add({ source = "akinsho/toggleterm.nvim" })
|
||||
@@ -24,25 +25,24 @@ add({ source = "mfussenegger/nvim-lint" })
|
||||
add({ source = "seblyng/roslyn.nvim" })
|
||||
add({ source = "tris203/rzls.nvim" })
|
||||
add({ source = "https://git.narl.io/nvrl/mould-rs", checkout = "main" })
|
||||
add({ source = "ray-x/go.nvim" })
|
||||
|
||||
-- Autocompletion
|
||||
add({
|
||||
source = "Saghen/blink.cmp",
|
||||
depends = { "rafamadriz/friendly-snippets" },
|
||||
hooks = {
|
||||
post_install = function(ctx)
|
||||
vim.cmd("!cd " .. ctx.path .. " && cargo build --release")
|
||||
end,
|
||||
post_checkout = function(ctx)
|
||||
vim.cmd("!cd " .. ctx.path .. " && cargo build --release")
|
||||
end,
|
||||
},
|
||||
source = "saghen/blink.cmp",
|
||||
depends = {'saghen/blink.lib', "rafamadriz/friendly-snippets" },
|
||||
hooks = {
|
||||
-- NOTE: v2 also changed how the rust binary is built!
|
||||
-- Replace the old 'cargo build --release' string with the new Lua API:
|
||||
post_install = function() require('blink.cmp').build():pwait(60000) end,
|
||||
post_checkout = function() require('blink.cmp').build():pwait(60000) end,
|
||||
}
|
||||
})
|
||||
|
||||
-- Treesitter
|
||||
add({
|
||||
source = "nvim-treesitter/nvim-treesitter",
|
||||
checkout = "master",
|
||||
checkout = "main",
|
||||
monitor = "main",
|
||||
hooks = {
|
||||
post_checkout = function()
|
||||
|
||||
+3
-11
@@ -75,6 +75,9 @@ require("roslyn").setup({
|
||||
config = { handlers = require("rzls.roslyn_handlers") },
|
||||
})
|
||||
|
||||
-- Dedicated go Setup
|
||||
require('go').setup()
|
||||
|
||||
-- Diagnostics Configuration
|
||||
local sign = function(opts)
|
||||
vim.fn.sign_define(opts.name, { texthl = opts.name, text = opts.text, numhl = "" })
|
||||
@@ -135,14 +138,3 @@ require("lint").linters_by_ft = {
|
||||
python = { "flake8" },
|
||||
}
|
||||
|
||||
-- Dynamic LSP Keymaps (Loaded only when LSP attaches to a buffer)
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
callback = function(event)
|
||||
local opts = { buffer = event.buf }
|
||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
|
||||
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts)
|
||||
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
|
||||
vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
|
||||
end,
|
||||
})
|
||||
|
||||
@@ -53,11 +53,10 @@ require("typst-preview").setup({
|
||||
end,
|
||||
})
|
||||
|
||||
require("marp").setup({})
|
||||
|
||||
-- Treesitter
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = { "lua", "rust", "toml", "c_sharp", "python", "typst", "markdown", "markdown_inline" },
|
||||
auto_install = true,
|
||||
highlight = { enable = true },
|
||||
ident = { enable = true },
|
||||
rainbow = { enable = true, extended_mode = true },
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = { '<filetype>' },
|
||||
callback = function() vim.treesitter.start() end,
|
||||
})
|
||||
|
||||
+5
-16
@@ -1,18 +1,7 @@
|
||||
-- Catppuccin Theme
|
||||
require("catppuccin").setup({
|
||||
flavour = "auto",
|
||||
background = { light = "latte", dark = "mocha" },
|
||||
transparent_background = false,
|
||||
show_end_of_buffer = false,
|
||||
integrations = {
|
||||
cmp = true,
|
||||
gitsigns = true,
|
||||
nvimtree = true,
|
||||
treesitter = true,
|
||||
mini = { enabled = true },
|
||||
},
|
||||
})
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
-- Takemi Theme — lives in colors/takemi.lua, shares its palette with
|
||||
-- ~/.config/quickshell/config/Theme.qml and ~/.config/alacritty/takemi.toml.
|
||||
vim.o.termguicolors = true
|
||||
vim.cmd.colorscheme("takemi")
|
||||
|
||||
-- Git Signs
|
||||
require("gitsigns").setup()
|
||||
@@ -35,7 +24,7 @@ end
|
||||
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
theme = require("catppuccin.utils.lualine")(),
|
||||
theme = require("takemi").lualine(),
|
||||
component_separators = { left = "|", right = "|" },
|
||||
section_separators = { left = "", right = "" },
|
||||
globalstatus = true,
|
||||
|
||||
Reference in New Issue
Block a user