[2024-05-20] Merging conflicting changes to feline.lua

nvim/init.vim

@@ -36,6 +36,8 @@ Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
 " 9000+ Snippets
 Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'xiyaowong/transparent.nvim'
+Plug 'justinhj/battery.nvim'
 call plug#end()
 
 set bg=dark

nvim/lua/init.lua

@@ -3,3 +3,4 @@ require('plugins.feline')
 require('gitsigns').setup()
 require('plugins.matlab_ls')
 require('plugins.treesitter')
+require('battery').setup()

nvim/lua/plugins/feline.lua

@@ -53,7 +53,6 @@ status_components.active[3][1] = {
 }
 status_components.active[3][2] = {
     provider = 'position'
-    
 }
 status_components.active[3][3] = {
     provider = 'line_percentage',
@@ -85,6 +84,12 @@ local custom_providers = {
     end,
 	word_count = function()
 		return vim.fn.wordcount().words .. 'W '
+	end,
+    date = function()
+		return tostring(vim.fn.strftime('%Y-%m-%d'))
+    end,
+    battery = function()
+		return require('battery').get_status_line()      	
     end
 }
 status_config.components = status_components
@@ -180,6 +185,24 @@ win_components.active[3][4] = {
     right_sep = 'right_rounded'
 }
 win_components.active[3][5] = {
+    provider = 'battery',
+    left_sep = {
+	str = 'block'
+    },
+	right_sep = {
+	str = 'block'
+    }	
+}
+win_components.active[3][6] = {
+    provider = 'date',
+    left_sep = {
+	str = 'block'
+    },
+	right_sep = {
+	str = 'block'
+	}
+}
+win_components.active[3][7] = {
     provider = 'time',
     left_sep = {
 	str = 'block'