From 0a8a79ab911cab920e82eb401ef6bb8ea190a948 Mon Sep 17 00:00:00 2001
From: Adelie Aldergrove <adelie@foxgirl.monster>
Date: Thu, 6 Nov 2025 21:04:36 -0600
Subject: [PATCH] fixed completion configs, replaced feline with lualine

---
 init.lua                  | 16 ++++++++--------
 lua/config/cmp.lua        | 17 ++++++++---------
 lua/config/feline.lua     |  4 ----
 lua/config/java.lua       |  3 +++
 lua/config/lazy.lua       |  2 ++
 lua/config/lua.lua        |  3 +++
 lua/config/python.lua     |  3 +++
 lua/config/typescript.lua |  3 +++
 lua/plugins.lua           | 16 +++++++++-------
 9 files changed, 39 insertions(+), 28 deletions(-)
 delete mode 100644 lua/config/feline.lua

diff --git a/init.lua b/init.lua
index 6538e9c..4c09ad9 100644
--- a/init.lua
+++ b/init.lua
@@ -4,19 +4,19 @@ vim.api.mapleader = "\\" -- map leader to backslash
 
 require("config.lazy") -- load lazy Plugin manager
 
-require("config.feline") -- load feline status line
-
 require("config.conform") -- load formatter config
-require("config.cmp") -- load completion config
-require("config.symbols-outline") -- load symbols outline
 require("config.telescope") -- load keyboard shortcuts for telescope
+require("config.symbols-outline") -- load config for symbols-outline
 
--- load language configs
-require("config.lua")
+--set up language servers
+require("config.lsp")
+require("config.cmp")
 require("config.java")
-require("config.typescript")
+require("config.lua")
 require("config.python")
-require("config.lsp")
+require("config.typescript")
+
+require("lualine").setup({}) --set up lualine statusline
 
 -- set up bufferline
 vim.opt.termguicolors = true
diff --git a/lua/config/cmp.lua b/lua/config/cmp.lua
index c216f2a..4107f48 100644
--- a/lua/config/cmp.lua
+++ b/lua/config/cmp.lua
@@ -1,5 +1,3 @@
-local vim = vim
-
 -- Set up nvim-cmp.
 local cmp = require("cmp")
 
@@ -21,8 +19,8 @@ cmp.setup({
 		end,
 	},
 	window = {
-		completion = cmp.config.window.bordered(),
-		documentation = cmp.config.window.bordered(),
+		-- completion = cmp.config.window.bordered(),
+		-- documentation = cmp.config.window.bordered(),
 	},
 	mapping = cmp.mapping.preset.insert({
 		["<C-b>"] = cmp.mapping.scroll_docs(-4),
@@ -73,9 +71,10 @@ cmp.setup.cmdline(":", {
 	matching = { disallow_symbol_nonprefix_matching = false },
 })
 
--- Set up lspconfig.
--- local capabilities = require("cmp_nvim_lsp").default_capabilities()
--- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
---require("lspconfig")["<YOUR_LSP_SERVER>"].setup({
---	capabilities = capabilities,
+---- Set up lspconfig.
+--local capabilities = require('cmp_nvim_lsp').default_capabilities()
+---- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
+--vim.lsp.config('<YOUR_LSP_SERVER>', {
+--  capabilities = capabilities
 --})
+--vim.lsp.enable('<YOUR_LSP_SERVER>')
diff --git a/lua/config/feline.lua b/lua/config/feline.lua
deleted file mode 100644
index 97480af..0000000
--- a/lua/config/feline.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local vim = vim
-
-vim.o.termguicolors = true
-require('feline').setup()
diff --git a/lua/config/java.lua b/lua/config/java.lua
index b5f97e3..591018f 100644
--- a/lua/config/java.lua
+++ b/lua/config/java.lua
@@ -1,4 +1,7 @@
+local vim = vim
+
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 vim.lsp.config("jdtls", {
 	capabilities = capabilities,
 })
+vim.lsp.enable("jdtls")
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 0750c56..0712eb9 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -1,3 +1,5 @@
+local vim = vim
+
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
diff --git a/lua/config/lua.lua b/lua/config/lua.lua
index a10ece8..4f44d82 100644
--- a/lua/config/lua.lua
+++ b/lua/config/lua.lua
@@ -1,4 +1,7 @@
+local vim = vim
+
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 vim.lsp.config("lua_ls", {
 	capabilities = capabilities,
 })
+vim.lsp.enable("lua_ls")
diff --git a/lua/config/python.lua b/lua/config/python.lua
index ca969e6..dca8cca 100644
--- a/lua/config/python.lua
+++ b/lua/config/python.lua
@@ -1,4 +1,7 @@
+local vim = vim
+
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 vim.lsp.config("pylsp", {
 	capabilities = capabilities,
 })
+vim.lsp.enable("pylsp")
diff --git a/lua/config/typescript.lua b/lua/config/typescript.lua
index b6ab64e..d43423f 100644
--- a/lua/config/typescript.lua
+++ b/lua/config/typescript.lua
@@ -1,4 +1,7 @@
+local vim = vim
+
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 vim.lsp.config("ts_ls", {
 	capabilities = capabilities,
 })
+vim.lsp.enable("ts_ls")
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 763086d..30227e3 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -3,15 +3,17 @@ return {
 	"tpope/vim-surround",
 	"tpope/vim-sleuth",
 	"tpope/vim-abolish",
-	"adpce/feline.nvim",
 	"mattn/emmet-vim",
 	"easymotion/vim-easymotion",
 	"mhinz/vim-startify",
+	{
+		"nvim-lualine/lualine.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+	},
 	"jergason/symbols-outline.nvim",
 	"neovim/nvim-lspconfig",
 	{
-		"vulns-are-features-too/nvim-cmp",
-		--"hrsh7th/nvim-cmp",
+		"hrsh7th/nvim-cmp",
 		dependencies = {
 			"hrsh7th/cmp-nvim-lsp",
 			"hrsh7th/cmp-buffer",
@@ -34,13 +36,13 @@ return {
 		lazy = false,
 		priority = 1000,
 	},
+	{
+		"stevearc/conform.nvim",
+		opts = {},
+	},
 	{
 		"akinsho/bufferline.nvim",
 		version = "*",
 		dependencies = "nvim-tree/nvim-web-devicons",
 	},
-	{
-		"stevearc/conform.nvim",
-		opts = {},
-	},
 }