diff --git a/lazy-lock.json b/lazy-lock.json index e3061065..21e5695a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,46 +1,50 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" }, + "conform.nvim": { "branch": "master", "commit": "667102f26106709cddd2dff1f699610df5b94d7f" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, - "easytables.nvim": { "branch": "master", "commit": "a00222ffc64dc31e69e32e8a0fc34f520540bc97" }, + "easytables.nvim": { "branch": "master", "commit": "ae57fdaad25a5f9ac2773ebdb8782c7bbc7d8932" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" }, - "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, + "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, + "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" }, + "mini.nvim": { "branch": "main", "commit": "974ebc04dff3b59899a5eee29157a9bbfd85dce3" }, + "music-controls.nvim": { "branch": "master", "commit": "579e371b7aef158bcbfbdb4f690ab36d9b870cc1" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "notifier.nvim": { "branch": "master", "commit": "eea2d368ffd1b527e6f0c454c2cd907fd63420d8" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "1ea7c6126a1aa0121098e4f16c04d5dde1a4ba22" }, - "nvim-treesitter": { "branch": "master", "commit": "2883d0c03f4d0f80bbc1eacff61675cde7ed255b" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, + "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "oil.nvim": { "branch": "master", "commit": "a6cea1a5b9bc9351769fe09a547c62fe4b669abd" }, + "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "precognition.nvim": { "branch": "main", "commit": "2a566f03eb06859298eff837f3a6686dfa5304a5" }, - "render-markdown": { "branch": "main", "commit": "123048b428eb85618780fcef9ea9f4d68b5d2508" }, + "precognition.nvim": { "branch": "main", "commit": "de72c68e9a5fb76b030a40122b02c2ec4c7fb029" }, + "render-markdown.nvim": { "branch": "main", "commit": "72688baea4ef0ed605033bf654b54d801b6a5f01" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, - "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" }, - "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-eunuch": { "branch": "master", "commit": "8fb3904be27b6b60d086f87c2570085902414069" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-suda": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "which-key.nvim": { "branch": "main", "commit": "c74c245d9277ad6865b28ea7e37158b7f990b7fe" }, + "vim-wakatime": { "branch": "master", "commit": "53bba6bb8342de9cbdafc82142a9b5e82008d858" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "zoxide.vim": { "branch": "master", "commit": "b1e70b6fc1682a83929aee63680d2b43456fe9a5" } } diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index b590c668..b0b3998c 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -9,5 +9,23 @@ vim.keymap.set('n', 'ot', function() vim.api.nvim_feedkeys('G', 'n', false) end) vim.keymap.set('n', 'ol', ':ObsidianFollowLink') +vim.keymap.set('n', 'oe', function() + local fileName = os.time(os.date '!*t') .. '.excalidraw.md' + + local pos = vim.api.nvim_win_get_cursor(0)[2] + local line = vim.api.nvim_get_current_line() + local nline = (line:sub(0, pos) .. '[[' .. fileName .. ']]' .. line:sub(pos + 1)) + vim.api.nvim_set_current_line(nline) + + vim.cmd ':w' + vim.cmd(':!cp ~/Documents/Obsidian/Artemis/Templates/excalidraw.md ~/Documents/Obsidian/Artemis/Excalidraw/' .. fileName) + vim.cmd(':e ~/Documents/Obsidian/Artemis/Excalidraw/' .. fileName) + vim.cmd(':ObsidianOpen ~/Documents/Obsidian/Artemis/Excalidraw/' .. fileName) +end) vim.keymap.set('n', 'dd', ':Dashboard:echo') + +vim.keymap.set('n', 'mp', ':MusicPlay spotify:echo') +vim.keymap.set('n', 'mn', ':MusicNext spotify:echo') +vim.keymap.set('n', 'mb', ':MusicPrev spotify:echo') +vim.keymap.set('n', 'mc', ':MusicCurrent spotify:echo') diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua deleted file mode 100644 index 9977ea91..00000000 --- a/lua/custom/plugins/markdown.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - 'MeanderingProgrammer/markdown.nvim', - name = 'render-markdown', -- Only needed if you have another plugin named markdown.nvim - dependencies = { 'nvim-treesitter/nvim-treesitter' }, - config = function() - require('render-markdown').setup {} - end, -} diff --git a/lua/custom/plugins/markview.lua b/lua/custom/plugins/markview.lua new file mode 100644 index 00000000..9cdcc441 --- /dev/null +++ b/lua/custom/plugins/markview.lua @@ -0,0 +1,19 @@ +return { + -- 'OXY2DEV/markview.nvim', + -- lazy = false, -- Recommended + -- -- ft = "markdown" -- If you decide to lazy-load anyway + -- + -- dependencies = { + -- -- You will not need this if you installed the + -- -- parsers manually + -- -- Or if the parsers are in your $RUNTIMEPATH + -- 'nvim-treesitter/nvim-treesitter', + -- + -- 'nvim-tree/nvim-web-devicons', + -- }, + -- config = function() + -- require('markview').setup { + -- + -- } + -- end, +} diff --git a/lua/custom/plugins/music-controls.lua b/lua/custom/plugins/music-controls.lua new file mode 100644 index 00000000..c991d99a --- /dev/null +++ b/lua/custom/plugins/music-controls.lua @@ -0,0 +1,7 @@ +return { + 'AntonVanAssche/music-controls.nvim', + dependencies = { 'rcarriga/nvim-notify' }, + opts = { + default_player = 'spotify', + }, +} diff --git a/lua/custom/plugins/obsidian.lua b/lua/custom/plugins/obsidian.lua index 09a684f3..567bfb27 100644 --- a/lua/custom/plugins/obsidian.lua +++ b/lua/custom/plugins/obsidian.lua @@ -31,12 +31,12 @@ return { mappings = { -- Overrides the 'gf' mapping to work on markdown/wiki links within your vault. - ['gf'] = { - action = function() - return require('obsidian').util.gf_passthrough() - end, - opts = { noremap = false, expr = true, buffer = true }, - }, + -- ['gf'] = { + -- action = function() + -- return require('obsidian').util.gf_passthrough() + -- end, + -- opts = { noremap = false, expr = true, buffer = true }, + -- }, -- Toggle check-boxes. ['ch'] = { action = function() @@ -47,7 +47,8 @@ return { -- Smart action depending on context, either follow link or toggle checkbox. [''] = { action = function() - return require('obsidian').util.smart_action() + -- return require('obsidian').util.smart_action() + vim.cmd 'ObsidianFollowLink' end, opts = { buffer = true, expr = true }, }, @@ -75,45 +76,6 @@ return { ui = { enable = false, -- set to false to disable all additional syntax features - update_debounce = 200, -- update delay after a text change (in milliseconds) - max_file_length = 5000, -- disable UI features for files with more than this many lines - -- Define how various check-boxes are displayed - checkboxes = { - -- NOTE: the 'char' value has to be a single character, and the highlight groups are defined below. - [' '] = { char = '󰄱', hl_group = 'ObsidianTodo' }, - ['x'] = { char = '', hl_group = 'ObsidianDone' }, - ['>'] = { char = '', hl_group = 'ObsidianRightArrow' }, - ['~'] = { char = '󰰱', hl_group = 'ObsidianTilde' }, - ['!'] = { char = '', hl_group = 'ObsidianImportant' }, - -- Replace the above with this if you don't have a patched font: - -- [" "] = { char = "☐", hl_group = "ObsidianTodo" }, - -- ["x"] = { char = "✔", hl_group = "ObsidianDone" }, - - -- You can also add more custom ones... - }, - -- Use bullet marks for non-checkbox lists. - bullets = { char = '•', hl_group = 'ObsidianBullet' }, - external_link_icon = { char = '', hl_group = 'ObsidianExtLinkIcon' }, - -- Replace the above with this if you don't have a patched font: - -- external_link_icon = { char = "", hl_group = "ObsidianExtLinkIcon" }, - reference_text = { hl_group = 'ObsidianRefText' }, - highlight_text = { hl_group = 'ObsidianHighlightText' }, - tags = { hl_group = 'ObsidianTag' }, - block_ids = { hl_group = 'ObsidianBlockID' }, - hl_groups = { - -- The options are passed directly to `vim.api.nvim_set_hl()`. See `:help nvim_set_hl`. - ObsidianTodo = { bold = true, fg = '#f78c6c' }, - ObsidianDone = { bold = true, fg = '#89ddff' }, - ObsidianRightArrow = { bold = true, fg = '#f78c6c' }, - ObsidianTilde = { bold = true, fg = '#ff5370' }, - ObsidianImportant = { bold = true, fg = '#d73128' }, - ObsidianBullet = { bold = true, fg = '#89ddff' }, - ObsidianRefText = { underline = true, fg = '#c792ea' }, - ObsidianExtLinkIcon = { fg = '#c792ea' }, - ObsidianTag = { italic = true, fg = '#89ddff' }, - ObsidianBlockID = { italic = true, fg = '#89ddff' }, - ObsidianHighlightText = { bg = '#75662e' }, - }, }, }, } diff --git a/lua/custom/plugins/render-markdown.lua b/lua/custom/plugins/render-markdown.lua new file mode 100644 index 00000000..934d0e49 --- /dev/null +++ b/lua/custom/plugins/render-markdown.lua @@ -0,0 +1,8 @@ +return { + 'MeanderingProgrammer/render-markdown.nvim', + opts = {}, + dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite + config = function() + require('render-markdown').setup() + end, +} diff --git a/lua/custom/plugins/wakatime.lua b/lua/custom/plugins/wakatime.lua new file mode 100644 index 00000000..89df0940 --- /dev/null +++ b/lua/custom/plugins/wakatime.lua @@ -0,0 +1 @@ +return { 'wakatime/vim-wakatime', lazy = false }