Switch to lualine

nvim/init.lua

@@ -3,6 +3,7 @@ require('settings')
 require('plugins')
 require('lsp_config')
 require('telescope_config')
+require('lualine_config')
 require('mappings')
 
 require('trim').setup({
@@ -15,6 +16,7 @@ require('trim').setup({
 })
 
 require('leap').set_default_keymaps()
+require('Comment').setup()
 
 vim.cmd("colorscheme hybrid_material")
 vim.api.nvim_create_autocmd("FileType", { pattern = "make", command = [[set tabstop=8 shiftwidth=8 softtabstop=0 noexpandtab]] })

nvim/lua/lualine_config.lua

@@ -0,0 +1,25 @@
+local function getWords()
+  return tostring(vim.fn.wordcount().words) .. " Words"
+end
+
+require('lualine').setup({
+    options = {
+        theme = 'nightfly',
+    },
+    sections = {
+        lualine_a = {'mode'},
+        lualine_b = {'diff', 'diagnostics'},
+        lualine_c = {'filename'},
+        lualine_x = {'encoding', 'fileformat', 'filetype'},
+        lualine_y = {'filesize', getWords},
+        lualine_z = {'branch'},
+    },
+    inactive_sections = {
+        lualine_a = {'mode'},
+        lualine_b = {},
+        lualine_c = {'filename'},
+        lualine_x = {},
+        lualine_y = {'filesize'},
+        lualine_z = {'branch'},
+    },
+})

nvim/lua/plugins.lua

@@ -22,9 +22,7 @@ require('packer').startup(function(use)
     use 'prabirshrestha/vim-lsp'
     use 'tmux-plugins/vim-tmux'
     use 'tmux-plugins/vim-tmux-focus-events'
-    use 'tomtom/tcomment_vim'
+    use 'numToStr/Comment.nvim'
-    use 'vim-airline/vim-airline'
-    use 'vim-airline/vim-airline-themes'
     use 'vimwiki/vimwiki'
     use 'wbthomason/packer.nvim'
     use 'williamboman/nvim-lsp-installer'
@@ -34,6 +32,7 @@ require('packer').startup(function(use)
     use {'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'}
     use {'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}}
     use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end}
+    use {'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true }}
     use {
         "folke/trouble.nvim",
         requires = "kyazdani42/nvim-web-devicons",

nvim/lua/settings.lua

@@ -3,7 +3,6 @@ vim.opt.background = "dark"
 vim.opt.backspace = {"indent", "eol", "start"}
 vim.opt.encoding = "utf-8"
 vim.opt.expandtab = true
-vim.opt.guifont = "Ubuntu Mono derivative Powerline 13"
 vim.opt.hidden = true
 vim.opt.hlsearch = true
 vim.opt.ignorecase = true
@@ -32,8 +31,6 @@ vim.opt.wildmenu = true
 vim.opt.wildmode = {"longest", "list"}
 vim.g.mapleader = ","
 vim.g.python_highlight_all = 1
-vim.g.solarized_termcolors = 256
-vim.g.airline_powerline_fonts = 1
 vim.wo.signcolumn = "number"
 
 -- Tab for completion