replace lazyvim with custom config

33 files changed, 258 insertions, 29 deletions

diff --git a/dot-config/nvim/.gitignore b/dot-config/nvim-old/.gitignore
index cc5457a..cc5457a 100644
--- a/dot-config/nvim/.gitignore
+++ b/dot-config/nvim-old/.gitignore
diff --git a/dot-config/nvim/.neoconf.json b/dot-config/nvim-old/.neoconf.json
index 7c48087..7c48087 100644
--- a/dot-config/nvim/.neoconf.json
+++ b/dot-config/nvim-old/.neoconf.json
diff --git a/dot-config/nvim/LICENSE b/dot-config/nvim-old/LICENSE
index 261eeb9..261eeb9 100644
--- a/dot-config/nvim/LICENSE
+++ b/dot-config/nvim-old/LICENSE
diff --git a/dot-config/nvim/README.md b/dot-config/nvim-old/README.md
index 185280b..185280b 100644
--- a/dot-config/nvim/README.md
+++ b/dot-config/nvim-old/README.md
diff --git a/dot-config/nvim-old/init.lua b/dot-config/nvim-old/init.lua
new file mode 100644
index 0000000..2514f9e
--- /dev/null
+++ b/dot-config/nvim-old/init.lua
@@ -0,0 +1,2 @@
+-- bootstrap lazy.nvim, LazyVim and your plugins
+require("config.lazy")
diff --git a/dot-config/nvim/lazy-lock.json b/dot-config/nvim-old/lazy-lock.json
index 31a58d0..eb7ba43 100644
--- a/dot-config/nvim/lazy-lock.json
+++ b/dot-config/nvim-old/lazy-lock.json
@@ -16,28 +16,28 @@
   "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" },
   "jellybeans.nvim": { "branch": "main", "commit": "28b80886b54396b13a2a85edf608926333e842b9" },
   "kanso.nvim": { "branch": "main", "commit": "c2525ebafa73c1860301716d9a17e3f07f5038b8" },
-  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
-  "lazydev.nvim": { "branch": "main", "commit": "371cd7434cbf95606f1969c2c744da31b77fcfa6" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" },
   "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" },
-  "mini.comment": { "branch": "main", "commit": "c40bc46e72f41d3db265f6d86deb3dc259c0985d" },
-  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
-  "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" },
-  "mini.surround": { "branch": "main", "commit": "da5a221b4317c52447df6d9c18610d19b88ea0f4" },
+  "mini.ai": { "branch": "main", "commit": "0d3c9cf22e37b86b7a0dfbe7ef129ee7a5f4f93c" },
+  "mini.comment": { "branch": "main", "commit": "a0c721115faff8d05505c0a12dab410084d9e536" },
+  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
+  "mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" },
+  "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" },
   "modus-themes.nvim": { "branch": "master", "commit": "c57c2c56c9f0af04f3b609d11caa840880074784" },
   "moonfly": { "branch": "master", "commit": "ef85b89739bee184e204c89bc06280d62bd84039" },
   "multicursor.nvim": { "branch": "1.0", "commit": "0c6ceae228bf209e8b8717df9de500770c4e7022" },
   "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
-  "noice.nvim": { "branch": "main", "commit": "5099348591f7d3ba9e547b1e631c694c65bbe0b9" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nordic.nvim": { "branch": "main", "commit": "6afe957722fb1b0ec7ca5fbea5a651bcca55f3e1" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lint": { "branch": "master", "commit": "8c694e1a1ee2ac14df931679cd54e6b8d402c2c2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a89bfcfd0e44f898341ac8a80ba83ccf6218bef3" },
+  "nvim-lint": { "branch": "master", "commit": "8b349e822a36e9480aed96c6dd2f757f80524a35" },
+  "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" },
   "nvim-treesitter": { "branch": "main", "commit": "55820833a32c61a423587e2826c5b59577aaddbb" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "1f29f2f788dbbf6573a0d968a6dfe75a0fa628d0" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "2e5b8735a61d3cfaa65d9a8ff787a7b0a0a81b70" },
   "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
   "oxocarbon": { "branch": "main", "commit": "9f85f6090322f39b11ae04a343d4eb9d12a86897" },
@@ -45,14 +45,14 @@
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "render-markdown.nvim": { "branch": "main", "commit": "10126effbafb74541b69219711dfb2c631e7ebf8" },
   "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
-  "snacks.nvim": { "branch": "main", "commit": "bd3c1a071483c943ce98723ef7ac79fda0c7ee16" },
+  "snacks.nvim": { "branch": "main", "commit": "c1e15001c0da18f740bc8bbe55fc0509f41bd9c6" },
   "sonokai": { "branch": "master", "commit": "48c809c887ce7b7828f7ea27408fc2ef2179efb5" },
   "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" },
   "tokyonight.nvim": { "branch": "main", "commit": "b13cfc1286d2aa8bda6ce137b79e857d5a3d5739" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
   "vague.nvim": { "branch": "main", "commit": "5689afda42d60c8db12ff93dd6e1322f59e46a93" },
-  "venv-selector.nvim": { "branch": "main", "commit": "0241027095d7efd111b84ff4e980b3d1cce2335c" },
+  "venv-selector.nvim": { "branch": "main", "commit": "1ef6564d0bd0d9c4194711cfb696357a6119abd7" },
   "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" },
   "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }
diff --git a/dot-config/nvim/lazyvim.json b/dot-config/nvim-old/lazyvim.json
index ef7d917..ef7d917 100644
--- a/dot-config/nvim/lazyvim.json
+++ b/dot-config/nvim-old/lazyvim.json
diff --git a/dot-config/nvim/lua/config/autocmds.lua b/dot-config/nvim-old/lua/config/autocmds.lua
index 4221e75..4221e75 100644
--- a/dot-config/nvim/lua/config/autocmds.lua
+++ b/dot-config/nvim-old/lua/config/autocmds.lua
diff --git a/dot-config/nvim/lua/config/keymaps.lua b/dot-config/nvim-old/lua/config/keymaps.lua
index 2c134f7..2c134f7 100644
--- a/dot-config/nvim/lua/config/keymaps.lua
+++ b/dot-config/nvim-old/lua/config/keymaps.lua
diff --git a/dot-config/nvim/lua/config/lazy.lua b/dot-config/nvim-old/lua/config/lazy.lua
index d73bfa1..d73bfa1 100644
--- a/dot-config/nvim/lua/config/lazy.lua
+++ b/dot-config/nvim-old/lua/config/lazy.lua
diff --git a/dot-config/nvim/lua/config/options.lua b/dot-config/nvim-old/lua/config/options.lua
index 332d2af..332d2af 100644
--- a/dot-config/nvim/lua/config/options.lua
+++ b/dot-config/nvim-old/lua/config/options.lua
diff --git a/dot-config/nvim/lua/plugins/example.lua b/dot-config/nvim-old/lua/plugins/example.lua
index 17f53d6..17f53d6 100644
--- a/dot-config/nvim/lua/plugins/example.lua
+++ b/dot-config/nvim-old/lua/plugins/example.lua
diff --git a/dot-config/nvim/lua/plugins/handlebars.lua b/dot-config/nvim-old/lua/plugins/handlebars.lua
index b09dc3c..b09dc3c 100644
--- a/dot-config/nvim/lua/plugins/handlebars.lua
+++ b/dot-config/nvim-old/lua/plugins/handlebars.lua
diff --git a/dot-config/nvim/lua/plugins/hardtime.lua b/dot-config/nvim-old/lua/plugins/hardtime.lua
index 8e8078a..8e8078a 100644
--- a/dot-config/nvim/lua/plugins/hardtime.lua
+++ b/dot-config/nvim-old/lua/plugins/hardtime.lua
diff --git a/dot-config/nvim/lua/plugins/hledger.lua b/dot-config/nvim-old/lua/plugins/hledger.lua
index 240d0a6..240d0a6 100644
--- a/dot-config/nvim/lua/plugins/hledger.lua
+++ b/dot-config/nvim-old/lua/plugins/hledger.lua
diff --git a/dot-config/nvim/lua/plugins/lualine.lua b/dot-config/nvim-old/lua/plugins/lualine.lua
index d71612a..d71612a 100644
--- a/dot-config/nvim/lua/plugins/lualine.lua
+++ b/dot-config/nvim-old/lua/plugins/lualine.lua
diff --git a/dot-config/nvim/lua/plugins/markdown.lua b/dot-config/nvim-old/lua/plugins/markdown.lua
index 48c957d..48c957d 100644
--- a/dot-config/nvim/lua/plugins/markdown.lua
+++ b/dot-config/nvim-old/lua/plugins/markdown.lua
diff --git a/dot-config/nvim/lua/plugins/multicursor.lua b/dot-config/nvim-old/lua/plugins/multicursor.lua
index 6e81074..6e81074 100644
--- a/dot-config/nvim/lua/plugins/multicursor.lua
+++ b/dot-config/nvim-old/lua/plugins/multicursor.lua
diff --git a/dot-config/nvim/lua/plugins/theme.lua b/dot-config/nvim-old/lua/plugins/theme.lua
index 166c3a9..166c3a9 100644
--- a/dot-config/nvim/lua/plugins/theme.lua
+++ b/dot-config/nvim-old/lua/plugins/theme.lua
diff --git a/dot-config/nvim/lua/plugins/yaml.lua b/dot-config/nvim-old/lua/plugins/yaml.lua
index c14f04d..c14f04d 100644
--- a/dot-config/nvim/lua/plugins/yaml.lua
+++ b/dot-config/nvim-old/lua/plugins/yaml.lua
diff --git a/dot-config/nvim-old/lua/wordcount.lua b/dot-config/nvim-old/lua/wordcount.lua
new file mode 100644
index 0000000..92944e5
--- /dev/null
+++ b/dot-config/nvim-old/lua/wordcount.lua
@@ -0,0 +1,33 @@
+-- Wordcount in markdown
+--
+-- Credits
+-- https://github.com/nvim-lualine/lualine.nvim/issues/328#issuecomment-982672253
+-- https://github.com/skwee357/nvim-prose
+
+local M = {}
+
+local config = {
+  filetypes = { "markdown", "text", "typst" },
+}
+
+function M.wordcount()
+  local wc = vim.fn.wordcount()
+
+  if wc.visual_words then
+    return tostring(wc.visual_words) .. " words"
+  end
+
+  return tostring(wc.words) .. " words"
+end
+
+function M.is_available()
+  for _, ft in ipairs(config.filetypes) do
+    if ft == vim.bo.filetype then
+      return true
+    end
+  end
+
+  return false
+end
+
+return M
diff --git a/dot-config/nvim/stylua.toml b/dot-config/nvim-old/stylua.toml
index 5d6c50d..5d6c50d 100644
--- a/dot-config/nvim/stylua.toml
+++ b/dot-config/nvim-old/stylua.toml
diff --git a/dot-config/nvim/init.lua b/dot-config/nvim/init.lua
index 2514f9e..ad65bbd 100644
--- a/dot-config/nvim/init.lua
+++ b/dot-config/nvim/init.lua
@@ -1,2 +1,28 @@
--- bootstrap lazy.nvim, LazyVim and your plugins
-require("config.lazy")
+-- General
+vim.g.mapleader = " "
+
+vim.o.undofile = true -- Persistant undo
+
+-- UI
+vim.o.cmdheight = 0 -- Puts Lualine at very bottom
+vim.o.cursorline = true -- Current line highlighting
+vim.o.number = true -- Show line numbers
+vim.o.relativenumber = true -- Relative line numbers
+vim.o.signcolumn = "yes" -- Always show signcolumn (less flicker)
+vim.o.splitbelow = true -- Horizontal splits will be below
+vim.o.splitright = true -- Vertical splits will be to the right
+vim.o.termguicolors = true -- Enable 24-bit RGB color in TUI
+vim.o.winborder = "single" -- Use border in floating windows
+
+-- Editing
+vim.o.autoindent = true -- Use auto indent
+vim.o.expandtab = true -- Convert tabs to spaces
+vim.o.ignorecase = true -- Ignore case during search
+vim.o.incsearch = true -- Show search matches while typing
+vim.o.shiftwidth = 2 -- Use this number of spaces for indentation
+vim.o.smartindent = true -- Make indenting smart
+vim.o.tabstop = 2 -- Show tab as this number of spaces
+
+-- TODO: consider not using clipboard for all operations
+-- see :h clipboard
+vim.opt.clipboard = "unnamedplus"
diff --git a/dot-config/nvim/lua/wordcount.lua b/dot-config/nvim/lua/wordcount.lua
index 92944e5..1ff5579 100644
--- a/dot-config/nvim/lua/wordcount.lua
+++ b/dot-config/nvim/lua/wordcount.lua
@@ -7,27 +7,26 @@
 local M = {}
 
 local config = {
-  filetypes = { "markdown", "text", "typst" },
+	filetypes = { "markdown", "text", "typst" },
 }
 
-function M.wordcount()
-  local wc = vim.fn.wordcount()
-
-  if wc.visual_words then
-    return tostring(wc.visual_words) .. " words"
-  end
+local function format_wc(n)
+	return tostring(n) .. " words"
+end
 
-  return tostring(wc.words) .. " words"
+function M.wordcount()
+	local wc = vim.fn.wordcount()
+	return (wc.visual_words and format_wc(wc.visual_words)) or format_wc(wc.words)
 end
 
 function M.is_available()
-  for _, ft in ipairs(config.filetypes) do
-    if ft == vim.bo.filetype then
-      return true
-    end
-  end
+	for _, ft in ipairs(config.filetypes) do
+		if ft == vim.bo.filetype then
+			return true
+		end
+	end
 
-  return false
+	return false
 end
 
 return M
diff --git a/dot-config/nvim/nvim-pack-lock.json b/dot-config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..cf0d147
--- /dev/null
+++ b/dot-config/nvim/nvim-pack-lock.json
@@ -0,0 +1,56 @@
+{
+  "plugins": {
+    "conform.nvim": {
+      "rev": "cde4da5",
+      "src": "https://github.com/stevearc/conform.nvim"
+    },
+    "fzf-lua": {
+      "rev": "a8458b7",
+      "src": "https://github.com/ibhagwan/fzf-lua"
+    },
+    "hardtime.nvim": {
+      "rev": "b4e4319",
+      "src": "https://github.com/m4xshen/hardtime.nvim"
+    },
+    "jellybeans.nvim": {
+      "rev": "28b8088",
+      "src": "https://github.com/WTFox/jellybeans.nvim"
+    },
+    "lualine.nvim": {
+      "rev": "3946f01",
+      "src": "https://github.com/nvim-lualine/lualine.nvim"
+    },
+    "mason.nvim": {
+      "rev": "ad7146a",
+      "src": "https://github.com/mason-org/mason.nvim"
+    },
+    "nui.nvim": {
+      "rev": "de74099",
+      "src": "https://github.com/MunifTanjim/nui.nvim"
+    },
+    "nvim-lspconfig": {
+      "rev": "2010fc6",
+      "src": "https://github.com/neovim/nvim-lspconfig"
+    },
+    "nvim-notify": {
+      "rev": "8701bec",
+      "src": "https://github.com/rcarriga/nvim-notify"
+    },
+    "nvim-treesitter": {
+      "rev": "42fc28ba",
+      "src": "https://github.com/nvim-treesitter/nvim-treesitter"
+    },
+    "plenary.nvim": {
+      "rev": "b9fd522",
+      "src": "https://github.com/nvim-lua/plenary.nvim"
+    },
+    "sonokai": {
+      "rev": "ec07018",
+      "src": "https://github.com/sainnhe/sonokai"
+    },
+    "yazi.nvim": {
+      "rev": "667028e",
+      "src": "https://github.com/mikavilpas/yazi.nvim"
+    }
+  }
+}
\ No newline at end of file
diff --git a/dot-config/nvim/plugin/colorscheme.lua b/dot-config/nvim/plugin/colorscheme.lua
new file mode 100644
index 0000000..2539956
--- /dev/null
+++ b/dot-config/nvim/plugin/colorscheme.lua
@@ -0,0 +1,16 @@
+vim.pack.add({
+	"https://github.com/sainnhe/sonokai",
+	"https://github.com/WTFox/jellybeans.nvim",
+})
+
+vim.g.sonokai_transparent_background = 2
+vim.g.sonokai_float_style = "bright"
+
+require("jellybeans").setup({
+	transparent = true,
+	italics = false,
+	bold = false,
+	flat_ui = true, -- toggles "flat UI" for pickers
+})
+
+vim.cmd("colorscheme jellybeans")
diff --git a/dot-config/nvim/plugin/fzf.lua b/dot-config/nvim/plugin/fzf.lua
new file mode 100644
index 0000000..259d828
--- /dev/null
+++ b/dot-config/nvim/plugin/fzf.lua
@@ -0,0 +1,9 @@
+vim.pack.add({
+	"https://github.com/ibhagwan/fzf-lua",
+})
+
+require("fzf-lua").setup()
+
+vim.keymap.set("n", "<leader><Space>", FzfLua.files)
+vim.keymap.set("n", "<leader>/", FzfLua.live_grep)
+vim.keymap.set("n", "<leader>fb", FzfLua.buffers)
diff --git a/dot-config/nvim/plugin/hardtime.lua b/dot-config/nvim/plugin/hardtime.lua
new file mode 100644
index 0000000..f956c86
--- /dev/null
+++ b/dot-config/nvim/plugin/hardtime.lua
@@ -0,0 +1,6 @@
+vim.pack.add({
+	"https://github.com/m4xshen/hardtime.nvim",
+	"https://github.com/MunifTanjim/nui.nvim",
+})
+
+require("hardtime").setup()
diff --git a/dot-config/nvim/plugin/lsp.lua b/dot-config/nvim/plugin/lsp.lua
new file mode 100644
index 0000000..4b8a66b
--- /dev/null
+++ b/dot-config/nvim/plugin/lsp.lua
@@ -0,0 +1,26 @@
+vim.pack.add({
+	"https://github.com/neovim/nvim-lspconfig",
+	"https://github.com/mason-org/mason.nvim",
+	"https://github.com/stevearc/conform.nvim",
+})
+
+require("mason").setup()
+
+vim.lsp.enable({
+	"expert", -- elixir
+	"lua_ls", -- lua
+})
+
+require("conform").setup({
+	-- Formatters
+	formatters_by_ft = {
+		elixir = { "mix" },
+		lua = { "stylua" },
+	},
+
+	format_on_save = {
+		-- I recommend these options. See :help conform.format for details.
+		lsp_format = "fallback",
+		timeout_ms = 500,
+	},
+})
diff --git a/dot-config/nvim/plugin/lualine.lua b/dot-config/nvim/plugin/lualine.lua
new file mode 100644
index 0000000..b605786
--- /dev/null
+++ b/dot-config/nvim/plugin/lualine.lua
@@ -0,0 +1,22 @@
+vim.pack.add({
+	"https://github.com/nvim-lualine/lualine.nvim",
+})
+
+local wc = require("wordcount")
+
+require("lualine").setup({
+	options = {
+		component_separators = "",
+		section_separators = "",
+	},
+	sections = {
+		lualine_y = {
+			-- Add wordcount
+			{ wc.wordcount, cond = wc.is_available },
+			-- Existing conf
+			"progress",
+		},
+	},
+})
+
+vim.o.cmdheight = 0 -- Puts Lualine at very bottom
diff --git a/dot-config/nvim/plugin/notify.lua b/dot-config/nvim/plugin/notify.lua
new file mode 100644
index 0000000..75ceb47
--- /dev/null
+++ b/dot-config/nvim/plugin/notify.lua
@@ -0,0 +1,11 @@
+vim.pack.add({
+	"https://github.com/rcarriga/nvim-notify",
+})
+
+require("notify").setup({
+	background_colour = "#000000",
+	render = "wrapped-compact",
+	stages = "static",
+})
+
+vim.notify = require("notify") -- Use "notify" plugin as default notify function
diff --git a/dot-config/nvim/plugin/treesitter.lua b/dot-config/nvim/plugin/treesitter.lua
new file mode 100644
index 0000000..a1cc545
--- /dev/null
+++ b/dot-config/nvim/plugin/treesitter.lua
@@ -0,0 +1,15 @@
+vim.pack.add({
+	"https://github.com/nvim-treesitter/nvim-treesitter",
+})
+
+require("nvim-treesitter").setup()
+require("nvim-treesitter.configs").setup({
+	ensure_installed = {
+		"eex", -- elixir
+		"elixir",
+		"heex", -- elixir
+	},
+	highlight = {
+		enable = true,
+	},
+})
diff --git a/dot-config/nvim/plugin/yazi.lua b/dot-config/nvim/plugin/yazi.lua
new file mode 100644
index 0000000..d34c359
--- /dev/null
+++ b/dot-config/nvim/plugin/yazi.lua
@@ -0,0 +1,8 @@
+vim.pack.add({
+	"https://github.com/mikavilpas/yazi.nvim",
+	"https://github.com/nvim-lua/plenary.nvim", --dependency
+})
+
+vim.keymap.set("n", "<leader>e", function()
+	require("yazi").yazi()
+end)