diff --git a/docs/TODO.md b/docs/TODO.md
index bad1f0e..eda47fe 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -12,7 +12,6 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 - [ ] Nixvim
   - [ ] Telescope Theme
   - [ ] Markdown tab size 2
-  - [ ] Harpoon
   - [ ] UFO for folding
   - [ ] neotest golang
   - [ ] nvim dap
diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix
index 4b31324..ae1a3b4 100644
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -7,6 +7,7 @@
           breadcrumb = "»";
           group = "+";
           separator = ""; # ➜
+          mappings = false;
         };
         spec = [
           # General Mappings
diff --git a/home/programs/nvim/options.nix b/home/programs/nvim/options.nix
index 4ae2812..f4d9fce 100644
--- a/home/programs/nvim/options.nix
+++ b/home/programs/nvim/options.nix
@@ -22,11 +22,13 @@
     hlsearch = true;
     smartcase = true;
     wildmode = "list:longest";
-    completeopt = [ "menuone" "noselect" ];
+    completeopt = [ "menuone" "noselect" "noinsert" ];
     signcolumn = "yes";
     cursorline = false;
     scrolloff = 8;
     mouse = "a";
+    termguicolors = true;
+    showmode = false;
 
     wrap = false;
 
diff --git a/home/programs/nvim/plugins/ui.nix b/home/programs/nvim/plugins/ui.nix
index 082ecc5..bc8c113 100644
--- a/home/programs/nvim/plugins/ui.nix
+++ b/home/programs/nvim/plugins/ui.nix
@@ -6,53 +6,40 @@
       lualine = {
         enable = true;
         settings = {
-          options = {
-            sections = {
-              lualine_a = [ "mode" ];
-              lualine_b = [ ];
-              lualine_c = [ ];
-              lualine_y = [{
-                __unkeyed-1 = "aerial";
-                colored = true;
-                cond = {
-                  __raw = ''
-                    function()
-                      local buf_size_limit = 1024 * 1024
-                      if vim.api.nvim_buf_get_offset(0, vim.api.nvim_buf_line_count(0)) > buf_size_limit then
-                        return false
-                      end
 
-                      return true
-                    end
-                  '';
-                };
-                dense = false;
-                dense_sep = ".";
-                depth = { __raw = "nil"; };
-                sep = " ) ";
-              }];
-              lualine_z = [{ __unkeyed-1 = "location"; }];
-            };
-            tabline = {
-              lualine_a = [{
-                __unkeyed-1 = "buffers";
-                symbols = { alternate_file = ""; };
-              }];
-              lualine_z = [ "tabs" ];
-            };
+          alwaysDivideMiddle = true;
+          globalstatus = true;
+          ignoreFocus = [ "neo-tree" ];
+          extensions = [ "fzf" ];
+          theme = "auto";
+          componentSeparators = {
+            left = "|";
+            right = "|";
+          };
+          sectionSeparators = {
+            left = "█"; # 
+            right = "█"; # 
+          };
+          sections = {
+            lualine_a = [ "mode" ];
+            lualine_b = [ "branch" "diff" "diagnostics" ];
+            lualine_c = [ "filename" ];
+            lualine_x = [ "filetype" ];
+            lualine_y = [ "progress" ];
+            lualine_z = [ ''" " .. os.date("%R")'' ];
           };
         };
       };
       dap.enable = true;
       web-devicons.enable = true;
       noice.enable = true;
+      notify.enable = true;
       gitsigns = {
         enable = true;
         settings.current_line_blame = false;
       };
       trouble.enable = true;
       indent-blankline.enable = true;
-      which-key.enable = true;
       nvim-colorizer.enable = true;
       tagbar = {
         enable = true;