fish.nix

home/default.nix

@@ -31,11 +31,13 @@
     tree
     vdirsyncer
     tdesktop
+    nnn
   ];
 
   imports = [
     ./R.nix
     ./nvim
+    ./fish.nix
   ];
 
   home.shellAliases = {
@@ -44,9 +46,6 @@
     v = "nvim";
   };
 
-  programs.fish = {
-    enable = true;
-  };
 
   programs.git = { 
     enable = true;

home/nvim/lsp.vim

@@ -59,6 +59,8 @@ lua <<EOF
 --  require('lspconfig')['typescript'].setup {
 --    capabilities = capabilities
 --  }
+
+  local nvim_lsp = require('lspconfig')
   local servers = { "r_language_server", "tsserver" }
   for _, lsp in ipairs(servers) do
     nvim_lsp[lsp].setup {