From ccb15a9a4aed45c7ddfd03a50f7cae15ae5a14e0 Mon Sep 17 00:00:00 2001
From: chlorospingus <paul@sayson.com>
Date: Thu, 26 Jun 2025 12:55:17 -0700
Subject: [PATCH] idek

---
 nvim/init.lua            | 36 +++++++++++++++++++-------------
 nvim/lua/plugins/cmp.lua | 45 +++++++++++++++++++++++++++++-----------
 starship.toml            | 22 +++++++-------------
 3 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/nvim/init.lua b/nvim/init.lua
index 18cdaee..1734a04 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,21 +1,22 @@
 require('config.lazy')
 
-vim.lsp.enable(
-	"rust_analyzer",
-	"clangd",
-	"jdtls",
-	"csharp_ls",
-	"html",
-	"ts_ls",
-	"css_ls",
-	"tinymist"
-)
+vim.lsp.enable("rust_analyzer")
+vim.lsp.enable("jdtls")
+vim.lsp.enable("clangd")
+vim.lsp.enable("csharp_ls")
+vim.lsp.enable("lua_ls")
+vim.lsp.enable("html")
+vim.lsp.enable("ts_ls")
+vim.lsp.enable("css_ls")
+vim.lsp.enable("tinymist")
+
 
 vim.keymap.set({'n', 'x', 'o'}, ',', vim.diagnostic.open_float)
 vim.keymap.set({'n', 'x', 'o', 'i'}, '<c-s>', "<cmd>up<cr>")
 
 vim.cmd([[
 	no e <c-r>
+	no : ,
 
 	no a i
 	no i a
@@ -23,13 +24,17 @@ vim.cmd([[
 	no I A
 	no k o
 	no j J
+	no m q
+	no M Q
+	no q t
+	no Q T
 
 	no h <left>
 	no t <up>
 	no n <down>
 	no s <right>
-	no T <pageup>
-	no N <pagedown>
+	no T <C-y>
+	no N <C-e>
 	no / ^
 	no = <end>
 
@@ -49,11 +54,14 @@ vim.cmd([[
 	set number
 	set relativenumber
 	hi LineNr ctermfg=67
+	set expandtab
 	set tabstop=4
 	set shiftwidth=4
 	set cmdheight=0
 
 	let g:vsnip_snippet_dir = '~/.config/nvim/vsnip'
-
 	colorscheme catppuccin
-]])	
+]])
+
+vim.api.nvim_set_hl(0, "Pmenu", { bg = nil })
+vim.api.nvim_set_hl(0, "NormalFloat", { bg = nil })
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index 30ed18a..a26a5dd 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -2,10 +2,8 @@ return {
   'saghen/blink.cmp',
   dependencies = {
 	  "neovim/nvim-lspconfig",
-	  'rafamadriz/friendly-snippets'
   },
 
-  -- use a release tag to download pre-built binaries
   version = '1.*',
   ---@module 'blink.cmp'
   ---@type blink.cmp.Config
@@ -28,20 +26,43 @@ return {
       nerd_font_variant = 'mono'
     },
 
-    -- (Default) Only show the documentation popup when manually triggered
-    completion = { documentation = { auto_show = true } },
+    completion = {
+		menu = {
+			border = {'╭', '─', '╮', '│', '╯', '─', '╰', '│'},
+			-- border = {'╓', '─', '╖', '║', '╜', '─', '╙', '║'},
+			draw = {
+				columns = { {
+					"label",
+					"label_description",
+					gap = 1
+				}, {
+					"kind",
+				} }
+			},
+			components = {
+				label = {
+					text = {
+						background = "#ffffff"
+					},
+				}
+			}
+		},
+		documentation = {
+			auto_show = true,
+			treesitter_highlighting = true,
+			window = {
+				border = {'╭', '─', '╮', '│', '╯', '─', '╰', '│'},
+			}
+		},
+		ghost_text = {
+			enabled = true,
+		}
+	},
 
-    -- Default list of enabled providers defined so that you can extend it
-    -- elsewhere in your config, without redefining it, due to `opts_extend`
     sources = {
-      default = { 'lsp', 'snippets' },
+      default = { 'lsp' },
     },
 
-    -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
-    -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
-    -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
-    --
-    -- See the fuzzy documentation for more information
     fuzzy = { implementation = "prefer_rust_with_warning" }
   },
   opts_extend = { "sources.default" }
diff --git a/starship.toml b/starship.toml
index 6094b1a..2c7840c 100644
--- a/starship.toml
+++ b/starship.toml
@@ -26,19 +26,19 @@ success_symbol = "[](green bold)"
 error_symbol = "[](pink)"
 
 [directory]
-format = "[]($style)[󱙴 $path](bg:base fg:lavender bold)[ ]($style)"
-style = "bg:none fg:base"
+style = "bg:none fg:{{colors.outline_variant.default.hex}}"
+format = "[]($style)[󱗆 $path](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[ ]($style)"
 truncation_length = 3
 truncate_to_repo=false
 
 [git_branch]
-format = "[]($style)[[ ](bg:base fg:green bold)$branch](bg:base fg:lavender)[ ]($style)"
-style = "bg:none fg:base"
+style = "bg:none fg:{{colors.outline_variant.default.hex}}"
+format = "[]($style)[[ ](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})$branch](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[ ]($style)"
 
 [git_status]
 # $all status$ahead_behind
-format = "[]($style)[$all_status$ahead_behind](bg:base fg:yellow)[ ]($style)"
-style = "bg:none fg:base"
+style = "bg:none fg:{{colors.outline_variant.default.hex}}"
+format = "[]($style)[$all_status$ahead_behind](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[ ]($style)"
 conflicted = "="
 ahead =	"⇡${count}"
 behind = "⇣${count}"
@@ -54,14 +54,9 @@ deleted = "${count}"
 [cmd_duration]
 min_time = 1
 # duration & style 
-format = "[]($style)[$duration](bg:base fg:text)[ ]($style)"
+style = "bg:none fg:{{colors.outline_variant.default.hex}}"
+format = "[]($style)[$duration](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[]($style)"
 disabled = false
-style = "bg:none fg:base"
-
-[sudo]
-format = "[]($style)[$symbol](bg:base fg:text)[ ]($style)"
-style = 'bg:none fg:base'
-
 
 [palettes.catppuccin_mocha]
 rosewater = "#f5e0dc"
@@ -90,4 +85,3 @@ surface0 = "#313244"
 base = "#1e1e2e"
 mantle = "#181825"
 crust = "#11111b"
-