Merge remote-tracking branch 'origin/master' into work

programs/nvim.nix

@@ -17,6 +17,7 @@
       telescope-nvim
       (nvim-treesitter.withAllGrammars)
       vim-nix
+      lualine-nvim
     ];
 
     extraLuaConfig = ''
@@ -63,6 +64,25 @@
       local builtin = require("telescope.builtin")
       vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
       vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+
+      -- =========================
+      -- Lualine (status line with Git branch)
+      -- =========================
+      require('lualine').setup {
+        options = {
+          theme = 'catppuccin',  -- match your colorscheme
+          section_separators = {'', ''},
+          component_separators = {'', ''},
+        },
+        sections = {
+          lualine_a = {'mode'},
+          lualine_b = {'branch'},  -- shows Git branch here
+          lualine_c = {'filename'},
+          lualine_x = {'encoding', 'fileformat', 'filetype'},
+          lualine_y = {'progress'},
+          lualine_z = {'location'}
+        }
+      }
     '';
   };
 }