Skip to content

Commit

Permalink
Custom Lualine
Browse files Browse the repository at this point in the history
  • Loading branch information
Moritz Zimmermann authored and Moritz Zimmermann committed Jun 5, 2024
1 parent 7d74b8e commit 2820fe2
Show file tree
Hide file tree
Showing 11 changed files with 547 additions and 88 deletions.
68 changes: 31 additions & 37 deletions nvim/lazy-lock.json
View file
Original file line number Diff line number Diff line change
@@ -1,56 +1,50 @@
{
"LazyVim": { "branch": "main", "commit": "b601ade71c7f8feacf62a762d4e81cf99c055ea7" },
"LuaSnip": { "branch": "master", "commit": "7b1dda0dfdefc10b2501295eba5e463dbd7c338f" },
"bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" },
"LazyVim": { "branch": "main", "commit": "0f6ff53ce336082869314db11e9dfa487cf83292" },
"LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" },
"bufferline.nvim": { "branch": "main", "commit": "73edc1f2732678e7a681e3d3be49782610914f6b" },
"catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"conform.nvim": { "branch": "master", "commit": "59d0dd233a2cafacfa1235ab22054c4d80a72319" },
"dashboard-nvim": { "branch": "master", "commit": "a0a78099658c7d4be3714f657b18ca8285d5d106" },
"dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
"conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
"dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" },
"dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
"flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" },
"friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
"lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
"lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
"mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
"mini.ai": { "branch": "main", "commit": "55e9b7217f29e62f734e239bfeed5731a065d801" },
"mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
"mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" },
"mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
"mini.ai": { "branch": "main", "commit": "a0262e61f79dfc7bb940d1719c00b0ede042ddd7" },
"mini.comment": { "branch": "main", "commit": "6b6da2c272545ac6a201fb45af3aba66ef96d052" },
"mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" },
"mini.surround": { "branch": "main", "commit": "eb89a88a51655e46a93595204a9251a012918883" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
"neoconf.nvim": { "branch": "main", "commit": "a0aa3cc5e12a6c5eb8543e2508149f263fc32b2a" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
"neoconf.nvim": { "branch": "main", "commit": "9092129e9a42ae26375001bd2e6118f8d57c7f2a" },
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
"noice.nvim": { "branch": "main", "commit": "61947de3d5904375ea94e0c13db2537488ad9829" },
"none-ls.nvim": { "branch": "main", "commit": "10c976d633862b9fe16171f5f5f17732bc54e19f" },
"nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
"nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" },
"nvim-lint": { "branch": "master", "commit": "f3bcc28ffccb768212247294acccc106e029fc3c" },
"nvim-lspconfig": { "branch": "master", "commit": "cee94b22adc96582d9136f85fb3b076feda8825c" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
"nvim-treesitter": { "branch": "master", "commit": "8012b55eee65eba1d1ee4df0a186d30e72dcbe65" },
"nvim-treesitter-context": { "branch": "master", "commit": "7068ad6d16c682db0f6bf25f64ccfee34ec5d452" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "84cc9ed772f1fee2f47c1e076f518829583d8347" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
"noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" },
"none-ls.nvim": { "branch": "main", "commit": "aa4442a8493934e3354e507a556ea5f670f68491" },
"nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
"nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" },
"nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-spectre": { "branch": "master", "commit": "5690ea46baf08bbc1623980012e14b6239ce582e" },
"nvim-treesitter": { "branch": "master", "commit": "298a9dd4f8a0d95b347a7ebd301849d8b0e3917e" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
"nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
"obsidian.nvim": { "branch": "main", "commit": "db41b1f20459293436fab510bec58c82a73bd1f7" },
"persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
"persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope.nvim": { "branch": "master", "commit": "52f500110bcf9190b44b4d8640162adc86772ec4" },
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
"tokyonight.nvim": { "branch": "main", "commit": "c91aef1125e052c9d862e68389e4185ec56f6cde" },
"trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
"vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" },
"vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
"telescope.nvim": { "branch": "master", "commit": "5665d93988acfbb0747bdbf4f4cb583bcebc8930" },
"todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
"tokyonight.nvim": { "branch": "main", "commit": "b9b494fa7f7bbf2fe0747b47fa290fb7a4eddcc7" },
"trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
}
4 changes: 2 additions & 2 deletions nvim/lazyvim.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"lazyvim.plugins.extras.lsp.none-ls"
],
"news": {
"NEWS.md": "3314"
"NEWS.md": "4964"
},
"version": 3
"version": 4
}
2 changes: 2 additions & 0 deletions nvim/lua/config/lazy.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ require("lazy").setup({
-- { import = "lazyvim.plugins.extras.lang.typescript" },
-- { import = "lazyvim.plugins.extras.lang.json" },
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
{ import = "lazyvim.plugins.extras.coding.mini-surround" },
{ import = "lazyvim.plugins.extras.ui.mini-indentscope" },
{ import = "lazyvim.plugins.extras.lsp.none-ls" },
-- import/override with your plugins
{ import = "plugins" },
Expand Down
99 changes: 53 additions & 46 deletions nvim/lua/plugins/lualine.lua
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,57 @@
return {
"nvim-lualine/lualine.nvim",
event = "VeryLazy",
opts = function()
return {
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", "tab", right_padding = 2 } },
lualine_b = { "filename", "branch", "diff" },
lualine_c = {
"%=", --[[ add your center compoentnts here in place of this comment ]]
},
lualine_x = { "diagnostics" },
lualine_y = { "filetype", "fileformat", "progress" },
lualine_z = {
{ "diagnostics", "location", left_padding = 2 },
},
},
inactive_sections = {
lualine_a = { "filename" },
lualine_b = {},
lualine_c = {},
lualine_x = {},
lualine_y = {},
lualine_z = { "location" },
},
tabline = {},
winbar = {},
inactive_winbar = {},
extensions = { "nvim-tree" },
}
end,
opts = require("plugins.modules.setup.lualine").otps,
config = require("plugins.modules.setup.lualine").config,
}

-- return {
-- "nvim-lualine/lualine.nvim",
-- event = "VeryLazy",
-- opts = function()
-- return {
-- 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", "tab", right_padding = 2 } },
-- lualine_b = { "filename", "branch", "diff" },
-- lualine_c = {
-- "%=", --[[ add your center compoentnts here in place of this comment ]]
-- },
-- lualine_x = { "diagnostics" },
-- lualine_y = { "filetype", "fileformat", "progress" },
-- lualine_z = {
-- { "diagnostics", "location", left_padding = 2 },
-- },
-- },
-- inactive_sections = {
-- lualine_a = { "filename" },
-- lualine_b = {},
-- lualine_c = {},
-- lualine_x = {},
-- lualine_y = {},
-- lualine_z = { "location" },
-- },
-- tabline = {},
-- winbar = {},
-- inactive_winbar = {},
-- extensions = { "nvim-tree" },
-- }
-- end,
-- }
144 changes: 144 additions & 0 deletions nvim/lua/plugins/modules/icons.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
local icons = {}

-- stylua: ignore
icons.diagnostics = {
Error = "",
Warning = "",
Hint = "󰌵",
Info = "",
}

-- stylua: ignore
icons.notify = {
ERROR = "󰅚",
WARN = "",
INFO = "󰋽",
DEBUG = '',
TRACE = '✎',
}

-- stylua: ignore
icons.git = {
Add = "",
Mod = "",
Remove = "",
Ignore = "",
Rename = "",
Untracked = "U",
Unmerged = "",
Staged = "S",
Unstaged = "",
Branch = "",
}

-- stylua: ignore
icons.os = {
Unix = "", -- ebc6
Mac = "", -- e302
Dos = "", -- e70f
}

-- stylua: ignore
icons.fs = {
DirClosed = "",
DirOpen = "",
DirEmptyClosed = "",
DirEmptyOpen = "",
DirSymlink = "",
File = "",
FileSymlink = "",
Exec = "",
Unknown = "",
Bookmark = ''
}

-- stylua: ignore
icons.kind = {
Array = "",
Boolean = "",
Class = "",
Color = "󰏘",
Constant = "",
Constructor = "",
Enum = "",
EnumMember = "",
Event = "",
Field = "",
File = "",
Folder = "",
Function = "󰊕",
Interface = "",
Key = "",
Keyword = "",
Macro = "",
Method = "󰆧",
Module = "",
Namespace = "",
Null = "",
Number = "",
Object = "󰅩",
Operator = "",
Package = "",
Parameter = "",
Property = "",
Reference = "",
Snippet = "",
String = "",
Struct = "",
Variable = "",
Text = "󰉿",
TypeParameter = "",
Unit = "",
Value = "",
StaticMethod = "",
TypeAlias = "",
}

-- stylua: ignore
icons.custom = {
Octoface = "",
Emoji = "󰞅",
Crates = "",
Tree = "",
}

-- stylua: ignore
icons.type = {
Array = "",
Number = "󰎠",
String = "󰉿",
Boolean = "",
Object = "󰅩",
Null = "",
}

-- stylua: ignore
icons.misc = {
Ghost = "󰊠",
SemiCircleLeft = "",
SemiCircleRight = "",
Info = "󰋼",
Formatter = "󰉢",
LSP = "",
FileSize = "",
Location = ""
}

-- stylua: ignore
icons.dap = {
Breakpoint = '󰝥',
BreakpointCondition = '󰟃',
BreakpointRejected = '',
LogPoint = '',
Pause = '',
Play = '',
RunLast = '↻',
StepBack = '',
StepInto = '󰆹',
StepOut = '󰆸',
StepOver = '󰆷',
Stopped = '',
Terminate = '󰝤',
}

return icons
Loading

0 comments on commit 2820fe2

Please sign in to comment.