diff --git a/nvim/init.lua b/nvim/init.lua
index b93aa15..a408a6e 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -13,3 +13,4 @@ require('telescopeconfig')
 require('autocompletion')
 require('treesitterconfig')
 require('filemanager')
+require('statusline')
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index daa2d78..25e3f5b 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -58,7 +58,7 @@ Plug 'jidbo/sonokai'
 Plug 'norcalli/nvim-colorizer.lua'
 
 -- powerline
-Plug 'vim-airline/vim-airline'
+Plug 'nvim-lualine/lualine.nvim'
 
 -- LANGUAGES
 -- ===================
diff --git a/nvim/lua/statusline.lua b/nvim/lua/statusline.lua
new file mode 100644
index 0000000..d4d2d84
--- /dev/null
+++ b/nvim/lua/statusline.lua
@@ -0,0 +1,28 @@
+require('lualine').setup {
+  options = {
+    icons_enabled = true,
+    theme = 'sonokai',
+    component_separators = { left = '', right = ''},
+    section_separators = { left = '', right = ''},
+    disabled_filetypes = {},
+    always_divide_middle = true,
+  },
+  sections = {
+    lualine_a = {'mode'},
+    lualine_b = {'branch', {'diagnostics', sources = {'nvim_lsp'}}},
+    lualine_c = {{'filename', path=1}},
+    lualine_x = {'filetype'},
+    lualine_y = {},
+    lualine_z = {'%l/%L:%c'}
+  },
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = {'filename'},
+    lualine_x = {'location'},
+    lualine_y = {},
+    lualine_z = {}
+  },
+  tabline = {},
+  extensions = {'nvim-tree', 'fugitive'}
+}
diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim
index 430f101..9aaa03d 100644
--- a/nvim/pluginoptions.vim
+++ b/nvim/pluginoptions.vim
@@ -1,25 +1,7 @@
 " PLUGIN OPTIONS
 
-" AIRLINE SETUP
-" =========================
-
-" sections
-let g:airline_section_y = ""
-let g:airline_section_z = "%l/%L:%c"
-let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}"
-" other stuff
-let g:airline_theme='luna'
-let g:airline_powerline_fonts = 1
-let g:airline_inactive_collapse=1
-let g:airline_skip_empty_sections = 1
-let g:airline#extensions#whitespace#enabled = 0
-let g:airline#extensions#wordcount#enabled = 0
-let g:airline#extensions#keymap#enabled = 0
-set ttimeoutlen=50
-
 " GITGUTTER SETUP
 " =========================
-
 let g:gitgutter_sign_added = '∙'
 let g:gitgutter_sign_modified = '∙'
 let g:gitgutter_sign_removed = '∙'