diff --git a/init.lua b/init.lua index 762f8839..28217fe7 100644 --- a/init.lua +++ b/init.lua @@ -182,7 +182,7 @@ require('lazy').setup({ -- after the plugin has been loaded: -- config = function() ... end - { -- Useful plugin to show you pending keybinds. + { -- Useful plugin to show you pending keybinds. 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' config = function() -- This is the function that runs, AFTER loading @@ -230,7 +230,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -328,7 +328,7 @@ require('lazy').setup({ -- Useful status updates for LSP. -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins -- used for completion, annotations and signatures of Neovim apis @@ -757,7 +757,7 @@ require('lazy').setup({ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'javascript', 'typescript' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { diff --git a/lazy-lock.json b/lazy-lock.json index 21e5695a..1b4de28b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,50 +1,53 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "667102f26106709cddd2dff1f699610df5b94d7f" }, + "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, + "copilot.vim": { "branch": "release", "commit": "782461159655b259cff10ecff05efa761e3d4764" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, + "easypick.nvim": { "branch": "main", "commit": "3ce209d05d402ba40e29e6b69b759eb8421b145a" }, "easytables.nvim": { "branch": "master", "commit": "ae57fdaad25a5f9ac2773ebdb8782c7bbc7d8932" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "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": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "974ebc04dff3b59899a5eee29157a9bbfd85dce3" }, + "mini.nvim": { "branch": "main", "commit": "eb0f557a5797cfe9c720ed84a71582c22bccb4f8" }, "music-controls.nvim": { "branch": "master", "commit": "579e371b7aef158bcbfbdb4f690ab36d9b870cc1" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "notifier.nvim": { "branch": "master", "commit": "eea2d368ffd1b527e6f0c454c2cd907fd63420d8" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, + "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" }, + "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" }, + "nvim-treesitter": { "branch": "master", "commit": "3826d0c42ac635f560479b5b6ab522f6627a3466" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "precognition.nvim": { "branch": "main", "commit": "de72c68e9a5fb76b030a40122b02c2ec4c7fb029" }, - "render-markdown.nvim": { "branch": "main", "commit": "72688baea4ef0ed605033bf654b54d801b6a5f01" }, + "oil.nvim": { "branch": "master", "commit": "1fe476daf0b3c108cb8ee1fc1226cc282fa2c9c1" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "precognition.nvim": { "branch": "main", "commit": "8a81c310b4e76b4884fc5350a5741cf683c645c7" }, + "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" }, "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": "8f45f353dc3649cb9b44cecda96827ea88128584" }, - "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, + "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "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" }, + "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, "vim-wakatime": { "branch": "master", "commit": "53bba6bb8342de9cbdafc82142a9b5e82008d858" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, + "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, "zoxide.vim": { "branch": "master", "commit": "b1e70b6fc1682a83929aee63680d2b43456fe9a5" } } diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index b0b3998c..4bcd6edd 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -1,9 +1,20 @@ vim.keymap.set('n', 'oo', ':ObsidianOpen') vim.keymap.set('n', 'on', ':ObsidianNew') vim.keymap.set('n', 'os', ':ObsidianQuickSwitch') -vim.keymap.set('n', 'oi', ':e oil://~/Documents/Obsidian/Artemis/Inbox/') -vim.keymap.set('n', 'od', ':e oil://~/Documents/Obsidian/Artemis/') -vim.keymap.set('n', 'om', ':Move Notes:e oil://~/Documents/Obsidian/Artemis/Inbox/') +vim.keymap.set('n', 'oi', ':e oil:///mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Inbox/') +vim.keymap.set('n', 'od', ':e oil:///mnt/c/Users/jkosk/OneDrive/Documents/Artemis/') +-- vim.keymap.set('n', 'om', ':Move Notes:e oil:///mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Inbox/') + + +vim.keymap.set('n', 'om', function() + vim.api.nvim_feedkeys('yy', 'n', false) + vim.cmd ':e oil:///mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Notes/' + vim.api.nvim_feedkeys('p', 'n', false) + vim.cmd ':w' + vim.cmd ':e oil:///mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Inbox/' +end) + + vim.keymap.set('n', 'ot', function() vim.cmd ':ObsidianToday' vim.api.nvim_feedkeys('G', 'n', false) @@ -14,13 +25,15 @@ vim.keymap.set('n', 'oe', function() 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)) + 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) + vim.cmd( + ':!cp /mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Templates/excalidraw.md /mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Excalidraw/' .. + fileName) + vim.cmd(':e /mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Excalidraw/' .. fileName) + vim.cmd(':ObsidianOpen /mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Excalidraw/' .. fileName) end) vim.keymap.set('n', 'dd', ':Dashboard:echo') @@ -29,3 +42,10 @@ 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') + +vim.keymap.set('n', 'oc', function() + require('easypick').actions.nvim_commandf(':Move /mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Classes/%s') + require('easypick').one_off('ls /mnt/c/Users/jkosk/OneDrive/Documents/Artemis/Classes/') +end) + +vim.keymap.set('n', 'op', ':ObsidianTag') diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua new file mode 100644 index 00000000..7a6f681b --- /dev/null +++ b/lua/custom/plugins/copilot.lua @@ -0,0 +1,3 @@ +return { + 'github/copilot.vim' +} diff --git a/lua/custom/plugins/easypick.lua b/lua/custom/plugins/easypick.lua new file mode 100644 index 00000000..babd5c7b --- /dev/null +++ b/lua/custom/plugins/easypick.lua @@ -0,0 +1,6 @@ +return { + 'axkirillov/easypick.nvim', + dependencies = { + 'nvim-telescope/telescope.nvim', + }, +} diff --git a/lua/custom/plugins/obsidian.lua b/lua/custom/plugins/obsidian.lua index 567bfb27..ba68a449 100644 --- a/lua/custom/plugins/obsidian.lua +++ b/lua/custom/plugins/obsidian.lua @@ -20,7 +20,7 @@ return { workspaces = { { name = 'Artemis', - path = '~/Documents/Obsidian/Artemis/', + path = '/mnt/c/Users/jkosk/OneDrive/Documents/Artemis/', }, }, diff --git a/lua/custom/plugins/vim-tmux-navigator.lua b/lua/custom/plugins/vim-tmux-navigator.lua new file mode 100644 index 00000000..da0aca9b --- /dev/null +++ b/lua/custom/plugins/vim-tmux-navigator.lua @@ -0,0 +1,17 @@ +return { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + }, + keys = { + { "", "TmuxNavigateLeft" }, + { "", "TmuxNavigateDown" }, + { "", "TmuxNavigateUp" }, + { "", "TmuxNavigateRight" }, + { "", "TmuxNavigatePrevious" }, + }, +}