diff --git a/nvim/cheatsheet.txt b/nvim/cheatsheet.txt
index ac65262..b152e90 100644
--- a/nvim/cheatsheet.txt
+++ b/nvim/cheatsheet.txt
@@ -1,5 +1,6 @@
 ## Telescope @custom:
 Search, Preview and Open file | <leader>ff
+Live grep of all files in current directory| <leader>fg
 
 ## Formatter @custom:
 Format current buffer | <leader>f
@@ -9,3 +10,6 @@ Format and write current buffer | <leader>F
 Toggles the comment state of the selected line(s) | [count]<leader>c<space>
 Comment out the current line or text selected in visual mode | [count]<leader>cc
 Toggles the comment state of the selected line(s) individually | [count]<leader>ci
+
+## cheatsheet @custom:
+Shows a searchable list of all keybindings | <leader>?
diff --git a/nvim/init.lua b/nvim/init.lua
new file mode 100644
index 0000000..15a011b
--- /dev/null
+++ b/nvim/init.lua
@@ -0,0 +1,52 @@
+vim.o.nocompatible = true
+vim.o.showmatch = true
+
+vim.wo.number = true
+vim.wo.relativenumber = true
+
+-- Set background color for ColorColumn
+vim.o.cc = 80
+vim.api.nvim_exec(
+	[[
+  hi ColorColumn ctermbg=black guibg=black
+]],
+	false
+)
+
+vim.o.mouse = "a"
+
+vim.o.ignorecase = true
+vim.o.smartcase = true
+vim.o.expandtab = true
+vim.o.shiftwidth = 4
+vim.o.tabstop = 4
+vim.o.cursorline = true
+
+-- Enable auto-indentation
+vim.o.autoindent = true
+
+-- Set completion options
+vim.o.completeopt = "menu,menuone,noselect"
+
+-- Highlight search results
+vim.o.hlsearch = true
+
+-- Highlight current line
+vim.o.cursorline = true
+
+-- Increase speed for terminals
+vim.o.ttyfast = true
+
+-- Highlight on yank (copy). It will do a nice highlight blink of the thing you just copied.
+vim.api.nvim_exec(
+	[[
+  autocmd! TextYankPost * silent! lua vim.highlight.on_yank()
+  autocmd! BufWritePost * FormatWrite
+]],
+	false
+)
+
+-- Enable filetype plugins
+vim.cmd("filetype plugin on")
+
+require("plugins")
diff --git a/nvim/init.vim b/nvim/init.vim
deleted file mode 100644
index 05eb79b..0000000
--- a/nvim/init.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-set nocompatible
-set relativenumber
-set cc=80
-set ignorecase
-hi ColorColumn ctermbg=black guibg=black
-set tabstop=4
-set expandtab
-set shiftwidth=4
-set autoindent
-set completeopt=menu,menuone,noselect
-
-filetype plugin on
-
-augroup FormatAutogroup
-  autocmd!
-  autocmd BufWritePost * FormatWrite
-augroup END
-
-so "keybinding.vim"
-
-lua require('plugins')
diff --git a/nvim/keybinding.vim b/nvim/keybinding.vim
deleted file mode 100644
index b7348b8..0000000
--- a/nvim/keybinding.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-nnoremap <silent> <leader>f :Format<CR>
-nnoremap <silent> <leader>F :FormatWrite<CR>
diff --git a/nvim/lua/commander-config.lua demete b/nvim/lua/commander-config.lua demete
new file mode 100644
index 0000000..59d97de
--- /dev/null
+++ b/nvim/lua/commander-config.lua demete	
@@ -0,0 +1,8 @@
+	integration = {
+		telescope = {
+			enable = true,
+			-- Optional, you can use any telescope supported theme
+			theme = require("telescope.themes").commander,
+		},
+	},
+})
diff --git a/nvim/lua/keybinding.lua b/nvim/lua/keybinding.lua
new file mode 100644
index 0000000..f753e15
--- /dev/null
+++ b/nvim/lua/keybinding.lua
@@ -0,0 +1,7 @@
+local opts = { noremap = true, silent = true }
+local keymap = vim.api.nvim_set_keymap
+
+vim.g.mapleader = ","
+
+keymap("n", "<C-p>", ":Telescope find_files<CR>", opts)
+keymap("n", "<S-C-p>", ":Telescope<CR>", opts)
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index a0ee9aa..8495e8b 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -10,7 +10,7 @@ local ensure_packer = function()
 end
 
 local packer_bootstrap = ensure_packer()
-
+require("keybinding")
 return require("packer").startup(function(use)
 	use("wbthomason/packer.nvim")
 
@@ -90,7 +90,7 @@ return require("packer").startup(function(use)
 	require("nvim-tree-config")
 	require("nvim-cmp-config")
 	require("autoclose-config")
-    require("barbar-config")
+	require("barbar-config")
 	--require("image-config")
 	require("telescope-config")
 	-- require('ale-config')
@@ -98,7 +98,7 @@ return require("packer").startup(function(use)
 	require("lualine").setup()
 	require("virt-column").setup()
 
-    if packer_bootstrap then
+	if packer_bootstrap then
 		require("packer").sync()
 	end
 end)