From e17e2149588737852607382163611ee71c553e98 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 29 May 2024 20:43:16 -0700 Subject: [PATCH] feat: add feline --- lazy-lock.json | 2 +- lua/options.lua | 2 +- lua/plugins/ui.lua | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 797979b..2a1415e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,13 +8,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, diff --git a/lua/options.lua b/lua/options.lua index e08d218..c8870dc 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,7 +4,7 @@ vim.g.maplocalleader = " " vim.opt.belloff = "all" vim.opt.backspace = "2" vim.opt.showcmd = true -vim.opt.laststatus = 2 +vim.opt.laststatus = 3 -- global status bar vim.opt.swapfile = false vim.opt.number = true diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 93c616b..d3fa655 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,20 +1,15 @@ return { { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - options = { - disabled_filetypes = { - statusline = { - "alpha", - } - }, - }, - extensions = { - "lazy", - "neo-tree", - } - }, + 'freddiehaddad/feline.nvim', + init = function() + local ctp_feline = require('catppuccin.groups.integrations.feline') + + ctp_feline.setup() + + require("feline").setup({ + components = ctp_feline.get(), + }) + end }, { "famiu/bufdelete.nvim",