From 43d0434ace439b8656539af9dc332a7494918017 Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Wed, 12 Jul 2023 18:18:43 +0200 Subject: [PATCH] add solargraph and rubocop --- configuration.nix | 1 + modules/languages/default.nix | 1 + modules/languages/ruby.nix | 157 ++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 modules/languages/ruby.nix diff --git a/configuration.nix b/configuration.nix index a38a2dae..72c625a3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -67,6 +67,7 @@ inputs: let python.enable = isMaximal; dart.enable = isMaximal; elixir.enable = isMaximal; + ruby.enable = isMaximal; }; vim.visuals = { diff --git a/modules/languages/default.nix b/modules/languages/default.nix index 9a5135e0..c09fe771 100644 --- a/modules/languages/default.nix +++ b/modules/languages/default.nix @@ -17,6 +17,7 @@ in { ./go.nix ./nix.nix ./python.nix + ./ruby.nix ./rust.nix ./sql.nix ./ts.nix diff --git a/modules/languages/ruby.nix b/modules/languages/ruby.nix new file mode 100644 index 00000000..4b5a6147 --- /dev/null +++ b/modules/languages/ruby.nix @@ -0,0 +1,157 @@ +{ + pkgs, + config, + lib, + ... +}: +with lib; +with builtins; let + cfg = config.vim.languages.ruby; + + defaultServer = "rubyserver"; + servers = { + rubyserver = { + package = pkgs.rubyPackages_3_2.solargraph; + lspConfig = '' + lspconfig.rubyserver.setup { + capabilities = capabilities; + on_attach = attach_keymaps, + cmd = { "${pkgs.bundler}/bin/bundle exec solargraph", "stdio" } + } + ''; + }; + }; + + # TODO: specify packages + defaultFormat = "rubocop"; + formats = { + rubocop = { + package = pkgs.rubocop; + nullConfig = '' + + local conditional = function(fn) + local utils = require("null-ls.utils").make_conditional_utils() + return fn(utils) + end + + table.insert( + ls_sources, + null_ls.builtins.formatting.rubocop.with({ + command = "${pkgs.bundler}/bin/bundle", + args = vim.list_extend( + { "exec", "rubocop", "-a" }, + null_ls.builtins.formatting.rubocop._opts.args + ), + }) + + + -- conditional(function(utils) + -- return utils.root_has_file("Gemfile") + -- and null_ls.builtins.formatting.rubocop.with({ + -- command = "${pkgs.bundler}", + -- args = vim.list_extend( + -- { "exec", "rubocop" }, + -- nls.builtins.formatting.rubocop._opts.args + -- ), + -- }) + -- or null_ls.builtins.formatting.rubocop.with({ + -- command = "${cfg.format.package}/bin/rubocop", + -- }) + -- end) + ) + ''; + }; + }; + # TODO: specify packages + defaultDiagnostics = ["rubocop"]; + diagnostics = { + rubocop = { + package = pkgs.rubyPackages_3_2.rubocop; + nullConfig = pkg: '' + table.insert( + ls_sources, + null_ls.builtins.diagnostics.rubocop.with({ + command = "${lib.getExe pkg}", + }) + ) + ''; + }; + }; +in { + options.vim.languages.ruby = { + enable = mkEnableOption "Ruby/Ruby on Rails language support"; + + treesitter = { + enable = mkEnableOption "Enable Ruby treesitter" // {default = config.vim.languages.enableTreesitter;}; + rubyPackage = nvim.types.mkGrammarOption pkgs "ruby"; + }; + + lsp = { + enable = mkEnableOption "Enable Ruby/Ruby on Rails LSP support" // {default = config.vim.languages.enableLSP;}; + + server = mkOption { + description = "Ruby/RoR LSP server to use"; + type = with types; enum (attrNames servers); + default = defaultServer; + }; + + package = mkOption { + description = "Ruby/RoR LSP server package"; + type = types.package; + default = servers.${cfg.lsp.server}.package; + }; + }; + + format = { + enable = mkEnableOption "Enable Ruby/RoR formatting" // {default = config.vim.languages.enableFormat;}; + + type = mkOption { + description = "Ruby/RoR formatter to use"; + type = with types; enum (attrNames formats); + default = defaultFormat; + }; + + package = mkOption { + description = "Ruby/RoR formatter package"; + type = types.package; + default = formats.${cfg.format.type}.package; + }; + }; + + extraDiagnostics = { + enable = mkEnableOption "Enable extra Ruby/RoR diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; + + types = lib.nvim.types.diagnostics { + langDesc = "Ruby/RoR"; + inherit diagnostics; + inherit defaultDiagnostics; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.rubyPackage]; + }) + + (mkIf cfg.lsp.enable { + vim.lsp.lspconfig.enable = true; + vim.lsp.lspconfig.sources.ruby-lsp = servers.${cfg.lsp.server}.lspConfig; + }) + + (mkIf cfg.format.enable { + vim.lsp.null-ls.enable = true; + vim.lsp.null-ls.sources.ruby-format = formats.${cfg.format.type}.nullConfig; + }) + + (mkIf cfg.extraDiagnostics.enable { + vim.lsp.null-ls.enable = true; + vim.lsp.null-ls.sources = lib.nvim.languages.diagnosticsToLua { + lang = "ruby"; + config = cfg.extraDiagnostics.types; + inherit diagnostics; + }; + }) + ]); +}