diff --git a/flake.lock b/flake.lock
index f490a4a..ce8eedc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "comment-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717957420,
+        "narHash": "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=",
+        "owner": "numToStr",
+        "repo": "Comment.nvim",
+        "rev": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numToStr",
+        "repo": "Comment.nvim",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -55,6 +71,22 @@
         "type": "github"
       }
     },
+    "neotree": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726542367,
+        "narHash": "sha256-Lqt0KJNT9HmpJwZoWChYeVBrDWhscRe8COqVCwgcTwk=",
+        "owner": "nvim-neo-tree",
+        "repo": "neo-tree.nvim",
+        "rev": "a77af2e764c5ed4038d27d1c463fa49cd4794e07",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neo-tree",
+        "repo": "neo-tree.nvim",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1708475490,
@@ -105,11 +137,30 @@
         "type": "github"
       }
     },
+    "presence-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723359933,
+        "narHash": "sha256-qC8iNanAZ+WoqUfbJEvrebuR8ipEp6qCHS18oDr8qzQ=",
+        "owner": "jiriks74",
+        "repo": "presence.nvim",
+        "rev": "25076ce0921d68a1d998a66daccc68f9d5d7b087",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jiriks74",
+        "repo": "presence.nvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "comment-nvim": "comment-nvim",
         "flake-utils": "flake-utils",
         "gen-luarc": "gen-luarc",
-        "nixpkgs": "nixpkgs_2"
+        "neotree": "neotree",
+        "nixpkgs": "nixpkgs_2",
+        "presence-nvim": "presence-nvim"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 7f03010..94ced7f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,18 @@
 
     # Add bleeding-edge plugins here.
     # They can be updated with `nix flake update` (make sure to commit the generated flake.lock)
+    presence-nvim = {
+      url = "github:jiriks74/presence.nvim";
+      flake = false;
+    };
+    comment-nvim = {
+      url = "github:numToStr/Comment.nvim";
+      flake = false;
+    };
+    neotree = {
+      url = "github:nvim-neo-tree/neo-tree.nvim";
+      flake = false;
+    };
     # wf-nvim = {
     #   url = "github:Cassin01/wf.nvim";
     #   flake = false;
diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix
index f63f50e..b174054 100644
--- a/nix/neovim-overlay.nix
+++ b/nix/neovim-overlay.nix
@@ -78,6 +78,8 @@ with final.pkgs.lib; let
     nvim-surround # https://github.com/kylechui/nvim-surround/
     nvim-treesitter-textobjects # https://github.com/nvim-treesitter/nvim-treesitter-textobjects/
     nvim-ts-context-commentstring # https://github.com/joosepalviste/nvim-ts-context-commentstring/
+    (mkNvimPlugin inputs.comment-nvim "Comment.nvim") # https://github.com/numToStr/Comment.nvim
+    (mkNvimPlugin inputs.neotree "neo-tree.nvim") # https://github.com/numToStr/Comment.nvim
     # ^ navigation/editing enhancement plugins
 
     # Useful utilities
@@ -89,9 +91,12 @@ with final.pkgs.lib; let
     plenary-nvim
     nvim-web-devicons
     vim-repeat
+    nui-nvim
+    nvim-web-devicons
     # ^ libraries that other plugins depend on
 
     # bleeding-edge plugins from flake inputs
+    (mkNvimPlugin inputs.presence-nvim "presence.nvim")
     # (mkNvimPlugin inputs.wf-nvim "wf.nvim") # (example) keymap hints | https://github.com/Cassin01/wf.nvim
     # ^ bleeding-edge plugins from flake inputs
     which-key-nvim
diff --git a/nvim/plugin/lualine.lua b/nvim/plugin/lualine.lua
index 88aec14..9570f1b 100644
--- a/nvim/plugin/lualine.lua
+++ b/nvim/plugin/lualine.lua
@@ -43,36 +43,36 @@ require('lualine').setup {
     theme = 'auto',
   },
   -- Example top tabline configuration (this may clash with other plugins)
-  -- tabline = {
-  --   lualine_a = {
-  --     {
-  --       'tabs',
-  --       mode = 1,
-  --     },
-  --   },
-  --   lualine_b = {
-  --     {
-  --       'buffers',
-  --       show_filename_only = true,
-  --       show_bufnr = true,
-  --       mode = 4,
-  --       filetype_names = {
-  --         TelescopePrompt = 'Telescope',
-  --         dashboard = 'Dashboard',
-  --         fzf = 'FZF',
-  --       },
-  --       buffers_color = {
-  --         -- Same values as the general color option can be used here.
-  --         active = 'lualine_b_normal', -- Color for active buffer.
-  --         inactive = 'lualine_b_inactive', -- Color for inactive buffer.
-  --       },
-  --     },
-  --   },
-  --   lualine_c = {},
-  --   lualine_x = {},
-  --   lualine_y = {},
-  --   lualine_z = {},
-  -- },
+  tabline = {
+    lualine_a = {
+      {
+        'tabs',
+        mode = 1,
+      },
+    },
+    lualine_b = {
+      {
+        'buffers',
+        show_filename_only = true,
+        show_bufnr = true,
+        mode = 4,
+        filetype_names = {
+          TelescopePrompt = 'Telescope',
+          dashboard = 'Dashboard',
+          fzf = 'FZF',
+        },
+        buffers_color = {
+          -- Same values as the general color option can be used here.
+          active = 'lualine_b_normal', -- Color for active buffer.
+          inactive = 'lualine_b_inactive', -- Color for inactive buffer.
+        },
+      },
+    },
+    lualine_c = {},
+    lualine_x = {},
+    lualine_y = {},
+    lualine_z = {},
+  },
   winbar = {
     lualine_z = {
       {
diff --git a/nvim/plugin/plugins.lua b/nvim/plugin/plugins.lua
index 401b4a9..752f52c 100644
--- a/nvim/plugin/plugins.lua
+++ b/nvim/plugin/plugins.lua
@@ -10,3 +10,4 @@ require("dapui").setup()
 require("copilot_cmp").setup()
 require('nvim-surround').setup()
 require('which-key').setup()
+require('Comment').setup()