diff --git a/lazy-lock.json b/lazy-lock.json
index 615f502..d498409 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,11 +6,14 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
+  "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
   "gruvbox.nvim": { "branch": "main", "commit": "f99a08abc5ab0b9b5b0e7a33211a439155c60a61" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" },
+  "heirline-components.nvim": { "branch": "main", "commit": "31bd340149d212b4dc78147977fcd9181ee98a05" },
+  "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
+  "lazy.nvim": { "branch": "main", "commit": "a3edeae34a5dd2c129388c6cbb8f1d156e6f7724" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
-  "mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" },
+  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
   "nvim-lspconfig": { "branch": "master", "commit": "710a8fa7379db32199545f30ea01dd8446b9302f" },
   "nvim-treesitter": { "branch": "master", "commit": "979beffc1a86e7ba19bd6535c0370d8e1aaaad3c" },
diff --git a/lua/crentist/lazy/heirline.lua b/lua/crentist/lazy/heirline.lua
new file mode 100644
index 0000000..26e6156
--- /dev/null
+++ b/lua/crentist/lazy/heirline.lua
@@ -0,0 +1,43 @@
+return {
+    {
+        "lewis6991/gitsigns.nvim",
+        config = function ()
+            require('gitsigns').setup()
+        end
+    },
+    {
+        "rebelot/heirline.nvim",
+        version = "1.0.*",
+        dependencies = { "Zeioth/heirline-components.nvim" },
+        opts = function()
+            local lib = require("heirline-components.all")
+            return {
+
+                statusline = { -- UI statusbar
+                    hl = { fg = "fg", bg = "bg" },
+                    lib.component.mode(),
+                    lib.component.git_branch(),
+                    lib.component.file_info(),
+                    lib.component.git_diff(),
+                    lib.component.diagnostics(),
+                    lib.component.fill(),
+                    lib.component.cmd_info(),
+                    lib.component.fill(),
+                    lib.component.lsp(),
+                    lib.component.compiler_state(),
+                    lib.component.virtual_env(),
+                    lib.component.nav(),
+                    lib.component.mode { surround = { separator = "right" } },
+                },
+            }
+        end,
+        config = function(_, opts)
+            local heirline = require "heirline"
+            local heirline_components = require "heirline-components.all"
+
+            heirline_components.init.subscribe_to_events()
+            heirline.load_colors(heirline_components.hl.get_colors())
+            heirline.setup(opts)
+        end
+    }
+}