From 5b37cb587525c891abf24ad6a483bc7084a2dc86 Mon Sep 17 00:00:00 2001
From: siduck <siduck@tutanota.com>
Date: Fri, 10 Jun 2022 17:24:02 +0530
Subject: [PATCH] fix #1188 | remove options that already have default vim
 values | remove better-escape.nvim as it feels un-needed, ESC or Ctrl c can
 be used for escaping normal mode or just map jk to ESC

---
 lua/core/options.lua  | 5 -----
 lua/plugins/init.lua  | 7 +------
 lua/ui/statusline.lua | 4 ++++
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lua/core/options.lua b/lua/core/options.lua
index 6b20277..e0f7074 100644
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -11,15 +11,12 @@ g.do_filetype_lua = 1
 g.toggle_theme_icon = "   "
 g.transparency = config.ui.transparency
 
-opt.confirm = true
-
 opt.laststatus = 3 -- global statusline
 opt.statusline = config.plugins.options.statusline.config
 opt.showmode = false
 
 opt.title = true
 opt.clipboard = "unnamedplus"
-opt.cmdheight = 1
 opt.cul = true -- cursor line
 
 -- Indentline
@@ -30,7 +27,6 @@ opt.smartindent = true
 -- disable tilde on end of buffer: https://github.com/neovim/neovim/pull/8546#issuecomment-643643758
 opt.fillchars = { eob = " " }
 
-opt.hidden = true
 opt.ignorecase = true
 opt.smartcase = true
 opt.mouse = "a"
@@ -38,7 +34,6 @@ opt.mouse = "a"
 -- Numbers
 opt.number = true
 opt.numberwidth = 2
-opt.relativenumber = false
 opt.ruler = false
 
 -- disable nvim intro
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index af9e9ba..e7ab43b 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -107,12 +107,7 @@ local plugins = {
       end,
    },
 
-   ["max397574/better-escape.nvim"] = {
-      event = "InsertCharPre",
-      config = function()
-         require("plugins.configs.others").better_escape()
-      end,
-   },
+ 
 
    -- load luasnips + cmp related in insert mode only
 
diff --git a/lua/ui/statusline.lua b/lua/ui/statusline.lua
index 963f804..cdde087 100644
--- a/lua/ui/statusline.lua
+++ b/lua/ui/statusline.lua
@@ -28,9 +28,13 @@ local sep_r = sep_style[user_sep_style]["right"]
 
 local modes = {
    ["n"] = { "NORMAL", "St_NormalMode" },
+   ["niI"] = { "NORMAL i", "St_NormalMode" },
+   ["niR"] = { "NORMAL r", "St_NormalMode" },
+   ["niV"] = { "NORMAL v", "St_NormalMode" },
    ["no"] = { "N-PENDING", "St_NormalMode" },
    ["i"] = { "INSERT", "St_InsertMode" },
    ["ic"] = { "INSERT", "St_InsertMode" },
+   ["ix"] = { "INSERT completion", "St_InsertMode" },
    ["t"] = { "TERMINAL", "St_TerminalMode" },
    ["nt"] = { "NTERMINAL", "St_NTerminalMode" },
    ["v"] = { "VISUAL", "St_VisualMode" },