nix #11

Manually merged
geoffrey merged 113 commits from nix into main 2023-12-09 21:43:01 +01:00
Showing only changes of commit 85ac632025 - Show all commits

View file

@ -1,8 +1,9 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
let let
nixvim = import (builtins.fetchGit { nixvim = import (builtins.fetchGit {
url = "https://github.com/nix-community/nixvim"; # UPST Ready to create a MR once the tests have ran
ref = "nixos-23.11"; url = "https://github.com/GeoffreyFrogeye/nixvim";
ref = "perlls";
}); });
vim-shot-f = pkgs.vimUtils.buildVimPlugin { vim-shot-f = pkgs.vimUtils.buildVimPlugin {
pname = "vim-shot-f"; pname = "vim-shot-f";
@ -156,11 +157,11 @@ in
}; };
}; };
servers = { servers = {
# FIXME ansiblels ansiblels.enable = true; # Ansible
bashls.enable = true; # Bash bashls.enable = true; # Bash
jsonls.enable = true; # JSON jsonls.enable = true; # JSON
lua-ls.enable = true; # Lua (for Neovim debugging) lua-ls.enable = true; # Lua (for Neovim debugging)
# FIXME perlls perlpls.enable = true; # Perl
pylsp = lib.mkIf config.frogeye.dev.python { pylsp = lib.mkIf config.frogeye.dev.python {
# Python # Python
enable = true; enable = true;
@ -195,7 +196,7 @@ in
}; };
phpactor.enable = true; # PHP phpactor.enable = true; # PHP
rnix-lsp.enable = true; # Nix rnix-lsp.enable = true; # Nix
# FIXME sqlls # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
yamlls.enable = true; # YAML yamlls.enable = true; # YAML
# TODO Check out none-ls # TODO Check out none-ls
}; };