diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix
index 7082f34..00842b8 100644
--- a/modules/user/neovim.nix
+++ b/modules/user/neovim.nix
@@ -26,15 +26,16 @@ in {
     ];
 
     plugins = with pkgs.vimPlugins; [
-      ctrlp-vim
+      fzf-vim
+      fzf-lsp-nvim
       lualine-nvim
-      nerdtree
       tokyonight-nvim
       vim-fugitive
       vim-nix
       vim-repeat
       vim-signify
       vim-surround
+      lsp_signature-nvim
 
       nvim-cmp
       nvim-lspconfig
@@ -43,12 +44,10 @@ in {
       luasnip
 
       (pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [
-        tree-sitter-comment
         tree-sitter-c-sharp
         pkgs.me.tree-sitter-glimmer
         tree-sitter-html
         tree-sitter-javascript
-        tree-sitter-jsdoc
         tree-sitter-json
         pkgs.me.tree-sitter-jsonc
         tree-sitter-lua
diff --git a/modules/user/sessionVariables.nix b/modules/user/sessionVariables.nix
index 5dcd43a..6c9fab0 100644
--- a/modules/user/sessionVariables.nix
+++ b/modules/user/sessionVariables.nix
@@ -12,6 +12,7 @@
     _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
     CARGO_HOME = "${config.xdg.dataHome}/cargo";
     DIRENV_LOG_FORMAT = "";
+    FZF_DEFAULT_COMMAND = "fd --type f --hidden --follow --exclude .git";
     GNUPGHOME = "${config.xdg.dataHome}/gnupg";
     GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
     LESSHISTFILE = "-";
diff --git a/res/config.lua b/res/config.lua
index cbedd42..20b6bcf 100644
--- a/res/config.lua
+++ b/res/config.lua
@@ -5,11 +5,11 @@ map('n', '<C-J>', '<C-W>j', { noremap = true })
 map('n', '<C-K>', '<C-W>k', { noremap = true })
 map('n', '<C-L>', '<C-W>l', { noremap = true })
 map('n', '<C-Q>', ':q<CR>', { noremap = true })
+map('n', '<C-P>', ':Files<CR>', { noremap = true })
 
 -- Autocommands
 vim.cmd('au BufEnter * set noro')
 vim.cmd('au CursorHold * lua vim.diagnostic.open_float(0, { scope = "line", focusable = false })')
-vim.cmd('au CursorHoldI * silent! lua vim.lsp.buf.signature_help({ focusable = false })')
 
 -- Settings
 vim.opt.relativenumber = true
@@ -101,8 +101,6 @@ local on_attach = function(client, bufnr)
     local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
     local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 
-    buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
     local opts = { noremap = true, silent = true }
 
     buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
@@ -141,7 +139,7 @@ local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
 
-local servers = { 'cssls', 'html', 'rnix', 'rust_analyzer', 'tsserver', 'yamlls' }
+local servers = { 'cssls', 'html', 'rnix', 'rust_analyzer', 'yamlls' }
 for _, lsp in ipairs(servers) do
     nvim_lsp[lsp].setup {
         capabilities = capabilities,
@@ -197,6 +195,12 @@ cmp.setup {
     }
 }
 
+-- LSP/Volar
+require'lspconfig'.volar.setup{
+  filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' },
+  cmd = { 'vue-language-server', '--stdio' }
+}
+
 -- LSP/Omnisharp
 local pid = vim.fn.getpid()
 require'lspconfig'.omnisharp.setup {
@@ -209,7 +213,7 @@ require'lspconfig'.omnisharp.setup {
 nvim_lsp.diagnosticls.setup {
     capabilities = capabilities,
     on_attach = on_attach,
-    filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact' },
+    filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'vue' },
     init_options = {
         linters = {
             eslint = {
@@ -237,7 +241,18 @@ nvim_lsp.diagnosticls.setup {
             javascript = 'eslint',
             javascriptreact = 'eslint',
             typescript = 'eslint',
-            typescriptreact = 'eslint'
+            typescriptreact = 'eslint',
+            vue = 'eslint'
         }
     }
 }
+
+-- LSP/Signatures
+require("lsp_signature").setup {
+    hint_enable = false,
+    handler_opts = { border = "none" },
+    fix_pos = true
+}
+
+-- LSP/fzf
+require'fzf_lsp'.setup()
diff --git a/users/rin/packages.nix b/users/rin/packages.nix
index 5004694..b439068 100644
--- a/users/rin/packages.nix
+++ b/users/rin/packages.nix
@@ -42,11 +42,13 @@ in {
 
   home.packages = with pkgs; [
     dconf
+    fd
     ffmpeg
     gnupg
     kitty
     nodejs-16_x
     pamixer
+    ripgrep
     rnix-lsp
     unrar
     weechat