diff --git a/init.lua b/init.lua index 2b3ca16b..55dc6ca3 100644 --- a/init.lua +++ b/init.lua @@ -69,6 +69,8 @@ vim.opt.scrolloff = 10 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` +require 'custom.keymaps' + -- Set highlight on search, but clear on pressing in normal mode vim.opt.hlsearch = true vim.keymap.set('n', '', 'nohlsearch') diff --git a/lazy-lock.json b/lazy-lock.json index 3f188a1a..e3061065 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,37 +1,46 @@ { - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, - "auto-session": { "branch": "main", "commit": "af2219b9fa99c1d7ac409bd9eac094c459d3f52d" }, + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "355049bc318c3c968b2b434cea9a5bcdf6bf8ea7" }, - "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, - "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, - "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, - "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, + "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" }, + "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, + "easytables.nvim": { "branch": "master", "commit": "a00222ffc64dc31e69e32e8a0fc34f520540bc97" }, + "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, + "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" }, + "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "d330f2639462084d2ef6c699ccd6219b81c45bc7" }, - "mkdnflow.nvim": { "branch": "main", "commit": "ff86169949466bf3e43e87a7c44c696fe7445e7b" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "notifier.nvim": { "branch": "master", "commit": "eea2d368ffd1b527e6f0c454c2cd907fd63420d8" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lspconfig": { "branch": "master", "commit": "d1ab6b6051976b04948e127b0f302a465b1394d6" }, - "nvim-treesitter": { "branch": "master", "commit": "49e4e2b4b62360677568c47b6467f31c809b391c" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, - "oil.nvim": { "branch": "master", "commit": "bbc0e67eebc15342e73b146a50d9b52e6148161b" }, + "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" }, + "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "oil.nvim": { "branch": "master", "commit": "a6cea1a5b9bc9351769fe09a547c62fe4b669abd" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "precognition.nvim": { "branch": "main", "commit": "2a566f03eb06859298eff837f3a6686dfa5304a5" }, + "render-markdown": { "branch": "main", "commit": "123048b428eb85618780fcef9ea9f4d68b5d2508" }, + "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": "70a93ce66083699571adc361166504b03cc39c2b" }, - "tokyonight.nvim": { "branch": "main", "commit": "d3f3c3b1b1cae6dca4da76aadb8844d48f223517" }, + "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, + "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" }, + "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, + "vim-eunuch": { "branch": "master", "commit": "8fb3904be27b6b60d086f87c2570085902414069" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } -} \ No newline at end of file + "vim-suda": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, + "which-key.nvim": { "branch": "main", "commit": "c74c245d9277ad6865b28ea7e37158b7f990b7fe" }, + "zoxide.vim": { "branch": "master", "commit": "b1e70b6fc1682a83929aee63680d2b43456fe9a5" } +} diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua new file mode 100644 index 00000000..b590c668 --- /dev/null +++ b/lua/custom/keymaps.lua @@ -0,0 +1,13 @@ +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', 'ot', function() + vim.cmd ':ObsidianToday' + vim.api.nvim_feedkeys('G', 'n', false) +end) +vim.keymap.set('n', 'ol', ':ObsidianFollowLink') + +vim.keymap.set('n', 'dd', ':Dashboard:echo') diff --git a/lua/custom/plugins/auto-session.lua b/lua/custom/plugins/auto-session.lua index bacb83f1..2962acd5 100644 --- a/lua/custom/plugins/auto-session.lua +++ b/lua/custom/plugins/auto-session.lua @@ -1,9 +1,9 @@ return { - 'rmagatti/auto-session', - config = function() - require('auto-session').setup { - log_level = 'error', - auto_session_suppress_dirs = { '~/', '~/Projects', '~/Downloads', '/' }, - } - end, + -- 'rmagatti/auto-session', + -- config = function() + -- require('auto-session').setup { + -- log_level = 'error', + -- auto_session_suppress_dirs = { '~/', '~/Projects', '~/Downloads', '/' }, + -- } + -- end, } diff --git a/lua/custom/plugins/dashboard.lua b/lua/custom/plugins/dashboard.lua new file mode 100644 index 00000000..039307dd --- /dev/null +++ b/lua/custom/plugins/dashboard.lua @@ -0,0 +1,39 @@ +return { + 'nvimdev/dashboard-nvim', + event = 'VimEnter', + config = function() + require('dashboard').setup { + theme = 'hyper', + config = { + week_header = { + enable = true, + }, + shortcut = { + { desc = '󰊳 Update', group = '@property', action = 'Lazy update', key = 'u' }, + { + icon = ' ', + icon_hl = '@variable', + desc = 'Files', + group = 'Label', + action = 'Telescope find_files', + key = 'f', + }, + { + desc = '󱇗 Daily Note', + group = 'DiagnosticHint', + action = 'ObsidianToday', + key = 'o', + }, + { + desc = ' New File', + group = 'Number', + action = 'enew', + key = 'n', + }, + }, + }, + shortcut_type = 'number', + } + end, + dependencies = { { 'nvim-tree/nvim-web-devicons' } }, +} diff --git a/lua/custom/plugins/easy-tables.lua b/lua/custom/plugins/easy-tables.lua new file mode 100644 index 00000000..79195b8e --- /dev/null +++ b/lua/custom/plugins/easy-tables.lua @@ -0,0 +1,9 @@ +return { + lazy = false, + 'Myzel394/easytables.nvim', + config = function() + require('easytables').setup { + -- Your configuration comes here + } + end, +} diff --git a/lua/custom/plugins/eunuch.lua b/lua/custom/plugins/eunuch.lua new file mode 100644 index 00000000..025dd20f --- /dev/null +++ b/lua/custom/plugins/eunuch.lua @@ -0,0 +1,3 @@ +return { + 'tpope/vim-eunuch', +} diff --git a/lua/custom/plugins/marksman-lspconfig.lua b/lua/custom/plugins/marksman-lspconfig.lua new file mode 100644 index 00000000..284fa8d9 --- /dev/null +++ b/lua/custom/plugins/marksman-lspconfig.lua @@ -0,0 +1,5 @@ +return { + 'williamboman/mason.nvim', + 'williamboman/mason-lspconfig.nvim', + 'neovim/nvim-lspconfig', +} diff --git a/lua/custom/plugins/mkdnflow.lua b/lua/custom/plugins/mkdnflow.lua deleted file mode 100644 index 7d4a31a5..00000000 --- a/lua/custom/plugins/mkdnflow.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - 'jakewvincent/mkdnflow.nvim', - config = function() - require('mkdnflow').setup { - -- Config goes here; leave blank for defaults - links = { - style = 'wiki', - }, - } - end, -} diff --git a/lua/custom/plugins/obsidian.lua b/lua/custom/plugins/obsidian.lua index cc69fb93..09a684f3 100644 --- a/lua/custom/plugins/obsidian.lua +++ b/lua/custom/plugins/obsidian.lua @@ -1,7 +1,7 @@ return { 'epwalsh/obsidian.nvim', version = '*', -- recommended, use latest release instead of latest commit - lazy = true, + lazy = false, ft = 'markdown', -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: -- event = { @@ -53,21 +53,24 @@ return { }, }, - new_notes_location = '/', + notes_subdir = 'Inbox', + new_notes_location = 'notes_subdir', preffered_link_style = 'wiki', + note_id_func = function(title) + return title + end, - picker = { - -- Set your preferred picker. Can be one of 'telescope.nvim', 'fzf-lua', or 'mini.pick'. - name = 'telescope.nvim', - -- Optional, configure key mappings for the picker. These are the defaults. - -- Not all pickers support all mappings. - mappings = { - -- Create a new note from your query. - new = '', - -- Insert a link to the selected note. - insert_link = '', - }, + templates = { + folder = 'Templates', + date_format = '%Y-%m-%d-%a', + time_format = '%H:%M', + }, + + daily_notes = { + folder = 'Daily Notes', + date_format = '%Y-%m-%d', + default_tags = { 'dailynote' }, }, ui = { diff --git a/lua/custom/plugins/zoxide.lua b/lua/custom/plugins/zoxide.lua new file mode 100644 index 00000000..83e0c1ca --- /dev/null +++ b/lua/custom/plugins/zoxide.lua @@ -0,0 +1,3 @@ +return { + 'nanotee/zoxide.vim', +}