From 1c8f70a3a6fb7fbb3e82a8eaa873a8e27f2f36bc Mon Sep 17 00:00:00 2001
From: Hunter Stasonis <hsta@beachmont.xyz>
Date: Fri, 16 May 2025 19:13:27 -0400
Subject: [PATCH] new nvim cfg

---
 Session.vim                  | 49 +++++++++++-------------------------
 lazy-lock.json               | 19 +++++++-------
 lua/hsta/config.lua          |  4 +--
 lua/hsta/plugins/colors.lua  | 35 ++++----------------------
 lua/hsta/plugins/discord.lua | 11 ++++++++
 lua/hsta/plugins/lsp.lua     |  2 +-
 lua/hsta/plugins/snacks.lua  | 17 -------------
 7 files changed, 42 insertions(+), 95 deletions(-)
 create mode 100644 lua/hsta/plugins/discord.lua
 delete mode 100644 lua/hsta/plugins/snacks.lua

diff --git a/Session.vim b/Session.vim
index 49822ca..a4d45e2 100644
--- a/Session.vim
+++ b/Session.vim
@@ -14,19 +14,19 @@ else
   set shortmess=aoO
 endif
 badd +45 lua/hsta/plugins/mini.lua
-badd +34 lua/hsta/config.lua
+badd +30 lua/hsta/config.lua
 badd +1 lua/hsta/plugins/keybinds.lua
-badd +50 lua/hsta/plugins/lsp.lua
-badd +16 lua/hsta/plugins/colors.lua
+badd +33 lua/hsta/plugins/lsp.lua
+badd +10 lua/hsta/plugins/colors.lua
+badd +4 lua/hsta/plugins/discord.lua
 argglobal
 %argdel
-edit lua/hsta/plugins/lsp.lua
+edit lua/hsta/plugins/colors.lua
 argglobal
-balt lua/hsta/plugins/colors.lua
+balt lua/hsta/config.lua
 setlocal keymap=
 setlocal noarabic
 setlocal autoindent
-setlocal backupcopy=
 setlocal nobinary
 setlocal nobreakindent
 setlocal breakindentopt=
@@ -43,6 +43,7 @@ setlocal comments=:---,:--
 setlocal commentstring=--\ %s
 setlocal complete=.,w,b,u,t
 setlocal completefunc=
+setlocal completeslash=
 setlocal concealcursor=
 setlocal conceallevel=0
 setlocal nocopyindent
@@ -51,19 +52,16 @@ setlocal nocursorcolumn
 setlocal cursorline
 setlocal cursorlineopt=both
 setlocal define=\\<function\\|\\<local\\%(\\s\\+function\\)\\=
-setlocal dictionary=
 setlocal nodiff
-setlocal equalprg=
-setlocal errorformat=
+setlocal eventignorewin=
 setlocal expandtab
 if &filetype != 'lua'
 setlocal filetype=lua
 endif
-setlocal fillchars=
 setlocal fixendofline
 setlocal foldcolumn=0
 setlocal foldenable
-setlocal foldexpr=0
+setlocal foldexpr=v:lua.vim.treesitter.foldexpr()
 setlocal foldignore=#
 setlocal foldlevel=0
 setlocal foldmarker={{{,}}}
@@ -74,25 +72,18 @@ setlocal foldtext=foldtext()
 setlocal formatexpr=v:lua.vim.lsp.formatexpr()
 setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
 setlocal formatoptions=jcroql
-setlocal formatprg=
-setlocal grepprg=
 setlocal iminsert=0
 setlocal imsearch=-1
-setlocal include=
-setlocal includeexpr=tr(v:fname,'.','/')
+setlocal include=\\<\\%(\\%(do\\|load\\)file\\|require\\)\\s*(
+setlocal includeexpr=v:lua.require'vim._ftplugin.lua'.includeexpr(v:fname)
 setlocal indentexpr=nvim_treesitter#indent()
 setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e,0=end,0=until
 setlocal noinfercase
 setlocal iskeyword=@,48-57,_,192-255
-setlocal keywordprg=
 setlocal nolinebreak
 setlocal nolisp
 setlocal lispoptions=
-setlocal lispwords=
 setlocal nolist
-setlocal listchars=
-setlocal makeencoding=
-setlocal makeprg=
 setlocal matchpairs=(:),{:},[:]
 setlocal modeline
 setlocal modifiable
@@ -100,7 +91,6 @@ setlocal nrformats=bin,hex
 setlocal number
 setlocal numberwidth=4
 setlocal omnifunc=v:lua.vim.lsp.omnifunc
-setlocal path=
 setlocal nopreserveindent
 setlocal nopreviewwindow
 setlocal quoteescape=\\
@@ -110,10 +100,7 @@ setlocal norightleft
 setlocal rightleftcmd=search
 setlocal scrollback=-1
 setlocal noscrollbind
-setlocal scrolloff=-1
 setlocal shiftwidth=4
-setlocal showbreak=
-setlocal sidescrolloff=-1
 setlocal signcolumn=auto
 setlocal nosmartindent
 setlocal nosmoothscroll
@@ -132,18 +119,11 @@ if &syntax != ''
 setlocal syntax=
 endif
 setlocal tabstop=4
-setlocal tagcase=
 setlocal tagfunc=v:lua.vim.lsp.tagfunc
-setlocal tags=
 setlocal textwidth=0
-setlocal thesaurus=
-setlocal thesaurusfunc=
 setlocal noundofile
-setlocal undolevels=-123456
 setlocal varsofttabstop=
 setlocal vartabstop=
-setlocal virtualedit=
-setlocal winbar=
 setlocal winblend=0
 setlocal nowinfixbuf
 setlocal winfixheight
@@ -153,12 +133,12 @@ setlocal nowrap
 setlocal wrapmargin=0
 silent! normal! zE
 let &fdl = &fdl
-let s:l = 50 - ((12 * winheight(0) + 12) / 24)
+let s:l = 10 - ((9 * winheight(0) + 12) / 25)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
-keepjumps 50
-normal! 0
+keepjumps 10
+normal! 044|
 tabnext 1
 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
   silent exe 'bwipe ' . s:wipebuf
@@ -171,7 +151,6 @@ if filereadable(s:sx)
   exe "source " . fnameescape(s:sx)
 endif
 let &g:so = s:so_save | let &g:siso = s:siso_save
-nohlsearch
 doautoall SessionLoadPost
 unlet SessionLoad
 " vim: set ft=vim :
diff --git a/lazy-lock.json b/lazy-lock.json
index 75dcf44..2f82d1b 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,23 +1,22 @@
 {
-  "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" },
-  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
+  "auto-dark-mode.nvim": { "branch": "master", "commit": "c31de126963ffe9403901b4b0990dde0e6999cc6" },
+  "blink.cmp": { "branch": "main", "commit": "54cbaac2064fe6198ec55b636b53cc8c9791ead3" },
+  "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
+  "ef-themes.nvim": { "branch": "main", "commit": "5deb08237d1e243532dfdb5b24c3658c31d255aa" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "kanagawa-paper.nvim": { "branch": "master", "commit": "7a77de03b636fb5c8034d86da5fb3b164c0f7c57" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
-  "melange-nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" },
   "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
   "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" },
-  "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
+  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" },
-  "scope.nvim": { "branch": "main", "commit": "3fc963e75f88990a9467ff72b8eea667a69c30a2" },
-  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
-  "solarized.nvim": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" },
+  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+  "scope.nvim": { "branch": "main", "commit": "6b4208f017da9b122d69ddc5841e040dffe7313c" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "vesper.nvim": { "branch": "main", "commit": "1717b1ad657c94bec3fc2bdebb0c55452d9fe46d" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/lua/hsta/config.lua b/lua/hsta/config.lua
index 0c848d2..598bab4 100644
--- a/lua/hsta/config.lua
+++ b/lua/hsta/config.lua
@@ -2,7 +2,7 @@
 
 vim.g.mapleader = "`"
 
--- Dont change cursor when entering insert mode
+-- Don't change cursor when entering insert mode
 vim.opt.guicursor = "i:block"
 
 vim.opt.shiftwidth = 4
@@ -28,7 +28,7 @@ vim.o.cursorline = true
 
 vim.opt.fillchars = { eob = " " }
 vim.o.clipboard = "unnamed"
-vim.o.background = "dark"
+vim.o.background = "light"
 
 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions,globals"
 vim.o.swapfile = false
diff --git a/lua/hsta/plugins/colors.lua b/lua/hsta/plugins/colors.lua
index dbfa73f..8e8763d 100644
--- a/lua/hsta/plugins/colors.lua
+++ b/lua/hsta/plugins/colors.lua
@@ -11,44 +11,19 @@ return {
 		end,
 	},
 	{
-		"thesimonho/kanagawa-paper.nvim",
+		"datsfilipe/vesper.nvim",
 		lazy = false,
 		enabled = false,
 		priority = 1000,
 		config = function()
-			require("kanagawa-paper").setup({})
+			require("vesper").setup({})
 
-			vim.cmd([[ colorscheme kanagawa-paper ]])
+			vim.cmd.colorscheme("vesper")
 		end,
 	},
+	{},
 	{
-		"savq/melange-nvim",
-		lazy = false,
-		enabled = false,
-		priority = 1000,
-		config = function()
-			vim.cmd([[ colorscheme melange ]])
-		end,
-	},
-	{
-		"maxmx03/solarized.nvim",
-		lazy = false,
-		priority = 1000,
-		enabled = false,
-		---@type solarized.config
+		"f-person/auto-dark-mode.nvim",
 		opts = {},
-		config = function(_, opts)
-			vim.o.termguicolors = true
-			require("solarized").setup(opts)
-			vim.cmd.colorscheme("solarized")
-		end,
-	},
-	{
-		"rose-pine/neovim",
-		name = "rose-pine",
-		lazy = false,
-		priority = 1000,
-		enabled = false,
-		config = function() end,
 	},
 }
diff --git a/lua/hsta/plugins/discord.lua b/lua/hsta/plugins/discord.lua
new file mode 100644
index 0000000..da41008
--- /dev/null
+++ b/lua/hsta/plugins/discord.lua
@@ -0,0 +1,11 @@
+return {
+	{
+		"andweeb/presence.nvim",
+		lazy = false,
+		opts = function()
+			require("presence").setup({
+				neovim_image_text = "/usr/bin/nvim",
+			})
+		end,
+	},
+}
diff --git a/lua/hsta/plugins/lsp.lua b/lua/hsta/plugins/lsp.lua
index 8c35f8d..16c3960 100644
--- a/lua/hsta/plugins/lsp.lua
+++ b/lua/hsta/plugins/lsp.lua
@@ -48,7 +48,7 @@ return {
 
 			require("mason-lspconfig").setup({
 				automatic_installation = true,
-				ensure_installed = { "lua_ls", "rust_analyzer", "clangd", "cmake" },
+				ensure_installed = { "lua_ls", "rust_analyzer", "clangd", "cmake", "cssls", "html" },
 			})
 
 			require("mason-lspconfig").setup_handlers({
diff --git a/lua/hsta/plugins/snacks.lua b/lua/hsta/plugins/snacks.lua
deleted file mode 100644
index c6c9a6b..0000000
--- a/lua/hsta/plugins/snacks.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
-	{
-		"folke/snacks.nvim",
-		priority = 1000,
-		lazy = false,
-		enabled = false,
-		---@type snacks.Config
-		opts = {
-			-- your configuration comes here
-			-- or leave it empty to use the default settings
-			-- refer to the configuration section below
-			bigfile = { enabled = true },
-			dashboard = { enabled = true },
-			notifier = { enabled = true },
-		},
-	},
-}