This commit is contained in:
iris committed 2024-07-13 16:32:23 -04:00
1 parent 8fd4917480
commit 69f23e1384
7 files changed
+59 -51

No files matched your search

+1
View File
@@ -1,5 +1,6 @@
vim.filetype.add({
extension = {
wgsl = 'wgsl',
slint = 'slint',
},
})
+21 -7
View File
@@ -5,6 +5,7 @@ local g = vim.g
o.number = true
o.showmode = false
o.clipboard = "unnamedplus"
o.undofile = true
g.mapleader = " "
g.maplocalleader = ","
@@ -33,17 +34,30 @@ else
end
-- diagnostics
local signs = { Error = "", Warn = "", Hint = "", Info = "" }
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
end
local sev = vim.diagnostic.severity
local text = {
[sev.ERROR] = "",
[sev.WARN] = "",
[sev.HINT] = "",
[sev.INFO] = "",
}
local hl = {
[sev.ERROR] = "DiagnosticSignError",
[sev.WARN] = "DiagnosticSignWarn",
[sev.HINT] = "DiagnosticSignHint",
[sev.INFO] = "DiagnosticSignInfo",
}
vim.diagnostic.config({
virtual_text = { prefix = "" },
signs = {
text = text,
numhl = hl,
},
})
-- neovide
if vim.g.neovide then
vim.g.transparency = 0.8
vim.g.neovide_transparency = 0.8
vim.g.neovide_background_color = "#1e1e2a"
end
+11 -17
View File
@@ -1,22 +1,7 @@
local rt_config = function()
local rt = require "rust-tools"
rt.setup {
server = {
-- on_attach = function(_, bufnr)
-- vim.keymap.set("n", "<C-k>", rt.hover_actions.hover_actions, { buffer = bufnr })
-- vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
-- end
}
}
end
return {
{
"simrat39/rust-tools.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
"mfussenegger/nvim-dap",
},
config = rt_config
"mrcjkb/rustaceanvim",
ft = { "rust" },
},
{
"windwp/nvim-autopairs",
@@ -33,4 +18,13 @@ return {
"mfussenegger/nvim-jdtls",
"mfussenegger/nvim-dap",
"folke/neodev.nvim",
{
"williamboman/mason.nvim",
config = function() require "mason".setup {} end,
},
{
"williamboman/mason-lspconfig.nvim",
dependencies = { "williamboman/mason.nvim" },
config = function() require "mason-lspconfig" end,
},
}
+3 -1
View File
@@ -50,6 +50,7 @@ local config = function()
}
c.wgsl_analyzer.setup {}
c.hls.setup {}
c.slint_lsp.setup {}
require 'config.lsp-settings'
end
@@ -57,6 +58,7 @@ end
return {
{
"neovim/nvim-lspconfig",
config = config
config = config,
dependencies = { "williamboman/mason-lspconfig.nvim"},
},
}
-1
View File
@@ -1,7 +1,6 @@
return {
{
"nvim-telescope/telescope.nvim",
tag = "0.1.0",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
require("telescope").setup {}
+18 -19
View File
@@ -1,23 +1,22 @@
return {
{
"nvim-neorg/neorg",
build = ":Neorg sync-parsers",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
require("neorg").setup {
load = {
["core.defaults"] = {},
["core.concealer"] = {},
["core.completion"] = {
config = {
engine = "nvim-cmp"
}
},
["core.export"] = {},
}
}
end,
},
-- {
-- "nvim-neorg/neorg",
-- dependencies = { "nvim-lua/plenary.nvim" },
-- config = function()
-- require("neorg").setup {
-- load = {
-- ["core.defaults"] = {},
-- ["core.concealer"] = {},
-- ["core.completion"] = {
-- config = {
-- engine = "nvim-cmp"
-- }
-- },
-- ["core.export"] = {},
-- }
-- }
-- end,
-- },
{
"folke/which-key.nvim",
config = function()
+5 -6
View File
@@ -32,9 +32,7 @@ return {
{
"lewis6991/gitsigns.nvim",
config = function()
require("gitsigns").setup({
_signs_staged_enable = true
})
require("gitsigns").setup()
end
},
{
@@ -74,9 +72,11 @@ return {
lookahead = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
["kf"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = "@class.inner",
["kc"] = "@class.inner",
["ap"] = "@parameter.outer",
["kp"] = "@parameter.inner",
},
},
swap = {
@@ -88,7 +88,6 @@ return {
["<leader>sn"] = "@parameter.inner",
},
},
},
}
end