Skip to content

Commit

Permalink
Merge pull request #323 from izumin5210/izumin5210/nixd
Browse files Browse the repository at this point in the history
chore(neovim): use nixd
  • Loading branch information
izumin5210 authored Apr 7, 2024
2 parents 873b9ca + ed11024 commit ac57e13
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
10 changes: 7 additions & 3 deletions config/.config/nvim/lua/pluginconfig/lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ function M.setup()
'graphql',
'jsonnet_ls',
'rust_analyzer',
-- Nix
'nil',
-- Ruby
'solargraph',
-- JS
Expand All @@ -312,7 +310,7 @@ function M.setup()
'jsonls',
'yamlls'
},
automatic_installation = true,
automatic_installation = false,
handlers = {
function(server_name)
lspconfig[server_name].setup({
Expand All @@ -324,6 +322,12 @@ function M.setup()
end,
}
})

-- language servers are installed manually
lspconfig.nixd.setup({
on_attach = on_attach_lsp,
capabilities = require('cmp_nvim_lsp').default_capabilities(),
})
end

return M
18 changes: 9 additions & 9 deletions flake.lock

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

13 changes: 9 additions & 4 deletions home.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:

{
nixpkgs.overlays = [ (import ./overlays/sheldon.nix) ];

nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "ngrok" ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "ngrok" ];
# Home Manager needs a bit of information about you and the paths it should
# manage.
# home.username = user.name;
Expand Down Expand Up @@ -57,7 +61,8 @@
pkgs.reattach-to-user-namespace # only darwin

# nix
pkgs.nixfmt
pkgs.nixd
pkgs.nixfmt-rfc-style

# middlewares
pkgs.postgresql_16
Expand Down

0 comments on commit ac57e13

Please sign in to comment.