diff --git a/hm/vim.nix b/hm/vim.nix
index bf82131..2f15e45 100644
--- a/hm/vim.nix
+++ b/hm/vim.nix
@@ -1,8 +1,9 @@
 { pkgs, lib, config, ... }:
 let
   nixvim = import (builtins.fetchGit {
-    url = "https://github.com/nix-community/nixvim";
-    ref = "nixos-23.11";
+  # UPST Ready to create a MR once the tests have ran
+    url = "https://github.com/GeoffreyFrogeye/nixvim";
+    ref = "perlls";
   });
   vim-shot-f = pkgs.vimUtils.buildVimPlugin {
     pname = "vim-shot-f";
@@ -156,11 +157,11 @@ in
           };
         };
         servers = {
-          # FIXME ansiblels
+          ansiblels.enable = true; # Ansible
           bashls.enable = true; # Bash
           jsonls.enable = true; # JSON
           lua-ls.enable = true; # Lua (for Neovim debugging)
-          # FIXME perlls
+          perlpls.enable = true; # Perl
           pylsp = lib.mkIf config.frogeye.dev.python {
             # Python
             enable = true;
@@ -195,7 +196,7 @@ in
           };
           phpactor.enable = true; # PHP
           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
           # TODO Check out none-ls
         };