[nix] Fix bugs and switch to nil for nix lsp

nix/hosts/alymac/default.nix

@@ -21,7 +21,6 @@ let
       ffmpeg
       fzf
       gh
-      # git # already managed by home-manager
       git-crypt
       gitui
       gnupg
@@ -29,7 +28,6 @@ let
       kubectl
       kubelogin-oidc
       mosh
-      # neovim # already managed by home-manager
       nixpkgs-fmt
       ripgrep
       sops

nix/hosts/alymac/git.nix

@@ -1,4 +1,4 @@
-{ dotfiles, ... }:
+{ pkgs, dotfiles, ... }:
 
 {
   programs.git = {

nix/hosts/alymac/nvim.nix

@@ -1,4 +1,4 @@
-{ dotfiles, ... }:
+{ pkgs, dotfiles, ... }:
 
 {
   programs.neovim = {
@@ -11,10 +11,14 @@
       enable = true;
 
       settings = {
-        languageServer = {
+        languageserver = {
           nix = {
-            command = "rnix-lsp";
+            command = "nil";
             filetypes = [ "nix" ];
+            rootPatterns = [ "flake.nix" ];
+            "settings.nil" = {
+              "formatting.command" = ["nixpkgs-fmt"];
+            };
           };
           "go.goPlsOptions" = {
             completion = true;