diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index bc433cb..f7d95e0 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -1,99 +1,125 @@
 return {
-   "nvim-lualine/lualine.nvim",
-   dependencies = {
-      "nvim-tree/nvim-web-devicons",
-      "rmehri01/onenord.nvim",
-   },
-   config = function()
-      local lualine = require "lualine"
-      local lazy_status = require "lazy.status"
+  "nvim-lualine/lualine.nvim",
+  dependencies = {
+    "nvim-tree/nvim-web-devicons",
+    "rmehri01/onenord.nvim",
+  },
+  config = function()
+    local lualine = require("lualine")
+    local lazy_status = require("lazy.status")
 
-      lualine.setup {
-         options = {
-            icons_enabled = true,
-            theme = "onenord",
-            component_separators = { left = "", right = "" },
-            section_separators = { left = "", right = "" },
-            disabled_filetypes = {
-               statusline = { "alpha", "dashboard", "Outline" },
-               winbar = {},
+    local custom_components = {
+      encoding = function()
+        local ret, _ = (vim.bo.fenc or vim.go.enc):gsub("^utf%-8$", "")
+        return ret
+      end,
+
+      fileformat = function()
+        local ret, _ = vim.bo.fileformat:gsub("^unix$", "")
+        return ret
+      end,
+    }
+
+    local function gitsigns_diff()
+      local gitsigns = vim.b.gitsigns_status_dict
+      if gitsigns then
+        return {
+          added = gitsigns.added,
+          modified = gitsigns.changed,
+          removed = gitsigns.removed,
+        }
+      end
+    end
+
+    lualine.setup({
+      options = {
+        icons_enabled = true,
+        theme = "onenord",
+        component_separators = { left = "", right = "" },
+        section_separators = { left = "", right = "" },
+        disabled_filetypes = {
+          statusline = { "alpha", "dashboard", "Outline" },
+          winbar = {},
+        },
+        ignore_focus = { "NvimTree" },
+        always_divide_middle = true,
+        always_show_tabline = true,
+        globalstatus = false,
+        refresh = {
+          statusline = 1000,
+          tabline = 1000,
+          winbar = 1000,
+        },
+      },
+      sections = {
+        lualine_a = { "mode" },
+        lualine_b = {
+          {
+            "filename",
+            file_status = true,
+            newfile_status = true,
+            path = 4,
+            symbols = {
+              modified = "[+]",
+              readonly = "[-]",
             },
-            ignore_focus = { "NvimTree" },
-            always_divide_middle = true,
-            always_show_tabline = true,
-            globalstatus = false,
-            refresh = {
-               statusline = 1000,
-               tabline = 1000,
-               winbar = 1000,
-            },
-         },
-         sections = {
-            lualine_a = { "mode" },
-            lualine_b = {
-               {
-                  "filename",
-                  file_status = true,
-                  newfile_status = true,
-                  path = 4,
-                  symbols = {
-                     modified = "[+]",
-                     readonly = "[-]",
-                  },
-               },
-            },
-            lualine_c = {
-               "branch",
-               "diff",
-               "b:gitsigns_status",
-            },
-            lualine_x = {
-               {
-                  "diagnostics",
-                  sources = { "nvim_workspace_diagnostic" },
-                  sections = { "error", "warn", "info", "hint" },
-                  --symbols = { error = " ", warn = " ", info = " ", hint = "󰠠 " },
-                  colored = true,
-                  always_visible = false,
-               },
-               {
-                  lazy_status.updates,
-                  cond = lazy_status.has_updates,
-                  color = { fg = "#ebcb8b" },
-               },
-               -- {
-               --    function()
-               --       return require("auto-session.lib").current_session_name(true)
-               --    end,
-               -- },
-               "encoding",
-               "fileformat",
-               "filetype",
-            },
-            lualine_y = { "searchcount", "progress" },
-            lualine_z = { "selectioncount", "location" },
-         },
-         inactive_sections = {
-            lualine_a = {},
-            lualine_b = {},
-            lualine_c = { "filename" },
-            lualine_x = {
-               {
-                  "diagnostics",
-                  sources = { "nvim_lsp", "nvim_workspace_diagnostic", "nvim_diagnostic" },
-                  sections = { "error", "warn", "info", "hint" },
-                  --symbols = { error = " ", warn = " ", info = " ", hint = "󰠠 " },
-                  colored = false,
-                  always_visible = false,
-               },
-            },
-            lualine_y = {},
-            lualine_z = { "location" },
-         },
-         tabline = {},
-         winbar = {},
-         inactive_winbar = {},
-         extensions = { "nvim-tree", "lazy", "trouble", "quickfix", "fzf", "mason" },
-      }
-   end,
-}
+          },
+        },
+        lualine_c = {
+          "branch",
+          -- TODO: make it prettier...
+          { "b:gitsigns_head", icon = "" },
+          { "diff", source = gitsigns_diff },
+        },
+        lualine_x = {
+          -- TODO: spell indicator (when on)
+          -- TODO: LSP
+          {
+            "diagnostics",
+            sources = { "nvim_workspace_diagnostic" },
+            sections = { "error", "warn", "info", "hint" },
+            --symbols = { error = " ", warn = " ", info = " ", hint = "󰠠 " },
+            colored = true,
+            always_visible = false,
+          },
+          {
+            lazy_status.updates,
+            cond = lazy_status.has_updates,
+            color = { fg = "#ebcb8b" },
+          },
+          -- {
+          --    function()
+          --       return require("auto-session.lib").current_session_name(true)
+          --    end,
+          -- },
+          { custom_components.encoding },
+          { custom_components.fileformat },
+          "filetype",
+        },
+        lualine_y = { "searchcount", "progress" },
+        lualine_z = { "selectioncount", "location" },
+      },
+      inactive_sections = {
+        lualine_a = {},
+        lualine_b = {},
+        lualine_c = { "filename" },
+        lualine_x = {
+          {
+            "diagnostics",
+            sources = { "nvim_lsp", "nvim_workspace_diagnostic", "nvim_diagnostic" },
+            sections = { "error", "warn", "info", "hint" },
+            --symbols = { error = " ", warn = " ", info = " ", hint = "󰠠 " },
+            colored = false,
+            always_visible = false,
+          },
+        },
+        lualine_y = {},
+        lualine_z = { "location" },
+      },
+      tabline = {},
+      winbar = {},
+      inactive_winbar = {},
+      extensions = { "nvim-tree", "lazy", "trouble", "quickfix", "fzf", "mason" },
+    })
+  end,
+}
\ No newline at end of file