diff --git a/after/plugin/snips/lua.lua b/after/plugin/snips/lua.lua index 81dd1d0..2b903c1 100644 --- a/after/plugin/snips/lua.lua +++ b/after/plugin/snips/lua.lua @@ -70,11 +70,4 @@ ls.add_snippets("lua", { i(1), }) ), - s( - "treq", - fmt([[ local {} = require("telescope.{}") ]], { - d(2, require_var, { 1 }), - i(1), - }) - ), }) diff --git a/lazy-lock.json b/lazy-lock.json index bfe384a..ba20612 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,25 +4,24 @@ "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "blink-cmp-git": { "branch": "master", "commit": "226b269a50b5ece2ed95933b8d62f103f5d6a05d" }, "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "932a8e568b2dc4f42268cfcc885ff2d701dd8bb7" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "8dd8c8f19fde31b6aa861476efd452aa306e82ba" }, "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, - "catppuccin.nvim": { "branch": "main", "commit": "c89184526212e04feffbddda9d06b041a8fca416" }, + "catppuccin.nvim": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" }, "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" }, "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, - "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" }, "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" }, "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" }, "cmp-dbee": { "branch": "main", "commit": "1650f67b9bf43c029fc37570665ca895a33cdf5a" }, "colorful-menu.nvim": { "branch": "master", "commit": "d5b97d247528be308b6b69d96b5950a30e470f3d" }, - "conform.nvim": { "branch": "master", "commit": "9d6f881a4047a51c7709223dcf24e967633c6523" }, + "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" }, "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" }, "cratesearch.nvim": { "branch": "master", "commit": "9d09625d017f6b2e116503f935bc6862961313fa" }, "css-vars.nvim": { "branch": "main", "commit": "0615782c320f729b04d9c51a8a61fb498ee4234a" }, "csvview.nvim": { "branch": "main", "commit": "bbab4c2f808fd8e11ec8dfdd128251aadba566a1" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" }, - "demicolon.nvim": { "branch": "main", "commit": "be0c41fd1ce6a33f567d88278a700fcb417db9c3" }, + "demicolon.nvim": { "branch": "main", "commit": "36f9ddaf8d45f84644344cb057a115c425bcb5cc" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "041d923368d540a1e438989ce8f915628081a56a" }, "flow.nvim": { "branch": "main", "commit": "095c54bbaf55473418dd09d61d3167891684cf85" }, @@ -38,43 +37,42 @@ "jupynium.nvim": { "branch": "master", "commit": "144ab6e46d2b42264c16a4f3c780d88feb0a89e8" }, "kanagawa.nvim": { "branch": "master", "commit": "27f1e119f3a7e6d11d435a59e3262e6affda1f83" }, "kulala.nvim": { "branch": "main", "commit": "0d50e9ce5c992fe507743d8641b36125e668aad4" }, - "lackluster.nvim": { "branch": "main", "commit": "b247a6f51cb43e49f3f753f4a59553b698bf5438" }, + "lackluster.nvim": { "branch": "main", "commit": "70dd682e564784893b984deb51dd5ddd263c8cc7" }, "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" }, "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, "lsp-progress.nvim": { "branch": "main", "commit": "ae52979ad412371ea6dc39ff70c8dfc681fb42b8" }, "lualine-harpoon.nvim": { "branch": "main", "commit": "9ee90e6309c4219d6a06b771b53db6a59c8d32fa" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "markdown.nvim": { "branch": "master", "commit": "34bb88989ace6c678abd947662668994219996e0" }, - "markview.nvim": { "branch": "main", "commit": "c09958c78745e0d6374c9fe010b2432b713ccb83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" }, + "markview.nvim": { "branch": "main", "commit": "8c6d294d3d6a59f892c131d76f699b0696a25467" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "melange.nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, "mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" }, - "neoconf.nvim": { "branch": "main", "commit": "4debd74d740a8e7949eee7d1103642bdf276c60d" }, + "neoconf.nvim": { "branch": "main", "commit": "ca4179bc3f10cc8bd2eff29acbc270a47bbcd298" }, "neocord": { "branch": "main", "commit": "2ebf3792a8100376bb65fd66d5dbf60f50af7529" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neogit": { "branch": "master", "commit": "e106a39a8a37a9420f374545c876f8b52baf1c80" }, "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, - "neorg-telescope": { "branch": "main", "commit": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c" }, "neotest": { "branch": "master", "commit": "2cf3544fb55cdd428a9a1b7154aea9c9823426e8" }, "neotest-gtest": { "branch": "main", "commit": "b66f1d33cbf3b37b9803e6bc7ef47ac60eba86b1" }, "neotest-python": { "branch": "master", "commit": "7cab6e2ecc260bf61b97ca147574a470bd880cbd" }, "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" }, - "nightfly.nvim": { "branch": "master", "commit": "5f88609dd9c3883b50a2728537c55afd5544f466" }, + "nightfly.nvim": { "branch": "master", "commit": "502136cc4ec2eb94b054a30d583706f1b516c52b" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" }, - "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, + "nvim-dap": { "branch": "master", "commit": "881f7dc17c0b4204a1d844732f95539575350e5b" }, "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-dbee": { "branch": "master", "commit": "dda517694889a5d238d7aa407403984da9f80cc0" }, "nvim-java": { "branch": "main", "commit": "3d56b7461facb42f135e25b2636bf220a7f0ed42" }, - "nvim-lint": { "branch": "master", "commit": "335a6044be16d7701001059cba9baa36fbeef422" }, - "nvim-lspconfig": { "branch": "master", "commit": "b8c3630ce37dfbe51910b68785a71620b072c41a" }, + "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, + "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, @@ -82,7 +80,7 @@ "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" }, + "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" }, "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "oil-git.nvim": { "branch": "main", "commit": "d1f27a5982df35b70fb842aa6bbfac10735c7265" }, @@ -92,30 +90,15 @@ "otter.nvim": { "branch": "main", "commit": "c44d645f03ae96e2e3cdc37f92ecfa93a534b736" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "3277ad5f96eb03c9d618c88e24f683e4364e578c" }, "rainbow_csv.nvim": { "branch": "main", "commit": "26de78d8324f7ac6a3e478319d1eb1f17123eb5b" }, - "remote-sshfs.nvim": { "branch": "main", "commit": "45502b3892774811153aeab5f7f9b0033c82005c" }, "rose-pine.nvim": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, "snacks.nvim": { "branch": "main", "commit": "bfe8c26dbd83f7c4fbc222787552e29b4eccfcc0" }, "spellwarn.nvim": { "branch": "main", "commit": "47ada88a843f52f7aa90c018cc7ef514587bc3fd" }, "tagbar": { "branch": "master", "commit": "7bfffca1f121afb7a9e38747500bf5270e006bb1" }, "tailwind-fold.nvim": { "branch": "main", "commit": "d9e7ca11691d252b35795726dff087bf013b2ebf" }, - "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "d4f1bb2a939cc02720bceb635095246751db144f" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, - "telescope-git-diffs.nvim": { "branch": "main", "commit": "b8e5c9e13b9e27f8ccfd14430d04739b9996ae76" }, - "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" }, - "telescope-lazy.nvim": { "branch": "main", "commit": "abc70990733e8faa0e6f3c9de4d5fc34470a9737" }, - "telescope-luasnip.nvim": { "branch": "master", "commit": "07a2a2936a7557404c782dba021ac0a03165b343" }, - "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, - "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" }, - "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "timber.nvim": { "branch": "main", "commit": "aac3a12753652a60955d3178b75fdb6c247b9f7d" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "4d159616aee17796c2c94d2f5f87d2ee1a3f67c7" }, "tree-sitter-bruno": { "branch": "main", "commit": "347e99f256930213cd7fcd0efe3f9af83035c4b1" }, @@ -129,7 +112,7 @@ "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, - "vim-just": { "branch": "main", "commit": "19a7f07c16f010f6c0a3eb74041787bb6e460fbb" }, + "vim-just": { "branch": "main", "commit": "3deeee5998408ce5a0ff3959a0e6b4bce530c37e" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" }, diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index b291f39..1c72443 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -44,6 +44,21 @@ nmap("", [[:%s/\<\>//gI]], "[S]ubstit nmap("Q", "@qj", "Run macro") +nmap("oo", "updatesource", "Source current file") + +-- vim.keymap.set({ "n", "v", "x" }, "y", '"+y', { desc = "Yank to system clipboard" }) +-- vim.keymap.set("n", "Y", '"+yy', { desc = "Yank line to system clipboard" }) + +-- vim.keymap.set({ "n", "v", "x" }, "p", '"+p', { desc = "Paste from system clipboard" }) +-- vim.keymap.set("n", "P", '"+P', { desc = "Paste before cursor from system clipboard" }) + + +vim.keymap.set("n", "cf", function() + local file_path = vim.fn.expand("%:p") + vim.cmd([[call setreg("+", "]] .. vim.fn.escape(file_path, '\\ "') .. '")') + print("Copied current file path to clipboard: " .. vim.fn.expand("%:p")) +end, { desc = "Copy file path to clipboard" }) + xmap("Q", ":norm @q", "Run macro") xmap("p", '"_dP') diff --git a/lua/config/options.lua b/lua/config/options.lua index b5f5efb..81aa125 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -1,57 +1,57 @@ -vim.opt.backup = false -- creates a backup file -vim.opt.breakindent = true -- Enable break indent -vim.opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard -vim.opt.cmdheight = 1 -- more space in the neovim command line for displaying messages +vim.opt.backup = false -- creates a backup file +vim.opt.breakindent = true -- Enable break indent +vim.opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard +vim.opt.cmdheight = 1 -- more space in the neovim command line for displaying messages vim.opt.colorcolumn = "120" vim.opt.completeopt = { "menuone", "noselect" } -- mostly just for cmp -vim.opt.conceallevel = 2 -- so that `` is visible in markdown files -vim.opt.cursorcolumn = true -- highlight the current column -vim.opt.cursorline = true -- highlight the current line -vim.opt.expandtab = true -- convert tabs to spaces -vim.opt.fileencoding = "utf-8" -- the encoding written to a file +vim.opt.conceallevel = 2 -- so that `` is visible in markdown files +vim.opt.cursorcolumn = true -- highlight the current column +vim.opt.cursorline = true -- highlight the current line +vim.opt.expandtab = true -- convert tabs to spaces +vim.opt.fileencoding = "utf-8" -- the encoding written to a file vim.opt.fillchars.eob = " " vim.opt.foldmethod = "manual" vim.opt.foldenable = true vim.opt.foldlevelstart = 99 -vim.opt.foldcolumn = "1" -- '0' is not bad +vim.opt.foldcolumn = "1" -- '0' is not bad vim.opt.guifont = "JetBrainsMono NF:h11" -- the font used in graphical neovim applications -vim.opt.hlsearch = false -- highlight all matches on previous search pattern -vim.opt.ignorecase = true -- ignore case in search patterns +vim.opt.hlsearch = false -- highlight all matches on previous search pattern +vim.opt.ignorecase = true -- ignore case in search patterns vim.opt.incsearch = true vim.opt.isfname:append("@-@") vim.opt.iskeyword:append("-") vim.opt.laststatus = 3 -vim.opt.mouse = "a" -- allow the mouse to be used in neovim -vim.opt.number = true -- set numbered lines -vim.opt.numberwidth = 4 -- set number column width to 4 {default 4} -vim.opt.pumheight = 10 -- pop up menu height +vim.opt.mouse = "a" -- allow the mouse to be used in neovim +vim.opt.number = true -- set numbered lines +vim.opt.numberwidth = 4 -- set number column width to 4 {default 4} +vim.opt.pumheight = 10 -- pop up menu height vim.opt.relativenumber = true -- set relative numbered lines vim.opt.ruler = false -vim.opt.scrolloff = 8 -- is one of my fav -vim.opt.shiftwidth = 4 -- the number of spaces inserted for each indentation +vim.opt.scrolloff = 8 -- is one of my fav +vim.opt.shiftwidth = 4 -- the number of spaces inserted for each indentation vim.opt.shortmess:append("c") vim.opt.showcmd = false -vim.opt.showmode = false -- we don't need to see things like -- INSERT -- anymore -vim.opt.showtabline = 0 -- disable tabs +vim.opt.showmode = false -- we don't need to see things like -- INSERT -- anymore +vim.opt.showtabline = 0 -- disable tabs vim.opt.sidescrolloff = 8 -vim.opt.signcolumn = "auto" -- always show the sign column otherwise it would shift the text each time -vim.opt.smartcase = true -- smart case +vim.opt.signcolumn = "yes" -- always show the sign column otherwise it would shift the text each time +vim.opt.smartcase = true -- smart case vim.opt.smartindent = true -- make indenting smarter again vim.opt.softtabstop = 4 vim.opt.spell = false vim.opt.spelloptions:append("camel") -vim.opt.splitbelow = true -- force all horizontal splits to go below current window -vim.opt.splitright = true -- force all vertical splits to go to the right of current window -vim.opt.swapfile = false -- creates a swapfile -vim.opt.tabstop = 4 -- insert 4 spaces for a tab +vim.opt.splitbelow = true -- force all horizontal splits to go below current window +vim.opt.splitright = true -- force all vertical splits to go to the right of current window +vim.opt.swapfile = false -- creates a swapfile +vim.opt.tabstop = 4 -- insert 4 spaces for a tab vim.opt.termguicolors = true -- set term gui colors (most terminals support this) -vim.opt.timeoutlen = 250 -- time to wait for a mapped sequence to complete (in milliseconds) +vim.opt.timeoutlen = 250 -- time to wait for a mapped sequence to complete (in milliseconds) vim.opt.undodir = vim.fn.stdpath("data") .. "/nvim/undodir" -vim.opt.undofile = true -- enable persistent undo -vim.opt.updatetime = 50 -- faster completion (4000ms default) +vim.opt.undofile = true -- enable persistent undo +vim.opt.updatetime = 50 -- faster completion (4000ms default) vim.opt.whichwrap:append("<,>,[,],h,l") -vim.opt.wrap = false -- display lines as one long line -vim.opt.writebackup = false -- if a file is being edited by another program (or was written to file while editing with another program) it is not allowed to be edit +vim.opt.wrap = false -- display lines as one long line +vim.opt.writebackup = false -- if a file is being edited by another program (or was written to file while editing with another program) it is not allowed to be edit vim.opt_local.path:prepend(vim.fn.stdpath("config") .. "/lua") vim.opt_local.suffixesadd:prepend(".lua") vim.opt_local.suffixesadd:prepend("init.lua") diff --git a/lua/plugins/cheatsheet.lua b/lua/plugins/cheatsheet.lua deleted file mode 100644 index 6392672..0000000 --- a/lua/plugins/cheatsheet.lua +++ /dev/null @@ -1,41 +0,0 @@ -return { - "doctorfree/cheatsheet.nvim", - event = "VeryLazy", - dependencies = { - { "nvim-telescope/telescope.nvim" }, - { "nvim-lua/popup.nvim" }, - { "nvim-lua/plenary.nvim" }, - }, - config = function() - require("cheatsheet").setup({ - -- Whether to show bundled cheatsheets - - -- For generic cheatsheets like default, unicode, nerd-fonts, etc - bundled_cheatsheets = { - enabled = { "default", "unicode", "regex", "markdown", "lua" }, - disabled = { "nerd-fonts" }, - }, - -- bundled_cheatsheets = true, - - -- For plugin specific cheatsheets - bundled_plugin_cheatsheets = { - enabled = {}, - disabled = {}, - }, - -- bundled_plugin_cheatsheets = true, - - -- For bundled plugin cheatsheets, do not show a sheet if you - -- don't have the plugin installed (searches runtimepath for - -- same directory name) - include_only_installed_plugins = true, - - -- Key mappings bound inside the telescope window - telescope_mappings = { - [""] = require("cheatsheet.telescope.actions").select_or_fill_commandline, - [""] = require("cheatsheet.telescope.actions").select_or_execute, - [""] = require("cheatsheet.telescope.actions").copy_cheat_value, - [""] = require("cheatsheet.telescope.actions").edit_user_cheatsheet, - }, - }) - end, -} diff --git a/lua/plugins/gitignore.lua b/lua/plugins/gitignore.lua index fe53d2a..7ea4da6 100644 --- a/lua/plugins/gitignore.lua +++ b/lua/plugins/gitignore.lua @@ -1,6 +1,6 @@ return { "wintermute-cell/gitignore.nvim", - dependencies = { "nvim-telescope/telescope.nvim" }, + dependencies = {}, cmd = { "Gitignore" }, keys = { { diff --git a/lua/plugins/http-codes.lua b/lua/plugins/http-codes.lua index 6289821..bbce8e0 100644 --- a/lua/plugins/http-codes.lua +++ b/lua/plugins/http-codes.lua @@ -1,6 +1,7 @@ return { "barrett-ruth/http-codes.nvim", - dependencies = { "nvim-telescope/telescope.nvim" }, + dependencies = { "folke/snacks.nvim" }, + cmd = "HTTPCodes", keys = { { "pdh", vim.cmd.HTTPCodes, desc = "HTTP" } }, config = true, } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 8be0ec8..295b805 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -4,7 +4,7 @@ return { "mason-org/mason.nvim", "mason-org/mason-lspconfig.nvim", "saghen/blink.cmp", - "nvim-telescope/telescope.nvim", + "folke/snacks.nvim", "folke/trouble.nvim", "folke/neoconf.nvim", "mrcjkb/rustaceanvim", @@ -99,7 +99,7 @@ return { nmap("gr", function() trouble.toggle("lsp_references") end, "[G]oto [R]eferences") - nmap("gR", require("telescope.builtin").lsp_references, "[G]oto [R]eferences") + nmap("gR", function() Snacks.picker.lsp_references() end, "[G]oto [R]eferences") end, }) diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua index 56acd2b..4195841 100644 --- a/lua/plugins/neogit.lua +++ b/lua/plugins/neogit.lua @@ -2,9 +2,9 @@ return { "NeogitOrg/neogit", version = "*", dependencies = { - "nvim-lua/plenary.nvim", -- required - "sindrets/diffview.nvim", -- Diff integration - "nvim-telescope/telescope.nvim", + "nvim-lua/plenary.nvim", + "sindrets/diffview.nvim", + "folke/snacks.nvim", }, cmd = { "Neogit" }, keys = { @@ -18,16 +18,7 @@ return { { "gd", vim.cmd.DiffviewOpen, desc = "Git Diff" }, }, opts = { - -- When enabled, will watch the `.git/` directory for changes and refresh the status buffer in response to filesystem - -- events. - filewatcher = { - interval = 500, - }, - -- Allows a different telescope sorter. Defaults to 'fuzzy_with_index_bias'. The example below will use the native fzf - -- sorter instead. By default, this function returns `nil`. - telescope_sorter = function() - return require("telescope").extensions.fzf.native_fzf_sorter() - end, + filewatcher = { interval = 500 }, -- Table of settings to never persist. Uses format "Filetype--cli-value" ignored_settings = { "NeogitPushPopup--force-with-lease", diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index d24b16c..ba4cddb 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -1,8 +1,5 @@ return { "nvim-neorg/neorg", - dependencies = { - "nvim-neorg/neorg-telescope", - }, lazy = true, version = "*", ft = "norg", @@ -112,15 +109,6 @@ return { }, }, -- ["core.ui.calendar"] = {}, - ["core.integrations.telescope"] = { - config = { - insert_file_link = { - -- Whether to show the title preview in telescope. Affects performance with a large - -- number of files. - show_title_preview = true, - }, - }, - }, }, }, } diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua index 7ca74b3..729a606 100644 --- a/lua/plugins/obsidian.lua +++ b/lua/plugins/obsidian.lua @@ -5,7 +5,7 @@ return { event = "BufReadPre " .. vim.fn.expand("~") .. "/Obsidian/**/*.md", dependencies = { "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", + "folke/snacks.nvim", "nvim-treesitter/nvim-treesitter", }, keys = { diff --git a/lua/plugins/remote-sshfs.lua b/lua/plugins/remote-sshfs.lua deleted file mode 100644 index 26cc533..0000000 --- a/lua/plugins/remote-sshfs.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "nosduco/remote-sshfs.nvim", - dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }, - opts = {}, -} diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index b6741cb..984e83b 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -3,6 +3,7 @@ return { dependencies = { { "echasnovski/mini.icons", version = "*" }, "stevearc/oil.nvim", + "folke/trouble.nvim", }, priority = 1000, lazy = false, @@ -39,7 +40,29 @@ return { lazygit = { enabled = false }, notifier = { enabled = false }, notify = { enabled = false }, - picker = { enabled = false }, + picker = { + enabled = true, + format = "file", + layout = { + preset = "telescope" + }, + matcher = { + frecency = true, + sort_empty = true, + cwd_bonus = true, + }, + actions = require("trouble.sources.snacks").actions, + win = { + input = { + keys = { + [""] = { + "trouble_open", + mode = { "n", "i" } + } + } + } + }, + }, profiler = { enabled = false }, quickfile = { enabled = true, exclude = { "latex" } }, rename = { enabled = true }, @@ -92,6 +115,21 @@ return { end, desc = "Git Blame", }, + { + "", function() Snacks.picker.files() end, desc = "Find Files" }, + { "pf", function() Snacks.picker.files() end, desc = "Find Files" }, + { "ps", function() Snacks.picker.grep() end, desc = "Grep" }, + { "pb", function() Snacks.picker.buffers() end, desc = "Buffers" }, + { "pw", function() Snacks.picker.grep_word() end, desc = "Visual selection of word", mode = { "n", "x" } }, + { "pi", function() Snacks.picker.icons() end, desc = "Icons", }, + { "ph", function() Snacks.picker.help() end, desc = "Help Pages", }, + { "pr", function() Snacks.picker.recent() end, desc = "Recent", }, + { "pR", function() Snacks.picker.registers() end, desc = "Registers", }, + { "pg", function() Snacks.picker.git_files() end, desc = "Find Git Fiels", }, + { "pk", function() Snacks.picker.keymaps() end, desc = "Keymaps" }, + { "pt", function() Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" }, + { "pc", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" }, + { "pl", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" }, }, init = function() vim.api.nvim_create_autocmd("User", { diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index ec10685..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,279 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - version = "*", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - "nvim-telescope/telescope-media-files.nvim", - "nvim-telescope/telescope-symbols.nvim", - "nvim-telescope/telescope-bibtex.nvim", - "tsakirist/telescope-lazy.nvim", - "chip/telescope-software-licenses.nvim", - "crispgm/telescope-heading.nvim", - "benfowler/telescope-luasnip.nvim", - "paopaol/telescope-git-diffs.nvim", - { "ThePrimeagen/harpoon", branch = "harpoon2" }, - "nvim-telescope/telescope-frecency.nvim", - "nvim-telescope/telescope-ui-select.nvim", - "nosduco/remote-sshfs.nvim", - }, - keys = { - { - "", - require("telescope.builtin").git_files, - desc = "Telescope git_files", - }, - { - "pf", - require("telescope.builtin").find_files, - desc = "Files", - }, - { - "/", - function() - require("telescope.builtin").current_buffer_fuzzy_find( - require("telescope.themes").get_dropdown({ previewer = false }) - ) - end, - desc = "Current Buffer Fuzzy", - }, - { "ps", require("telescope.builtin").live_grep, desc = "Live Grep" }, - { "pb", require("telescope.builtin").buffers, desc = "Find Buffers" }, - { "pws", require("telescope.builtin").grep_string, desc = "String under the cursor" }, - { "pe", require("telescope.builtin").symbols, desc = "Emoji" }, - { "pd", require("telescope.builtin").diagnostic, desc = "Diagnostics" }, - { "pB", require("telescope.builtin").git_branches, desc = "Checkout Branch" }, - { "ph", require("telescope.builtin").help_tags, desc = "Help" }, - { "pM", require("telescope.builtin").man_pages, desc = "Man Pages" }, - { "pr", require("telescope.builtin").oldfiles, desc = "Open Recent Files" }, - { "pR", require("telescope.builtin").registers, desc = "Registers" }, - { "pg", require("telescope.builtin").git_files, desc = "Git Files" }, - { "pk", require("telescope.builtin").keymaps, desc = "Keymaps" }, - { "pC", require("telescope.builtin").commands, desc = "Commands" }, - { "pt", vim.cmd.TodoTelescope, desc = "Todo" }, - { - "pm", - function() - require("telescope").extensions.media_files.media_files() - end, - desc = "Media", - }, - { - "pc", - function() - require("telescope.builtin").colorscheme({ enable_preview = true }) - end, - desc = "Colorscheme with Preview", - }, - { - "pl", - function() - require("telescope").extensions.lazy.lazy() - end, - desc = "Lazy", - }, - { - "pL", - function() - require("telescope").extensions.luasnip.luasnip() - end, - desc = "Luasnip", - }, - { - "pH", - function() - require("telescope").extensions.heading.heading() - end, - desc = "Heading", - }, - { - "pds", - "Telescope software-licenses find", - desc = "Software Licenses", - }, - { - "pD", - function() - require("telescope").extensions.git_diffs.diff_commits() - end, - desc = "Git Diff Telescope", - }, - { - "tB", - require("telescope.builtin").bibtex, - desc = "Telescope Bibtex", - }, - }, - opts = { - defaults = { - vimgrep_arguments = { - "rg", - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - "--smart-case", - "--hidden", - }, - prompt_prefix = " ", - selection_caret = " ", - path_display = { "smart" }, - file_ignore_patterns = { ".git/", ".spl", "target/", "*.pdf" }, - mappings = { - i = { - [""] = require("telescope.actions").cycle_history_next, - [""] = require("telescope.actions").cycle_history_prev, - [""] = require("telescope.actions").move_selection_next, - [""] = require("telescope.actions").move_selection_previous, - [""] = require("telescope.actions").delete_buffer + require("telescope.actions").move_to_top, - [""] = require("trouble.sources.telescope").open, - -- [""] = require("telescope.actions").remove_selection - }, - n = { [""] = require("trouble.sources.telescope").open }, - }, - history = { - path = "~/.local/share/nvim/databases/telescope_history.sqlite3", - limit = 100, - }, - }, - pickers = { - find_files = { - hidden = true, - follow = true, - }, - }, - extensions = { - fzf = { - fuzzy = true, -- false will only do exact matching - override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "smart_case", -- or "ignore_case" or "respect_case" - }, - media_files = { - -- filetypes whitelist - filetypes = { "png", "webp", "jpg", "jpeg", "mp4", "webm" }, - find_cmd = "rg", - }, - emoji = { - action = function(emoji) - -- argument emoji is a table. - -- {name="", value="", cagegory="", description=""} - - vim.fn.setreg("*", emoji.value) - print([[Press p or "*p to paste this emoji]] .. emoji.value) - - -- insert emoji when picked - -- vim.api.nvim_put({ emoji.value }, 'c', false, true) - end, - }, - ["ui-select"] = { - require("telescope.themes").get_dropdown({ - -- even more opts - }), - - -- pseudo code / specification for writing custom displays, like the one - -- for "codeactions" - -- specific_opts = { - -- [kind] = { - -- make_indexed = function(items) -> indexed_items, width, - -- make_displayer = function(widths) -> displayer - -- make_display = function(displayer) -> function(e) - -- make_ordinal = function(e) -> string - -- }, - -- -- for example to disable the custom builtin "codeactions" display - -- do the following - -- codeactions = false, - -- } - }, - lazy = { - -- Optional theme (the extension doesn't set a default theme) - theme = "dropdown", - previewer = false, - -- Whether or not to show the icon in the first column - show_icon = true, - -- Mappings for the actions - mappings = { - open_in_browser = "", - open_in_file_browser = "", - open_in_find_files = "", - open_in_live_grep = "", - open_plugins_picker = "", -- Works only after having called first another action - open_lazy_root_find_files = "f", - open_lazy_root_live_grep = "g", - }, - -- Other telescope configuration options - }, - http = { - -- How the mozilla url is opened. By default will be configured based on OS: - open_url = "xdg-open %s", -- UNIX - -- open_url = 'open %s' -- OSX - -- open_url = 'start %s' -- Windows - }, - heading = { - treesitter = true, - picker_opts = { - layout_config = { width = 0.8, preview_width = 0.5 }, - layout_strategy = "horizontal", - }, - }, - bibtex = { - -- Depth for the *.bib file - depth = 1, - -- Custom format for citation label - custom_formats = {}, - -- Format to use for citation label. - -- Try to match the filetype by default, or use 'plain' - format = "", - -- Path to global bibliographies (placed outside of the project) - global_files = {}, - -- Define the search keys to use in the picker - search_keys = { "author", "year", "title" }, - -- Template for the formatted citation - citation_format = "{{author}} ({{year}}), {{title}}.", - -- Only use initials for the authors first name - citation_trim_firstname = true, - -- Max number of authors to write in the formatted citation - -- following authors will be replaced by "et al." - citation_max_auth = 2, - -- Context awareness disabled by default - context = false, - -- Fallback to global/directory .bib files if context not found - -- This setting has no effect if context = false - context_fallback = true, - -- Wrapping in the preview window is disabled by default - wrap = false, - }, - frecency = { - path_display = { "short" }, - ignore_patterns = { "*/.git/*", "*/.DS_Store/*", "*/.venv/*", "*/tmp/*", "*/bruno/*" }, - default_workspace = "CWD", - hide_current_buffer = true, - show_scores = true, - }, - package_info = { - -- Optional theme (the extension doesn't set a default theme) - theme = "ivy", - }, - }, - }, - config = function(_, opts) - local telescope = require("telescope") - - telescope.setup(opts) - - pcall(telescope.load_extension, "fzf") - pcall(telescope.load_extension, "ui-select") - pcall(telescope.load_extension, "media_files") -- Telescope media_files - pcall(telescope.load_extension, "lazy") -- Telescope lazy - pcall(telescope.load_extension, "software-licenses") -- Telescope software-licenses list - pcall(telescope.load_extension, "heading") -- Telescope heading - pcall(telescope.load_extension, "luasnip") -- Telescope luasnip - pcall(telescope.load_extension, "git_diffs") -- Telescope git_diffs diff_commits - pcall(telescope.load_extension, "bibtex") -- Telescope bibtex - pcall(telescope.load_extension, "harpoon") - pcall(telescope.load_extension, "frecency") - pcall(telescope.load_extension, "remote-sshfs") - end, -} diff --git a/lua/plugins/timber.lua b/lua/plugins/timber.lua deleted file mode 100644 index 86271f7..0000000 --- a/lua/plugins/timber.lua +++ /dev/null @@ -1,26 +0,0 @@ --- Action Keymap Description --- insert_log_below glj Insert a log statement below the cursor --- insert_log_above glk Insert a log statement above the cursor --- insert_plain_log_below glo Insert a plain log statement below the cursor --- insert_plain_log_above gl Insert a plain log statement above the cursor --- add_log_targets_to_batch gla Add a log target to the batch --- insert_batch_log glb Insert a batch log statement -return { - "Goose97/timber.nvim", - version = "*", - event = "VeryLazy", - dependencies = { - "nvim-treesitter/nvim-treesitter", - "nvim-telescope/telescope.nvim", - }, - opts = { - log_templates = { - default = { - python = [[logger.debug(f"{%log_target=}")]], - }, - }, - }, - config = function(_, opts) - require("timber").setup(opts) - end, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 73d09ff..569a189 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,8 +3,8 @@ return { build = ":TSUpdate", dependencies = { "nvim-treesitter/nvim-treesitter-context", - "JoosepAlviste/nvim-ts-context-commentstring", "nvim-treesitter/nvim-treesitter-textobjects", + "JoosepAlviste/nvim-ts-context-commentstring", "kristoferssolo/tree-sitter-bruno", "OXY2DEV/markview.nvim", { @@ -52,10 +52,10 @@ return { incremenral_selection = { enable = false, keymaps = { - init_selection = "", - node_selection = "", - scope_selection = "", - node_deselection = "", + init_selection = "", + node_selection = "", + scope_selection = "", + node_deselection = "", }, }, textobjects = { diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 510dd80..249a5b4 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -31,7 +31,7 @@ return { desc = "substitute word", }, { - { "c", vim.cmd.bdelete, desc = "Close Buffer" }, + { "c", vim.cmd.bdelete, desc = "Close Buffer" }, { "X", function() @@ -44,7 +44,7 @@ return { { "q", group = "Persistence" }, { "l", group = "LSP" }, { "w", group = "Workspace" }, - { "p", group = "Telescope", { "pd", group = "Development" } }, + { "f", group = "Picker", { "pd", group = "Development" } }, { "z", group = "Zen" }, { "o", group = "Action" }, { "r", group = "Rust" }, @@ -67,13 +67,13 @@ return { { "L", group = "Languate settings", - { "Lc", "setlocal formatoptions-=cro", desc = "Disable autocomment" }, - { "LC", "setlocal formatoptions=cro", desc = "Enable autocomment" }, - { "Ls", "setlocal spell!", desc = "Toggle spellchecker" }, + { "Lc", "setlocal formatoptions-=cro", desc = "Disable autocomment" }, + { "LC", "setlocal formatoptions=cro", desc = "Enable autocomment" }, + { "Ls", "setlocal spell!", desc = "Toggle spellchecker" }, { "Le", "setlocal spell spelllang=en_us", desc = "Enable English spellchecker" }, { "Ll", "setlocal spell spelllang=lv_LV", desc = "Enable Latvian spellchecker" }, - { "LI", "setlocal autoindent", desc = "Enable autoindent" }, - { "Li", "setlocal noautoindent", desc = "Disable autoindent" }, + { "LI", "setlocal autoindent", desc = "Enable autoindent" }, + { "Li", "setlocal noautoindent", desc = "Disable autoindent" }, }, --[[ { "P", diff --git a/plugin/menu.lua b/plugin/menu.lua index 5adaaa7..08378af 100644 --- a/plugin/menu.lua +++ b/plugin/menu.lua @@ -3,7 +3,7 @@ vim.cmd([[ anoremenu PopUp.Inspect Inspect amenu PopUp.-1- anoremenu PopUp.Definition lua vim.lsp.buf.definition() - anoremenu PopUp.References Telescope lsp_references + anoremenu PopUp.References lua nacks.picker.lsp_references() nnoremenu PopUp.Back amenu PopUp.-2- amenu PopUp.URL gx diff --git a/spell/lv.utf-8.add b/spell/lv.utf-8.add index 739e923..dc8ecbd 100644 --- a/spell/lv.utf-8.add +++ b/spell/lv.utf-8.add @@ -624,3 +624,6 @@ Rūpes proaktīva Proaktīvs saprotami +iekavās +iekavām +viennozīmīgu diff --git a/spell/lv.utf-8.add.spl b/spell/lv.utf-8.add.spl index 786843c..1fbd4fc 100644 Binary files a/spell/lv.utf-8.add.spl and b/spell/lv.utf-8.add.spl differ