diff --git a/.config/git/config b/.config/git/config index b9019b5..e98226a 100644 --- a/.config/git/config +++ b/.config/git/config @@ -5,9 +5,6 @@ [core] editor = helix pager = delta - ; repositoryformatversion = 1 -; [extensions] - ; objectformat = sha256 [diff] tool = nvimdiff algorithm = histogram diff --git a/.config/helix/config.toml b/.config/helix/config.toml index ad953bc..ff0e476 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -230,7 +230,7 @@ d = ":toggle inline-diagnostics.cursor-line disable warning" D = ":toggle inline-diagnostics.other-lines disable error" l = ":lsp-stop" L = ":lsp-restart" -A-l = ":run-shell-command lspmux reload" +A-l = ":run-shell-command systemctl --user restart lspmux.service" # t = [":toggle cursorline", ":toggle line-number absolute relative"] # https://github.com/helix-editor/helix/issues/13187 diff --git a/.config/nvim/after/lsp/rust_analyzer.lua b/.config/nvim/after/lsp/rust_analyzer.lua index 2177c3c..d40ccf4 100644 --- a/.config/nvim/after/lsp/rust_analyzer.lua +++ b/.config/nvim/after/lsp/rust_analyzer.lua @@ -1,42 +1,43 @@ return { - settings = { - ["rust-analyzer"] = { - cargo = { - features = "all", - loadOutDirsFromCheck = true, - runBuildScripts = true, - }, - -- Add clippy lints for Rust. - checkOnSave = true, - check = { - features = "all", - command = "clippy", - extraArgs = { - "--", - "--no-deps", -- run Clippy only on the given crate - -- Deny, Warn, Allow, Forbid - "-Wclippy::correctness", -- code that is outright wrong or useless - "-Wclippy::complexity", -- code that does something simple but in a complex way - "-Wclippy::suspicious", -- code that is most likely wrong or useless - "-Wclippy::style", -- code that should be written in a more idiomatic way - "-Wclippy::perf", -- code that can be written to run faster - "-Wclippy::pedantic", -- lints which are rather strict or have occasional false positives - "-Wclippy::nursery", -- new lints that are still under development - "-Wclippy::cargo", -- lints for the cargo manifest - -- Use in production - "-Aclippy::restriction", -- lints which prevent the use of language and library features - -- Other - "-Aclippy::must_use_candidate", -- must_use is rather annoing - }, - }, - procMacro = { - enable = true, - -- ignored = { - -- ["async-trait"] = { "async_trait" }, - -- ["napi-derive"] = { "napi" }, - -- ["async-recursion"] = { "async_recursion" }, - -- }, - }, + cmd = { "lspmux" }, + settings = { + ["rust-analyzer"] = { + cargo = { + features = "all", + loadOutDirsFromCheck = true, + runBuildScripts = true, + }, + -- Add clippy lints for Rust. + checkOnSave = true, + check = { + features = "all", + command = "clippy", + extraArgs = { + "--", + "--no-deps", -- run Clippy only on the given crate + -- Deny, Warn, Allow, Forbid + "-Wclippy::correctness", -- code that is outright wrong or useless + "-Wclippy::complexity", -- code that does something simple but in a complex way + "-Wclippy::suspicious", -- code that is most likely wrong or useless + "-Wclippy::style", -- code that should be written in a more idiomatic way + "-Wclippy::perf", -- code that can be written to run faster + "-Wclippy::pedantic", -- lints which are rather strict or have occasional false positives + "-Wclippy::nursery", -- new lints that are still under development + "-Wclippy::cargo", -- lints for the cargo manifest + -- Use in production + "-Aclippy::restriction", -- lints which prevent the use of language and library features + -- Other + "-Aclippy::must_use_candidate", -- must_use is rather annoing }, - } + }, + procMacro = { + enable = true, + -- ignored = { + -- ["async-trait"] = { "async_trait" }, + -- ["napi-derive"] = { "napi" }, + -- ["async-recursion"] = { "async_recursion" }, + -- }, + }, + }, + } } diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..d5d2e61 --- /dev/null +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,20 @@ +return { + "neovim/nvim-lspconfig", + event = "User LazyFile", + config = function() + local enabled = { + "lua_ls", + "bashls", + "tinymist", + "rust_analyzer", + "yamlls", + "clangd", + "jdtls", + "hyprls", + } + for _, name in ipairs(enabled) do + vim.lsp.enable(name) + end + end + +} diff --git a/.config/nvim/lua/plugins/mason-lspconfig.lua b/.config/nvim/lua/plugins/mason-lspconfig.lua index 45e5b55..e96714c 100644 --- a/.config/nvim/lua/plugins/mason-lspconfig.lua +++ b/.config/nvim/lua/plugins/mason-lspconfig.lua @@ -1,6 +1,7 @@ return { "mason-org/mason-lspconfig.nvim", -- event = "BufReadPre", + enabled = false, event = "User LazyFile", dependencies = { -- load those first { diff --git a/.config/udiskie/config.yml b/.config/udiskie/config.yml index 321fd74..ef98e7a 100644 --- a/.config/udiskie/config.yml +++ b/.config/udiskie/config.yml @@ -1,6 +1,6 @@ program_options: tray: auto - automount: true + automount: false notify: true password_cache: false file_manager: xdg-open