Skip to content

Commit

Permalink
Add EHCSLS
Browse files Browse the repository at this point in the history
  • Loading branch information
Sigmanificient committed Jan 4, 2024
1 parent 308da2e commit fb1cc13
Show file tree
Hide file tree
Showing 5 changed files with 192 additions and 23 deletions.
2 changes: 1 addition & 1 deletion bacon.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ in
useUserPackages = true;
users.${username} = import ./home;
extraSpecialArgs = {
inherit username system ecsls;
inherit username system ecsls ehcsls;
};
};
};
Expand Down
188 changes: 171 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";

ecsls.url = "github:Sigmapitech-meta/ecsls";
ecsls.url = "github:Sigmapitech/ecsls";
ehcsls.url = "github:Sigmapitech/ehcsls";

hosts.url = "github:StevenBlack/hosts";
nixos-hardware.url = "github:NixOS/nixos-hardware";

Expand Down
4 changes: 3 additions & 1 deletion home/nvim/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ecsls, system, ... }:
{ pkgs, ecsls, ehcsls, system, ... }:
{
home.file = {
nvim_conf = {
Expand Down Expand Up @@ -26,6 +26,7 @@

extraPackages = with pkgs; let
ecsls-pkg = ecsls.packages.${system}.default;
ehcsls-pkg = ehcsls.packages.${system}.default;
in
[
nil
Expand All @@ -36,6 +37,7 @@
nodejs
xclip
ecsls-pkg
ehcsls-pkg
];
};
}
17 changes: 14 additions & 3 deletions home/nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,20 @@ if not configs.ecsls then
},
}
end
lspconfig.ecsls.setup({

})
lspconfig.ecsls.setup({})
-- ↓ Epitech HCS
if not configs.ehcsls then
configs.ehcsls = {
default_config = {
root_dir = lspconfig.util.root_pattern(".git"),
cmd = { "ehcsls_run" },
autostart = true,
name = "ehcsls",
filetypes = { "haskell" },
},
}
end
lspconfig.ehcsls.setup({})
--

lsp.on_attach(function(_, bufnr)
Expand Down

0 comments on commit fb1cc13

Please sign in to comment.