lazy-lock.json

@@ -1,30 +1,28 @@
 {
   "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
-  "catppuccin": { "branch": "main", "commit": "c9e205fe035d622b3c2d66ee42edf368c0c31fd5" },
   "ccc.nvim": { "branch": "main", "commit": "af2cf5a963f401aad868c065222ee13d4bbc9050" },
   "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "friendly-snippets": { "branch": "main", "commit": "fc8f183479a472df60aa86f00e295462f2308178" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ee28ba3e70ecea811b8f6d7b51d81976e94b121c" },
+  "gitsigns.nvim": { "branch": "main", "commit": "9cd665f46ab7af2e49d140d328b8e72ea1cf511b" },
-  "kanagawa": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.nvim": { "branch": "main", "commit": "90ab64f944a5a63a9efebe6735e1f2c6d4db3613" },
+  "mini.nvim": { "branch": "main", "commit": "088d67751584e4168f35bca89bad70ada7ea4636" },
   "newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" },
   "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
-  "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
+  "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" },
   "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" },
-  "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" },
+  "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" },
   "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "pomo.nvim": { "branch": "main", "commit": "7e06e5221d8d1e596a0ab29dd4d7fcee5f3cd05a" },
-  "rose-pine": { "branch": "main", "commit": "614892e32e94378d976a238f287532cfe790c1fe" },
+  "rose-pine": { "branch": "main", "commit": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac" },
   "snipe.nvim": { "branch": "main", "commit": "2a1b738dfae8502e6162eddfc774da65ed404142" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
-  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "tokyonight.nvim": { "branch": "main", "commit": "b262293ef481b0d1f7a14c708ea7ca649672e200" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },

lsp/bicep.lua

@@ -1,8 +0,0 @@
----@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

@@ -1,7 +0,0 @@
----@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

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

lsp/write-good.lua

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

lua/weeheavy/autocmd.lua

@@ -61,14 +61,3 @@ vim.api.nvim_create_autocmd("FileType", {
         vim.bo.commentstring = "# %s"
     end,
 })
-
--- Force correct filetype for Docker compose files
-local ft_lsp_group = vim.api.nvim_create_augroup("ft_lsp_group", { clear = true })
-vim.api.nvim_create_autocmd({ "BufReadPost", "BufNewFile" }, {
-    pattern = { "docker_compose.yml", "docker_compose_*.yml" },
-    group = ft_lsp_group,
-    desc = "Force docker-compose ft",
-    callback = function()
-        vim.opt.filetype = "yaml.docker-compose"
-    end,
-})

lua/weeheavy/plugins/lsp/conform.lua

@@ -17,9 +17,7 @@ return {
                 html = { "prettier" },
                 json = { "prettier" },
                 yaml = { "prettier" },
-                -- yaml.docker-compose = { "prettier" },
                 markdown = { "prettier" },
-                text = { "woke" },
                 graphql = { "prettier" },
                 lua = { "stylua" },
                 python = { "isort", "black" },
@@ -29,8 +27,7 @@ return {
             },
             stop_after_first = false,
             format_on_save = {
-                -- lsp_fallback = true,
+                lsp_fallback = true,
-                lsp_format = "fallback",
                 async = false,
                 timeout_ms = 1000, -- default: 1000
             },

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

@@ -1,7 +1,6 @@
 return {
 	"mfussenegger/nvim-lint",
-    -- event = { "BufReadPre", "BufNewFile" },
+	event = { "BufReadPre", "BufNewFile" },
-    event = "VeryLazy",
 	config = function()
 		local lint = require("lint")
 
@@ -14,14 +13,13 @@ return {
 			python = { "pylint" },
 			ansible = { "woke" },
 			markdown = { "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", "BufReadPost", "BufWritePost", "InsertLeave" }, {
+		vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
-            -- group = lint_augroup,
+			group = lint_augroup,
 			callback = function()
 				lint.try_lint()
 			end,

lua/weeheavy/plugins/lualine.lua

@@ -37,7 +37,7 @@ return {
 		options = {
 			globalstatus = false, -- true == single statusline
 			icons_enabled = true,
-            theme = "rose-pine",
+			theme = "auto",
 			component_separators = "⋮",
 			--section_separators = { left = "", right = "" },
 			section_separators = { left = "", right = "" },
@@ -69,23 +69,10 @@ return {
 			lualine_x = {
 				-- specify full list of elements when adding custom things
 				{ "encoding", cond = hide_in_width },
-                { "fileformat",    cond = hide_in_width },
+				{ "fileformat" },
-                { "filetype" },
+				{ "filetype", cond = hide_in_width },
 				{ lsp_client_name, 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

@@ -3,20 +3,7 @@ return {
 	"echasnovski/mini.nvim",
 	version = false,
 	config = function()
-        require("mini.icons").setup()
+		local icons = require("mini.icons")
-        require("mini.surround").setup({
+		icons.setup({})
-            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

@@ -5,12 +5,14 @@ return {
 	lazy = true,
 	cmd = "Oil",
 	config = function()
-        require("oil").setup({
+		local oil = require("oil")
+		oil.setup({
+			-- Leave netrw there, so we can open link with `gx`
+			--default_file_explorer = false,
 			default_file_explorer = true,
 			columns = {
 				--"size",
 				"icon",
-                -- "mtime",
 			},
 			view_options = {
 				show_hidden = true,
@@ -22,7 +24,6 @@ return {
 				["<C-x>"] = "actions.select_split",
 				["<C-c>"] = "actions.close",
 				["q"] = "actions.close",
-                ["<Esc>"] = "actions.close",
 			},
 
 			float = {

lua/weeheavy/plugins/pomo.lua

@@ -1,10 +0,0 @@
-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

@@ -3,7 +3,7 @@ return {
 	lazy = true,
 	--event = "VeryLazy",
 	cmd = "Telescope",
-    tag = "0.1.8",
+	tag = "0.1.5",
 	dependencies = {
 		"nvim-lua/plenary.nvim",
 	},
@@ -14,7 +14,6 @@ return {
 		--telescope.load_extension("file_browser")
 		telescope.setup({
 			defaults = {
-                border = false,
 				sorting_strategy = "ascending",
 				wrap_result = true,
 				layout_strategy = "horizontal",

lua/weeheavy/plugins/theme/catppuccin.lua

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

@@ -1,18 +0,0 @@
-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,23 +21,6 @@ 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,7 +10,6 @@ vim.lsp.enable({
     "woke",
     "tailwind",
     "docker-compose",
-    "bicep",
 })
 
 -- Set highlight on search

lua/weeheavy/remap.lua

@@ -1,5 +1,4 @@
 -- keyboard shortcuts
---
 
 -- Leader key. Base for any key combo
 vim.g.mapleader = ";"
@@ -44,8 +43,13 @@ vim.keymap.set("n", "<leader>gd", function()
     else
         vim.cmd("DiffviewClose")
     end
-end, { noremap = true, desc = "Git diff/stage" })
+end, { noremap = true, desc = "Toggle diff/stage UI " })
-vim.keymap.set("n", "<leader>gb", ":Gitsigns toggle_current_line_blame<CR>", { noremap = true, desc = "Git blame" })
+vim.keymap.set(
+    "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
@@ -61,12 +65,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()
@@ -79,19 +83,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", "<leader>da", function()
+vim.keymap.set({ "n", "v" }, "<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", "<leader>de", function()
+vim.keymap.set({ "n", "v" }, "<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", "<leader>dw", function()
+vim.keymap.set({ "n", "v" }, "<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" })
@@ -110,9 +114,3 @@ 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" })