diff --git a/hosts/totsugeki/home-manager/development/nixvim/default.nix b/hosts/totsugeki/home-manager/development/nixvim/default.nix
index bb08745..1d420e8 100644
--- a/hosts/totsugeki/home-manager/development/nixvim/default.nix
+++ b/hosts/totsugeki/home-manager/development/nixvim/default.nix
@@ -6,18 +6,20 @@
     ./neo-tree.nix
     ./none-ls.nix
     ./treesitter.nix
+    ./telescope.nix
   ];
   programs.nixvim = {
     enable = true;
 
-    colorschemes.tokyonight = {
+    colorschemes.catppuccin = {
       enable = true;
       settings = {
-        style = "night";
-        transparent = true;
-        styles = {
-          comments.italic = false;
-          keywords.italic = false;
+        flavour = "mocha";
+        no_italic = true;
+        transparent_background = true;
+        integrations = {
+          cmp = true;
+          neotree = true;
         };
       };
     };
@@ -36,7 +38,10 @@
       signcolumn = "yes";
     };
 
-    plugins.nvim-autopairs.enable = true;
+    plugins = {
+      web-devicons.enable = true;
+      nvim-autopairs.enable = true;
+    };
 
     extraPlugins = with pkgs.vimPlugins; [ nvim-web-devicons ];
   };
diff --git a/hosts/totsugeki/home-manager/development/nixvim/lsp.nix b/hosts/totsugeki/home-manager/development/nixvim/lsp.nix
index 5038061..be25a5c 100644
--- a/hosts/totsugeki/home-manager/development/nixvim/lsp.nix
+++ b/hosts/totsugeki/home-manager/development/nixvim/lsp.nix
@@ -3,9 +3,9 @@
     lsp = {
       enable = true;
       servers = {
-        nil-ls.enable = true;
+        nil_ls.enable = true;
         pyright.enable = true;
-        rust-analyzer = {
+        rust_analyzer = {
           enable = true;
           installCargo = false;
           installRustc = false;
diff --git a/hosts/totsugeki/home-manager/development/nixvim/lualine.nix b/hosts/totsugeki/home-manager/development/nixvim/lualine.nix
index 1f254ba..ffcaee8 100644
--- a/hosts/totsugeki/home-manager/development/nixvim/lualine.nix
+++ b/hosts/totsugeki/home-manager/development/nixvim/lualine.nix
@@ -1,14 +1,16 @@
 { ... }: {
   programs.nixvim.plugins.lualine = {
     enable = true;
-    componentSeparators = {
-      left = "";
-      right = "";
+    settings.options = {
+      component_separators = {
+        left = "";
+        right = "";
+      };
+      section_separators = {
+        left = "";
+        right = "";
+      };
+      disabled_filetypes.statusline = [ "neo-tree" ];
     };
-    sectionSeparators = {
-      left = "";
-      right = "";
-    };
-    disabledFiletypes.statusline = [ "neo-tree" ];
   };
 }
diff --git a/hosts/totsugeki/home-manager/development/nixvim/telescope.nix b/hosts/totsugeki/home-manager/development/nixvim/telescope.nix
new file mode 100644
index 0000000..4ccf83b
--- /dev/null
+++ b/hosts/totsugeki/home-manager/development/nixvim/telescope.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  programs.nixvim.plugins.telescope = {
+    enable = true;
+    keymaps = {
+      "<leader>ff" = "find_files";
+      "<leader>bb" = "buffers";
+    };
+  };
+}