chore: update to NixOS 22.11
This commit is contained in:
parent
ad6f8e5233
commit
316d877765
11 changed files with 52 additions and 92 deletions
|
@ -75,11 +75,7 @@ in
|
|||
{ command = "element-desktop"; notification = false; }
|
||||
{ command = "keepassxc"; notification = false; }
|
||||
{ command = "nextcloud"; notification = false; }
|
||||
{ command = "signal-desktop"; notification = false; }
|
||||
{ command = "slack"; notification = false; }
|
||||
{ command = "telegram-desktop"; notification = false; }
|
||||
{ command = "thunderbird"; notification = false; }
|
||||
{ command = "whatsapp-for-linux"; notification = false; }
|
||||
];
|
||||
|
||||
assigns = {
|
||||
|
|
|
@ -1,54 +1,10 @@
|
|||
// vim:ts=4:sw=4:et
|
||||
{
|
||||
"layout": "tabbed",
|
||||
"type": "con",
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Telegram",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^TelegramDesktop$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
},
|
||||
{
|
||||
"name": "Signal",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^Signal$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
},
|
||||
{
|
||||
"name": "Element",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^Element$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
},
|
||||
{
|
||||
"name": "Whatsapp",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^Whatsapp-for-linux$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
}
|
||||
]
|
||||
"name": "Element",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^Element$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
}
|
||||
|
||||
{
|
||||
"name": "Slack",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^Slack$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"name": "Email",
|
||||
"swallows": [
|
||||
{
|
||||
"class": "^Thunderbird$"
|
||||
"class": "^thunderbird$"
|
||||
}
|
||||
],
|
||||
"type": "con"
|
||||
|
|
|
@ -75,7 +75,7 @@ in
|
|||
project-nvim
|
||||
auto-session
|
||||
|
||||
nvim-treesitter
|
||||
nvim-treesitter.withAllGrammars
|
||||
markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" })
|
||||
toggleterm-nvim
|
||||
nvim-notify
|
||||
|
@ -120,7 +120,7 @@ in
|
|||
nvim-lspconfig
|
||||
lsp-status-nvim
|
||||
rust-tools-nvim
|
||||
lua-dev-nvim
|
||||
neodev-nvim
|
||||
null-ls-nvim
|
||||
lsp_lines-nvim
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ local on_attach = function(client, bufnr)
|
|||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.formatting_sync(nil, 3000)
|
||||
vim.lsp.buf.format({ timeout_ms = 3000, async = false })
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
@ -49,8 +49,17 @@ lsp_status.config({
|
|||
})
|
||||
lsp_status.register_progress()
|
||||
|
||||
local capabilities = vim.tbl_extend("keep", vim.lsp.protocol.make_client_capabilities(), lsp_status.capabilities)
|
||||
capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
|
||||
-- setup lua language server for init.nvim and nvim plugin development
|
||||
require("neodev").setup({
|
||||
override = function(root_dir, library)
|
||||
if require("neodev.util").has_file(root_dir, "/etc/nixos") then
|
||||
library.enabled = true
|
||||
library.plugins = true
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.capabilities)
|
||||
|
||||
local servers = {
|
||||
["bashls"] = {},
|
||||
|
@ -66,6 +75,7 @@ local servers = {
|
|||
},
|
||||
["pyright"] = {},
|
||||
["rnix"] = {},
|
||||
["sumneko_lua"] = {},
|
||||
["terraformls"] = {},
|
||||
["tflint"] = {},
|
||||
["tsserver"] = {},
|
||||
|
@ -108,16 +118,6 @@ require("rust-tools").setup({
|
|||
},
|
||||
})
|
||||
|
||||
local luadev = require("lua-dev").setup({
|
||||
lspconfig = {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
},
|
||||
runtime_path = true,
|
||||
})
|
||||
|
||||
lspconfig["sumneko_lua"].setup(luadev)
|
||||
|
||||
-- setup null-ls for markdown formatting
|
||||
local null_ls = require("null-ls")
|
||||
null_ls.setup({
|
||||
|
|
|
@ -1,10 +1,4 @@
|
|||
require('nvim-treesitter.configs').setup({
|
||||
ensure_installed = {
|
||||
"bash", "c", "cpp", "css", "dockerfile", "hcl", "html", "javascript",
|
||||
"json", "latex", "lua", "markdown", "nix", "python", "rust", "svelte",
|
||||
"toml", "tsx", "typescript", "vim", "vue", "yaml"
|
||||
},
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue