feat: random beautification

lsp/bicep.lua

@@ -0,0 +1,8 @@
+---@type vim.lsp.Config
+
+local bicep_lsp_bin = "/Users/oliver.ladner/bicep-langserver/Bicep.LangServer.dll"
+return {
+    cmd = { "/opt/homebrew/opt/dotnet@8/libexec/dotnet", bicep_lsp_bin },
+    root_markers = { ".git" },
+    filetypes = { "bicep" },
+}

lsp/docker-compose.lua

@@ -0,0 +1,7 @@
+---@type vim.lsp.Config
+return {
+    cmd = { "docker-compose-langserver", "--stdio" },
+    root_markers = { "docker_compose*.yml", "docker-compose.yml" },
+    filetypes = { "yaml.docker-compose" },
+    single_file_support = true,
+}

lsp/woke.lua

@@ -0,0 +1,5 @@
+---@type vim.lsp.Config
+return {
+    cmd = { "woke", "--stdin" },
+    filetypes = { "markdown", "text", "gitcommit", "plaintext" },
+}

lsp/write-good.lua

@@ -0,0 +1,6 @@
+---@type vim.lsp.Config
+return {
+    cmd = { "write-good", "/dev/stdin" },
+    -- root_markers = { ".md" },
+    filetypes = { "markdown", "text", "gitcommit" },
+}

lua/weeheavy/plugins/lsp/nvim-lint.lua

@@ -1,32 +1,34 @@
 return {
-	"mfussenegger/nvim-lint",
+    "mfussenegger/nvim-lint",
-	event = { "BufReadPre", "BufNewFile" },
+    -- event = { "BufReadPre", "BufNewFile" },
-	config = function()
+    event = "VeryLazy",
-		local lint = require("lint")
+    config = function()
+        local lint = require("lint")
 
-		lint.linters_by_ft = {
+        lint.linters_by_ft = {
-			javascript = { "eslint_d" },
+            javascript = { "eslint_d" },
-			typescript = { "eslint_d" },
+            typescript = { "eslint_d" },
-			javascriptreact = { "eslint_d" },
+            javascriptreact = { "eslint_d" },
-			typescriptreact = { "eslint_d" },
+            typescriptreact = { "eslint_d" },
-			svelte = { "eslint_d" },
+            svelte = { "eslint_d" },
-			python = { "pylint" },
+            python = { "pylint" },
-			ansible = { "woke" },
+            ansible = { "woke" },
-			markdown = { "woke" },
+            markdown = { "woke" },
-			sh = { "woke" },
+            text = { "woke" },
-		}
+            sh = { "woke" },
+        }
 
-		local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
+        -- local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
 
-		vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
+        vim.api.nvim_create_autocmd({ "BufEnter", "BufReadPost", "BufWritePost", "InsertLeave" }, {
-			group = lint_augroup,
+            -- group = lint_augroup,
-			callback = function()
+            callback = function()
-				lint.try_lint()
+                lint.try_lint()
-			end,
+            end,
-		})
+        })
 
-		vim.keymap.set("n", "<leader>l", function()
+        vim.keymap.set("n", "<leader>l", function()
-			lint.try_lint()
+            lint.try_lint()
-		end, { desc = "Trigger linting for current file" })
+        end, { desc = "Trigger linting for current file" })
-	end,
+    end,
 }

lua/weeheavy/plugins/lualine.lua

@@ -2,78 +2,91 @@
 
 -- Display attached LSP client
 local function lsp_client_name()
-	local bufnr = vim.api.nvim_get_current_buf()
+    local bufnr = vim.api.nvim_get_current_buf()
 
-	-- local clients = vim.lsp.buf_get_clients(bufnr)
+    -- local clients = vim.lsp.buf_get_clients(bufnr)
-	local clients = vim.lsp.get_clients({ bufnr = 0 })
+    local clients = vim.lsp.get_clients({ bufnr = 0 })
-	if next(clients) == nil then
+    if next(clients) == nil then
-		return "n/a"
+        return "n/a"
-	end
+    end
 
-	local c = {}
+    local c = {}
-	for _, client in pairs(clients) do
+    for _, client in pairs(clients) do
-		table.insert(c, client.name)
+        table.insert(c, client.name)
-		-- table.insert(c, string.sub(client.name, 0, 8) .. "...")
+        -- table.insert(c, string.sub(client.name, 0, 8) .. "...")
-	end
+    end
-	return "\u{f085} " .. table.concat(c, ",")
+    return "\u{f085} " .. table.concat(c, ",")
 end
 
 -- hide content on narrow windows
 local function hide_in_width()
-	return vim.fn.winwidth(0) > 80
+    return vim.fn.winwidth(0) > 80
 end
 
 local function clock()
-	local time = tostring(os.date()):sub(12, 16)
+    local time = tostring(os.date()):sub(12, 16)
-	return time
+    return time
 end
 
 return {
-	"nvim-lualine/lualine.nvim",
+    "nvim-lualine/lualine.nvim",
-	lazy = true,
+    lazy = true,
-	event = { "BufReadPre", "BufNewFile" },
+    event = { "BufReadPre", "BufNewFile" },
 
-	opts = {
+    opts = {
-		options = {
+        options = {
-			globalstatus = false, -- true == single statusline
+            globalstatus = false, -- true == single statusline
-			icons_enabled = true,
+            icons_enabled = true,
-			theme = "auto",
+            theme = "rose-pine",
-			component_separators = "⋮",
+            component_separators = "⋮",
-			--section_separators = { left = "", right = "" },
+            --section_separators = { left = "", right = "" },
-			section_separators = { left = "", right = "" },
+            section_separators = { left = "", right = "" },
-		},
+        },
-		sections = {
+        sections = {
-			lualine_a = {
+            lualine_a = {
-				{
+                {
-					-- shorten mode names
+                    -- shorten mode names
-					-- https://github.com/nvim-lualine/lualine.nvim/issues/614#issuecomment-1072275099
+                    -- https://github.com/nvim-lualine/lualine.nvim/issues/614#issuecomment-1072275099
-					"mode",
+                    "mode",
-					fmt = function(res)
+                    fmt = function(res)
-						return res:sub(1, 1)
+                        return res:sub(1, 1)
-					end,
+                    end,
-				},
+                },
-			},
+            },
-			lualine_c = {
+            lualine_c = {
-				--{ "searchcount" },
+                --{ "searchcount" },
-				{
+                {
-					"buffers",
+                    "buffers",
-					show_filename_only = true,
+                    show_filename_only = true,
-					--fmt = function(str)
+                    --fmt = function(str)
-					--	return str:sub(1, 1)
+                    --	return str:sub(1, 1)
-					--end,
+                    --end,
-					--fmt = function()
+                    --fmt = function()
-					--	return string.gsub(vim.api.nvim_buf_get_name(0), vim.loop.cwd(), "")
+                    --	return string.gsub(vim.api.nvim_buf_get_name(0), vim.loop.cwd(), "")
-					--end,
+                    --end,
-				},
+                },
-			},
+            },
-			lualine_x = {
+            lualine_x = {
-				-- specify full list of elements when adding custom things
+                -- specify full list of elements when adding custom things
-				{ "encoding", cond = hide_in_width },
+                { "encoding",      cond = hide_in_width },
-				{ "fileformat" },
+                { "fileformat",    cond = hide_in_width },
-				{ "filetype", cond = hide_in_width },
+                { "filetype" },
-				{ lsp_client_name, cond = hide_in_width },
+                { lsp_client_name, cond = hide_in_width },
-				--{ clock, cond = hide_in_width },
+                --{ clock, cond = hide_in_width },
-			},
+                function()
-		},
+                    local ok, pomo = pcall(require, "pomo")
-	},
+                    if not ok then
+                        return ""
+                    end
+
+                    local timer = pomo.get_first_to_finish()
+                    if timer == nil then
+                        return ""
+                    end
+
+                    return "󰄉 " .. tostring(timer)
+                end,
+            },
+        },
+    },
 }

lua/weeheavy/plugins/mini.lua

@@ -1,9 +1,22 @@
 -- Adds git related signs to the gutter, as well as utilities for managing changes
 return {
-	"echasnovski/mini.nvim",
+    "echasnovski/mini.nvim",
-	version = false,
+    version = false,
-	config = function()
+    config = function()
-		local icons = require("mini.icons")
+        require("mini.icons").setup()
-		icons.setup({})
+        require("mini.surround").setup({
-	end,
+            mappings = {
+                add = "wq", -- Add surrounding in Normal and Visual modes
+                delete = "wd", -- Delete surrounding
+                -- find = "sf", -- Find surrounding (to the right)
+                -- find_left = "sF", -- Find surrounding (to the left)
+                highlight = "hs", -- Highlight surrounding
+                replace = "wc", -- Replace surrounding
+                -- update_n_lines = "sn", -- Update `n_lines`
+
+                -- suffix_last = "l", -- Suffix to search with "prev" method
+                -- suffix_next = "n", -- Suffix to search with "next" method
+            },
+        })
+    end,
 }

lua/weeheavy/plugins/oil.lua

@@ -1,41 +1,40 @@
 -- File system operations for nerds
 -- https://github.com/stevearc/oil.nvim
 return {
-	"stevearc/oil.nvim",
+    "stevearc/oil.nvim",
-	lazy = true,
+    lazy = true,
-	cmd = "Oil",
+    cmd = "Oil",
-	config = function()
+    config = function()
-		local oil = require("oil")
+        require("oil").setup({
-		oil.setup({
+            default_file_explorer = true,
-			-- Leave netrw there, so we can open link with `gx`
+            columns = {
-			--default_file_explorer = false,
+                -- "size",
-			default_file_explorer = true,
+                "icon",
-			columns = {
+                -- "mtime",
-				--"size",
+            },
-				"icon",
+            view_options = {
-			},
+                show_hidden = true,
-			view_options = {
+            },
-				show_hidden = true,
+            keymaps = {
-			},
+                -- This should be matched to the open action in remap.lua
-			keymaps = {
+                ["<leader>e"] = "actions.close",
-				-- This should be matched to the open action in remap.lua
+                ["<C-v>"] = "actions.select_vsplit",
-				["<leader>e"] = "actions.close",
+                ["<C-x>"] = "actions.select_split",
-				["<C-v>"] = "actions.select_vsplit",
+                ["<C-c>"] = "actions.close",
-				["<C-x>"] = "actions.select_split",
+                ["q"] = "actions.close",
-				["<C-c>"] = "actions.close",
+                ["<Esc>"] = "actions.close",
-				["q"] = "actions.close",
+            },
-			},
 
-			float = {
+            float = {
-				-- Padding around the floating window
+                -- Padding around the floating window
-				padding = 4,
+                padding = 4,
-				max_width = 80,
+                max_width = 80,
-				max_height = 25,
+                max_height = 25,
-				border = "rounded",
+                border = "rounded",
-				win_options = {
+                win_options = {
-					winblend = 0,
+                    winblend = 0,
-				},
+                },
-			},
+            },
-		})
+        })
-	end,
+    end,
 }

lua/weeheavy/plugins/pomo.lua

@@ -0,0 +1,10 @@
+return {
+    "epwalsh/pomo.nvim",
+    version = "*", -- Recommended, use latest release instead of latest commit
+    lazy = true,
+    cmd = { "TimerStart", "TimerRepeat", "TimerSession" },
+    opts = {
+        -- See below for full list of options 👇
+        update_interval = 20000,
+    },
+}

lua/weeheavy/plugins/telescope.lua

@@ -1,52 +1,53 @@
 return {
-	"nvim-telescope/telescope.nvim",
+    "nvim-telescope/telescope.nvim",
-	lazy = true,
+    lazy = true,
-	--event = "VeryLazy",
+    --event = "VeryLazy",
-	cmd = "Telescope",
+    cmd = "Telescope",
-	tag = "0.1.5",
+    tag = "0.1.8",
-	dependencies = {
+    dependencies = {
-		"nvim-lua/plenary.nvim",
+        "nvim-lua/plenary.nvim",
-	},
+    },
-	--config = function(lazy, opts)
+    --config = function(lazy, opts)
-	config = function()
+    config = function()
-		local telescope = require("telescope")
+        local telescope = require("telescope")
-		telescope.load_extension("fzf")
+        telescope.load_extension("fzf")
-		--telescope.load_extension("file_browser")
+        --telescope.load_extension("file_browser")
-		telescope.setup({
+        telescope.setup({
-			defaults = {
+            defaults = {
-				sorting_strategy = "ascending",
+                border = false,
-				wrap_result = true,
+                sorting_strategy = "ascending",
-				layout_strategy = "horizontal",
+                wrap_result = true,
-				layout_config = {
+                layout_strategy = "horizontal",
-					horizontal = {
+                layout_config = {
-						prompt_position = "top",
+                    horizontal = {
-						preview_width = 0.45,
+                        prompt_position = "top",
-						width = 0.90,
+                        preview_width = 0.45,
-						height = 0.75,
+                        width = 0.90,
-						preview_cutoff = 90,
+                        height = 0.75,
-					},
+                        preview_cutoff = 90,
-				},
+                    },
-			},
+                },
-			pickers = {
+            },
-				find_files = {
+            pickers = {
-					hidden = true,
+                find_files = {
-					wrap_results = false, -- this is not about the preview
+                    hidden = true,
-				},
+                    wrap_results = false, -- this is not about the preview
-				live_grep = {
+                },
-					additional_args = function()
+                live_grep = {
-						return { "--hidden", "--glob", "!**/.git/*" }
+                    additional_args = function()
-					end,
+                        return { "--hidden", "--glob", "!**/.git/*" }
-				},
+                    end,
-				grep_string = {
+                },
-					additional_args = function()
+                grep_string = {
-						return { "--hidden", "--glob", "!**/.git/*" }
+                    additional_args = function()
-					end,
+                        return { "--hidden", "--glob", "!**/.git/*" }
-				},
+                    end,
-				["lsp_references"] = { wrap_results = true },
+                },
-				["lsp_definitions"] = { wrap_results = true },
+                ["lsp_references"] = { wrap_results = true },
-				["diagnostics"] = { wrap_results = true },
+                ["lsp_definitions"] = { wrap_results = true },
-				["buffers"] = { sort_mru = true, sort_lastused = true, ignore_current_buffer = false },
+                ["diagnostics"] = { wrap_results = true },
-			},
+                ["buffers"] = { sort_mru = true, sort_lastused = true, ignore_current_buffer = false },
-		})
+            },
-	end,
+        })
+    end,
 }

lua/weeheavy/plugins/theme/catppuccin.lua

@@ -3,57 +3,57 @@ return {
 	name = "catppuccin",
 	tag = "stable",
 	lazy = false,
-	enabled = false,
+	enabled = true,
 	priority = 1000,
 	opts = {},
-	--	config = function()
+	config = function()
-	--		local tokyonight = require("tokyonight")
+		require("catppuccin").setup({
-	--		local util = require("tokyonight.util")
+			flavour = "auto", -- latte, frappe, macchiato, mocha
-	--		tokyonight.setup({
+			background = { -- :h background
-	--			styles = {
+				light = "latte",
-	--				comments = { italic = true },
+				dark = "mocha",
-	--			},
+			},
-	--			on_colors = function(colors)
+			transparent_background = false, -- disables setting the background color.
-	--				-- Brighten up comments a bit
+			show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
-	--				colors.comment = "#888fac"
+			term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`)
-	--				-- Better visible visual selection background color
+			dim_inactive = {
-	--				colors.bg_visual = "#e82a86"
+				enabled = false, -- dims the background color of inactive window
-	--			end,
+				shade = "dark",
-	--			on_highlights = function(hl, c)
+				percentage = 0.15, -- percentage of the shade to apply to the inactive window
-	--				-- Brighter line numbers
+			},
-	--				hl.LineNr = {
+			no_italic = false, -- Force no italic
-	--					fg = util.darken(c.dark5, 0.6),
+			no_bold = false, -- Force no bold
-	--				}
+			no_underline = false, -- Force no underline
-	--				-- Remove borders from Telescope windows
+			styles = { -- Handles the styles of general hi groups (see `:h highlight-args`):
-	--				local prompt = "#4e3e6c"
+				comments = { "italic" }, -- Change the style of comments
-	--				hl.TelescopeNormal = {
+				conditionals = { "italic" },
-	--					bg = c.bg_dark,
+				loops = {},
-	--					fg = c.fg_dark,
+				functions = {},
-	--				}
+				keywords = {},
-	--				hl.TelescopeBorder = {
+				strings = {},
-	--					bg = c.bg_dark,
+				variables = {},
-	--					fg = c.bg_dark,
+				numbers = {},
-	--				}
+				booleans = {},
-	--				hl.TelescopePromptNormal = {
+				properties = {},
-	--					bg = prompt,
+				types = {},
-	--				}
+				operators = {},
-	--				hl.TelescopePromptBorder = {
+				-- miscs = {}, -- Uncomment to turn off hard-coded styles
-	--					bg = prompt,
+			},
-	--					fg = prompt,
+			color_overrides = {},
-	--				}
+			custom_highlights = {},
-	--				hl.TelescopePromptTitle = {
+			default_integrations = true,
-	--					bg = prompt,
+			integrations = {
-	--					fg = prompt,
+				cmp = true,
-	--				}
+				gitsigns = true,
-	--				hl.TelescopePreviewTitle = {
+				nvimtree = true,
-	--					bg = c.bg_dark,
+				treesitter = true,
-	--					fg = c.bg_dark,
+				notify = false,
-	--				}
+				mini = {
-	--				hl.TelescopeResultsTitle = {
+					enabled = true,
-	--					bg = c.bg_dark,
+					indentscope_color = "",
-	--					fg = c.bg_dark,
+				},
-	--				}
+				-- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
-	--			end,
+			},
-	--		})
+		})
-	--	end,
+	end,
 }

lua/weeheavy/plugins/theme/kanagawa.lua

@@ -0,0 +1,18 @@
+return {
+    "rebelot/kanagawa.nvim",
+    name = "kanagawa",
+    branch = "master",
+    lazy = false,
+    enabled = false,
+    priority = 1000,
+    opts = {},
+    config = function()
+        require("kanagawa").setup({
+            theme = "lotus", -- Load "wave" theme
+            background = { -- map the value of 'background' option to a theme
+                dark = "wave", -- try "dragon" !
+                light = "lotus",
+            },
+        })
+    end,
+}

lua/weeheavy/plugins/theme/rosepine.lua

@@ -21,6 +21,23 @@ return {
             styles = {
                 transparency = false,
             },
+            highlight_groups = {
+                -- TelescopeResultsNormal = { fg = "subtle", bg = "none" },
+
+                TelescopeBorder = { fg = "overlay", bg = "overlay" },
+                TelescopeNormal = { fg = "subtle", bg = "overlay" },
+                TelescopeSelection = { fg = "text", bg = "highlight_med" },
+                -- TelescopeSelectionCaret = { fg = "love", bg = "highlight_med" },
+                TelescopeSelectionCaret = { fg = "rose", bg = "rose" },
+                TelescopeMultiSelection = { fg = "text", bg = "highlight_high" },
+
+                TelescopeTitle = { fg = "base", bg = "love" },
+                TelescopePromptTitle = { fg = "base", bg = "pine" },
+                TelescopePreviewTitle = { fg = "base", bg = "iris" },
+
+                TelescopePromptNormal = { fg = "text", bg = "surface" },
+                TelescopePromptBorder = { fg = "surface", bg = "surface" },
+            },
         })
     end,
 }

lua/weeheavy/prefs.lua

@@ -10,6 +10,7 @@ vim.lsp.enable({
     "woke",
     "tailwind",
     "docker-compose",
+    "bicep",
 })
 
 -- Set highlight on search

lua/weeheavy/remap.lua

@@ -1,4 +1,5 @@
 -- keyboard shortcuts
+--
 
 -- Leader key. Base for any key combo
 vim.g.mapleader = ";"
@@ -43,13 +44,8 @@ vim.keymap.set("n", "<leader>gd", function()
     else
         vim.cmd("DiffviewClose")
     end
-end, { noremap = true, desc = "Toggle diff/stage UI " })
+end, { noremap = true, desc = "Git diff/stage" })
-vim.keymap.set(
+vim.keymap.set("n", "<leader>gb", ":Gitsigns toggle_current_line_blame<CR>", { noremap = true, desc = "Git blame" })
-    "n",
-    "<leader>gb",
-    ":Gitsigns toggle_current_line_blame<CR>",
-    { noremap = true, desc = "Toggle git blame" }
-)
 
 -- Remapping of existing Vim key binds
 vim.keymap.set("n", "w", "W") -- skip punctuation when moving to start of next word
@@ -65,12 +61,12 @@ vim.keymap.set("n", "<C-d>", "<C-d>zz")      -- eye-friendly down scrolling
 vim.keymap.set("n", "<C-u>", "<C-u>zz")      -- eye-friendly up scrolling
 vim.keymap.set("n", "J", "mzJ`z")            -- when merging lines, keep cursor at current position
 
-vim.keymap.set(
+-- vim.keymap.set(
-    "n",
+--     "n",
-    "<leader>s",
+--     "<leader>s",
-    [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
+--     [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
-    { noremap = true, desc = "Replace word below cursor" }
+--     { noremap = true, desc = "Replace word below cursor" }
-)
+-- )
 
 -- Apply conform.nvim formatting on keypress (same as on save)
 vim.keymap.set({ "n", "v" }, "<leader>o", function()
@@ -83,19 +79,19 @@ vim.keymap.set({ "n", "v" }, "<leader>o", function()
 end, { desc = "Format file or range (in visual mode)" })
 
 -- Go to next diagnostic item (any severity)
-vim.keymap.set({ "n", "v" }, "<leader>da", function()
+vim.keymap.set("n", "<leader>da", function()
     vim.diagnostic.get_next({})
     vim.api.nvim_feedkeys("zz", "n", false)
 end, { desc = "Go to next diagnostic" })
 
 -- Go to next diagnostic item (error severity)
-vim.keymap.set({ "n", "v" }, "<leader>de", function()
+vim.keymap.set("n", "<leader>de", function()
     vim.diagnostic.get_next({ severity = vim.diagnostic.severity.ERROR })
     vim.api.nvim_feedkeys("zz", "n", false)
 end, { desc = "Go to next error diagnostic" })
 
 -- Go to next diagnostic item (warning severity)
-vim.keymap.set({ "n", "v" }, "<leader>dw", function()
+vim.keymap.set("n", "<leader>dw", function()
     vim.diagnostic.get_next({ severity = vim.diagnostic.severity.WARN })
     vim.api.nvim_feedkeys("zz", "n", false)
 end, { desc = "Go to next warning diagnostic" })
@@ -114,3 +110,9 @@ vim.keymap.set("n", "<leader>tdd", function()
         virtual_text = not vim.diagnostic.config().virtual_text,
     })
 end, { desc = "Toggle diagnostic virtual lines and virtual text" })
+
+-- Enclose word with double quotes
+-- vim.keymap.set("n", "<leader>wq", 'ciw""<Esc>P', { desc = "Enclose in double quotes" })
+
+-- Pomodoro timer
+vim.keymap.set("n", "<leader>p", ":TimerStart 30m<CR>", { desc = "Pomodoro" })