diff --git a/.bashrc b/.bashrc
index 2436686..a13d001 100644
--- a/.bashrc
+++ b/.bashrc
@@ -13,6 +13,8 @@ alias ll='ls -alF'
 alias la='ls -A'
 alias l='ls -CF'
 alias vi='vim'
+alias vim='nvim'
+alias vi='nvim'
 
 # PS1="[\[\e[01;32m\]\u@\h \[\e[00;33m\]\W\[\e[00m\]]\$ "
 PS1="[\[\e[00;33m\]\w\[\e[00m\]]\$ "
@@ -21,3 +23,4 @@ PS1="[\[\e[00;33m\]\w\[\e[00m\]]\$ "
 # PS1='[\u@\h \W]\$ '
 
 PATH=$PATH:/home/dhanus/.myscripts:/home/dhanus/.local/bin:/home/dhanus/.myexes
+. "$HOME/.cargo/env"
diff --git a/nvim/bindings.lua b/nvim/bindings.lua
new file mode 100644
index 0000000..0f4f6aa
--- /dev/null
+++ b/nvim/bindings.lua
@@ -0,0 +1,8 @@
+-- bindings
+vim.keymap.set('i', 'jk', '<esc>')
+vim.keymap.set('n', '<leader>l', '<c-w>l')
+vim.keymap.set('n', '<leader>h', '<c-w>h')
+vim.keymap.set('n', '<leader>j', '<c-w>j')
+vim.keymap.set('n', '<leader>k', '<c-w>k')
+vim.keymap.set('n', '<leader>sv', ':source $MYVIMRC<cr>')
+vim.keymap.set('n', '<leader>ev', ':edit $MYVIMRC<cr>')
diff --git a/nvim/init.vim b/nvim/init.vim
new file mode 100644
index 0000000..aa0dc19
--- /dev/null
+++ b/nvim/init.vim
@@ -0,0 +1,3 @@
+lua require('settings')
+lua require('bindings')
+
diff --git a/nvim/settings.lua b/nvim/settings.lua
new file mode 100644
index 0000000..19d7fd5
--- /dev/null
+++ b/nvim/settings.lua
@@ -0,0 +1,16 @@
+-- global settings
+vim.g.mapleader = ' '
+
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.softtabstop = 2
+vim.opt.expandtab = true
+
+vim.opt.autoindent = true
+
+vim.opt.number = true
+vim.opt.relativenumber = true
+
+vim.opt.cursorline = true
+
+vim.opt.statusline = '%f %y %= C:%c L:%L %p%%'
diff --git a/tmux/.tmux.conf b/tmux/tmux.conf
similarity index 100%
rename from tmux/.tmux.conf
rename to tmux/tmux.conf