diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 5aadcc1..78dd79f 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,14 +1,17 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" - if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filteer=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) end +end vim.opt.rtp:prepend(lazypath) vim.g.mapleader = ',' @@ -103,7 +106,7 @@ vim.cmd [[ autocmd FileType python set textwidth=250 ]] vim.cmd [[ autocmd FileType lua set textwidth=80 ]] vim.cmd [[ autocmd FileType markdown,text set shiftwidth=2 foldlevel=99 ]] -- vim.cmd [[ autocmd FileType markdown setlocal foldlevel=99 ]] -vim.cmd[[ colorscheme dustfox ]] +vim.cmd[[ colorscheme duskfox ]] local disabled_built_ins = { "netrw", diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b448a81..f68f20b 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -3,34 +3,31 @@ "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, - "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blink.cmp": { "branch": "main", "commit": "506ea74e53a825cc6efd40a46c4129576409e440" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, - "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "deadcolumn.nvim": { "branch": "master", "commit": "af13928aa281f36273e8f220b19e78d497c7fb87" }, + "blink.cmp": { "branch": "main", "commit": "75cadbcd2657ed01326ca2b0e5e4d78a77127ca3" }, + "deadcolumn.nvim": { "branch": "master", "commit": "897c905aef1a268ce4cc507d5cce048ed808fa7a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dracula.nvim": { "branch": "main", "commit": "fdf503e52ec1c8aae07353604d891fe5a3ed5201" }, + "dracula.nvim": { "branch": "main", "commit": "94fa7885a06a67f0a8bfa03e064619d05d1ba496" }, "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, - "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, + "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "hover.nvim": { "branch": "main", "commit": "4339cbbcb572b1934c53dcb66ad4bf6a0abb7918" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, + "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" }, + "hover.nvim": { "branch": "main", "commit": "f8e162daccb2f117e19f3d5ad3647ac0cefb02e3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, - "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, + "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "lualine.nvim": { "branch": "master", "commit": "640260d7c2d98779cab89b1e7088ab14ea354a02" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.fuzzy": { "branch": "stable", "commit": "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d" }, "mini.hipatterns": { "branch": "main", "commit": "797cbdc893cdcc2f0fbc05a23b4dae238a1fb0ae" }, + "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, + "mini.misc": { "branch": "main", "commit": "428da688126b320194a944233f9f8dfc46669307" }, "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, "mini.pairs": { "branch": "stable", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, "mini.pick": { "branch": "main", "commit": "b87f4d4e75673f6e7b918408017833424ecaa245" }, @@ -38,50 +35,48 @@ "mini.trailspace": { "branch": "main", "commit": "3a328e62559c33014e422fb9ae97afc4208208b1" }, "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" }, "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" }, - "neovim": { "branch": "main", "commit": "d396005db5bbd1d4ec7772a7c96c96f4c4802328" }, + "neovim": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" }, "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" }, - "nightfly": { "branch": "master", "commit": "f4f932d3129fee10a0e944445fe6be5abf76465c" }, + "nightfly": { "branch": "master", "commit": "fe3aaa329692e7a0820a65d32406ede3e3ab3c91" }, "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim": { "branch": "main", "commit": "35d8057137af463c9f41f169539e9b190d57d269" }, "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-http": { "branch": "main", "commit": "9a0e97b639d34af17d06b3421fe633b416dd64ee" }, - "nvim-lspconfig": { "branch": "master", "commit": "d3f169f436e1b44538bfe7e13b4721eec48dbc59" }, + "nvim-lspconfig": { "branch": "master", "commit": "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, - "nvim-treesitter": { "branch": "master", "commit": "9d2acd49976e2a9da72949008df03436f781fd23" }, - "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, - "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, - "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, + "nvim-treesitter": { "branch": "master", "commit": "7dc8aabe86db8c2f23520e8334f7584f83e84342" }, + "nvim-ufo": { "branch": "main", "commit": "522d719d421fc42b95577d9624048d8348d326ea" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, + "oil.nvim": { "branch": "master", "commit": "52cc8a1fb35ea6ce1df536143add7ce7215c63c0" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "e0f9b3efe150724af2d2ed59997d5ece373840e3" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, "solarized-osaka.nvim": { "branch": "main", "commit": "126d394c0c979a99206214a2b6b8c86e456c9c0f" }, "sonokai": { "branch": "master", "commit": "3dcd97c0c5e4118bc171df6ba33800dfd9524a00" }, "spacecamp": { "branch": "master", "commit": "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591" }, - "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, - "telescope-cmdline.nvim": { "branch": "main", "commit": "1c6a169d84a5e8f0c796f8275bdbb8019bd3ca14" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "3b8a1e17187cfeedb31decbd625da62398a8ff34" }, + "telescope-cmdline.nvim": { "branch": "main", "commit": "8b05928ac1b9f2b772cedde891faa6669b0ec59a" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, - "tmux.nvim": { "branch": "main", "commit": "65ee9d6e6308afcd7d602e1320f727c5be63a947" }, + "tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, - "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, + "tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" }, + "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, - "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, + "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" }, "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" }, "vim-wakatime": { "branch": "master", "commit": "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1" }, diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua index 28ee7ed..486e42d 100644 --- a/nvim/.config/nvim/lua/plugins/blink.lua +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -3,33 +3,31 @@ return { lazy = false, -- lazy loading handled internally -- optional: provides snippets for the snippet source dependencies = { - 'rafamadriz/friendly-snippets', - 'L3MON4D3/LuaSnip', - }, + 'rafamadriz/friendly-snippets', + 'L3MON4D3/LuaSnip', + }, version = 'v0.*', - opts = { highlight = { use_nvim_cmp_as_default = true, - nerd_font_variant = 'normal', - } - }, - - trigger = { - completion = { - keyword_regex = '[%w_\\-]', - blocked_trigger_characters = { ' ', '\n', '\t' }, - show_on_insert_on_trigger_character = true, - } - }, - sources = { - providers = { - { - { 'blink.cmp.sources.lsp' }, - { 'blink.cmp.sources.path' }, - { 'blink.cmp.sources.snippets', score_offset = -3 }, + nerd_font_variant = 'normal', + } }, - { { 'blink.cmp.sources.buffer' } }, - } - }, -} + trigger = { + completion = { + keyword_regex = '[%w_\\-]', + blocked_trigger_characters = { ' ', '\n', '\t' }, + show_on_insert_on_trigger_character = true, + } + }, + sources = { + providers = { + { + { 'blink.cmp.sources.lsp' }, + { 'blink.cmp.sources.path' }, + { 'blink.cmp.sources.snippets', score_offset = -1 }, + }, + { { 'blink.cmp.sources.buffer' } }, + } + }, + } diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index ff30647..98b707d 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -47,15 +47,15 @@ return { -- {"ellisonleao/glow.nvim", config = function() require("glow").setup() end }, - 'saadparwaiz1/cmp_luasnip', - 'hrsh7th/cmp-nvim-lsp-signature-help', - 'lukas-reineke/cmp-under-comparator', + -- 'saadparwaiz1/cmp_luasnip', + -- 'hrsh7th/cmp-nvim-lsp-signature-help', + -- 'lukas-reineke/cmp-under-comparator', - { - 'asiryk/auto-hlsearch.nvim', - version = "1.1.0", - config = function() require("auto-hlsearch").setup{} end, - }, + -- { + -- 'asiryk/auto-hlsearch.nvim', + -- version = "1.1.0", + -- config = function() require("auto-hlsearch").setup{} end, + -- }, ------------------------------------------------------------ -- General Functionality @@ -64,8 +64,8 @@ return { { 'stevearc/oil.nvim', opts = {}, - -- dependencies = { { "echasnovski/mini.icons", opts = {} } }, - dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons + dependencies = { { "echasnovski/mini.icons", opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons }, { 'kenn7/vim-arsync', dependencies={'prabirshrestha/async.vim'}, @@ -173,8 +173,7 @@ return { } end }, - "hrsh7th/nvim-cmp", -- optional, for completion - "ggandor/lightspeed.nvim", + -- "hrsh7th/nvim-cmp", -- optional, for completion -- Top Right Notify Pop Up { @@ -195,6 +194,15 @@ return { -- echasnovski's Minis get a section of their own... ------------------------------------------------------------ +{ + 'echasnovski/mini.misc', version = '*', + config = function() + require('mini.misc').setup({ + make_global = {'setup_auto_root'}, + }) + end + }, + { 'echasnovski/mini.pick', version = '*', config = function() require('mini.pick').setup() @@ -320,12 +328,12 @@ return { -- Text, Icons, Symbols ---------------------------------------------------------- - { - 'simrat39/symbols-outline.nvim', - config = function() - require('symbols-outline').setup() - end - }, + -- { + -- 'simrat39/symbols-outline.nvim', + -- config = function() + -- require('symbols-outline').setup() + -- end + -- }, { "j-hui/fidget.nvim", opts = { diff --git a/zsh/.zshrc b/zsh/.zshrc index f008f9c..dd9700d 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -120,3 +120,73 @@ eval "$(uv generate-shell-completion zsh)" eval "$(uv generate-shell-completion zsh)" eval "$(uv generate-shell-completion zsh)" eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)"