diff --git a/.config/nvim/fnl/plugins.fnl b/.config/nvim/fnl/plugins.fnl
index b1d8176..e18c0bc 100644
--- a/.config/nvim/fnl/plugins.fnl
+++ b/.config/nvim/fnl/plugins.fnl
@@ -14,9 +14,6 @@
   (use! "~/.config/nvim/themes/solarized.nvim"
         :module :settings.solarized)
 
-  (use! :nvim-lua/popup.nvim
-        :module :popup)
-
   (use! :nvim-treesitter/nvim-treesitter
         :run (fn [] ((. (require :nvim-treesitter.install) :update) {:with_sync true}))
         :module :settings.treesitter)
@@ -103,4 +100,9 @@
   (use! :edluffy/hologram.nvim
         :module :settings.hologram)
 
-  (use! :lambdalisue/suda.vim))
+  (use! :lambdalisue/suda.vim)
+
+  (use! :folke/noice.nvim
+        :event :VimEnter
+        :requires [:MunifTanjim/nui.nvim]
+        :module :settings.noice))
diff --git a/.config/nvim/fnl/settings/aerial.fnl b/.config/nvim/fnl/settings/aerial.fnl
index c5a56c6..d655dfd 100644
--- a/.config/nvim/fnl/settings/aerial.fnl
+++ b/.config/nvim/fnl/settings/aerial.fnl
@@ -14,12 +14,4 @@
                         "packer"
                         "qf"
                         "help"
-                        "DiffviewFileHistory"]}
-   :on_attach (fn [bufnr]
-                (map! [n :buffer] :t (fn []
-                                       (vim.tbl_map (fn [buf]
-                                                      (if (= (vim.api.nvim_buf_get_option buf "filetype") "aerial")
-                                                            (vim.tbl_map (fn [win]
-                                                                             (vim.api.nvim_set_current_win win))
-                                                                         (vim.fn.win_findbuf buf))))
-                                                    (vim.api.nvim_list_bufs)))))})
+                        "DiffviewFileHistory"]}})
diff --git a/.config/nvim/fnl/settings/lspconfig.fnl b/.config/nvim/fnl/settings/lspconfig.fnl
index 596c64f..32c6f74 100644
--- a/.config/nvim/fnl/settings/lspconfig.fnl
+++ b/.config/nvim/fnl/settings/lspconfig.fnl
@@ -29,7 +29,7 @@
   (map! [n :noremap :buffer] :gr vim.lsp.buf.references)
   (map! [n :noremap :buffer] :<space>f vim.lsp.buf.formatting))
 
-(local capabilities ((. (require :cmp_nvim_lsp) :update_capabilities) (vim.lsp.protocol.make_client_capabilities)))
+(local capabilities ((. (require :cmp_nvim_lsp) :default_capabilities) (vim.lsp.protocol.make_client_capabilities)))
 
 (setup :mason)
 (setup :mason-lspconfig
diff --git a/.config/nvim/fnl/settings/noice.fnl b/.config/nvim/fnl/settings/noice.fnl
new file mode 100644
index 0000000..b00e61a
--- /dev/null
+++ b/.config/nvim/fnl/settings/noice.fnl
@@ -0,0 +1,3 @@
+(import-macros {: setup} :macros)
+
+(setup :noice)