From 40a659381168f7d3f6fad5151c1397734bd91d7f Mon Sep 17 00:00:00 2001 From: Soliprem Date: Mon, 30 Sep 2024 14:35:29 +0200 Subject: [PATCH] removing haskell from kotlin branch --- configuration.nix | 1 - modules/plugins/languages/default.nix | 1 - modules/plugins/languages/haskell.nix | 55 --------------------------- 3 files changed, 57 deletions(-) delete mode 100644 modules/plugins/languages/haskell.nix diff --git a/configuration.nix b/configuration.nix index 7ee86137..e5b9c65a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -62,7 +62,6 @@ isMaximal: { dart.enable = isMaximal; bash.enable = isMaximal; r.enable = isMaximal; - haskell.enable = isMaximal; tailwind.enable = isMaximal; typst.enable = isMaximal; clang = { diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 6d12e08b..b46d992c 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -8,7 +8,6 @@ in { ./css.nix ./elixir.nix ./go.nix - ./haskell.nix ./kotlin.nix ./html.nix ./java.nix diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix deleted file mode 100644 index 47f122c0..00000000 --- a/modules/plugins/languages/haskell.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; - inherit (lib.nvim.lua) expToLua; - inherit (lib.types) package; - inherit (lib.nvim.types) mkGrammarOption; - - cfg = config.vim.languages.haskell; -in { - options.vim.languages.haskell = { - enable = mkEnableOption "Haskell support"; - - treesitter = { - enable = mkEnableOption "Haskell treesitter" // {default = config.vim.languages.enableTreesitter;}; - package = mkGrammarOption pkgs "haskell"; - }; - - lsp = { - enable = mkEnableOption "Haskell LSP support (haskell-language-server)" // {default = true;}; - - package = mkOption { - description = "haskell_ls package"; - type = package; - default = pkgs.haskell-language-server; - }; - }; - }; - config = mkIf cfg.enable (mkMerge [ - (mkIf cfg.treesitter.enable { - vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.package]; - }) - - (mkIf cfg.lsp.enable { - vim.lsp.lspconfig.enable = true; - vim.lsp.lspconfig.sources.hls = '' - lspconfig.hls.setup { - capabilities = capabilities, - on_attach=default_on_attach, - cmd = ${ - if isList cfg.lsp.package - then expToLua cfg.lsp.package - else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper", "--lsp"}'' - }, - } - ''; - }) - ]); -}