Merge branch 'main' into manjaro

dotfiles/neovim/init.lua

@@ -3,7 +3,8 @@
 vim.o.number = true
 vim.o.relativenumber = true
 vim.cmd([[
-highlight LineNr cterm=none ctermfg=256 
+highlight LineNr cterm=none ctermfg=243 
+highlight CursorLineNr cterm=none ctermfg=250 
 ]])
 vim.o.tabstop = 4
 vim.o.shiftwidth = 4
@@ -132,6 +133,10 @@ cmp.setup({
 --   },
 -- })
 
+-- satysfi language server
+require('lspconfig')['satysfi-ls'].setup{
+  autostart = true
+}
 
 -----------------------------------------------------------
 -- Ctrl + P to invoke fzf file search
@@ -141,7 +146,10 @@ vim.api.nvim_set_keymap('n', '<c-P>',
 
 
 -----------------------------------------------------------
--- satysfi language server
-require('lspconfig')['satysfi-ls'].setup{
-  autostart = true
-}
+-- lualine
+require('lualine_setup')
+lualine = require('lualine')
+lualine.setup({
+	options = { theme = 'iceberg_dark' }
+})
+lualine.setup()

dotfiles/neovim/lua/lualine_setup.lua

@@ -0,0 +1,40 @@
+require('lualine').setup {
+  options = {
+    icons_enabled = true,
+    theme = 'auto',
+    component_separators = { left = '|', right = '|'},
+    section_separators = { left = '', right = ''},
+    disabled_filetypes = {
+      statusline = {},
+      winbar = {},
+    },
+    ignore_focus = {},
+    always_divide_middle = true,
+    globalstatus = false,
+    refresh = {
+      statusline = 1000,
+      tabline = 1000,
+      winbar = 1000,
+    }
+  },
+  sections = {
+    lualine_a = {'mode'},
+    lualine_b = {'branch', 'diff', 'diagnostics'},
+    lualine_c = {'filename'},
+    lualine_x = {'filetype'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = {'filename'},
+    lualine_x = {'location'},
+    lualine_y = {},
+    lualine_z = {}
+  },
+  tabline = {},
+  winbar = {},
+  inactive_winbar = {},
+  extensions = {}
+}

dotfiles/neovim/lua/plugins.lua

@@ -9,6 +9,12 @@ return require('packer').startup(function(use)
 		--requires = { 'kyazdan142/nvim-web/devicons' } -- not found
 	}
 
+	-- lualine(statusline)
+	use {
+		'nvim-lualine/lualine.nvim',
+		requires = { 'kyazdani42/nvim-web-devicons', opt = true }
+	}
+
 	-- LSP
 	use 'neovim/nvim-lspconfig'
 	use "williamboman/mason.nvim"