diff --git a/home-cli.nix b/home-cli.nix
index 7a69589..776e631 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -14,7 +14,7 @@ in
   ];
 
   home.sessionVariables = {
-    EDITOR = "vim";
+    EDITOR = "$PATH:${builtins.getEnv "HOME"}/.local/bin/lvim";
     BROSWER = "open";
     MANPAGER = "sh -c 'col -bx | bat -l man -p'";
     PATH = "$PATH:${builtins.getEnv "HOME"}/.cargo/bin";
@@ -73,7 +73,7 @@ in
     enableAutosuggestions = true;
     oh-my-zsh = {
       enable = true;
-      plugins = [ "git" "httpie" "aws" "fd" "fzf" "mosh" "npm" "ripgrep" "rsync" "sudo" "yarn" ];
+      plugins = [ "git" "httpie" "aws" "fd" "fzf" "mosh" "npm" "ripgrep" "rsync" "sudo" "yarn" "vi-mode" ];
     };
     shellAliases = {
       l = "exa -lah --icons --git";
diff --git a/lunar.lua b/lunar.lua
index 3fb4921..d6cad2b 100644
--- a/lunar.lua
+++ b/lunar.lua
@@ -31,18 +31,15 @@ lvim.plugins = {
   { "folke/todo-comments.nvim", event = "BufRead", config = function() require "todo-comments".setup() end },
   { "ray-x/lsp_signature.nvim", event = "BufRead", config = function() require "lsp_signature".setup() end },
   { "lukas-reineke/indent-blankline.nvim", event = "BufRead" },
-  {
-    "nvim-orgmode/orgmode",
-    config = function()
+  { "nvim-orgmode/orgmode", config = function()
       require('orgmode').setup_ts_grammar()
+      -- vim.opt.conceallevel = 1
 
       require('orgmode').setup {
         org_agenda_files = {'~/Sync/Notes/*'},
         org_default_notes_file = '~/Sync/Notes/Main.org',
         org_log_done = false,
-        -- org_todo_keywords = {'TODO', 'WAIT', '|', 'DONE'},
       }
-      -- vim.opt.conceallevel = 1
     end
   },
   { "akinsho/org-bullets.nvim",