Compare commits

..

No commits in common. "4138a017a3187bb0610d7cafc2e3639c64686856" and "81990813485a580d69853d8429e3b8aece7f66a6" have entirely different histories.

6 changed files with 12 additions and 82 deletions

View file

@ -15,7 +15,7 @@
./lualine.nix
./neo-tree.nix
./nvim-cmp.nix
# ./project.nix
./project.nix
./rainbow-delimiters.nix
./telescope.nix
./toggleterm.nix

View file

@ -1,37 +0,0 @@
{ helpers, pkgs, ... }: {
plugins.conform-nvim = {
enable = true;
formatAfterSave = ''
{
format_after_save = {
lsp_format = "fallback",
},
}
'';
formattersByFt = {
python = [ "black" ];
c = [ "clang-format" ];
cpp = [ "clang-format" ];
cmake = [ "cmake_format" ];
nix = [ "nixfmt" ];
# Standalone scalafmt is too slow, so we use it as a fallback
scala = helpers.mkRaw ''
{ scalafmt, lsp_format = "prefer" }
'';
toml = [ "taplo" ];
yaml = [ "yq" ];
json = [ "jq" ];
};
};
extraPackages = with pkgs; [
black
clang-tools
cmake-format
jq
nixfmt-rfc-style
scalafmt
taplo
yq
];
}

View file

@ -1,6 +1,5 @@
{
imports = [
./conform.nix
./lsp.nix
./lsp-format.nix
./lspkind.nix

View file

@ -1,4 +1,4 @@
{ pkgs, helpers, ... }:
{ helpers, ... }:
{
plugins.lsp = {
@ -69,14 +69,6 @@
};
};
};
onAttach = ''
require("lsp_signature").on_attach({
bind = true,
handler_opts = {
border = "rounded"
};
}, bufnr)
'';
};
keymaps = [
@ -93,20 +85,4 @@
};
}
];
extraConfigLua = ''
require("lspconfig").asm_lsp.setup {
filetypes = { "asm", "s", "S" }
}
require("lspconfig").verible.setup { }
'';
extraPlugins = with pkgs.vimPlugins; [
lsp_signature-nvim
];
extraPackages = with pkgs; [
asm-lsp
verible
];
}

View file

@ -8,28 +8,12 @@
extraPackages = [
pkgs.metals
pkgs.scalafmt
];
autoGroups.nvim_metals_group = {
clear = true;
};
extraConfigLua = ''
metals_config = require("metals").bare_config()
metals_config.init_options.statusBarProvider = "off"
metals_config.settings = {
showInferredType = true,
showImplicitArguments = false,
showImplicitConversionsAndClasses = false,
metalsBinaryPath = "${pkgs.lib.getExe pkgs.metals}",
excludedPackages = { "akka.actor.typed.javadsl", "com.github.swagger.akka.javadsl" },
useGlobalExecutable = true,
verboseCompilation = true
}
metals_config.capabilities = require("cmp_nvim_lsp").default_capabilities()
'';
autoCmd = [
{
event = "FileType";
@ -37,10 +21,18 @@
desc = "Initialize nvim-metals";
callback = helpers.mkRaw ''
function()
metals_config = require("metals").bare_config()
metals_config.init_options.statusBarProvider = "off"
metals_config.settings = {
showInferredType = true,
showImplicitArguments = false,
showImplicitConversionsAndClasses = false,
metalsBinaryPath = "${pkgs.lib.getExe pkgs.metals}",
useGlobalExecutable = true
}
require("metals").initialize_or_attach(metals_config)
end
'';
pattern = [ "scala" "sbt" ];
}
];

View file

@ -5,7 +5,7 @@
enable = true;
enableTelescope = true;
silentChdir = false;
manualMode = true;
scopeChdir = "tab";
};
autoGroups.project_nvim_group = {