diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore new file mode 100644 index 00000000..cc5457ab --- /dev/null +++ b/.config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/.config/nvim/.neoconf.json b/.config/nvim/.neoconf.json new file mode 100644 index 00000000..7c480874 --- /dev/null +++ b/.config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/.config/nvim/LICENSE b/.config/nvim/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/.config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/.config/nvim/README.md b/.config/nvim/README.md new file mode 100644 index 00000000..185280b0 --- /dev/null +++ b/.config/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 00000000..2514f9ed --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 00000000..4558a2a1 --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,50 @@ +{ + "LazyVim": { "branch": "main", "commit": "fb1f29c32c516601b4074d113202482769ef030e" }, + "LuaSnip": { "branch": "master", "commit": "1f72e43a446961a1372c54038882c1d36e105cab" }, + "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, + "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, + "catppuccin": { "branch": "main", "commit": "bfe91dfb3a19ffd4445e43611fcde68acbb3fed4" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "dressing.nvim": { "branch": "master", "commit": "39611852fd7bbac117e939a26759bb37361f0c90" }, + "flash.nvim": { "branch": "main", "commit": "b6b89a517d53f6e09ce4eb82c5114121c0bf89d2" }, + "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, + "gitsigns.nvim": { "branch": "main", "commit": "1e01b2958aebb79f1c33e7427a1bac131a678e0d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, + "lazy.nvim": { "branch": "main", "commit": "14d76aac4bd3ff07c1fca074c210f28f766a931e" }, + "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, + "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "mini.ai": { "branch": "main", "commit": "5218ea75e635df78a807bc9d5a7162594fb76d02" }, + "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, + "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, + "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, + "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, + "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "981a43adcca25e7ccc3c589902d49f25e4d48ebc" }, + "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" }, + "neodev.nvim": { "branch": "main", "commit": "62515f64dfb196e8abe1263e17e2546559e41292" }, + "noice.nvim": { "branch": "main", "commit": "bfd2368b3f1fdd5766885b0115238d1f47113c6d" }, + "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, + "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, + "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, + "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, + "nvim-navic": { "branch": "master", "commit": "e6da6f74d89de65258ea7e98e22103ff5de6dcf5" }, + "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-spectre": { "branch": "master", "commit": "6edac44e10b94b88bf3067fae937915172a3f825" }, + "nvim-treesitter": { "branch": "master", "commit": "19b29f7cb046317b74e60fc7bff2f86ece4dc118" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, + "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, + "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, + "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, + "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, + "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, + "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, + "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" } +} \ No newline at end of file diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua new file mode 100644 index 00000000..27e9e064 --- /dev/null +++ b/.config/nvim/lua/config/autocmds.lua @@ -0,0 +1,3 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- Add any additional autocmds here diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua new file mode 100644 index 00000000..2c134f7b --- /dev/null +++ b/.config/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua new file mode 100644 index 00000000..891b1901 --- /dev/null +++ b/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,46 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + -- bootstrap lazy.nvim + -- stylua: ignore + vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) +end +vim.opt.rtp:prepend(vim.env.LAZY or lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import any extras modules here + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { enabled = true }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua new file mode 100644 index 00000000..3ea1454f --- /dev/null +++ b/.config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 00000000..a6134856 --- /dev/null +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,6 @@ +return { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin-macchiato", + }, +} diff --git a/.config/nvim/lua/plugins/example.lua b/.config/nvim/lua/plugins/example.lua new file mode 100644 index 00000000..78a33705 --- /dev/null +++ b/.config/nvim/lua/plugins/example.lua @@ -0,0 +1,266 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- add symbols-outline + { + "simrat39/symbols-outline.nvim", + cmd = "SymbolsOutline", + keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, + config = true, + }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + local cmp = require("cmp") + opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } })) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add telescope-fzf-native + { + "telescope.nvim", + dependencies = { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + config = function() + require("telescope").load_extension("fzf") + end, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, "😄") + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, + + -- Use for completion and snippets (supertab) + -- first: disable default and behavior in LuaSnip + { + "L3MON4D3/LuaSnip", + keys = function() + return {} + end, + }, + -- then: setup supertab in cmp + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-emoji", + }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + end + + local luasnip = require("luasnip") + local cmp = require("cmp") + + opts.mapping = vim.tbl_extend("force", opts.mapping, { + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() + -- this way you will only jump inside the snippet region + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }) + end, + }, +} diff --git a/.config/nvim/stylua.toml b/.config/nvim/stylua.toml new file mode 100644 index 00000000..5d6c50dc --- /dev/null +++ b/.config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-blue.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-blue.gif new file mode 100644 index 00000000..704bf99b Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-blue.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-flamingo.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-flamingo.gif new file mode 100644 index 00000000..0fc9a0d3 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-flamingo.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-green.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-green.gif new file mode 100644 index 00000000..9408c385 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-green.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-lavender.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-lavender.gif new file mode 100644 index 00000000..f176ee67 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-lavender.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-maroon.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-maroon.gif new file mode 100644 index 00000000..1c218769 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-maroon.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-mauve.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-mauve.gif new file mode 100644 index 00000000..a5daf0d4 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-mauve.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-peach.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-peach.gif new file mode 100644 index 00000000..d8d4ce7f Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-peach.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-pink.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-pink.gif new file mode 100644 index 00000000..e8f4ffa5 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-pink.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-red.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-red.gif new file mode 100644 index 00000000..7191693d Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-red.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-rosewater.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-rosewater.gif new file mode 100644 index 00000000..6e761605 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-rosewater.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-sky.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-sky.gif new file mode 100644 index 00000000..c267dab9 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-sky.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-teal.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-teal.gif new file mode 100644 index 00000000..58d99391 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-teal.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-white.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-white.gif new file mode 100644 index 00000000..cf37197c Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-white.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-yellow.gif b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-yellow.gif new file mode 100644 index 00000000..45d15929 Binary files /dev/null and b/.config/spicetify/Themes/catppuccin-macchiato/assets/equalizer-animated-yellow.gif differ diff --git a/.config/spicetify/Themes/catppuccin-macchiato/color.ini b/.config/spicetify/Themes/catppuccin-macchiato/color.ini new file mode 100644 index 00000000..6679f143 --- /dev/null +++ b/.config/spicetify/Themes/catppuccin-macchiato/color.ini @@ -0,0 +1,234 @@ +[rosewater] +text = F4DBD6 +subtext = CAD3F5 +accent = FAE3B0 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = F4DBD6 +misc = 5B6078 + +[flamingo] +text = F0C6C6 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = F0C6C6 +misc = 585B70 + +[mauve] +text = C6A0F6 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = C6A0F6 +misc = 585B70 + +[pink] +text = F5BDE6 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = F5BDE6 +misc = 585B70 + +[maroon] +text = EE99A0 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = EE99A0 +misc = 585B70 + +[red] +text = ED8796 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = ED8796 +misc = 585B70 + +[peach] +text = F5A97F +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = F5A97F +misc = 585B70 + +[yellow] +text = EED49F +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = EED49F +misc = 585B70 + +[green] +text = A6DA95 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = A6DA95 +misc = 585B70 + +[teal] +text = 8BD5CA +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = 8BD5CA +misc = 585B70 + +[blue] +text = 8AADF4 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = 8AADF4 +misc = 585B70 + +[sky] +text = 91D7E3 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = 91D7E3 +misc = 585B70 + +[lavender] +text = B7BDF8 +subtext = CAD3F5 +main = 24273A +sidebar = 1E2030 +player = 181926 +card = 363A4F +shadow = 1E2030 +selected-row = 5B6078 +button = 8087A2 +button-active = 939AB7 +button-disabled = 6E738D +tab-active = 363A4F +notification = 363A4F +notification-error = ED8796 +equalizer = B7BDF8 +misc = 585B70 diff --git a/.config/spicetify/Themes/catppuccin-macchiato/user.css b/.config/spicetify/Themes/catppuccin-macchiato/user.css new file mode 100644 index 00000000..cfe66b40 --- /dev/null +++ b/.config/spicetify/Themes/catppuccin-macchiato/user.css @@ -0,0 +1,274 @@ +/* Color Pallette */ +/* Note: These variables should be used ONLY when needed across ALL of the color palettes. */ +:root { + /* Morning */ + --flamingo: #f0c6c6; + --mauve: #c6a0f6; + --pink: #f5bde6; + --maroon: #ee99a0; + --red: #ed8796; + --peach: #f5a97f; + --yellow: #eed49f; + /* --yellow: #FAE3B0; */ + --green: #a6da95; + --teal: #8bd5ca; + --blue: #8aadf4; + --sky: #91d7e3; + /* Night */ + /* --black-0: #161320; */ + --crust: #181926; + /* --black-1: #1A1826; */ + --mantle: #1e2030; + /* --black-2: #1E1E2E; */ + --base: #24273a; + /* --black-3: #302D41; */ + --surface0: #363a4f; + /* --black-4: #575268; */ + --surface1: #494d64; + /* --gray-0: #6E6C7E; */ + --overlay0: #6e738d; + /* --gray-1: #988BA2; */ + ---overlay1: #8087a2; + /* --gray-2: #C3BAC6; */ + --overlay2: #939ab7; + /* --white: #D9E0EE; */ + --text: #cad3f5; + --lavender: #b7bdf8; + --rosewater: #f4dbd6; + +} + +/* Buttons */ +.main-playButton-PlayButton.main-playButton-primary { + color: var(--spice-player); +} + +.main-button-primary { + background-color: var(--spice-main); +} +.main-button-primary:active, +.main-button-primary:focus, +.main-button-primary:hover { + background-color: var(--spice-sidebar); +} + +.main-view-container button:hover > div[class^='ButtonInner-sc-'] { + background-color: var(--spice-button); +} + +.control-button-heart[aria-checked="true"], +.main-addButton-active, +.main-addButton-active:focus, +.main-addButton-active:hover { + color: var(--red); +} + +.main-addButton-active:hover { + -webkit-transform: scale(1.06); + transform: scale(1.06); +} + +/* Progress bar */ +.x-progressBar-progressBarBg > div > div { + background-color: var(--spice-text); +} + +/* Top bars */ +.main-entityHeader-backgroundColor, +.main-actionBarBackground-background, +.main-view-container main[aria-label="Spotify – Web Player"] > div:first-child { + display: none; +} + +.main-topBar-background { + background-color: var(--spice-main) !important; +} + +.main-entityHeader-withBackgroundImage { + background-color: rgba(var(--spice-rgb-player), 0.2); +} + +/* Sidebar */ +.main-navBar-navBar li:hover > div, +.main-navBar-navBar li:hover > a:not(.main-navBar-navBarLinkActive), +.spicetify-playlist-list li:hover { + background-color: var(--spice-main); +} + +#spicetify-sticky-list li:hover > div { + border-radius: 4px; +} + +/* Scrollbar */ +.os-theme-spotify > .os-scrollbar-horizontal, +.os-theme-spotify > .os-scrollbar-vertical { + padding: 4px; +} + +.os-theme-spotify.os-host-transition + > .os-scrollbar-horizontal + > .os-scrollbar-track + > .os-scrollbar-handle, +.os-theme-spotify.os-host-transition + > .os-scrollbar-vertical + > .os-scrollbar-track + > .os-scrollbar-handle { + background-color: var(--decorative-base); + border-radius: 6px; +} + +::-webkit-scrollbar { + width: 0.5em; +} +::-webkit-scrollbar-thumb { + background-color: #575268; + border-radius: 4px; +} + +/* Home */ +.main-home-homeHeader { + display: none; +} + +.main-home-content + > section:first-child + > .main-gridContainer-gridContainer + > div { + background-color: var(--spice-card); +} +.main-home-content + > section:first-child + > .main-gridContainer-gridContainer + > div:hover { + background-color: var(--spice-misc); +} + +.main-gridContainer-gridContainer > div, +.main-gridContainer-gridContainer > div > div > div { + border-radius: 6px; +} + +/* Cards */ +.main-card-card { + border-radius: 6px; +} + +.main-card-imageContainer { + margin: -16px -16px 16px -16px; +} + +.main-cardImage-imageWrapper, +.main-cardImage-image { + border-radius: 6px 6px 0 0; +} + +/* Settings */ +input:checked~.x-toggle-indicatorWrapper { + background-color: var(---overlay1); +} + +input:hover:not([disabled]):not(:active)~.x-toggle-indicatorWrapper { + background-color: var(--spice-button-active); +} + +select option:checked { + color: var(--spice-text); + font-weight: bold; +} + +/* Animated equalizer */ +/* EQ color classes are specified here in case the js extension is not moved over + * The default green eq will be used in this case */ +.catppuccin-eq-rosewater .main-trackList-playingIcon, +.catppuccin-eq-flamingo .main-trackList-playingIcon, +.catppuccin-eq-mauve .main-trackList-playingIcon, +.catppuccin-eq-pink .main-trackList-playingIcon, +.catppuccin-eq-maroon .main-trackList-playingIcon, +.catppuccin-eq-red .main-trackList-playingIcon, +.catppuccin-eq-peach .main-trackList-playingIcon, +.catppuccin-eq-yellow .main-trackList-playingIcon, +.catppuccin-eq-green .main-trackList-playingIcon, +.catppuccin-eq-teal .main-trackList-playingIcon, +.catppuccin-eq-blue .main-trackList-playingIcon, +.catppuccin-eq-sky .main-trackList-playingIcon, +.catppuccin-eq-lavender .main-trackList-playingIcon, +.catppuccin-eq-white .main-trackList-playingIcon { + background-size: cover; + padding-left: 100%; +} + +.catppuccin-eq-rosewater .main-trackList-playingIcon { + background-image: url("equalizer-animated-rosewater.gif"); +} +.catppuccin-eq-flamingo .main-trackList-playingIcon { + background-image: url("equalizer-animated-flamingo.gif"); +} +.catppuccin-eq-mauve .main-trackList-playingIcon { + background-image: url("equalizer-animated-mauve.gif"); +} +.catppuccin-eq-pink .main-trackList-playingIcon { + background-image: url("equalizer-animated-pink.gif"); +} +.catppuccin-eq-maroon .main-trackList-playingIcon { + background-image: url("equalizer-animated-maroon.gif"); +} +.catppuccin-eq-red .main-trackList-playingIcon { + background-image: url("equalizer-animated-red.gif"); +} +.catppuccin-eq-peach .main-trackList-playingIcon { + background-image: url("equalizer-animated-peach.gif"); +} +.catppuccin-eq-yellow .main-trackList-playingIcon { + background-image: url("equalizer-animated-yellow.gif"); +} +.catppuccin-eq-green .main-trackList-playingIcon { + background-image: url("equalizer-animated-green.gif"); +} +.catppuccin-eq-teal .main-trackList-playingIcon { + background-image: url("equalizer-animated-teal.gif"); +} +.catppuccin-eq-blue .main-trackList-playingIcon { + background-image: url("equalizer-animated-blue.gif"); +} +.catppuccin-eq-sky .main-trackList-playingIcon { + background-image: url("equalizer-animated-sky.gif"); +} +.catppuccin-eq-lavender .main-trackList-playingIcon { + background-image: url("equalizer-animated-lavender.gif"); +} +.catppuccin-eq-lavender .main-trackList-playingIcon { + background-image: url("equalizer-animated-white.gif"); +} + +/* For that small dot on podcasts that notify us of new episodes */ +.main-home-content + > section:first-child + > .main-gridContainer-gridContainer + > div + span[aria-label], +span[aria-label="New episode"], +span[aria-label="New Podcast Episode"] { + background: var(--spice-accent, var(--spice-text)); +} + +/* Modals */ +.GenericModal[aria-label="Already added"] > div { + background-color: var(--spice-card); + color: var(--spice-subtext); +} + +.GenericModal[aria-label="Already added"] button:first-child { + color: var(--spice-button-active); +} + +.GenericModal[aria-label="Already added"] button:first-child:hover { + color: var(--spice-notification-error); +} + +.GenericModal[aria-label="Already added"] button:last-child:hover > div { + background-color: var(--spice-button); +} + +.main-rootlist-rootlistItemLink:link, .main-rootlist-rootlistItemLink:visited { + z-index: 1; +} diff --git a/.config/spicetify/config-xpui.ini b/.config/spicetify/config-xpui.ini index 79b16b4a..99014664 100644 --- a/.config/spicetify/config-xpui.ini +++ b/.config/spicetify/config-xpui.ini @@ -10,7 +10,7 @@ sidebar_config = 1 home_config = 1 experimental_features = 1 extensions = adblock.js|hidePodcasts.js|historyShortcut.js|copyPlaylist.js|wikify.js|fullScreen.js|volumePercentage.js|bookmark.js|loopyLoop.js|keyboardShortcutMy.js|genre.js|playlistIcons.js|catppuccin-macchiato.js -custom_apps = lyrics-plus|marketplace +custom_apps = lyrics-plus|marketplace|stats [Patch]