Add in new conf
This commit is contained in:
parent
8e4f110938
commit
07b070cba0
3 changed files with 90 additions and 56 deletions
|
@ -22,6 +22,7 @@
|
||||||
- foot
|
- foot
|
||||||
- git
|
- git
|
||||||
- grimshot
|
- grimshot
|
||||||
|
- hiera-eyaml
|
||||||
- inkscape
|
- inkscape
|
||||||
- isort
|
- isort
|
||||||
- libreoffice
|
- libreoffice
|
||||||
|
|
|
@ -59,14 +59,16 @@ lvim.builtin.treesitter.ensure_installed = { "comment", "markdown_inline", "rege
|
||||||
-- ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
|
-- ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
|
||||||
-- ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
|
-- ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
|
||||||
-- add `pylyzer` to `skipped_servers` list
|
-- add `pylyzer` to `skipped_servers` list
|
||||||
|
require("mason").setup()
|
||||||
|
require("mason-lspconfig").setup()
|
||||||
vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pylyzer" })
|
vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pylyzer" })
|
||||||
-- remove `pyright` from `skipped_servers` list
|
-- remove `pyright` from `skipped_servers` list
|
||||||
lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
|
lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
|
||||||
return server ~= "pyright"
|
return server ~= "pyright"
|
||||||
end, lvim.lsp.automatic_configuration.skipped_servers)
|
end, lvim.lsp.automatic_configuration.skipped_servers)
|
||||||
require("mason-lspconfig").setup {
|
require("mason-lspconfig").setup({
|
||||||
automatic_installation = { exclude = { "puppet", "pylyzer" } }
|
automatic_installation = { exclude = { "puppet", "pylyzer" } },
|
||||||
}
|
})
|
||||||
-- local opts = {} -- check the lspconfig documentation for a list of all possible options
|
-- local opts = {} -- check the lspconfig documentation for a list of all possible options
|
||||||
-- require("lvim.lsp.manager").setup("pyright", opts)
|
-- require("lvim.lsp.manager").setup("pyright", opts)
|
||||||
--require 'lspconfig'.puppet.setup {}
|
--require 'lspconfig'.puppet.setup {}
|
||||||
|
@ -79,10 +81,9 @@ null_ls.setup({
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
-- -- linters, formatters and code actions <https://www.lunarvim.org/docs/languages#lintingformatting>
|
-- -- linters, formatters and code actions <https://www.lunarvim.org/docs/languages#lintingformatting>
|
||||||
local formatters = require "lvim.lsp.null-ls.formatters"
|
local formatters = require("lvim.lsp.null-ls.formatters")
|
||||||
formatters.setup {
|
formatters.setup({
|
||||||
{ command = "stylua" },
|
{ command = "stylua" },
|
||||||
{
|
{
|
||||||
command = "prettier",
|
command = "prettier",
|
||||||
|
@ -107,7 +108,7 @@ formatters.setup {
|
||||||
extra_args = { "-w" },
|
extra_args = { "-w" },
|
||||||
filetypes = { "sh" },
|
filetypes = { "sh" },
|
||||||
},
|
},
|
||||||
}
|
})
|
||||||
-- local linters = require "lvim.lsp.null-ls.linters"
|
-- local linters = require "lvim.lsp.null-ls.linters"
|
||||||
-- linters.setup {
|
-- linters.setup {
|
||||||
-- { command = "flake8", filetypes = { "python" } },
|
-- { command = "flake8", filetypes = { "python" } },
|
||||||
|
@ -140,7 +141,7 @@ vim.api.nvim_create_autocmd("BufReadPost", {
|
||||||
if vim.fn.line("'\"") > 1 and vim.fn.line("'\"") <= vim.fn.line("$") then
|
if vim.fn.line("'\"") > 1 and vim.fn.line("'\"") <= vim.fn.line("$") then
|
||||||
vim.api.nvim_exec("normal! g'\"", false)
|
vim.api.nvim_exec("normal! g'\"", false)
|
||||||
end
|
end
|
||||||
end
|
end,
|
||||||
})
|
})
|
||||||
-- vim.api.nvim_create_autocmd("FileType", {
|
-- vim.api.nvim_create_autocmd("FileType", {
|
||||||
-- pattern = "zsh",
|
-- pattern = "zsh",
|
||||||
|
@ -150,13 +151,44 @@ vim.api.nvim_create_autocmd("BufReadPost", {
|
||||||
-- end,
|
-- end,
|
||||||
-- })
|
-- })
|
||||||
|
|
||||||
|
vim.g.tabby_keybinding_accept = "<C-Right>"
|
||||||
vim.g.tabby_keybinding_accept = '<C-Right>'
|
vim.g.tabby_keybinding_trigger_or_dismiss = "<C-Left>"
|
||||||
vim.g.tabby_keybinding_trigger_or_dismiss = '<C-Left>'
|
|
||||||
vim.g.tabby_suggestion_delay = 100
|
vim.g.tabby_suggestion_delay = 100
|
||||||
lvim.builtin.which_key.mappings["lh"] = {
|
lvim.builtin.which_key.mappings["lh"] = {
|
||||||
"<cmd>lua vim.lsp.buf.hover()<CR>", "Show documentation"
|
"<cmd>lua vim.lsp.buf.hover()<CR>",
|
||||||
|
"Show documentation",
|
||||||
}
|
}
|
||||||
lvim.builtin.which_key.mappings["lu"] = {
|
lvim.builtin.which_key.mappings["lu"] = {
|
||||||
"<cmd>lua require('telescope.builtin').lsp_references()<CR>", "Show usage"
|
"<cmd>lua require('telescope.builtin').lsp_references()<CR>",
|
||||||
|
"Show usage",
|
||||||
}
|
}
|
||||||
|
local lspconfig = require("lspconfig")
|
||||||
|
local configs = require("lspconfig.configs")
|
||||||
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||||
|
|
||||||
|
if not configs.intelephense then
|
||||||
|
configs.intelephense = {
|
||||||
|
default_config = {
|
||||||
|
cmd = { "intelephense", "--stdio" },
|
||||||
|
filetypes = { "php" },
|
||||||
|
root_dir = function(fname)
|
||||||
|
return vim.loop.cwd()
|
||||||
|
end,
|
||||||
|
settings = {
|
||||||
|
intelephense = {
|
||||||
|
files = {
|
||||||
|
maxSize = 1000000,
|
||||||
|
},
|
||||||
|
environment = {
|
||||||
|
includePaths = {
|
||||||
|
"/home/micke/sources/nextcloud/server",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
lspconfig.intelephense.setup({ capabilities = capabilities })
|
||||||
|
|
|
@ -8,7 +8,7 @@ set $down j
|
||||||
set $up k
|
set $up k
|
||||||
set $right l
|
set $right l
|
||||||
# Your preferred terminal emulator
|
# Your preferred terminal emulator
|
||||||
set $term foot
|
set $term foot-client
|
||||||
# Your preferred application launcher
|
# Your preferred application launcher
|
||||||
# Note: pass the final command to swaymsg so that the resulting window can be opened
|
# Note: pass the final command to swaymsg so that the resulting window can be opened
|
||||||
# on the original workspace that the command was run on.
|
# on the original workspace that the command was run on.
|
||||||
|
@ -20,6 +20,7 @@ exec --no-startup-id autotiling
|
||||||
exec --no-startup-id lxpolkit
|
exec --no-startup-id lxpolkit
|
||||||
exec --no-startup-id nextcloud
|
exec --no-startup-id nextcloud
|
||||||
exec --no-startup-id fcitx5
|
exec --no-startup-id fcitx5
|
||||||
|
exec --no-startup-id foot --server
|
||||||
|
|
||||||
include /etc/sway/config-vars.d/*
|
include /etc/sway/config-vars.d/*
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue