From 8fde7d217b2bef8ce572467c2b438b4f9e341b29 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Wed, 28 Aug 2024 02:24:00 +0200 Subject: [PATCH 01/34] Auto commit --- .gitignore | 1 - README.md | 237 ------------------------ doc/kickstart.txt | 24 --- doc/tags | 3 - init.lua | 99 ---------- lazy-lock.json | 34 ++++ lua/custom/plugins/color-kanagawa.lua | 15 ++ lua/custom/plugins/color-lackluster.lua | 15 ++ lua/custom/plugins/init.lua | 12 +- lua/custom/plugins/markdown.lua | 97 ++++++++++ lua/custom/plugins/toggle-terminal.lua | 6 + lua/keymaps.lua | 46 +---- lua/kickstart/plugins/cmp.lua | 59 ++---- lua/kickstart/plugins/telescope.lua | 52 ------ lua/lazy-bootstrap.lua | 7 +- lua/lazy-plugins.lua | 43 +---- lua/options.lua | 44 +---- lua/snippets/c.lua | 23 +++ 18 files changed, 237 insertions(+), 580 deletions(-) delete mode 100644 doc/kickstart.txt delete mode 100644 doc/tags create mode 100644 lazy-lock.json create mode 100644 lua/custom/plugins/color-kanagawa.lua create mode 100644 lua/custom/plugins/color-lackluster.lua create mode 100644 lua/custom/plugins/markdown.lua create mode 100644 lua/custom/plugins/toggle-terminal.lua create mode 100644 lua/snippets/c.lua diff --git a/.gitignore b/.gitignore index 005b535b606..8a192cab54d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ test.sh nvim spell/ -lazy-lock.json diff --git a/README.md b/README.md index 2ed21a3e20d..8b137891791 100644 --- a/README.md +++ b/README.md @@ -1,238 +1 @@ -# kickstart-modular.nvim - -## Introduction - -*This is a fork of [nvim-lua/kickstart.nvim](https://github.com/nvim-lua/kickstart.nvim) that moves from a single file to a multi file configuration.* - -A starting point for Neovim that is: - -* Small -* Modular -* Completely Documented - -**NOT** a Neovim distribution, but instead a starting point for your configuration. - -## Installation - -### Install Neovim - -Kickstart.nvim targets *only* the latest -['stable'](https://github.com/neovim/neovim/releases/tag/stable) and latest -['nightly'](https://github.com/neovim/neovim/releases/tag/nightly) of Neovim. -If you are experiencing issues, please make sure you have the latest versions. - -### Install External Dependencies - -External Requirements: -- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`) -- [ripgrep](https://github.com/BurntSushi/ripgrep#installation) -- Clipboard tool (xclip/xsel/win32yank or other depending on platform) -- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons - - if you have it set `vim.g.have_nerd_font` in `init.lua` to true -- Language Setup: - - If you want to write Typescript, you need `npm` - - If you want to write Golang, you will need `go` - - etc. - -> **NOTE** -> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes -> and quick install snippets - -### Install Kickstart - -> **NOTE** -> [Backup](#FAQ) your previous configuration (if any exists) - -Neovim's configurations are located under the following paths, depending on your OS: - -| OS | PATH | -| :- | :--- | -| Linux, MacOS | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` | -| Windows (cmd)| `%localappdata%\nvim\` | -| Windows (powershell)| `$env:LOCALAPPDATA\nvim\` | - -#### Recommended Step - -[Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo -so that you have your own copy that you can modify, then install by cloning the -fork to your machine using one of the commands below, depending on your OS. - -> **NOTE** -> Your fork's url will be something like this: -> `https://github.com//kickstart-modular.nvim.git` - -You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file -too - it's ignored in the kickstart repo to make maintenance easier, but it's -[recommmended to track it in version control](https://lazy.folke.io/usage/lockfile). - -#### Clone kickstart.nvim -> **NOTE** -> If following the recommended step above (i.e., forking the repo), replace -> `dam9000` with `` in the commands below - -
Linux and Mac - -```sh -git clone https://github.com/dam9000/kickstart-modular.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim -``` - -
- -
Windows - -If you're using `cmd.exe`: - -``` -git clone https://github.com/dam9000/kickstart.nvim.git %localappdata%\nvim\ -``` - -If you're using `powershell.exe` - -``` -git clone https://github.com/dam9000/kickstart.nvim.git $env:LOCALAPPDATA\nvim\ -``` - -
- -### Post Installation - -Start Neovim - -```sh -nvim -``` - -That's it! Lazy will install all the plugins you have. Use `:Lazy` to view -current plugin status. Hit `q` to close the window. - -Read through the `init.lua` file in your configuration folder for more -information about extending and exploring Neovim. That also includes -examples of adding popularly requested plugins. - - -### Getting Started - -[The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o) - -### FAQ - -* What should I do if I already have a pre-existing neovim configuration? - * You should back it up and then delete all associated files. - * This includes your existing init.lua and the neovim files in `~/.local` - which can be deleted with `rm -rf ~/.local/share/nvim/` -* Can I keep my existing configuration in parallel to kickstart? - * Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME` - to maintain multiple configurations. For example, you can install the kickstart - configuration in `~/.config/nvim-kickstart` and create an alias: - ``` - alias nvim-kickstart='NVIM_APPNAME="nvim-kickstart" nvim' - ``` - When you run Neovim using `nvim-kickstart` alias it will use the alternative - config directory and the matching local directory - `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim - distribution that you would like to try out. -* What if I want to "uninstall" this configuration: - * See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information -* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files? - * The main purpose of kickstart is to serve as a teaching tool and a reference - configuration that someone can easily use to `git clone` as a basis for their own. - As you progress in learning Neovim and Lua, you might consider splitting `init.lua` - into smaller parts. A fork of kickstart that does this while maintaining the - same functionality is available here: - * [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim) - * *NOTE: This is the fork that splits the configuration into smaller parts.* - The original repo with the single `init.lua` file is available here: - * [kickstart.nvim](https://github.com/nvim-lua/kickstart.nvim) - * Discussions on this topic can be found here: - * [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218) - * [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473) - -### Install Recipes - -Below you can find OS specific install instructions for Neovim and dependencies. - -After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step. - -#### Windows Installation - -
Windows with Microsoft C++ Build Tools and CMake -Installation may require installing build tools and updating the run command for `telescope-fzf-native` - -See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation) - -This requires: - -- Install CMake and the Microsoft C++ Build Tools on Windows - -```lua -{'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' } -``` -
-
Windows with gcc/make using chocolatey -Alternatively, one can install gcc and make which don't require changing the config, -the easiest way is to use choco: - -1. install [chocolatey](https://chocolatey.org/install) -either follow the instructions on the page or use winget, -run in cmd as **admin**: -``` -winget install --accept-source-agreements chocolatey.chocolatey -``` - -2. install all requirements using choco, exit previous cmd and -open a new one so that choco path is set, and run in cmd as **admin**: -``` -choco install -y neovim git ripgrep wget fd unzip gzip mingw make -``` -
-
WSL (Windows Subsystem for Linux) - -``` -wsl --install -wsl -sudo add-apt-repository ppa:neovim-ppa/unstable -y -sudo apt update -sudo apt install make gcc ripgrep unzip git xclip neovim -``` -
- -#### Linux Install -
Ubuntu Install Steps - -``` -sudo add-apt-repository ppa:neovim-ppa/unstable -y -sudo apt update -sudo apt install make gcc ripgrep unzip git xclip neovim -``` -
-
Debian Install Steps - -``` -sudo apt update -sudo apt install make gcc ripgrep unzip git xclip curl - -# Now we install nvim -curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz -sudo rm -rf /opt/nvim-linux64 -sudo mkdir -p /opt/nvim-linux64 -sudo chmod a+rX /opt/nvim-linux64 -sudo tar -C /opt -xzf nvim-linux64.tar.gz - -# make it available in /usr/local/bin, distro installs to /usr/bin -sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/ -``` -
-
Fedora Install Steps - -``` -sudo dnf install -y gcc make git ripgrep fd-find unzip neovim -``` -
- -
Arch Install Steps - -``` -sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim -``` -
diff --git a/doc/kickstart.txt b/doc/kickstart.txt deleted file mode 100644 index cb87ac3f1de..00000000000 --- a/doc/kickstart.txt +++ /dev/null @@ -1,24 +0,0 @@ -================================================================================ -INTRODUCTION *kickstart.nvim* - -Kickstart.nvim is a project to help you get started on your neovim journey. - - *kickstart-is-not* -It is not: -- Complete framework for every plugin under the sun -- Place to add every plugin that could ever be useful - - *kickstart-is* -It is: -- Somewhere that has a good start for the most common "IDE" type features: - - autocompletion - - goto-definition - - find references - - fuzzy finding - - and hinting at what more can be done :) -- A place to _kickstart_ your journey. - - You should fork this project and use/modify it so that it matches your - style and preferences. If you don't want to do that, there are probably - other projects that would fit much better for you (and that's great!)! - - vim:tw=78:ts=8:ft=help:norl: diff --git a/doc/tags b/doc/tags deleted file mode 100644 index 687ae7721d9..00000000000 --- a/doc/tags +++ /dev/null @@ -1,3 +0,0 @@ -kickstart-is kickstart.txt /*kickstart-is* -kickstart-is-not kickstart.txt /*kickstart-is-not* -kickstart.nvim kickstart.txt /*kickstart.nvim* diff --git a/init.lua b/init.lua index 3784c1a18c9..340a068d5b6 100644 --- a/init.lua +++ b/init.lua @@ -1,109 +1,10 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== -======== .-----. ======== -======== .----------------------. | === | ======== -======== |.-""""""""""""""""""-.| |-----| ======== -======== || || | === | ======== -======== || KICKSTART.NVIM || |-----| ======== -======== || || | === | ======== -======== || || |-----| ======== -======== ||:Tutor || |:::::| ======== -======== |'-..................-'| |____o| ======== -======== `"")----------------(""` ___________ ======== -======== /::::::::::| |::::::::::\ \ no mouse \ ======== -======== /:::========| |==hjkl==:::\ \ required \ ======== -======== '""""""""""""' '""""""""""""' '""""""""""' ======== -======== ======== -===================================================================== -===================================================================== - -What is Kickstart? - - Kickstart.nvim is *not* a distribution. - - Kickstart.nvim is a starting point for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you can start exploring, configuring and tinkering to - make Neovim your own! That might mean leaving Kickstart just the way it is for a while - or immediately breaking it into modular pieces. It's up to you! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example which will only take 10-15 minutes: - - https://learnxinyminutes.com/docs/lua/ - - After understanding a bit more about Lua, you can use `:help lua-guide` as a - reference for how Neovim integrates Lua. - - :help lua-guide - - (or HTML version): https://neovim.io/doc/user/lua-guide.html - -Kickstart Guide: - - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. - - If you don't know what this means, type the following: - - - - : - - Tutor - - - - (If you already know the Neovim basics, you can skip this step.) - - Once you've completed that, you can continue working through **AND READING** the rest - of the kickstart init.lua. - - Next, run AND READ `:help`. - This will open up a help window with some basic information - about reading, navigating and searching the builtin help documentation. - - This should be the first place you go to look when you're stuck or confused - with something. It's one of my favorite Neovim features. - - MOST IMPORTANTLY, we provide a keymap "sh" to [s]earch the [h]elp documentation, - which is very useful when you're not exactly sure of what you're looking for. - - I have left several `:help X` comments throughout the init.lua - These are hints about where to find more information about the relevant settings, - plugins or Neovim features used in Kickstart. - - NOTE: Look for lines like this - - Throughout the file. These are for you, the reader, to help you understand what is happening. - Feel free to delete them once you know what you're doing, but they should serve as a guide - for when you are first encountering a few different constructs in your Neovim config. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now! :) ---]] - --- Set as the leader key --- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = false --- [[ Setting options ]] require 'options' - --- [[ Basic Keymaps ]] require 'keymaps' - --- [[ Install `lazy.nvim` plugin manager ]] require 'lazy-bootstrap' - --- [[ Configure and install plugins ]] require 'lazy-plugins' - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 00000000000..a2d5a6335e7 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,34 @@ +{ + "LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, + "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, + "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "80214a857ce512cc64964abddc1d8eb5a3e28396" }, + "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, + "lackluster.nvim": { "branch": "main", "commit": "228aea96b97a333c8386be137969e10efefb4441" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, + "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "b5ee41d2b8ab54f8b6b383b488e822c5cc431871" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-lspconfig": { "branch": "master", "commit": "2a6f00ff66e276ab3289be8bb9f844f7ab385848" }, + "nvim-treesitter": { "branch": "master", "commit": "2eb50352c039009cf046f43241b649b162ee5148" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "render-markdown.nvim": { "branch": "main", "commit": "9c4af1dcbf8af5fa02cc7d1734c67c9fb895e70b" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, + "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } +} diff --git a/lua/custom/plugins/color-kanagawa.lua b/lua/custom/plugins/color-kanagawa.lua new file mode 100644 index 00000000000..7e71d89c1af --- /dev/null +++ b/lua/custom/plugins/color-kanagawa.lua @@ -0,0 +1,15 @@ +return { + 'rebelot/kanagawa.nvim', + + config = function() + -- setup must be called before loading + -- vim.cmd 'colorscheme kanagawa-dragon' + -- vim.cmd 'colorscheme kanagawa-lotus' + -- vim.cmd 'colorscheme kanagawa-wave' + + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, +} diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua new file mode 100644 index 00000000000..92c329fd443 --- /dev/null +++ b/lua/custom/plugins/color-lackluster.lua @@ -0,0 +1,15 @@ +return { + 'slugbyte/lackluster.nvim', + lazy = false, + priority = 1000, + config = function() + -- vim.cmd.colorscheme 'lackluster' + vim.cmd.colorscheme 'lackluster-hack' -- my favorite + -- vim.cmd.colorscheme 'lackluster-mint' + + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, +} diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8d7a..a3203023772 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,14 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { 'metakirby5/codi.vim' }, + + { + 'echasnovski/mini.nvim', + config = function() + require('mini.surround').setup() + require('mini.pairs').setup() + end, + }, +} diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua new file mode 100644 index 00000000000..d24aefb323a --- /dev/null +++ b/lua/custom/plugins/markdown.lua @@ -0,0 +1,97 @@ +return { + { + 'iamcco/markdown-preview.nvim', + cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' }, + ft = { 'markdown' }, + build = function() + vim.fn['mkdp#util#install']() + end, + }, + + { + 'MeanderingProgrammer/render-markdown.nvim', + enabled = true, + opts = {}, + dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + }, + + { + 'tadmccorkle/markdown.nvim', + ft = 'markdown', -- or 'event = "VeryLazy"' + enabled = true, + opts = {}, + + config = function() + require('markdown').setup { + -- Disable all keymaps by setting mappings field to 'false'. + -- Selectively disable keymaps by setting corresponding field to 'false'. + mappings = { + inline_surround_toggle = 'gs', -- (string|boolean) toggle inline style + inline_surround_toggle_line = 'gss', -- (string|boolean) line-wise toggle inline style + inline_surround_delete = 'ds', -- (string|boolean) delete emphasis surrounding cursor + inline_surround_change = 'cs', -- (string|boolean) change emphasis surrounding cursor + link_add = 'gl', -- (string|boolean) add link + link_follow = 'gx', -- (string|boolean) follow link + go_curr_heading = ']c', -- (string|boolean) set cursor to current section heading + go_parent_heading = ']p', -- (string|boolean) set cursor to parent section heading + go_next_heading = ']]', -- (string|boolean) set cursor to next section heading + go_prev_heading = '[[', -- (string|boolean) set cursor to previous section heading + }, + inline_surround = { + -- For the emphasis, strong, strikethrough, and code fields: + -- * 'key': used to specify an inline style in toggle, delete, and change operations + -- * 'txt': text inserted when toggling or changing to the corresponding inline style + emphasis = { + key = 'i', + txt = '*', + }, + strong = { + key = 'b', + txt = '**', + }, + strikethrough = { + key = 's', + txt = '~~', + }, + code = { + key = 'c', + txt = '`', + }, + }, + link = { + paste = { + enable = true, -- whether to convert URLs to links on paste + }, + }, + toc = { + -- Comment text to flag headings/sections for omission in table of contents. + omit_heading = 'toc omit heading', + omit_section = 'toc omit section', + -- Cycling list markers to use in table of contents. + -- Use '.' and ')' for ordered lists. + markers = { '-' }, + }, + -- Hook functions allow for overriding or extending default behavior. + -- Called with a table of options and a fallback function with default behavior. + -- Signature: fun(opts: table, fallback: fun()) + hooks = { + -- Called when following links. Provided the following options: + -- * 'dest' (string): the link destination + -- * 'use_default_app' (boolean|nil): whether to open the destination with default application + -- (refer to documentation on mappings for explanation of when this option is used) + follow_link = nil, + }, + on_attach = function(bufnr) + local function toggle(key) + return "gvlua require'markdown.inline'" .. ".toggle_emphasis_visual'" .. key .. "'" + end + -- classic keymaps for bold and italic + vim.keymap.set('x', '', toggle 'b', { buffer = bufnr }) + vim.keymap.set('x', '', toggle 'i', { buffer = bufnr }) + end, + } + end, + }, +} diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua new file mode 100644 index 00000000000..eb837a458a1 --- /dev/null +++ b/lua/custom/plugins/toggle-terminal.lua @@ -0,0 +1,6 @@ +return { + { 'akinsho/toggleterm.nvim', event = 'VeryLazy', version = '*', opts = { + size = 15, + open_mapping = '', + } }, +} diff --git a/lua/keymaps.lua b/lua/keymaps.lua index c07a08a7514..e502a3f486c 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,42 +1,18 @@ --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` +local map = vim.keymap.set --- Clear highlights on search when pressing in normal mode --- See `:help hlsearch` -vim.keymap.set('n', '', 'nohlsearch') +map('n', 'pl', 'Explore') +map('n', '', 'nohlsearch') --- Diagnostic keymaps -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) +map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. --- --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) +map('n', '', '', { desc = 'Move focus to the left window' }) +map('n', '', '', { desc = 'Move focus to the right window' }) +map('n', '', '', { desc = 'Move focus to the lower window' }) +map('n', '', '', { desc = 'Move focus to the upper window' }) --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') +map('n', '/', 'gcc', { desc = 'Toggle Comment', remap = true }) +map('v', '/', 'gc', { desc = 'Toggle comment', remap = true }) --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.on_yank()` vim.api.nvim_create_autocmd('TextYankPost', { desc = 'Highlight when yanking (copying) text', group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), @@ -44,5 +20,3 @@ vim.api.nvim_create_autocmd('TextYankPost', { vim.highlight.on_yank() end, }) - --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index e9ed483b75f..0942c2d8bfa 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -3,40 +3,31 @@ return { 'hrsh7th/nvim-cmp', event = 'InsertEnter', dependencies = { - -- Snippet Engine & its associated nvim-cmp source { 'L3MON4D3/LuaSnip', build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then return end return 'make install_jsregexp' end)(), dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, + { + 'rafamadriz/friendly-snippets', + -- Tu importamo snippets + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets/' } } + end, + }, }, }, 'saadparwaiz1/cmp_luasnip', - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', }, config = function() - -- See `:help cmp` local cmp = require 'cmp' local luasnip = require 'luasnip' luasnip.config.setup {} @@ -49,44 +40,22 @@ return { }, completion = { completeopt = 'menu,menuone,noinsert' }, - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item [''] = cmp.mapping.select_prev_item(), - -- Scroll the documentation window [b]ack / [f]orward [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), + -- + [''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. [''] = cmp.mapping.complete {}, - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. [''] = cmp.mapping(function() if luasnip.expand_or_locally_jumpable() then luasnip.expand_or_jump() @@ -97,14 +66,10 @@ return { luasnip.jump(-1) end end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps }, sources = { { name = 'lazydev', - -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it group_index = 0, }, { name = 'nvim_lsp' }, diff --git a/lua/kickstart/plugins/telescope.lua b/lua/kickstart/plugins/telescope.lua index 159971f00e7..3f7149b284b 100644 --- a/lua/kickstart/plugins/telescope.lua +++ b/lua/kickstart/plugins/telescope.lua @@ -1,10 +1,3 @@ --- NOTE: Plugins can specify dependencies. --- --- The dependencies are proper plugin specifications as well - anything --- you do for a plugin at the top level, you can do for a dependency. --- --- Use the `dependencies` key to specify the dependencies of a particular plugin - return { { -- Fuzzy Finder (files, lsp, etc) 'nvim-telescope/telescope.nvim', @@ -14,54 +7,17 @@ return { 'nvim-lua/plenary.nvim', { -- If encountering errors, see telescope-fzf-native README for installation instructions 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. cond = function() return vim.fn.executable 'make' == 1 end, }, { 'nvim-telescope/telescope-ui-select.nvim' }, - -- Useful for getting pretty icons, but requires a Nerd Font. { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }, config = function() - -- Telescope is a fuzzy finder that comes with a lot of different things that - -- it can fuzzy find! It's more than just a "file finder", it can search - -- many different aspects of Neovim, your workspace, LSP, and more! - -- - -- The easiest way to use Telescope, is to start by doing something like: - -- :Telescope help_tags - -- - -- After running this command, a window will open up and you're able to - -- type in the prompt window. You'll see a list of `help_tags` options and - -- a corresponding preview of the help. - -- - -- Two important keymaps to use while in Telescope are: - -- - Insert mode: - -- - Normal mode: ? - -- - -- This opens a window that shows you all of the keymaps for the current - -- Telescope picker. This is really useful to discover what Telescope can - -- do as well as how to actually do it! - - -- [[ Configure Telescope ]] - -- See `:help telescope` and `:help telescope.setup()` require('telescope').setup { - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} extensions = { ['ui-select'] = { require('telescope.themes').get_dropdown(), @@ -69,11 +25,9 @@ return { }, } - -- Enable Telescope extensions if they are installed pcall(require('telescope').load_extension, 'fzf') pcall(require('telescope').load_extension, 'ui-select') - -- See `:help telescope.builtin` local builtin = require 'telescope.builtin' vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) @@ -86,17 +40,13 @@ return { vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - -- Slightly advanced example of overriding default behavior and theme vim.keymap.set('n', '/', function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { winblend = 10, previewer = false, }) end, { desc = '[/] Fuzzily search in current buffer' }) - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys vim.keymap.set('n', 's/', function() builtin.live_grep { grep_open_files = true, @@ -104,11 +54,9 @@ return { } end, { desc = '[S]earch [/] in Open Files' }) - -- Shortcut for searching your Neovim configuration files vim.keymap.set('n', 'sn', function() builtin.find_files { cwd = vim.fn.stdpath 'config' } end, { desc = '[S]earch [N]eovim files' }) end, }, } --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/lazy-bootstrap.lua b/lua/lazy-bootstrap.lua index 8dc96c8f068..f42c2b700bb 100644 --- a/lua/lazy-bootstrap.lua +++ b/lua/lazy-bootstrap.lua @@ -1,13 +1,12 @@ --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' + 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 error('Error cloning lazy.nvim:\n' .. out) end end ---@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) --- vim: ts=2 sts=2 sw=2 et +vim.opt.rtp:prepend(lazypath) diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index f601d395e2a..717c1a0c680 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -1,29 +1,6 @@ --- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- To update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. require('lazy').setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - -- NOTE: Plugins can also be added by using a table, - -- with the first argument being the link and the following - -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to force a plugin to be loaded. - -- - - - -- modular approach: using `require 'path/name'` will - -- include a plugin definition from file lua/path/name.lua - require 'kickstart/plugins/gitsigns', require 'kickstart/plugins/which-key', @@ -44,31 +21,15 @@ require('lazy').setup({ require 'kickstart/plugins/treesitter', - -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- -- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', -- require 'kickstart.plugins.neo-tree', - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, { ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table icons = vim.g.have_nerd_font and {} or { cmd = '⌘', config = '🛠', @@ -86,5 +47,3 @@ require('lazy').setup({ }, }, }) - --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/options.lua b/lua/options.lua index 94ee2ed6364..3b7eec0e579 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,65 +1,41 @@ --- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` +--vim.o.conceallevel = 2 +vim.opt.cursorline = true --- Make line numbers default vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.o.numberwidth = 4 +vim.opt.relativenumber = true +vim.opt.scrolloff = 25 --- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' --- Don't show the mode, since it's already in the status line vim.opt.showmode = false --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` vim.schedule(function() vim.opt.clipboard = 'unnamedplus' end) --- Enable break indent vim.opt.breakindent = true +vim.opt.smartindent = true +vim.opt.tabstop = 4 +vim.opt.shiftwidth = 4 --- Save undo history vim.opt.undofile = true --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.opt.ignorecase = true vim.opt.smartcase = true --- Keep signcolumn on by default vim.opt.signcolumn = 'yes' --- Decrease update time -vim.opt.updatetime = 250 +vim.opt.updatetime = 50 --- Decrease mapped sequence wait time --- Displays which-key popup sooner vim.opt.timeoutlen = 300 --- Configure how new splits should be opened vim.opt.splitright = true vim.opt.splitbelow = true --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` vim.opt.list = true vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } --- Preview substitutions live, as you type! vim.opt.inccommand = 'split' --- Show which line your cursor is on -vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- vim: ts=2 sts=2 sw=2 et +vim.opt.cursorline = false diff --git a/lua/snippets/c.lua b/lua/snippets/c.lua new file mode 100644 index 00000000000..6c4404e1d6d --- /dev/null +++ b/lua/snippets/c.lua @@ -0,0 +1,23 @@ +local ls = require 'luasnip' +local s = ls.snippet +local t = ls.text_node +local i = ls.insert_node +local fmta = require('luasnip.extras.fmt').fmta +local rep = require('luasnip.extras').rep + +-- include in main funckija, zato je base +s( + { trig = 'base', dscr = 'include stdio.h in main funkcija z return 0', regTrig = false, wordTrig = true }, + fmta( + [[ +#include + +int main() { + <> + + return 0; +} +]], + { i(1) } + ) +) From 315d33b238d6a5b42c6051f326b3858e3de69fc2 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Wed, 28 Aug 2024 14:09:24 +0200 Subject: [PATCH 02/34] "snippets dela; dodal gruvbox; spremenil neotree" --- lazy-lock.json | 11 +++++++++++ lua/custom/plugins/color-gruvbox.lua | 16 ++++++++++++++++ lua/custom/plugins/color-kanagawa.lua | 4 ++-- lua/custom/plugins/color-lackluster.lua | 2 +- lua/kickstart/plugins/cmp.lua | 2 +- lua/kickstart/plugins/indent_line.lua | 1 + lua/kickstart/plugins/neo-tree.lua | 16 ++++++++++++++++ lua/lazy-plugins.lua | 10 +++++----- lua/options.lua | 2 +- snippets/all.lua | 22 ++++++++++++++++++++++ {lua/snippets => snippets}/c.lua | 18 ++++++++++-------- snippets/lua.lua | 14 ++++++++++++++ 12 files changed, 100 insertions(+), 18 deletions(-) create mode 100644 lua/custom/plugins/color-gruvbox.lua create mode 100644 snippets/all.lua rename {lua/snippets => snippets}/c.lua (58%) create mode 100644 snippets/lua.lua diff --git a/lazy-lock.json b/lazy-lock.json index a2d5a6335e7..82138c0ae4f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,6 +8,8 @@ "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "80214a857ce512cc64964abddc1d8eb5a3e28396" }, + "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, + "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "228aea96b97a333c8386be137969e10efefb4441" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, @@ -16,11 +18,20 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.nvim": { "branch": "main", "commit": "b5ee41d2b8ab54f8b6b383b488e822c5cc431871" }, + "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, + "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, + "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, + "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, "nvim-lspconfig": { "branch": "master", "commit": "2a6f00ff66e276ab3289be8bb9f844f7ab385848" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "2eb50352c039009cf046f43241b649b162ee5148" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "render-markdown.nvim": { "branch": "main", "commit": "9c4af1dcbf8af5fa02cc7d1734c67c9fb895e70b" }, diff --git a/lua/custom/plugins/color-gruvbox.lua b/lua/custom/plugins/color-gruvbox.lua new file mode 100644 index 00000000000..80c3f0f8b94 --- /dev/null +++ b/lua/custom/plugins/color-gruvbox.lua @@ -0,0 +1,16 @@ +return { + { + 'sainnhe/gruvbox-material', + lazy = false, + priority = 1000, + opts = { + contrast = 'soft', + }, + config = function() + -- Optionally configure and load the colorscheme + -- directly inside the plugin declaration. + vim.g.gruvbox_material_enable_italic = true + vim.cmd.colorscheme 'gruvbox-material' + end, + }, +} diff --git a/lua/custom/plugins/color-kanagawa.lua b/lua/custom/plugins/color-kanagawa.lua index 7e71d89c1af..8dfb585d947 100644 --- a/lua/custom/plugins/color-kanagawa.lua +++ b/lua/custom/plugins/color-kanagawa.lua @@ -9,7 +9,7 @@ return { -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, } diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index 92c329fd443..ccba9d32dac 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -4,7 +4,7 @@ return { priority = 1000, config = function() -- vim.cmd.colorscheme 'lackluster' - vim.cmd.colorscheme 'lackluster-hack' -- my favorite + -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite -- vim.cmd.colorscheme 'lackluster-mint' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index 0942c2d8bfa..dc7999d6cba 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -17,7 +17,7 @@ return { -- Tu importamo snippets config = function() require('luasnip.loaders.from_vscode').lazy_load() - require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets/' } } + require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } end, }, }, diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua index ed7f269399f..0623a3cd428 100644 --- a/lua/kickstart/plugins/indent_line.lua +++ b/lua/kickstart/plugins/indent_line.lua @@ -5,5 +5,6 @@ return { -- See `:help ibl` main = 'ibl', opts = {}, + enabled = false, }, } diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index f126d68af2c..4db59d0ae3c 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -16,8 +16,24 @@ return { opts = { filesystem = { window = { + width = 30, + position = 'current', mappings = { ['\\'] = 'close_window', + ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, + ['l'] = 'focus_preview', + ['S'] = 'open_split', + ['s'] = 'open_vsplit', + ['A'] = 'add_directory', -- also accepts the optional config.show_path option like "add". this also supports BASH style brace expansion. + ['d'] = 'delete', + ['r'] = 'rename', + ['m'] = 'move', -- takes text input for destination, also accepts the optional config.show_path option like "add". + ['q'] = 'close_window', + ['R'] = 'refresh', + ['?'] = 'show_help', + ['<'] = 'prev_source', + ['>'] = 'next_source', + ['i'] = 'show_file_details', }, }, }, diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 717c1a0c680..de661a82e0b 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -21,11 +21,11 @@ require('lazy').setup({ require 'kickstart/plugins/treesitter', - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', + require 'kickstart.plugins.neo-tree', { import = 'custom.plugins' }, }, { diff --git a/lua/options.lua b/lua/options.lua index 3b7eec0e579..23df573f7a7 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,7 +4,7 @@ vim.opt.cursorline = true vim.opt.number = true vim.o.numberwidth = 4 vim.opt.relativenumber = true -vim.opt.scrolloff = 25 +vim.opt.scrolloff = 999 vim.opt.mouse = 'a' diff --git a/snippets/all.lua b/snippets/all.lua new file mode 100644 index 00000000000..48910c45433 --- /dev/null +++ b/snippets/all.lua @@ -0,0 +1,22 @@ +local ls = require 'luasnip' +local s = ls.snippet +local t = ls.text_node +local i = ls.insert_node +local fmta = require('luasnip.extras.fmt').fmta +local rep = require('luasnip.extras').rep + +return { + -- plugin + s( + { trig = 'plug', dscr = 'return table ta nov plugin' }, + fmta( + [[ + return { + <> + enabled = true, + } + ]], + { i(1) } + ) + ), +} diff --git a/lua/snippets/c.lua b/snippets/c.lua similarity index 58% rename from lua/snippets/c.lua rename to snippets/c.lua index 6c4404e1d6d..3c388292c6a 100644 --- a/lua/snippets/c.lua +++ b/snippets/c.lua @@ -6,11 +6,12 @@ local fmta = require('luasnip.extras.fmt').fmta local rep = require('luasnip.extras').rep -- include in main funckija, zato je base -s( - { trig = 'base', dscr = 'include stdio.h in main funkcija z return 0', regTrig = false, wordTrig = true }, - fmta( - [[ -#include +return { + s( + { trig = 'base', dscr = 'include stdio.h in main funkcija z return 0', regTrig = false, wordTrig = true }, + fmta( + [[ +#include <> int main() { <> @@ -18,6 +19,7 @@ int main() { return 0; } ]], - { i(1) } - ) -) + { i(1) } + ) + ), +} diff --git a/snippets/lua.lua b/snippets/lua.lua new file mode 100644 index 00000000000..ef5835f655a --- /dev/null +++ b/snippets/lua.lua @@ -0,0 +1,14 @@ +local ls = require 'luasnip' +local s = ls.snippet +local t = ls.text_node +local i = ls.insert_node +local fmta = require('luasnip.extras.fmt').fmta +local rep = require('luasnip.extras').rep + +return { + s({ trig = 'plug' }, { + t 'return {', + i(1), + t '}', + }), +} From a966528389b2e77ea75f4ed313afce74fd553c6b Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 29 Aug 2024 01:18:47 +0200 Subject: [PATCH 03/34] mini git... --- lazy-lock.json | 8 ++++---- lua/kickstart/plugins/mini.lua | 24 +----------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 82138c0ae4f..211da198336 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, @@ -7,7 +7,7 @@ "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "80214a857ce512cc64964abddc1d8eb5a3e28396" }, + "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, @@ -32,9 +32,9 @@ "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, "nvim-lspconfig": { "branch": "master", "commit": "2a6f00ff66e276ab3289be8bb9f844f7ab385848" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "2eb50352c039009cf046f43241b649b162ee5148" }, + "nvim-treesitter": { "branch": "master", "commit": "7a64148896289a91cb2a92e9da3f76d5512a3fb8" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "render-markdown.nvim": { "branch": "main", "commit": "9c4af1dcbf8af5fa02cc7d1734c67c9fb895e70b" }, + "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua index 3a9bdc30813..78114a4ba63 100644 --- a/lua/kickstart/plugins/mini.lua +++ b/lua/kickstart/plugins/mini.lua @@ -2,39 +2,17 @@ return { { -- Collection of various small independent plugins/modules 'echasnovski/mini.nvim', config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote require('mini.ai').setup { n_lines = 500 } - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] require('mini.surround').setup() + require('mini.git').setup() - -- Simple and easy statusline. - -- You could remove this setup call if you don't like it, - -- and try some other statusline plugin local statusline = require 'mini.statusline' - -- set use_icons to true if you have a Nerd Font statusline.setup { use_icons = vim.g.have_nerd_font } - -- You can configure sections in the statusline by overriding their - -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN ---@diagnostic disable-next-line: duplicate-set-field statusline.section_location = function() return '%2l:%-2v' end - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim end, }, } --- vim: ts=2 sts=2 sw=2 et From 892a02654460d5fc46e0b20cb911e9d387436c54 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 29 Aug 2024 03:22:30 +0200 Subject: [PATCH 04/34] Auto commit --- lazy-lock.json | 1 + lua/custom/plugins/markdown.lua | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 211da198336..a7542f64074 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -17,6 +17,7 @@ "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, + "markview.nvim": { "branch": "main", "commit": "4695a699ebd87889c815de07e1408331e5c1df61" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua index d24aefb323a..33c3c1bcbaa 100644 --- a/lua/custom/plugins/markdown.lua +++ b/lua/custom/plugins/markdown.lua @@ -17,6 +17,17 @@ return { -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons }, + { + 'OXY2DEV/markview.nvim', + lazy = false, -- Recommended + -- ft = "markdown" -- If you decide to lazy-load anyway + enabled = false, + dependencies = { + 'nvim-treesitter/nvim-treesitter', + 'nvim-tree/nvim-web-devicons', + }, + }, + { 'tadmccorkle/markdown.nvim', ft = 'markdown', -- or 'event = "VeryLazy"' From 3e552bf97be53bf08e8eb08a9a01479cddd100d6 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 29 Aug 2024 14:11:33 +0200 Subject: [PATCH 05/34] minor --- lazy-lock.json | 10 ++++++---- lua/custom/plugins/color-gruvbox.lua | 6 +++++- lua/custom/plugins/color-kanagawa.lua | 12 ++++++------ lua/custom/plugins/color-lackluster.lua | 10 +++++----- lua/custom/plugins/init.lua | 19 +++++++++++++++++++ lua/kickstart/plugins/neo-tree.lua | 2 +- lua/kickstart/plugins/tokyonight.lua | 12 ++++-------- lua/options.lua | 5 +++-- 8 files changed, 49 insertions(+), 27 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a7542f64074..71dd60f40c1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,9 +11,10 @@ "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lackluster.nvim": { "branch": "main", "commit": "228aea96b97a333c8386be137969e10efefb4441" }, + "lackluster.nvim": { "branch": "main", "commit": "dc10a0caef0618fbd2824c49e6bf6bd19abdb6bf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, @@ -31,9 +32,9 @@ "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, - "nvim-lspconfig": { "branch": "master", "commit": "2a6f00ff66e276ab3289be8bb9f844f7ab385848" }, + "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "7a64148896289a91cb2a92e9da3f76d5512a3fb8" }, + "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, @@ -42,5 +43,6 @@ "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, + "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/lua/custom/plugins/color-gruvbox.lua b/lua/custom/plugins/color-gruvbox.lua index 80c3f0f8b94..0f9675b1a7e 100644 --- a/lua/custom/plugins/color-gruvbox.lua +++ b/lua/custom/plugins/color-gruvbox.lua @@ -10,7 +10,11 @@ return { -- Optionally configure and load the colorscheme -- directly inside the plugin declaration. vim.g.gruvbox_material_enable_italic = true - vim.cmd.colorscheme 'gruvbox-material' + -- vim.cmd.colorscheme 'gruvbox-material' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, }, } diff --git a/lua/custom/plugins/color-kanagawa.lua b/lua/custom/plugins/color-kanagawa.lua index 8dfb585d947..5af91d56739 100644 --- a/lua/custom/plugins/color-kanagawa.lua +++ b/lua/custom/plugins/color-kanagawa.lua @@ -5,11 +5,11 @@ return { -- setup must be called before loading -- vim.cmd 'colorscheme kanagawa-dragon' -- vim.cmd 'colorscheme kanagawa-lotus' - -- vim.cmd 'colorscheme kanagawa-wave' - - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + -- vim.cmd 'colorscheme kanagawa-wave' + -- + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, } diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index ccba9d32dac..c187f20f6e8 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -4,12 +4,12 @@ return { priority = 1000, config = function() -- vim.cmd.colorscheme 'lackluster' - -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite + -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite -- vim.cmd.colorscheme 'lackluster-mint' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, } diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index a3203023772..73478848337 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -12,4 +12,23 @@ return { require('mini.pairs').setup() end, }, + + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + options = { theme = 'auto' }, + } + end, + }, + + { + 'folke/zen-mode.nvim', + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, + }, } diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 4db59d0ae3c..7e9c0cadc23 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -17,7 +17,7 @@ return { filesystem = { window = { width = 30, - position = 'current', + position = 'float', mappings = { ['\\'] = 'close_window', ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, diff --git a/lua/kickstart/plugins/tokyonight.lua b/lua/kickstart/plugins/tokyonight.lua index 3e5e74d945b..e9ed534f50c 100644 --- a/lua/kickstart/plugins/tokyonight.lua +++ b/lua/kickstart/plugins/tokyonight.lua @@ -7,14 +7,10 @@ return { 'folke/tokyonight.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' + -- vim.cmd.colorscheme 'tokyonight-storm' + -- vim.cmd.colorscheme 'tokyonight-moon' + -- vim.cmd.colorscheme 'tokyonight-night' + -- vim.cmd.colorscheme 'tokyonight-day' end, }, } --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/options.lua b/lua/options.lua index 23df573f7a7..a4d2ffe5a5e 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -2,9 +2,10 @@ vim.opt.cursorline = true vim.opt.number = true -vim.o.numberwidth = 4 +vim.o.numberwidth = 6 vim.opt.relativenumber = true vim.opt.scrolloff = 999 +vim.o.textwidth = 80 vim.opt.mouse = 'a' @@ -24,7 +25,7 @@ vim.opt.undofile = true vim.opt.ignorecase = true vim.opt.smartcase = true -vim.opt.signcolumn = 'yes' +vim.opt.signcolumn = 'no' vim.opt.updatetime = 50 From 50cba3af99929d343385bdceba5d45418c3b3d37 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Fri, 30 Aug 2024 17:03:24 +0200 Subject: [PATCH 06/34] minor --- init.lua | 2 ++ lazy-lock.json | 4 ++++ lua/custom/plugins/color-darkearth.lua | 12 ++++++++++++ lua/custom/plugins/color-gruvbox.lua | 2 +- lua/custom/plugins/color-ivory.lua | 14 ++++++++++++++ lua/custom/plugins/color-kanagawa.lua | 2 -- lua/custom/plugins/color-lackluster.lua | 2 -- lua/custom/plugins/color-okcolors.lua | 8 ++++++++ lua/kickstart/plugins/telescope.lua | 8 +++++--- lua/kickstart/plugins/tokyonight.lua | 10 +++++----- lua/options.lua | 4 ++-- snippets/c.lua | 1 + 12 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 lua/custom/plugins/color-darkearth.lua create mode 100644 lua/custom/plugins/color-ivory.lua create mode 100644 lua/custom/plugins/color-okcolors.lua diff --git a/init.lua b/init.lua index 340a068d5b6..ece03404dba 100644 --- a/init.lua +++ b/init.lua @@ -2,6 +2,8 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +vim.o.background = 'dark' + vim.g.have_nerd_font = false require 'options' diff --git a/lazy-lock.json b/lazy-lock.json index 71dd60f40c1..0a6299297d7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,11 +5,13 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, + "darkearth-nvim": { "branch": "main", "commit": "d53cc2384d0a84889bd44361cee33019bac02c58" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, + "ivory": { "branch": "master", "commit": "aab4a0a2d883ff8a8a7c07e5d339294756a730ff" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "dc10a0caef0618fbd2824c49e6bf6bd19abdb6bf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, @@ -35,6 +37,8 @@ "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" }, + "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/lua/custom/plugins/color-darkearth.lua b/lua/custom/plugins/color-darkearth.lua new file mode 100644 index 00000000000..73cb9e0856a --- /dev/null +++ b/lua/custom/plugins/color-darkearth.lua @@ -0,0 +1,12 @@ +return { + { + 'ptdewey/darkearth-nvim', + config = function() + vim.cmd.colorscheme 'darkearth' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, +} diff --git a/lua/custom/plugins/color-gruvbox.lua b/lua/custom/plugins/color-gruvbox.lua index 0f9675b1a7e..64704131cc7 100644 --- a/lua/custom/plugins/color-gruvbox.lua +++ b/lua/custom/plugins/color-gruvbox.lua @@ -10,7 +10,7 @@ return { -- Optionally configure and load the colorscheme -- directly inside the plugin declaration. vim.g.gruvbox_material_enable_italic = true - -- vim.cmd.colorscheme 'gruvbox-material' + -- vim.cmd.colorscheme 'gruvbox-material' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) diff --git a/lua/custom/plugins/color-ivory.lua b/lua/custom/plugins/color-ivory.lua new file mode 100644 index 00000000000..d1fac273f6e --- /dev/null +++ b/lua/custom/plugins/color-ivory.lua @@ -0,0 +1,14 @@ +return { + { + 'mstcl/ivory', + lazy = false, + priority = 1000, + config = function() + -- vim.cmd.colorscheme 'ivory' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, +} diff --git a/lua/custom/plugins/color-kanagawa.lua b/lua/custom/plugins/color-kanagawa.lua index 5af91d56739..9d3facf00ce 100644 --- a/lua/custom/plugins/color-kanagawa.lua +++ b/lua/custom/plugins/color-kanagawa.lua @@ -7,8 +7,6 @@ return { -- vim.cmd 'colorscheme kanagawa-lotus' -- vim.cmd 'colorscheme kanagawa-wave' -- - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index c187f20f6e8..0f6a0ad49ad 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -7,8 +7,6 @@ return { -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite -- vim.cmd.colorscheme 'lackluster-mint' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, diff --git a/lua/custom/plugins/color-okcolors.lua b/lua/custom/plugins/color-okcolors.lua new file mode 100644 index 00000000000..d1152deae31 --- /dev/null +++ b/lua/custom/plugins/color-okcolors.lua @@ -0,0 +1,8 @@ +return { + 'e-q/okcolors.nvim', + config = function() + -- vim.cmd 'colorscheme okcolors' + -- vim.cmd 'colorscheme okcolors-smooth' + -- vim.cmd("colorscheme okcolors-sharp") + end, +} diff --git a/lua/kickstart/plugins/telescope.lua b/lua/kickstart/plugins/telescope.lua index 3f7149b284b..2d210e80679 100644 --- a/lua/kickstart/plugins/telescope.lua +++ b/lua/kickstart/plugins/telescope.lua @@ -38,14 +38,16 @@ return { vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find current buffers' }) - vim.keymap.set('n', '/', function() + local popup = function() builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { winblend = 10, previewer = false, }) - end, { desc = '[/] Fuzzily search in current buffer' }) + end + + vim.keymap.set('n', '/', popup, { desc = '[/] Fuzzily search in current buffer' }) vim.keymap.set('n', 's/', function() builtin.live_grep { diff --git a/lua/kickstart/plugins/tokyonight.lua b/lua/kickstart/plugins/tokyonight.lua index e9ed534f50c..44f5dfec5b8 100644 --- a/lua/kickstart/plugins/tokyonight.lua +++ b/lua/kickstart/plugins/tokyonight.lua @@ -1,11 +1,11 @@ return { - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + { 'folke/tokyonight.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. + opts = { + tokyonight_transparent = true, + tokyonight_day_brightness = 0, + }, init = function() -- vim.cmd.colorscheme 'tokyonight-storm' -- vim.cmd.colorscheme 'tokyonight-moon' diff --git a/lua/options.lua b/lua/options.lua index a4d2ffe5a5e..de06f2a8b12 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,8 +1,8 @@ ---vim.o.conceallevel = 2 +vim.o.conceallevel = 2 vim.opt.cursorline = true vim.opt.number = true -vim.o.numberwidth = 6 +vim.o.numberwidth = 4 vim.opt.relativenumber = true vim.opt.scrolloff = 999 vim.o.textwidth = 80 diff --git a/snippets/c.lua b/snippets/c.lua index 3c388292c6a..f18f37cedf5 100644 --- a/snippets/c.lua +++ b/snippets/c.lua @@ -12,6 +12,7 @@ return { fmta( [[ #include <> +#include <> int main() { <> From f14f48d8617e3182e5e2d843133903ce4eff5e7a Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sat, 31 Aug 2024 00:58:57 +0200 Subject: [PATCH 07/34] colorschemes --- init.lua | 1 - lazy-lock.json | 4 +++- lua/custom/plugins/color-bamboo.lua | 15 ++++++++++++ lua/custom/plugins/color-darkearth.lua | 2 +- lua/custom/plugins/color-flow.lua | 16 +++++++++++++ lua/custom/plugins/color-lackluster.lua | 3 ++- lua/custom/plugins/color-obscure.lua | 13 +++++++++++ lua/custom/plugins/color-okcolors.lua | 2 +- lua/custom/plugins/toggle-terminal.lua | 17 ++++++++++---- lua/kickstart/plugins/lspconfig.lua | 31 +------------------------ lua/options.lua | 6 +++-- 11 files changed, 69 insertions(+), 41 deletions(-) create mode 100644 lua/custom/plugins/color-bamboo.lua create mode 100644 lua/custom/plugins/color-flow.lua create mode 100644 lua/custom/plugins/color-obscure.lua diff --git a/init.lua b/init.lua index ece03404dba..3b2a212e756 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,6 @@ -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' - vim.o.background = 'dark' vim.g.have_nerd_font = false diff --git a/lazy-lock.json b/lazy-lock.json index 0a6299297d7..0f0bbca1f01 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "bamboo.nvim": { "branch": "master", "commit": "02230fc2461e916d9e2a44b5f3487376d9ca3042" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, @@ -7,6 +8,7 @@ "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, "darkearth-nvim": { "branch": "main", "commit": "d53cc2384d0a84889bd44361cee33019bac02c58" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, + "flow.nvim": { "branch": "main", "commit": "3af4d4d1b8a99c34e060de6fdaa5babc596a50c1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, @@ -37,9 +39,9 @@ "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" }, "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/lua/custom/plugins/color-bamboo.lua b/lua/custom/plugins/color-bamboo.lua new file mode 100644 index 00000000000..b380fe739a2 --- /dev/null +++ b/lua/custom/plugins/color-bamboo.lua @@ -0,0 +1,15 @@ +return { + { + 'ribru17/bamboo.nvim', + lazy = false, + priority = 1000, + config = function() + require('bamboo').setup { + style = 'vulgaris', -- Choose between 'vulgaris' (regular), 'multiplex' (greener), and 'light' + transparent = false, -- Show/hide background + } + + -- vim.cmd 'colorscheme bamboo' + end, + }, +} diff --git a/lua/custom/plugins/color-darkearth.lua b/lua/custom/plugins/color-darkearth.lua index 73cb9e0856a..9626e5cf241 100644 --- a/lua/custom/plugins/color-darkearth.lua +++ b/lua/custom/plugins/color-darkearth.lua @@ -2,7 +2,7 @@ return { { 'ptdewey/darkearth-nvim', config = function() - vim.cmd.colorscheme 'darkearth' + -- vim.cmd.colorscheme 'darkearth' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) diff --git a/lua/custom/plugins/color-flow.lua b/lua/custom/plugins/color-flow.lua new file mode 100644 index 00000000000..16fe694b80f --- /dev/null +++ b/lua/custom/plugins/color-flow.lua @@ -0,0 +1,16 @@ +return { + '0xstepit/flow.nvim', + lazy = false, + priority = 1000, + + config = function() + require('flow').setup { + transparent = false, -- Set transparent background. + fluo_color = 'pink', -- Fluo color: pink, yellow, orange, or green. + mode = 'normal', -- Intensity of the palette: normal, bright, desaturate, or dark. Notice that dark is ugly! + aggressive_spell = false, -- Display colors for spell check. + } + + -- vim.cmd 'colorscheme flow' + end, +} diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index 0f6a0ad49ad..9db5c65936b 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -3,9 +3,10 @@ return { lazy = false, priority = 1000, config = function() - -- vim.cmd.colorscheme 'lackluster' + -- vim.cmd.colorscheme 'lackluster' -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite -- vim.cmd.colorscheme 'lackluster-mint' + -- vim.cmd.colorscheme 'lackluster-night' -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) diff --git a/lua/custom/plugins/color-obscure.lua b/lua/custom/plugins/color-obscure.lua new file mode 100644 index 00000000000..aaec2c2eae3 --- /dev/null +++ b/lua/custom/plugins/color-obscure.lua @@ -0,0 +1,13 @@ +return { + { + 'olivercederborg/poimandres.nvim', + lazy = false, + priority = 1000, + config = function() + require('poimandres').setup { + disable_background = false, + -- vim.cmd 'colorscheme poimandres', + } + end, + }, +} diff --git a/lua/custom/plugins/color-okcolors.lua b/lua/custom/plugins/color-okcolors.lua index d1152deae31..ce9d40a7cd2 100644 --- a/lua/custom/plugins/color-okcolors.lua +++ b/lua/custom/plugins/color-okcolors.lua @@ -1,7 +1,7 @@ return { 'e-q/okcolors.nvim', config = function() - -- vim.cmd 'colorscheme okcolors' + vim.cmd 'colorscheme okcolors' -- vim.cmd 'colorscheme okcolors-smooth' -- vim.cmd("colorscheme okcolors-sharp") end, diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index eb837a458a1..532c5c0cda1 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -1,6 +1,15 @@ return { - { 'akinsho/toggleterm.nvim', event = 'VeryLazy', version = '*', opts = { - size = 15, - open_mapping = '', - } }, + { + 'akinsho/toggleterm.nvim', + event = 'VeryLazy', + version = '*', + opts = { + size = 15, + open_mapping = '', + direction = 'float', + float_opts = { + winblend = 1, + }, + }, + }, } diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index b9c3c623c76..3602828a218 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -30,35 +30,6 @@ return { 'hrsh7th/cmp-nvim-lsp', }, config = function() - -- Brief aside: **What is LSP?** - -- - -- LSP is an initialism you've probably heard, but might not understand what it is. - -- - -- LSP stands for Language Server Protocol. It's a protocol that helps editors - -- and language tooling communicate in a standardized fashion. - -- - -- In general, you have a "server" which is some tool built to understand a particular - -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers - -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone - -- processes that communicate with some "client" - in this case, Neovim! - -- - -- LSP provides Neovim with features like: - -- - Go to definition - -- - Find references - -- - Autocompletion - -- - Symbol Search - -- - and more! - -- - -- Thus, Language Servers are external tools that must be installed separately from - -- Neovim. This is where `mason` and related plugins come into play. - -- - -- If you're wondering about lsp vs treesitter, you can check out the wonderfully - -- and elegantly composed help section, `:help lsp-vs-treesitter` - - -- This function gets run when an LSP attaches to a particular buffer. - -- That is to say, every time a new file is opened that is associated with - -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this - -- function will be executed to configure the current buffer vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), callback = function(event) @@ -167,7 +138,7 @@ return { -- - settings (table): Override the default settings passed when initializing the server. -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { - -- clangd = {}, + clangd = {}, -- gopls = {}, -- pyright = {}, -- rust_analyzer = {}, diff --git a/lua/options.lua b/lua/options.lua index de06f2a8b12..ca61952a66c 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,11 +1,13 @@ vim.o.conceallevel = 2 vim.opt.cursorline = true +vim.o.wrap = true + vim.opt.number = true -vim.o.numberwidth = 4 +vim.o.numberwidth = 5 vim.opt.relativenumber = true vim.opt.scrolloff = 999 -vim.o.textwidth = 80 +vim.o.textwidth = 0 vim.opt.mouse = 'a' From 381c6b5f0a920768553b3e7ff982d6ea5972b580 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 1 Sep 2024 18:41:24 +0200 Subject: [PATCH 08/34] minor --- init.lua | 2 +- lazy-lock.json | 4 +++- lua/custom/plugins/color-lackluster.lua | 4 +++- lua/custom/plugins/color-nord.lua | 6 ++++++ lua/custom/plugins/color-okcolors.lua | 2 +- lua/custom/plugins/color-shadotheme.lua | 6 ++++++ lua/custom/plugins/toggle-terminal.lua | 8 +++----- lua/keymaps.lua | 2 ++ lua/kickstart/plugins/indent_line.lua | 10 ---------- lua/kickstart/plugins/lspconfig.lua | 15 ++++----------- lua/kickstart/plugins/neo-tree.lua | 2 +- lua/lazy-plugins.lua | 1 - lua/options.lua | 4 ++-- 13 files changed, 32 insertions(+), 34 deletions(-) create mode 100644 lua/custom/plugins/color-nord.lua create mode 100644 lua/custom/plugins/color-shadotheme.lua delete mode 100644 lua/kickstart/plugins/indent_line.lua diff --git a/init.lua b/init.lua index 3b2a212e756..cdce0752840 100644 --- a/init.lua +++ b/init.lua @@ -3,7 +3,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.o.background = 'dark' -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true require 'options' require 'keymaps' diff --git a/lazy-lock.json b/lazy-lock.json index 0f0bbca1f01..dbc753b1bd1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,7 +12,6 @@ "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, - "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, "ivory": { "branch": "master", "commit": "aab4a0a2d883ff8a8a7c07e5d339294756a730ff" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "dc10a0caef0618fbd2824c49e6bf6bd19abdb6bf" }, @@ -29,6 +28,7 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.nvim": { "branch": "main", "commit": "b5ee41d2b8ab54f8b6b383b488e822c5cc431871" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, + "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, @@ -39,10 +39,12 @@ "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" }, "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, + "shadotheme": { "branch": "master", "commit": "ecf7eb5ecdc21a18f3ee7953e184482bcf91d47e" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index 9db5c65936b..2a0ad998d36 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -5,9 +5,11 @@ return { config = function() -- vim.cmd.colorscheme 'lackluster' -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite - -- vim.cmd.colorscheme 'lackluster-mint' + vim.cmd.colorscheme 'lackluster-mint' -- vim.cmd.colorscheme 'lackluster-night' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, diff --git a/lua/custom/plugins/color-nord.lua b/lua/custom/plugins/color-nord.lua new file mode 100644 index 00000000000..942d38b1557 --- /dev/null +++ b/lua/custom/plugins/color-nord.lua @@ -0,0 +1,6 @@ +return { + 'shaunsingh/nord.nvim', + config = function() + -- vim.cmd 'colorscheme nord' + end, +} diff --git a/lua/custom/plugins/color-okcolors.lua b/lua/custom/plugins/color-okcolors.lua index ce9d40a7cd2..d1152deae31 100644 --- a/lua/custom/plugins/color-okcolors.lua +++ b/lua/custom/plugins/color-okcolors.lua @@ -1,7 +1,7 @@ return { 'e-q/okcolors.nvim', config = function() - vim.cmd 'colorscheme okcolors' + -- vim.cmd 'colorscheme okcolors' -- vim.cmd 'colorscheme okcolors-smooth' -- vim.cmd("colorscheme okcolors-sharp") end, diff --git a/lua/custom/plugins/color-shadotheme.lua b/lua/custom/plugins/color-shadotheme.lua new file mode 100644 index 00000000000..5b720a9f242 --- /dev/null +++ b/lua/custom/plugins/color-shadotheme.lua @@ -0,0 +1,6 @@ +return { + 'Shadorain/shadotheme', + config = function() + -- vim.cmd 'colorscheme shado' + end, +} diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index 532c5c0cda1..79c77dd94b8 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -4,12 +4,10 @@ return { event = 'VeryLazy', version = '*', opts = { - size = 15, + size = 80, open_mapping = '', - direction = 'float', - float_opts = { - winblend = 1, - }, + autochdir = true, + direction = 'vertical', -- vertical, horizontal, tab, float }, }, } diff --git a/lua/keymaps.lua b/lua/keymaps.lua index e502a3f486c..1089fb05b48 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -3,6 +3,8 @@ local map = vim.keymap.set map('n', 'pl', 'Explore') map('n', '', 'nohlsearch') +map('n', 'mp', 'MarkdownPreviewToggle') + map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) map('n', '', '', { desc = 'Move focus to the left window' }) diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua deleted file mode 100644 index 0623a3cd428..00000000000 --- a/lua/kickstart/plugins/indent_line.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - { -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help ibl` - main = 'ibl', - opts = {}, - enabled = false, - }, -} diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index 3602828a218..04c018c0305 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -1,32 +1,25 @@ -- LSP Plugins return { { - -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis 'folke/lazydev.nvim', ft = 'lua', opts = { library = { - -- Load luvit types when the `vim.uv` word is found { path = 'luvit-meta/library', words = { 'vim%.uv' } }, }, }, }, + { 'Bilal2453/luvit-meta', lazy = true }, + { -- Main LSP Configuration 'neovim/nvim-lspconfig', dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, - - -- Allows extra capabilities provided by nvim-cmp + 'j-hui/fidget.nvim', 'hrsh7th/cmp-nvim-lsp', }, config = function() @@ -138,7 +131,7 @@ return { -- - settings (table): Override the default settings passed when initializing the server. -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { - clangd = {}, + -- clangd = {}, -- gopls = {}, -- pyright = {}, -- rust_analyzer = {}, diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 7e9c0cadc23..911be8ef53b 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -17,7 +17,7 @@ return { filesystem = { window = { width = 30, - position = 'float', + position = 'left', mappings = { ['\\'] = 'close_window', ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index de661a82e0b..f4630de986e 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -22,7 +22,6 @@ require('lazy').setup({ require 'kickstart/plugins/treesitter', require 'kickstart.plugins.debug', - require 'kickstart.plugins.indent_line', require 'kickstart.plugins.lint', require 'kickstart.plugins.autopairs', require 'kickstart.plugins.neo-tree', diff --git a/lua/options.lua b/lua/options.lua index ca61952a66c..4e01f573cba 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -36,8 +36,8 @@ vim.opt.timeoutlen = 300 vim.opt.splitright = true vim.opt.splitbelow = true -vim.opt.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +vim.opt.list = false +vim.opt.listchars = { trail = '·', nbsp = '␣' } vim.opt.inccommand = 'split' From 1edaa7f544c40f0677484958cf4a6b57792fac6c Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 1 Sep 2024 21:37:59 +0200 Subject: [PATCH 09/34] Auto commit --- lua/custom/plugins/color-lackluster.lua | 3 ++- lua/custom/plugins/toggle-terminal.lua | 2 +- lua/kickstart/plugins/neo-tree.lua | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index 2a0ad998d36..4ef9a267a51 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -5,8 +5,9 @@ return { config = function() -- vim.cmd.colorscheme 'lackluster' -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite - vim.cmd.colorscheme 'lackluster-mint' + -- vim.cmd.colorscheme 'lackluster-mint' -- vim.cmd.colorscheme 'lackluster-night' + vim.cmd.colorscheme 'lackluster-dark' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index 79c77dd94b8..110845b1016 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -7,7 +7,7 @@ return { size = 80, open_mapping = '', autochdir = true, - direction = 'vertical', -- vertical, horizontal, tab, float + direction = 'horizontal', -- vertical, horizontal, tab, float }, }, } diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 911be8ef53b..7e9c0cadc23 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -17,7 +17,7 @@ return { filesystem = { window = { width = 30, - position = 'left', + position = 'float', mappings = { ['\\'] = 'close_window', ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, From eabe1a984dae2a0fb2525b9c05285fdec31fcf1c Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Mon, 2 Sep 2024 01:22:30 +0200 Subject: [PATCH 10/34] minor --- lua/custom/plugins/toggle-terminal.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index 110845b1016..fafc160ab3e 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -4,7 +4,6 @@ return { event = 'VeryLazy', version = '*', opts = { - size = 80, open_mapping = '', autochdir = true, direction = 'horizontal', -- vertical, horizontal, tab, float From 15e434a0bf775b94b38556c6729847c4bdc052c8 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Mon, 2 Sep 2024 22:17:17 +0200 Subject: [PATCH 11/34] Auto commit --- init.lua | 2 +- lazy-lock.json | 6 +++++- lua/custom/plugins/color-lackluster.lua | 1 - lua/custom/plugins/color-oxocarbon.lua | 7 +++++++ lua/custom/plugins/color-zenbones.lua | 26 +++++++++++++++++++++++++ lua/custom/plugins/twilight.lua | 6 ++++++ 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 lua/custom/plugins/color-oxocarbon.lua create mode 100644 lua/custom/plugins/color-zenbones.lua create mode 100644 lua/custom/plugins/twilight.lua diff --git a/init.lua b/init.lua index cdce0752840..78901329f25 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -vim.o.background = 'dark' +vim.o.background = 'light' vim.g.have_nerd_font = true diff --git a/lazy-lock.json b/lazy-lock.json index dbc753b1bd1..f26814ae140 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,6 +18,7 @@ "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, @@ -41,6 +42,7 @@ "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, + "oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" }, "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, @@ -50,7 +52,9 @@ "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, - "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } + "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, + "zenbones.nvim": { "branch": "main", "commit": "006f15ad3437d85884ad50347bcbc60c9a377640" } } diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index 4ef9a267a51..eb42f4476f4 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -1,7 +1,6 @@ return { 'slugbyte/lackluster.nvim', lazy = false, - priority = 1000, config = function() -- vim.cmd.colorscheme 'lackluster' -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite diff --git a/lua/custom/plugins/color-oxocarbon.lua b/lua/custom/plugins/color-oxocarbon.lua new file mode 100644 index 00000000000..f1606db2bc3 --- /dev/null +++ b/lua/custom/plugins/color-oxocarbon.lua @@ -0,0 +1,7 @@ +return { + 'nyoom-engineering/oxocarbon.nvim', + config = function() + vim.opt.background = 'dark' -- set this to dark or light + -- vim.cmd 'colorscheme oxocarbon' + end, +} diff --git a/lua/custom/plugins/color-zenbones.lua b/lua/custom/plugins/color-zenbones.lua new file mode 100644 index 00000000000..fdeb663e595 --- /dev/null +++ b/lua/custom/plugins/color-zenbones.lua @@ -0,0 +1,26 @@ +return { + { + 'zenbones-theme/zenbones.nvim', + -- Optionally install Lush. Allows for more configuration or extending the colorscheme + -- If you don't want to install lush, make sure to set g:zenbones_compat = 1 + -- In Vim, compat mode is turned on as Lush only works in Neovim. + dependencies = 'rktjmp/lush.nvim', + lazy = false, + opts = {}, + config = function() + -- vim.cmd 'colorscheme zenbones' + -- vim.cmd 'colorscheme zenwritten' + -- vim.cmd 'colorscheme neobones' + -- vim.cmd 'colorscheme vimbones' + -- vim.cmd 'colorscheme rosebones' + -- vim.cmd 'colorscheme forestbones' + -- vim.cmd 'colorscheme nordbones' + -- vim.cmd 'colorscheme tokyobones' + -- vim.cmd 'colorscheme seoulbones' + -- vim.cmd 'colorscheme duckbones' + -- vim.cmd 'colorscheme zenburned' + -- vim.cmd 'colorscheme kanagawabones' + -- vim.cmd 'colorscheme randombones' + end, + }, +} diff --git a/lua/custom/plugins/twilight.lua b/lua/custom/plugins/twilight.lua new file mode 100644 index 00000000000..cb301d210aa --- /dev/null +++ b/lua/custom/plugins/twilight.lua @@ -0,0 +1,6 @@ +return { + { + 'folke/twilight.nvim', + opts = {}, + }, +} From b23437824e7e0dfac17ddc67dc20a373f08a407d Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Tue, 3 Sep 2024 14:00:09 +0200 Subject: [PATCH 12/34] Auto commit --- lua/custom/plugins/toggle-terminal.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index fafc160ab3e..bb77b013d31 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -6,7 +6,8 @@ return { opts = { open_mapping = '', autochdir = true, - direction = 'horizontal', -- vertical, horizontal, tab, float + direction = 'tab', -- vertical, horizontal, tab, float + winblend = 3, }, }, } From 41b870e28ac6b7258baf59f7453aa89fada3a4a9 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Wed, 4 Sep 2024 13:51:19 +0200 Subject: [PATCH 13/34] indentline - glej keymaps --- lazy-lock.json | 30 ++++++------- lua/custom/plugins/color-lackluster.lua | 2 +- lua/custom/plugins/indent-line.lua | 9 ++++ lua/custom/plugins/project-manager.lua | 56 +++++++++++++++++++++++++ lua/custom/plugins/toggle-terminal.lua | 10 ++++- lua/keymaps.lua | 2 + lua/kickstart/plugins/lspconfig.lua | 2 +- lua/lazy-plugins.lua | 11 ----- 8 files changed, 94 insertions(+), 28 deletions(-) create mode 100644 lua/custom/plugins/indent-line.lua create mode 100644 lua/custom/plugins/project-manager.lua diff --git a/lazy-lock.json b/lazy-lock.json index f26814ae140..73db00af33e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,17 +5,18 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, - "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, + "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, "darkearth-nvim": { "branch": "main", "commit": "d53cc2384d0a84889bd44361cee33019bac02c58" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flow.nvim": { "branch": "main", "commit": "3af4d4d1b8a99c34e060de6fdaa5babc596a50c1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, - "gruvbox-material": { "branch": "master", "commit": "1d0222181879f98fe782f6ed61f1ad922393b005" }, - "ivory": { "branch": "master", "commit": "aab4a0a2d883ff8a8a7c07e5d339294756a730ff" }, + "gruvbox-material": { "branch": "master", "commit": "559b4a9abb6781699404dfd98fb7d6ec83113337" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lackluster.nvim": { "branch": "main", "commit": "dc10a0caef0618fbd2824c49e6bf6bd19abdb6bf" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lackluster.nvim": { "branch": "main", "commit": "16a9f7022533f66b7a209fe4bd60c79a706e15a1" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, @@ -27,34 +28,35 @@ "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "b5ee41d2b8ab54f8b6b383b488e822c5cc431871" }, + "mini.nvim": { "branch": "main", "commit": "eb0f557a5797cfe9c720ed84a71582c22bccb4f8" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, + "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, - "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, - "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" }, + "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" }, + "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "585860a1865853d2c287c8ef534297da8115818e" }, + "nvim-treesitter": { "branch": "master", "commit": "5b8b126de02ebfd92e46ed5986b3e58e870b85de" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" }, - "render-markdown.nvim": { "branch": "main", "commit": "8c67dbc267549d2e3b3d721c656b644660a77d3f" }, + "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" }, "shadotheme": { "branch": "master", "commit": "ecf7eb5ecdc21a18f3ee7953e184482bcf91d47e" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, + "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, "zenbones.nvim": { "branch": "main", "commit": "006f15ad3437d85884ad50347bcbc60c9a377640" } } diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua index eb42f4476f4..f03685ce784 100644 --- a/lua/custom/plugins/color-lackluster.lua +++ b/lua/custom/plugins/color-lackluster.lua @@ -6,7 +6,7 @@ return { -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite -- vim.cmd.colorscheme 'lackluster-mint' -- vim.cmd.colorscheme 'lackluster-night' - vim.cmd.colorscheme 'lackluster-dark' + -- vim.cmd.colorscheme 'lackluster-dark' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) diff --git a/lua/custom/plugins/indent-line.lua b/lua/custom/plugins/indent-line.lua new file mode 100644 index 00000000000..e277f2b2fba --- /dev/null +++ b/lua/custom/plugins/indent-line.lua @@ -0,0 +1,9 @@ +return { + { + 'lukas-reineke/indent-blankline.nvim', + main = 'ibl', + ---@module "ibl" + ---@type ibl.config + opts = {}, + }, +} diff --git a/lua/custom/plugins/project-manager.lua b/lua/custom/plugins/project-manager.lua new file mode 100644 index 00000000000..8e6eda8e83d --- /dev/null +++ b/lua/custom/plugins/project-manager.lua @@ -0,0 +1,56 @@ +return { + { + 'ahmedkhalf/project.nvim', + config = function() + require('project_nvim').setup { + { + -- Manual mode doesn't automatically change your root directory, so you have + -- the option to manually do so using `:ProjectRoot` command. + manual_mode = false, + + -- Methods of detecting the root directory. **"lsp"** uses the native neovim + -- lsp, while **"pattern"** uses vim-rooter like glob pattern matching. Here + -- order matters: if one is not detected, the other is used as fallback. You + -- can also delete or rearangne the detection methods. + detection_methods = { 'lsp', 'pattern' }, + + -- All the patterns used to detect root dir, when **"pattern"** is in + -- detection_methods + patterns = { '.git', 'README.md', '_darcs', '.hg', '.bzr', '.svn', 'Makefile', 'package.json' }, + + -- Table of lsp clients to ignore by name + -- eg: { "efm", ... } + ignore_lsp = {}, + + -- Don't calculate root dir on specific directories + -- Ex: { "~/.cargo/*", ... } + exclude_dirs = {}, + + -- Show hidden files in telescope + show_hidden = false, + + -- When set to false, you will get a message when project.nvim changes your + -- directory. + silent_chdir = false, + + -- What scope to change the directory, valid options are + -- * global (default) + -- * tab + -- * win + scope_chdir = 'global', + + -- Path where project.nvim will store the project history for use in + -- telescope + datapath = vim.fn.stdpath 'data', + + -- Integration with telescope.nvim for switching projects + -- Automatically add projects to the Telescope project picker + telescope = { + enabled = true, + }, + }, + } + require('telescope').load_extension 'projects' + end, + }, +} diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index bb77b013d31..fe22bd914ff 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -6,8 +6,16 @@ return { opts = { open_mapping = '', autochdir = true, + -- on_open = function(term) + -- -- Set the terminal's current working directory to the directory of the current buffer + -- local buf_path = vim.fn.expand '%:p:h' -- Get the directory of the current file + -- if buf_path ~= '' then + -- term:change_dir(buf_path) -- Change the terminal's directory to the current buffer's directory + -- end + -- end, + shading_factor = 1, + close_on_exit = false, direction = 'tab', -- vertical, horizontal, tab, float - winblend = 3, }, }, } diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 1089fb05b48..f30733926ea 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -5,6 +5,8 @@ map('n', '', 'nohlsearch') map('n', 'mp', 'MarkdownPreviewToggle') +map('n', 'ibl', 'IBLToggle') + map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) map('n', '', '', { desc = 'Move focus to the left window' }) diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index 04c018c0305..863a48eaba9 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -133,7 +133,7 @@ return { local servers = { -- clangd = {}, -- gopls = {}, - -- pyright = {}, + pyright = {}, -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index f4630de986e..897c4a0531e 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -1,26 +1,15 @@ require('lazy').setup({ 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - require 'kickstart/plugins/gitsigns', - require 'kickstart/plugins/which-key', - require 'kickstart/plugins/telescope', - require 'kickstart/plugins/lspconfig', - require 'kickstart/plugins/conform', - require 'kickstart/plugins/cmp', - require 'kickstart/plugins/tokyonight', - require 'kickstart/plugins/todo-comments', - require 'kickstart/plugins/mini', - require 'kickstart/plugins/treesitter', - require 'kickstart.plugins.debug', require 'kickstart.plugins.lint', require 'kickstart.plugins.autopairs', From a2e9edd5c6b99e70d4d9f503947ac343f657768e Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Fri, 6 Sep 2024 02:38:48 +0200 Subject: [PATCH 14/34] Auto commit --- lua/custom/plugins/color-zenbones.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua/custom/plugins/color-zenbones.lua b/lua/custom/plugins/color-zenbones.lua index fdeb663e595..89486b616e3 100644 --- a/lua/custom/plugins/color-zenbones.lua +++ b/lua/custom/plugins/color-zenbones.lua @@ -21,6 +21,11 @@ return { -- vim.cmd 'colorscheme zenburned' -- vim.cmd 'colorscheme kanagawabones' -- vim.cmd 'colorscheme randombones' + + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, }, } From 283a920f247da213ced429f92e49b419e9e32950 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sat, 7 Sep 2024 00:27:17 +0200 Subject: [PATCH 15/34] Auto commit --- lua/kickstart/plugins/cmp.lua | 2 +- snippets/markdown.lua | 269 ++++++++++++++++++++++++++++++++++ snippets/math-util.lua | 63 ++++++++ 3 files changed, 333 insertions(+), 1 deletion(-) create mode 100644 snippets/markdown.lua create mode 100644 snippets/math-util.lua diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index dc7999d6cba..8b29791225f 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -30,7 +30,7 @@ return { config = function() local cmp = require 'cmp' local luasnip = require 'luasnip' - luasnip.config.setup {} + luasnip.config.setup { enable_autosnippets = true } cmp.setup { snippet = { diff --git a/snippets/markdown.lua b/snippets/markdown.lua new file mode 100644 index 00000000000..cd082330b15 --- /dev/null +++ b/snippets/markdown.lua @@ -0,0 +1,269 @@ +local ls = require 'luasnip' +local s = ls.snippet +local t = ls.text_node +local i = ls.insert_node +local fmta = require('luasnip.extras.fmt').fmta +local rep = require('luasnip.extras').rep + +local is_math_mode = require 'snippets.math-util' + +-- NOTE: Tukaj vstavljaš snippets za markdown +return { + -- Get in math mode + s({ trig = 'mk', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('$<>$', { i(1) })), + s( + { trig = 'dm', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + $$ + <> + $$ + ]], + { i(1) } + ) + ), + -- environment + s( + { trig = 'beg', name = 'Begin environment', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{<>} + <> + \end{<>} + ]], + { i(1), i(0), rep(1) } + ) + ), + + -- Greek letters + s({ trig = '@a', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\alpha', { condition = is_math_mode }), + s({ trig = '@b', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\beta', { condition = is_math_mode }), + s({ trig = '@g', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\gamma', { condition = is_math_mode }), + s({ trig = '@G', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Gamma', { condition = is_math_mode }), + s({ trig = '@d', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\delta', { condition = is_math_mode }), + s({ trig = '@D', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Delta', { condition = is_math_mode }), + s({ trig = '@e', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\epsilon', { condition = is_math_mode }), + s({ trig = ':e', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\varepsilon', { condition = is_math_mode }), + s({ trig = '@z', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\zeta', { condition = is_math_mode }), + s({ trig = '@t', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\theta', { condition = is_math_mode }), + s({ trig = '@T', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Theta', { condition = is_math_mode }), + s({ trig = ':t', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\vartheta', { condition = is_math_mode }), + s({ trig = '@i', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\iota', { condition = is_math_mode }), + s({ trig = '@k', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\kappa', { condition = is_math_mode }), + s({ trig = '@l', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\lambda', { condition = is_math_mode }), + s({ trig = '@L', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Lambda', { condition = is_math_mode }), + s({ trig = '@s', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\sigma', { condition = is_math_mode }), + s({ trig = '@S', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Sigma', { condition = is_math_mode }), + s({ trig = '@u', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\upsilon', { condition = is_math_mode }), + s({ trig = '@U', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Upsilon', { condition = is_math_mode }), + s({ trig = '@o', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\omega', { condition = is_math_mode }), + s({ trig = '@O', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\Omega', { condition = is_math_mode }), + s({ trig = 'ome', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\omega', { condition = is_math_mode }), + s({ trig = 'Ome', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\varOmega', { condition = is_math_mode }), + + -- Text environment + s({ trig = 'text', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, { t '\\text{', i(0, ''), t '}' }), + s({ trig = '"', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, { t '\\text{', i(0, ''), t '}' }), + + -- Basic operations + s({ trig = 'sr', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, t '^{2}'), + s({ trig = 'cb', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, t '^{3}'), + s({ trig = 'rd', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, { t '^{', i(0, ''), t '}' }), + s({ trig = '_', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, { t '_{', i(0, ''), t '}' }), + s({ trig = 'sts', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, { t '_\\text{', i(0, ''), t '}' }), + s('//', { t '\\frac{', i(0, ''), t '}{', i(1, ''), t '}' }), + s('ee', { t 'e^{', i(0, ''), t '}' }), + s({ trig = 'invs', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, t '^{-1}'), + s('([^\\])(exp|log|ln)', t '[[0]]\\[[1]]'), + s('conj', t '^{*}'), + s({ trig = 'RR', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\mathrm{RR}'), + s({ trig = 'bf', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, { t '\\mathbf{', i(0, ''), t '}' }), + s({ trig = 'rm', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, { t '\\mathrm{', i(0, ''), t '}' }), + + -- Linear algebra + s('([^\\])(det)', t '[[0]]\\[[1]]'), + s('trace', t '\\mathrm{Tr}'), + + -- More operations + s({ trig = '([a-zA-Z])hat', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, { t '\\hat{', i(0, ''), t '}' }, { condition = is_math_mode }), + s({ trig = '([a-zA-Z])bar', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, { t '\\bar{', i(0, ''), t '}' }, { condition = is_math_mode }), + s( + { trig = '([a-zA-Z])tilde', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, + { t '\\tilde{', i(0, ''), t '}' }, + { condition = is_math_mode } + ), + s({ trig = '([a-zA-Z])und', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\underline{<>}', { i(1) }), { condition = is_math_mode }), + s({ trig = '([a-zA-Z])vec', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\vec{<>}', { i(1) }), { condition = is_math_mode }), + s({ trig = '([a-zA-Z]),\\.', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, fmta('\\mathbf{<>}', { i(1) }), { condition = is_math_mode }), + s({ trig = '([a-zA-Z])\\.,', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, fmta('\\mathbf{<>}', { i(1) }), { condition = is_math_mode }), + s( + { trig = '\\\\(${GREEK}),\\.', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, + fmta('\\boldsymbol{\\<>}', { i(1) }), + { condition = is_math_mode } + ), + s( + { trig = '\\\\(${GREEK})\\.,', regTrig = true, wordTrig = false, snippetType = 'autosnippet' }, + fmta('\\boldsymbol{\\<>}', { i(1) }), + { condition = is_math_mode } + ), + + -- Subscripts + s({ trig = 'xnn', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t 'x_{n}', { condition = is_math_mode }), + s({ trig = 'xjj', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t 'x_{j}', { condition = is_math_mode }), + s({ trig = 'xp1', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t 'x_{n+1}', { condition = is_math_mode }), + s({ trig = 'ynn', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t 'y_{n}', { condition = is_math_mode }), + s({ trig = 'yii', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t 'y_{i}', { condition = is_math_mode }), + s({ trig = 'yjj', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t 'y_{j}', { condition = is_math_mode }), + + -- Symbols + s({ trig = 'ooo', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\infty', { condition = is_math_mode }), + s({ trig = 'sum', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\sum', { condition = is_math_mode }), + s({ trig = 'prod', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\prod', { condition = is_math_mode }), + s( + { trig = '\\sum', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta('\\sum_{<>}^<> <>', { i(1, 'i=1'), i(2, 'N'), i(0) }), + { condition = is_math_mode } + ), + s( + { trig = '\\prod', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, + fmta('\\prod_{<>}^<> <>', { i(1, 'i=1'), i(2, 'N'), i(0) }), + { condition = is_math_mode } + ), + s( + { trig = 'lim', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, + fmta('\\lim_{<> \\to <>} <>', { i(1, 'n'), i(2, '\\infty'), i(0) }), + { condition = is_math_mode } + ), + s({ trig = 'nabl', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\nabla', { condition = is_math_mode }), + s({ trig = 'del', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\nabla', { condition = is_math_mode }), + s({ trig = 'xx', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\times', { condition = is_math_mode }), + s({ trig = 'para', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\parallel', { condition = is_math_mode }), + + -- Comparisons and equivalence + s({ trig = '===', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\equiv', { condition = is_math_mode }), + s({ trig = '!=', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\neq', { condition = is_math_mode }), + s({ trig = '>=', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\geq', { condition = is_math_mode }), + s({ trig = '<=', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\leq', { condition = is_math_mode }), + s({ trig = '>>', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\gg', { condition = is_math_mode }), + s({ trig = '<<', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\ll', { condition = is_math_mode }), + s({ trig = 'simm', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\sim', { condition = is_math_mode }), + s({ trig = 'sim=', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\simeq', { condition = is_math_mode }), + s({ trig = 'prop', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\propto', { condition = is_math_mode }), + + -- Arrows + s({ trig = '<->', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\leftrightarrow ', { condition = is_math_mode }), + s({ trig = '->', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\to', { condition = is_math_mode }), + s({ trig = '=>', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\implies', { condition = is_math_mode }), + s({ trig = '=<', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, t '\\impliedby', { condition = is_math_mode }), + + -- Sets and relations + s({ trig = 'orr', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\cup', { condition = is_math_mode }), + s({ trig = 'inn', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\in', { condition = is_math_mode }), + s({ trig = 'notin', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\not\\in', { condition = is_math_mode }), + s({ trig = 'sub=', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\subseteq', { condition = is_math_mode }), + s({ trig = 'sup=', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\supseteq', { condition = is_math_mode }), + s({ trig = 'eset', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\emptyset', { condition = is_math_mode }), + s({ trig = 'cap', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\cap', { condition = is_math_mode }), + s({ trig = 'cup', regTrig = true, wordTrig = true, snippetType = 'autosnippet' }, t '\\cup', { condition = is_math_mode }), + + -- System of equations + s( + { trig = 'eqns', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{cases} + <> + \end{cases} + ]], + { i(1) } + ), + { condition = is_math_mode } + ), + + -- Matrix + s( + { trig = 'mat', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{matrix} + <> + \end{matrix} + ]], + { i(1) } + ), + { condition = is_math_mode } + ), + s( + { trig = 'bmat', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{bmatrix} + <> + \end{bmatrix} + ]], + { i(1) } + ), + { condition = is_math_mode } + ), + s( + { trig = 'pmat', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{pmatrix} + <> + \end{pmatrix} + ]], + { i(1) } + ), + { condition = is_math_mode } + ), + s( + { trig = 'vmat', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{vmatrix} + <> + \end{vmatrix} + ]], + { i(1) } + ), + { condition = is_math_mode } + ), + s( + { trig = 'Vmat', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, + fmta( + [[ + \begin{Vmatrix} + <> + \end{Vmatrix} + ]], + { i(1) } + ), + { condition = is_math_mode } + ), + + -- Definitions and Theorems + s({ trig = 'defn', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\begin{definition}\n <>\n\\end{definition}', { i(1) })), + s({ trig = 'thm', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\begin{theorem}\n <>\n\\end{theorem}', { i(1) })), + s({ trig = 'prop', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\begin{proposition}\n <>\n\\end{proposition}', { i(1) })), + s({ trig = 'lem', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\begin{lemma}\n <>\n\\end{lemma}', { i(1) })), + s({ trig = 'cor', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\begin{corollary}\n <>\n\\end{corollary}', { i(1) })), + s({ trig = 'proof', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\begin{proof}\n <>\n\\end{proof}', { i(1) })), + + -- Text formatting + s({ trig = 'textit', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\textit{<>}', { i(1) })), + s({ trig = 'textbf', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\textbf{<>}', { i(1) })), + s({ trig = 'textsf', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\textsf{<>}', { i(1) })), + s({ trig = 'texttt', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\texttt{<>}', { i(1) })), + s({ trig = 'textsc', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('\\textsc{<>}', { i(1) })), + + -- Theorem labels + s({ trig = 'th', regTrig = false, wordTrig = true }, fmta('\\textbf{Theorem:} <>', { i(1) })), + s({ trig = 'df', regTrig = false, wordTrig = true }, fmta('\\textbf{Definition:} <>', { i(1) })), + s({ trig = 'pr', regTrig = false, wordTrig = true }, fmta('\\textbf{Proposition:} <>', { i(1) })), + s({ trig = 'lm', regTrig = false, wordTrig = true }, fmta('\\textbf{Lemma:} <>', { i(1) })), + s({ trig = 'cr', regTrig = false, wordTrig = true }, fmta('\\textbf{Corollary:} <>', { i(1) })), + s({ trig = 'prf', regTrig = false, wordTrig = true }, fmta('\\textbf{Proof:} <>', { i(1) })), + s({ trig = 'rem', regTrig = false, wordTrig = true }, fmta('\\textbf{Remark:} <>', { i(1) })), + s({ trig = 'ex', regTrig = false, wordTrig = true }, fmta('\\textbf{Example:} <>', { i(1) })), +} diff --git a/snippets/math-util.lua b/snippets/math-util.lua new file mode 100644 index 00000000000..d2eedf7033c --- /dev/null +++ b/snippets/math-util.lua @@ -0,0 +1,63 @@ +-- standardna praksa baje +local M = {} + +-- NOTE: HELP FUNCTIONS FOR MATH MODE +-- https://github.com/frankroeder/dotfiles/blob/657a5dc559e9ff526facc2e74f9cc07a1875cac6/nvim/lua/tsutils.lua#L59 +local has_treesitter, ts = pcall(require, 'vim.treesitter') +local _, query = pcall(require, 'vim.treesitter.query') + +local MATH_ENVIRONMENTS = { + displaymath = true, + equation = true, + eqnarray = true, + align = true, + math = true, + array = true, +} + +local MATH_NODES = { + displayed_equation = true, + inline_formula = true, +} + +local function get_node_at_cursor() + local cursor = vim.api.nvim_win_get_cursor(0) + local cursor_range = { cursor[1] - 1, cursor[2] } + local buf = vim.api.nvim_get_current_buf() + local ok, parser = pcall(ts.get_parser, buf, 'latex') + if not ok or not parser then + return + end + local root_tree = parser:parse()[1] + local root = root_tree and root_tree:root() + + if not root then + return + end + + return root:named_descendant_for_range(cursor_range[1], cursor_range[2], cursor_range[1], cursor_range[2]) +end + +-- NOTE: https://github.com/nvim-treesitter/nvim-treesitter/issues/1184#issuecomment-830388856 +function M.is_math_mode() + if has_treesitter then + local buf = vim.api.nvim_get_current_buf() + local node = get_node_at_cursor() + while node do + if MATH_NODES[node:type()] then + return true + elseif node:type() == 'math_environment' or node:type() == 'generic_environment' then + local begin = node:child(0) + local names = begin and begin:field 'name' + if names and names[1] and MATH_ENVIRONMENTS[query.get_node_text(names[1], buf):match '[A-Za-z]+'] then + return true + end + end + node = node:parent() + end + return false + end +end + +-- return modul with is_math_mode function +return M From 91e845b4f7d29cc808b49a259864020c02a8e2a7 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Fri, 13 Sep 2024 03:57:29 +0200 Subject: [PATCH 16/34] spremenil da so colorschemes v eni datoteki --- init.lua | 4 +- lazy-lock.json | 41 +++-- lua/custom/plugins/color-bamboo.lua | 15 -- lua/custom/plugins/color-darkearth.lua | 12 -- lua/custom/plugins/color-flow.lua | 16 -- lua/custom/plugins/color-gruvbox.lua | 20 --- lua/custom/plugins/color-ivory.lua | 14 -- lua/custom/plugins/color-kanagawa.lua | 13 -- lua/custom/plugins/color-lackluster.lua | 16 -- lua/custom/plugins/color-nord.lua | 6 - lua/custom/plugins/color-obscure.lua | 13 -- lua/custom/plugins/color-okcolors.lua | 8 - lua/custom/plugins/color-oxocarbon.lua | 7 - lua/custom/plugins/color-shadotheme.lua | 6 - lua/custom/plugins/color-zenbones.lua | 31 ---- lua/custom/plugins/colors.lua | 139 +++++++++++++++++ lua/custom/plugins/lsp_completions.lua | 199 ++++++++++++++++++++++++ lua/custom/plugins/nvim-r.lua | 12 ++ lua/custom/plugins/project-manager.lua | 56 ------- lua/custom/plugins/test.R | 0 lua/custom/plugins/toggle-terminal.lua | 10 +- lua/keymaps.lua | 2 + lua/kickstart/plugins/lspconfig.lua | 1 + lua/kickstart/plugins/neo-tree.lua | 2 +- lua/lazy-plugins.lua | 4 +- lua/options.lua | 4 +- 26 files changed, 381 insertions(+), 270 deletions(-) delete mode 100644 lua/custom/plugins/color-bamboo.lua delete mode 100644 lua/custom/plugins/color-darkearth.lua delete mode 100644 lua/custom/plugins/color-flow.lua delete mode 100644 lua/custom/plugins/color-gruvbox.lua delete mode 100644 lua/custom/plugins/color-ivory.lua delete mode 100644 lua/custom/plugins/color-kanagawa.lua delete mode 100644 lua/custom/plugins/color-lackluster.lua delete mode 100644 lua/custom/plugins/color-nord.lua delete mode 100644 lua/custom/plugins/color-obscure.lua delete mode 100644 lua/custom/plugins/color-okcolors.lua delete mode 100644 lua/custom/plugins/color-oxocarbon.lua delete mode 100644 lua/custom/plugins/color-shadotheme.lua delete mode 100644 lua/custom/plugins/color-zenbones.lua create mode 100644 lua/custom/plugins/colors.lua create mode 100644 lua/custom/plugins/lsp_completions.lua create mode 100644 lua/custom/plugins/nvim-r.lua delete mode 100644 lua/custom/plugins/project-manager.lua create mode 100644 lua/custom/plugins/test.R diff --git a/init.lua b/init.lua index 78901329f25..86d62bb90c1 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -vim.o.background = 'light' +-- vim.o.background = 'light' vim.g.have_nerd_font = true @@ -9,3 +9,5 @@ require 'options' require 'keymaps' require 'lazy-bootstrap' require 'lazy-plugins' + +vim.opt.cursorline = true diff --git a/lazy-lock.json b/lazy-lock.json index 73db00af33e..254d9c50830 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,61 +1,56 @@ { "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "Nvim-R": { "branch": "master", "commit": "b7cdc9bcd6879465023e20b4a3ae16968edda776" }, "bamboo.nvim": { "branch": "master", "commit": "02230fc2461e916d9e2a44b5f3487376d9ca3042" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, - "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, - "darkearth-nvim": { "branch": "main", "commit": "d53cc2384d0a84889bd44361cee33019bac02c58" }, - "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "flow.nvim": { "branch": "main", "commit": "3af4d4d1b8a99c34e060de6fdaa5babc596a50c1" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, + "conform.nvim": { "branch": "master", "commit": "936f2413e6c57185cd873623a29a0685bce4b423" }, + "darkearth-nvim": { "branch": "main", "commit": "14369f828f4b09ee89b18bfa3f58b02720e8e20a" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "gruvbox-material": { "branch": "master", "commit": "559b4a9abb6781699404dfd98fb7d6ec83113337" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lackluster.nvim": { "branch": "main", "commit": "16a9f7022533f66b7a209fe4bd60c79a706e15a1" }, + "lackluster.nvim": { "branch": "main", "commit": "31cac1f30891281bbb3c45bcc12ab79466cec948" }, "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, - "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, "markview.nvim": { "branch": "main", "commit": "4695a699ebd87889c815de07e1408331e5c1df61" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "eb0f557a5797cfe9c720ed84a71582c22bccb4f8" }, + "mini.nvim": { "branch": "main", "commit": "f0d6e89515c6b055c20d257da717bd30211532f1" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, + "nvim-dap": { "branch": "master", "commit": "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516" }, "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" }, - "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" }, + "nvim-lspconfig": { "branch": "master", "commit": "d88ae6623fef09251e3aa20001bb761686eae730" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "5b8b126de02ebfd92e46ed5986b3e58e870b85de" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, + "nvim-treesitter": { "branch": "master", "commit": "d22166e3d8d375b761c32b303176f3e955560b0c" }, + "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, - "oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" }, + "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" }, - "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" }, - "shadotheme": { "branch": "master", "commit": "ecf7eb5ecdc21a18f3ee7953e184482bcf91d47e" }, + "render-markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-sleuth": { "branch": "master", "commit": "cd9d382e33bb817abe7f10cdc3a606bf1d491d75" }, "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, "zenbones.nvim": { "branch": "main", "commit": "006f15ad3437d85884ad50347bcbc60c9a377640" } diff --git a/lua/custom/plugins/color-bamboo.lua b/lua/custom/plugins/color-bamboo.lua deleted file mode 100644 index b380fe739a2..00000000000 --- a/lua/custom/plugins/color-bamboo.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - { - 'ribru17/bamboo.nvim', - lazy = false, - priority = 1000, - config = function() - require('bamboo').setup { - style = 'vulgaris', -- Choose between 'vulgaris' (regular), 'multiplex' (greener), and 'light' - transparent = false, -- Show/hide background - } - - -- vim.cmd 'colorscheme bamboo' - end, - }, -} diff --git a/lua/custom/plugins/color-darkearth.lua b/lua/custom/plugins/color-darkearth.lua deleted file mode 100644 index 9626e5cf241..00000000000 --- a/lua/custom/plugins/color-darkearth.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - 'ptdewey/darkearth-nvim', - config = function() - -- vim.cmd.colorscheme 'darkearth' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, - }, -} diff --git a/lua/custom/plugins/color-flow.lua b/lua/custom/plugins/color-flow.lua deleted file mode 100644 index 16fe694b80f..00000000000 --- a/lua/custom/plugins/color-flow.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - '0xstepit/flow.nvim', - lazy = false, - priority = 1000, - - config = function() - require('flow').setup { - transparent = false, -- Set transparent background. - fluo_color = 'pink', -- Fluo color: pink, yellow, orange, or green. - mode = 'normal', -- Intensity of the palette: normal, bright, desaturate, or dark. Notice that dark is ugly! - aggressive_spell = false, -- Display colors for spell check. - } - - -- vim.cmd 'colorscheme flow' - end, -} diff --git a/lua/custom/plugins/color-gruvbox.lua b/lua/custom/plugins/color-gruvbox.lua deleted file mode 100644 index 64704131cc7..00000000000 --- a/lua/custom/plugins/color-gruvbox.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - { - 'sainnhe/gruvbox-material', - lazy = false, - priority = 1000, - opts = { - contrast = 'soft', - }, - config = function() - -- Optionally configure and load the colorscheme - -- directly inside the plugin declaration. - vim.g.gruvbox_material_enable_italic = true - -- vim.cmd.colorscheme 'gruvbox-material' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, - }, -} diff --git a/lua/custom/plugins/color-ivory.lua b/lua/custom/plugins/color-ivory.lua deleted file mode 100644 index d1fac273f6e..00000000000 --- a/lua/custom/plugins/color-ivory.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - { - 'mstcl/ivory', - lazy = false, - priority = 1000, - config = function() - -- vim.cmd.colorscheme 'ivory' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, - }, -} diff --git a/lua/custom/plugins/color-kanagawa.lua b/lua/custom/plugins/color-kanagawa.lua deleted file mode 100644 index 9d3facf00ce..00000000000 --- a/lua/custom/plugins/color-kanagawa.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - 'rebelot/kanagawa.nvim', - - config = function() - -- setup must be called before loading - -- vim.cmd 'colorscheme kanagawa-dragon' - -- vim.cmd 'colorscheme kanagawa-lotus' - -- vim.cmd 'colorscheme kanagawa-wave' - -- - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, -} diff --git a/lua/custom/plugins/color-lackluster.lua b/lua/custom/plugins/color-lackluster.lua deleted file mode 100644 index f03685ce784..00000000000 --- a/lua/custom/plugins/color-lackluster.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - 'slugbyte/lackluster.nvim', - lazy = false, - config = function() - -- vim.cmd.colorscheme 'lackluster' - -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite - -- vim.cmd.colorscheme 'lackluster-mint' - -- vim.cmd.colorscheme 'lackluster-night' - -- vim.cmd.colorscheme 'lackluster-dark' - - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, -} diff --git a/lua/custom/plugins/color-nord.lua b/lua/custom/plugins/color-nord.lua deleted file mode 100644 index 942d38b1557..00000000000 --- a/lua/custom/plugins/color-nord.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - 'shaunsingh/nord.nvim', - config = function() - -- vim.cmd 'colorscheme nord' - end, -} diff --git a/lua/custom/plugins/color-obscure.lua b/lua/custom/plugins/color-obscure.lua deleted file mode 100644 index aaec2c2eae3..00000000000 --- a/lua/custom/plugins/color-obscure.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - 'olivercederborg/poimandres.nvim', - lazy = false, - priority = 1000, - config = function() - require('poimandres').setup { - disable_background = false, - -- vim.cmd 'colorscheme poimandres', - } - end, - }, -} diff --git a/lua/custom/plugins/color-okcolors.lua b/lua/custom/plugins/color-okcolors.lua deleted file mode 100644 index d1152deae31..00000000000 --- a/lua/custom/plugins/color-okcolors.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - 'e-q/okcolors.nvim', - config = function() - -- vim.cmd 'colorscheme okcolors' - -- vim.cmd 'colorscheme okcolors-smooth' - -- vim.cmd("colorscheme okcolors-sharp") - end, -} diff --git a/lua/custom/plugins/color-oxocarbon.lua b/lua/custom/plugins/color-oxocarbon.lua deleted file mode 100644 index f1606db2bc3..00000000000 --- a/lua/custom/plugins/color-oxocarbon.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - 'nyoom-engineering/oxocarbon.nvim', - config = function() - vim.opt.background = 'dark' -- set this to dark or light - -- vim.cmd 'colorscheme oxocarbon' - end, -} diff --git a/lua/custom/plugins/color-shadotheme.lua b/lua/custom/plugins/color-shadotheme.lua deleted file mode 100644 index 5b720a9f242..00000000000 --- a/lua/custom/plugins/color-shadotheme.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - 'Shadorain/shadotheme', - config = function() - -- vim.cmd 'colorscheme shado' - end, -} diff --git a/lua/custom/plugins/color-zenbones.lua b/lua/custom/plugins/color-zenbones.lua deleted file mode 100644 index 89486b616e3..00000000000 --- a/lua/custom/plugins/color-zenbones.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - { - 'zenbones-theme/zenbones.nvim', - -- Optionally install Lush. Allows for more configuration or extending the colorscheme - -- If you don't want to install lush, make sure to set g:zenbones_compat = 1 - -- In Vim, compat mode is turned on as Lush only works in Neovim. - dependencies = 'rktjmp/lush.nvim', - lazy = false, - opts = {}, - config = function() - -- vim.cmd 'colorscheme zenbones' - -- vim.cmd 'colorscheme zenwritten' - -- vim.cmd 'colorscheme neobones' - -- vim.cmd 'colorscheme vimbones' - -- vim.cmd 'colorscheme rosebones' - -- vim.cmd 'colorscheme forestbones' - -- vim.cmd 'colorscheme nordbones' - -- vim.cmd 'colorscheme tokyobones' - -- vim.cmd 'colorscheme seoulbones' - -- vim.cmd 'colorscheme duckbones' - -- vim.cmd 'colorscheme zenburned' - -- vim.cmd 'colorscheme kanagawabones' - -- vim.cmd 'colorscheme randombones' - - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, - }, -} diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua new file mode 100644 index 00000000000..37a9d743d5b --- /dev/null +++ b/lua/custom/plugins/colors.lua @@ -0,0 +1,139 @@ +return { + { + { 'rose-pine/neovim', name = 'rose-pine' }, + }, + + { + 'navarasu/onedark.nvim', + config = function() + require('onedark').setup { + style = 'darker', -- dark, darker, cool, deep, warm, warmer + } + + -- vim.cmd.colorscheme 'onedark' + end, + }, + + { + 'mstcl/ivory', + lazy = false, + config = function() + -- vim.cmd.colorscheme 'ivory' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, + + { + 'ribru17/bamboo.nvim', + lazy = false, + config = function() + require('bamboo').setup { + style = 'vulgaris', -- Choose between 'vulgaris' (regular), 'multiplex' (greener), and 'light' + transparent = false, -- Show/hide background + } + + -- vim.cmd 'colorscheme bamboo' + end, + }, + + { + 'ptdewey/darkearth-nvim', + config = function() + -- vim.cmd.colorscheme 'darkearth' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, + + { + 'sainnhe/gruvbox-material', + lazy = false, + opts = { + contrast = 'soft', + }, + config = function() + -- Optionally configure and load the colorscheme + -- directly inside the plugin declaration. + vim.g.gruvbox_material_enable_italic = true + -- vim.cmd.colorscheme 'gruvbox-material' + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, + + { + 'rebelot/kanagawa.nvim', + config = function() + -- setup must be called before loading + -- vim.cmd 'colorscheme kanagawa-dragon' + -- vim.cmd 'colorscheme kanagawa-lotus' + -- vim.cmd 'colorscheme kanagawa-wave' + -- + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, + + { + 'slugbyte/lackluster.nvim', + lazy = false, + config = function() + -- vim.cmd.colorscheme 'lackluster' + -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite + -- vim.cmd.colorscheme 'lackluster-mint' + -- vim.cmd.colorscheme 'lackluster-night' + -- vim.cmd.colorscheme 'lackluster-dark' + + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, + + { + 'e-q/okcolors.nvim', + config = function() + -- vim.cmd 'colorscheme okcolors' + -- vim.cmd 'colorscheme okcolors-smooth' + -- vim.cmd("colorscheme okcolors-sharp") + end, + }, + + { + 'zenbones-theme/zenbones.nvim', + -- Optionally install Lush. Allows for more configuration or extending the colorscheme + -- If you don't want to install lush, make sure to set g:zenbones_compat = 1 + -- In Vim, compat mode is turned on as Lush only works in Neovim. + dependencies = 'rktjmp/lush.nvim', + lazy = false, + opts = {}, + config = function() + -- vim.cmd 'colorscheme zenbones' + -- vim.cmd 'colorscheme zenwritten' + -- vim.cmd 'colorscheme neobones' + -- vim.cmd 'colorscheme vimbones' + -- vim.cmd 'colorscheme rosebones' + -- vim.cmd 'colorscheme forestbones' + -- vim.cmd 'colorscheme nordbones' + -- vim.cmd 'colorscheme tokyobones' + -- vim.cmd 'colorscheme seoulbones' + -- vim.cmd 'colorscheme duckbones' + -- vim.cmd 'colorscheme zenburned' + -- vim.cmd 'colorscheme kanagawabones' + -- vim.cmd 'colorscheme randombones' + + -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) + end, + }, +} diff --git a/lua/custom/plugins/lsp_completions.lua b/lua/custom/plugins/lsp_completions.lua new file mode 100644 index 00000000000..44c5234a102 --- /dev/null +++ b/lua/custom/plugins/lsp_completions.lua @@ -0,0 +1,199 @@ +return { + -- SNIPPETS + { + 'L3MON4D3/LuaSnip', + -- dependencies = { + -- 'rafamadriz/friendly-snippets', + -- -- Tu importamo snippets + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } + -- end, + -- }, + config = function() + require('luasnip').config.setup { + store_selection_keys = '', + } + end, + }, + + { 'saadparwaiz1/cmp_luasnip' }, + { 'hrsh7th/cmp-nvim-lsp' }, + { 'hrsh7th/cmp-nvim-lua' }, + { 'hrsh7th/cmp-buffer' }, + { 'hrsh7th/cmp-path' }, + { 'hrsh7th/cmp-cmdline' }, + { + 'hrsh7th/nvim-cmp', + config = function() + local cmp = require 'cmp' + local luasnip = require 'luasnip' + + luasnip.config.setup { enable_autosnippets = true } + + cmp.setup { + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + require('luasnip').lsp_expand(args.body) -- For `luasnip` users. + end, + }, + ---[==[ + mapping = cmp.mapping.preset.insert { + -- suggestions + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.confirm { select = false }, + + -- snippet insert nodes + [''] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }), + }, + --]==] + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'luasnip' }, -- For luasnip users. + { name = 'nvim_lua' }, + { name = 'path' }, + }, { + { name = 'buffer' }, + }), + } + + -- Set configuration for specific filetype. + cmp.setup.filetype('gitcommit', { + sources = cmp.config.sources({ + { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it. + }, { + { name = 'buffer' }, + }), + }) + -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore). + cmp.setup.cmdline('/', { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = 'buffer' }, + }, + }) + -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). + cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' }, + }, { + { name = 'cmdline' }, + }), + }) + end, + }, + + -- Built-in LSP + { + 'williamboman/mason-lspconfig.nvim', + dependencies = { + 'williamboman/mason.nvim', + 'neovim/nvim-lspconfig', + }, + config = function() + require('mason').setup() + require('mason-lspconfig').setup_handlers { + -- These are the setups for specific LSP servers + -- Default setup function + function(server_name) + local capabilities = require('cmp_nvim_lsp').default_capabilities() + require('lspconfig')[server_name].setup { capabilities = capabilities } + end, + + -- Every entry is a custom lsp config + ['marksman'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.clangd.setup { + capabilities = capabilities, + } + end, + + ['clangd'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.clangd.setup { + capabilities = capabilities, + } + end, + + ['lua_ls'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.lua_ls.setup { + capabilities = capabilities, + on_init = function(client) + local path = client.workspace_folders[1].name + if not vim.loop.fs_stat(path .. '/.luarc.json') and not vim.loop.fs_stat(path .. '/.luarc.jsonc') then + client.config.settings = vim.tbl_deep_extend('force', client.config.settings, { + Lua = { + runtime = { + version = 'LuaJIT', + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + }, + }, + }, + }) + client.notify('workspace/didChangeConfiguration', { settings = client.config.settings }) + end + return true + end, + } + end, + + ['texlab'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + lspconfig.texlab.setup { + capabilities = capabilities, + filetypes = { 'tex', 'bib', 'rnoweb' }, + } + end, + + ['r_language_server'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.r_language_server.setup { + capabilities = capabilities, + settings = { + r = { + lsp = { + rich_documentation = true, + diagnostics = true, + }, + }, + }, + on_attach = function(client, bufnr) + vim.diagnostic.config { + virtual_text = false, -- Disable virtual text (the inline hints) + signs = true, -- Show signs in the gutter + underline = false, -- Underline problematic code + } + end, + } + end, + } + end, + }, +} diff --git a/lua/custom/plugins/nvim-r.lua b/lua/custom/plugins/nvim-r.lua new file mode 100644 index 00000000000..31dd24ce2f2 --- /dev/null +++ b/lua/custom/plugins/nvim-r.lua @@ -0,0 +1,12 @@ +return { + { + 'jalvesaq/Nvim-R', + ft = { 'r', 'rmd' }, -- Load the plugin for R and R Markdown files + config = function() + vim.g.R_auto_start = 1 + vim.g.R_hl_term = 0 + vim.g.R_quiet = 1 + vim.g.R_assign = false + end, + }, +} diff --git a/lua/custom/plugins/project-manager.lua b/lua/custom/plugins/project-manager.lua deleted file mode 100644 index 8e6eda8e83d..00000000000 --- a/lua/custom/plugins/project-manager.lua +++ /dev/null @@ -1,56 +0,0 @@ -return { - { - 'ahmedkhalf/project.nvim', - config = function() - require('project_nvim').setup { - { - -- Manual mode doesn't automatically change your root directory, so you have - -- the option to manually do so using `:ProjectRoot` command. - manual_mode = false, - - -- Methods of detecting the root directory. **"lsp"** uses the native neovim - -- lsp, while **"pattern"** uses vim-rooter like glob pattern matching. Here - -- order matters: if one is not detected, the other is used as fallback. You - -- can also delete or rearangne the detection methods. - detection_methods = { 'lsp', 'pattern' }, - - -- All the patterns used to detect root dir, when **"pattern"** is in - -- detection_methods - patterns = { '.git', 'README.md', '_darcs', '.hg', '.bzr', '.svn', 'Makefile', 'package.json' }, - - -- Table of lsp clients to ignore by name - -- eg: { "efm", ... } - ignore_lsp = {}, - - -- Don't calculate root dir on specific directories - -- Ex: { "~/.cargo/*", ... } - exclude_dirs = {}, - - -- Show hidden files in telescope - show_hidden = false, - - -- When set to false, you will get a message when project.nvim changes your - -- directory. - silent_chdir = false, - - -- What scope to change the directory, valid options are - -- * global (default) - -- * tab - -- * win - scope_chdir = 'global', - - -- Path where project.nvim will store the project history for use in - -- telescope - datapath = vim.fn.stdpath 'data', - - -- Integration with telescope.nvim for switching projects - -- Automatically add projects to the Telescope project picker - telescope = { - enabled = true, - }, - }, - } - require('telescope').load_extension 'projects' - end, - }, -} diff --git a/lua/custom/plugins/test.R b/lua/custom/plugins/test.R new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index fe22bd914ff..21b8a1842ad 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -6,16 +6,10 @@ return { opts = { open_mapping = '', autochdir = true, - -- on_open = function(term) - -- -- Set the terminal's current working directory to the directory of the current buffer - -- local buf_path = vim.fn.expand '%:p:h' -- Get the directory of the current file - -- if buf_path ~= '' then - -- term:change_dir(buf_path) -- Change the terminal's directory to the current buffer's directory - -- end - -- end, shading_factor = 1, + size = 80, close_on_exit = false, - direction = 'tab', -- vertical, horizontal, tab, float + direction = 'vertical', -- vertical, horizontal, tab, float }, }, } diff --git a/lua/keymaps.lua b/lua/keymaps.lua index f30733926ea..e4148ed8b86 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,5 +1,7 @@ local map = vim.keymap.set +map('i', '', '') + map('n', 'pl', 'Explore') map('n', '', 'nohlsearch') diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index 863a48eaba9..b4879371b39 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -134,6 +134,7 @@ return { -- clangd = {}, -- gopls = {}, pyright = {}, + r_language_server = {}, -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 7e9c0cadc23..4db59d0ae3c 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -17,7 +17,7 @@ return { filesystem = { window = { width = 30, - position = 'float', + position = 'current', mappings = { ['\\'] = 'close_window', ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 897c4a0531e..b273937c4aa 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -3,9 +3,9 @@ require('lazy').setup({ require 'kickstart/plugins/gitsigns', require 'kickstart/plugins/which-key', require 'kickstart/plugins/telescope', - require 'kickstart/plugins/lspconfig', + -- require 'kickstart/plugins/lspconfig', require 'kickstart/plugins/conform', - require 'kickstart/plugins/cmp', + -- require 'kickstart/plugins/cmp', require 'kickstart/plugins/tokyonight', require 'kickstart/plugins/todo-comments', require 'kickstart/plugins/mini', diff --git a/lua/options.lua b/lua/options.lua index 4e01f573cba..53ac68a49bc 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,7 +4,7 @@ vim.opt.cursorline = true vim.o.wrap = true vim.opt.number = true -vim.o.numberwidth = 5 +vim.o.numberwidth = 3 vim.opt.relativenumber = true vim.opt.scrolloff = 999 vim.o.textwidth = 0 @@ -27,7 +27,7 @@ vim.opt.undofile = true vim.opt.ignorecase = true vim.opt.smartcase = true -vim.opt.signcolumn = 'no' +vim.opt.signcolumn = 'yes' vim.opt.updatetime = 50 From aa342b46cef4122d116cffce606ff332d225ea33 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sat, 14 Sep 2024 01:49:30 +0200 Subject: [PATCH 17/34] minor --- lua/custom/plugins/lsp_completions.lua | 16 ++++++++-------- lua/keymaps.lua | 4 +--- lua/options.lua | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lua/custom/plugins/lsp_completions.lua b/lua/custom/plugins/lsp_completions.lua index 44c5234a102..89a3b89e31d 100644 --- a/lua/custom/plugins/lsp_completions.lua +++ b/lua/custom/plugins/lsp_completions.lua @@ -2,14 +2,14 @@ return { -- SNIPPETS { 'L3MON4D3/LuaSnip', - -- dependencies = { - -- 'rafamadriz/friendly-snippets', - -- -- Tu importamo snippets - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } - -- end, - -- }, + dependencies = { + 'rafamadriz/friendly-snippets', + -- Tu importamo snippets + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } + end, + }, config = function() require('luasnip').config.setup { store_selection_keys = '', diff --git a/lua/keymaps.lua b/lua/keymaps.lua index e4148ed8b86..a567e1adee1 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,15 +1,13 @@ local map = vim.keymap.set map('i', '', '') - map('n', 'pl', 'Explore') map('n', '', 'nohlsearch') - map('n', 'mp', 'MarkdownPreviewToggle') - map('n', 'ibl', 'IBLToggle') map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) +map('n', 'gd', ':Telescope lsp_definitions') map('n', '', '', { desc = 'Move focus to the left window' }) map('n', '', '', { desc = 'Move focus to the right window' }) diff --git a/lua/options.lua b/lua/options.lua index 53ac68a49bc..67801b6b3ed 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,5 +1,5 @@ vim.o.conceallevel = 2 -vim.opt.cursorline = true +-- vim.opt.cursorline = true vim.o.wrap = true From 9b222603564c5ab2ef2dc2449eda031333d82579 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 15 Sep 2024 03:34:31 +0200 Subject: [PATCH 18/34] Auto commit --- init.lua | 5 ++- lazy-lock.json | 2 + lua/custom/plugins/colors.lua | 84 +++++++---------------------------- lua/options.lua | 2 +- 4 files changed, 22 insertions(+), 71 deletions(-) diff --git a/init.lua b/init.lua index 86d62bb90c1..0d10ef3de60 100644 --- a/init.lua +++ b/init.lua @@ -10,4 +10,7 @@ require 'keymaps' require 'lazy-bootstrap' require 'lazy-plugins' -vim.opt.cursorline = true +-- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) diff --git a/lazy-lock.json b/lazy-lock.json index 254d9c50830..6cde8117ad0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,12 +11,14 @@ "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, "conform.nvim": { "branch": "master", "commit": "936f2413e6c57185cd873623a29a0685bce4b423" }, "darkearth-nvim": { "branch": "main", "commit": "14369f828f4b09ee89b18bfa3f58b02720e8e20a" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "gruvbox-material": { "branch": "master", "commit": "559b4a9abb6781699404dfd98fb7d6ec83113337" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "31cac1f30891281bbb3c45bcc12ab79466cec948" }, + "lavish.nvim": { "branch": "main", "commit": "e6e20c26cba13ac587652f4b77a75672588daa50" }, "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 37a9d743d5b..f9a5acead95 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -1,4 +1,13 @@ return { + { + 'ferdinandrau/lavish.nvim', + priority = 1000, + config = function() + require('lavish').apply 'light' + require('lavish').apply 'dark' + end, + }, + { { 'rose-pine/neovim', name = 'rose-pine' }, }, @@ -9,21 +18,13 @@ return { require('onedark').setup { style = 'darker', -- dark, darker, cool, deep, warm, warmer } - - -- vim.cmd.colorscheme 'onedark' end, }, { 'mstcl/ivory', lazy = false, - config = function() - -- vim.cmd.colorscheme 'ivory' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, + config = function() end, }, { @@ -34,20 +35,12 @@ return { style = 'vulgaris', -- Choose between 'vulgaris' (regular), 'multiplex' (greener), and 'light' transparent = false, -- Show/hide background } - - -- vim.cmd 'colorscheme bamboo' end, }, { 'ptdewey/darkearth-nvim', - config = function() - -- vim.cmd.colorscheme 'darkearth' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, + config = function() end, }, { @@ -60,51 +53,23 @@ return { -- Optionally configure and load the colorscheme -- directly inside the plugin declaration. vim.g.gruvbox_material_enable_italic = true - -- vim.cmd.colorscheme 'gruvbox-material' - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) end, }, { 'rebelot/kanagawa.nvim', - config = function() - -- setup must be called before loading - -- vim.cmd 'colorscheme kanagawa-dragon' - -- vim.cmd 'colorscheme kanagawa-lotus' - -- vim.cmd 'colorscheme kanagawa-wave' - -- - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, + config = function() end, }, { 'slugbyte/lackluster.nvim', lazy = false, - config = function() - -- vim.cmd.colorscheme 'lackluster' - -- vim.cmd.colorscheme 'lackluster-hack' -- my favorite - -- vim.cmd.colorscheme 'lackluster-mint' - -- vim.cmd.colorscheme 'lackluster-night' - -- vim.cmd.colorscheme 'lackluster-dark' - - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, + config = function() end, }, { 'e-q/okcolors.nvim', - config = function() - -- vim.cmd 'colorscheme okcolors' - -- vim.cmd 'colorscheme okcolors-smooth' - -- vim.cmd("colorscheme okcolors-sharp") - end, + config = function() end, }, { @@ -115,25 +80,6 @@ return { dependencies = 'rktjmp/lush.nvim', lazy = false, opts = {}, - config = function() - -- vim.cmd 'colorscheme zenbones' - -- vim.cmd 'colorscheme zenwritten' - -- vim.cmd 'colorscheme neobones' - -- vim.cmd 'colorscheme vimbones' - -- vim.cmd 'colorscheme rosebones' - -- vim.cmd 'colorscheme forestbones' - -- vim.cmd 'colorscheme nordbones' - -- vim.cmd 'colorscheme tokyobones' - -- vim.cmd 'colorscheme seoulbones' - -- vim.cmd 'colorscheme duckbones' - -- vim.cmd 'colorscheme zenburned' - -- vim.cmd 'colorscheme kanagawabones' - -- vim.cmd 'colorscheme randombones' - - -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) - -- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) - end, + config = function() end, }, } diff --git a/lua/options.lua b/lua/options.lua index 67801b6b3ed..db4c76a8e15 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,7 +4,7 @@ vim.o.conceallevel = 2 vim.o.wrap = true vim.opt.number = true -vim.o.numberwidth = 3 +vim.o.numberwidth = 2 vim.opt.relativenumber = true vim.opt.scrolloff = 999 vim.o.textwidth = 0 From 8fadcc893cd52566b9be7eb5eed2bb95f1d0c2c9 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 15 Sep 2024 23:14:05 +0200 Subject: [PATCH 19/34] minor --- lua/custom/plugins/nvim-r.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/custom/plugins/nvim-r.lua b/lua/custom/plugins/nvim-r.lua index 31dd24ce2f2..b2b49907b87 100644 --- a/lua/custom/plugins/nvim-r.lua +++ b/lua/custom/plugins/nvim-r.lua @@ -4,7 +4,7 @@ return { ft = { 'r', 'rmd' }, -- Load the plugin for R and R Markdown files config = function() vim.g.R_auto_start = 1 - vim.g.R_hl_term = 0 + vim.g.R_hl_term = 1 vim.g.R_quiet = 1 vim.g.R_assign = false end, From 8792c2c62071c492e4a4bbc637c55b8c7692ca7b Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Wed, 18 Sep 2024 13:14:36 +0200 Subject: [PATCH 20/34] Auto commit --- lua/custom/plugins/colors.lua | 4 ++-- lua/custom/plugins/toggle-terminal.lua | 1 - lua/options.lua | 2 ++ snippets/c.lua | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index f9a5acead95..88b24450d77 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -3,8 +3,8 @@ return { 'ferdinandrau/lavish.nvim', priority = 1000, config = function() - require('lavish').apply 'light' - require('lavish').apply 'dark' + -- require('lavish').apply 'light' + -- require('lavish').apply 'dark' end, }, diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index 21b8a1842ad..dfc9bc25b6e 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -7,7 +7,6 @@ return { open_mapping = '', autochdir = true, shading_factor = 1, - size = 80, close_on_exit = false, direction = 'vertical', -- vertical, horizontal, tab, float }, diff --git a/lua/options.lua b/lua/options.lua index db4c76a8e15..8f50ff8e7f2 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,3 +1,5 @@ +-- vim.opts.rocks.hererocks = true + vim.o.conceallevel = 2 -- vim.opt.cursorline = true diff --git a/snippets/c.lua b/snippets/c.lua index f18f37cedf5..1dbf9844bb1 100644 --- a/snippets/c.lua +++ b/snippets/c.lua @@ -23,4 +23,9 @@ int main() { { i(1) } ) ), + + s( + { trig = 'line', dscr = 'ustvari file pointer za file, ki ga hočeš prebrat', regTrig = false, wordTrig = true }, + fmta('FILE *file = fopen(<>, <>)', { i(1), i(2) }) + ), } From c5616ef75a0b8eecbe0b1f88daf288e57ce87842 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 22 Sep 2024 12:46:52 +0200 Subject: [PATCH 21/34] Auto commit --- init.lua | 1 - lazy-lock.json | 1 + lua/custom/plugins/colors.lua | 13 +++++++++++++ lua/custom/plugins/lsp_completions.lua | 2 +- lua/keymaps.lua | 1 - lua/kickstart/plugins/debug.lua | 2 -- lua/options.lua | 4 +--- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 0d10ef3de60..f0bed20959b 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,6 @@ -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- vim.o.background = 'light' vim.g.have_nerd_font = true diff --git a/lazy-lock.json b/lazy-lock.json index 6cde8117ad0..bc7ba4d2ef0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,6 +11,7 @@ "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, "conform.nvim": { "branch": "master", "commit": "936f2413e6c57185cd873623a29a0685bce4b423" }, "darkearth-nvim": { "branch": "main", "commit": "14369f828f4b09ee89b18bfa3f58b02720e8e20a" }, + "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "gruvbox-material": { "branch": "master", "commit": "559b4a9abb6781699404dfd98fb7d6ec83113337" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 88b24450d77..8ff326f6959 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -1,4 +1,14 @@ return { + { + 'eldritch-theme/eldritch.nvim', + lazy = false, + priority = 1000, + opts = {}, + config = function() + -- vim.cmd 'colorscheme eldritch' + end, + }, + { 'ferdinandrau/lavish.nvim', priority = 1000, @@ -65,6 +75,9 @@ return { 'slugbyte/lackluster.nvim', lazy = false, config = function() end, + config = function() + vim.cmd 'colorscheme lackluster-dark' + end, }, { diff --git a/lua/custom/plugins/lsp_completions.lua b/lua/custom/plugins/lsp_completions.lua index 89a3b89e31d..9db3cbca867 100644 --- a/lua/custom/plugins/lsp_completions.lua +++ b/lua/custom/plugins/lsp_completions.lua @@ -186,7 +186,7 @@ return { }, on_attach = function(client, bufnr) vim.diagnostic.config { - virtual_text = false, -- Disable virtual text (the inline hints) + virtual_text = false, -- Virtual text (the inline hints) signs = true, -- Show signs in the gutter underline = false, -- Underline problematic code } diff --git a/lua/keymaps.lua b/lua/keymaps.lua index a567e1adee1..84300224481 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -7,7 +7,6 @@ map('n', 'mp', 'MarkdownPreviewToggle') map('n', 'ibl', 'IBLToggle') map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) -map('n', 'gd', ':Telescope lsp_definitions') map('n', '', '', { desc = 'Move focus to the left window' }) map('n', '', '', { desc = 'Move focus to the right window' }) diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index 196f2c6dbd6..06f624087a0 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -7,9 +7,7 @@ -- kickstart.nvim and not kitchen-sink.nvim ;) return { - -- NOTE: Yes, you can install new plugins here! 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well dependencies = { -- Creates a beautiful debugger UI 'rcarriga/nvim-dap-ui', diff --git a/lua/options.lua b/lua/options.lua index 8f50ff8e7f2..f53e4a1ef67 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,7 +1,7 @@ -- vim.opts.rocks.hererocks = true vim.o.conceallevel = 2 --- vim.opt.cursorline = true +vim.opt.cursorline = true vim.o.wrap = true @@ -42,5 +42,3 @@ vim.opt.list = false vim.opt.listchars = { trail = '·', nbsp = '␣' } vim.opt.inccommand = 'split' - -vim.opt.cursorline = false From a476c651b6486a86f85b80f990ae8de9bfe5e85e Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Mon, 23 Sep 2024 23:58:48 +0200 Subject: [PATCH 22/34] Auto commit --- lazy-lock.json | 1 + lua/custom/plugins/colors.lua | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index bc7ba4d2ef0..64b33ec387c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -55,6 +55,7 @@ "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-sleuth": { "branch": "master", "commit": "cd9d382e33bb817abe7f10cdc3a606bf1d491d75" }, "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, + "yorumi.nvim": { "branch": "main", "commit": "7bd484b82d1d7748d2ed73a12dbafad016c558fe" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, "zenbones.nvim": { "branch": "main", "commit": "006f15ad3437d85884ad50347bcbc60c9a377640" } } diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 8ff326f6959..77607978e66 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -1,4 +1,11 @@ return { + { + 'yorumicolors/yorumi.nvim', + config = function() + vim.cmd 'colorscheme yorumi' + end, + }, + { 'eldritch-theme/eldritch.nvim', lazy = false, @@ -63,6 +70,7 @@ return { -- Optionally configure and load the colorscheme -- directly inside the plugin declaration. vim.g.gruvbox_material_enable_italic = true + -- vim.cmd 'colorscheme gruvbox-material' end, }, @@ -76,7 +84,7 @@ return { lazy = false, config = function() end, config = function() - vim.cmd 'colorscheme lackluster-dark' + -- vim.cmd 'colorscheme lackluster-dark' end, }, From e316176893fe2dfab92714d90f7c093b08e68564 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 26 Sep 2024 00:47:09 +0200 Subject: [PATCH 23/34] Auto commit --- init.lua | 4 +- lazy-lock.json | 2 + lua/custom/plugins/alpha.lua | 12 +++ lua/custom/plugins/colors.lua | 8 +- lua/custom/plugins/lsp_completions.lua | 64 ++++++++++++++- lua/custom/plugins/test.R | 0 lua/custom/plugins/toggle-terminal.lua | 1 + lua/options.lua | 1 + snippets/README.md | 109 +++++++++++++++++++++++++ snippets/all.lua | 16 ++++ 10 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 lua/custom/plugins/alpha.lua delete mode 100644 lua/custom/plugins/test.R create mode 100644 snippets/README.md diff --git a/init.lua b/init.lua index f0bed20959b..68dde92f852 100644 --- a/init.lua +++ b/init.lua @@ -11,5 +11,5 @@ require 'lazy-plugins' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) --- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) --- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) diff --git a/lazy-lock.json b/lazy-lock.json index 64b33ec387c..c3806a8aeaf 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, "Nvim-R": { "branch": "master", "commit": "b7cdc9bcd6879465023e20b4a3ae16968edda776" }, + "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "bamboo.nvim": { "branch": "master", "commit": "02230fc2461e916d9e2a44b5f3487376d9ca3042" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -29,6 +30,7 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.icons": { "branch": "main", "commit": "2d89252993fec829b24720097a687412d10f6c85" }, "mini.nvim": { "branch": "main", "commit": "f0d6e89515c6b055c20d257da717bd30211532f1" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, diff --git a/lua/custom/plugins/alpha.lua b/lua/custom/plugins/alpha.lua new file mode 100644 index 00000000000..fa738f8b784 --- /dev/null +++ b/lua/custom/plugins/alpha.lua @@ -0,0 +1,12 @@ +return { + { + 'goolord/alpha-nvim', + dependencies = { + 'echasnovski/mini.icons', + 'nvim-lua/plenary.nvim', + }, + config = function() + require('alpha').setup(require('alpha.themes.theta').config) + end, + }, +} diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 77607978e66..3216ea31f5e 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -76,7 +76,9 @@ return { { 'rebelot/kanagawa.nvim', - config = function() end, + config = function() + -- vim.cmd 'colorscheme kanagawa' + end, }, { @@ -101,6 +103,8 @@ return { dependencies = 'rktjmp/lush.nvim', lazy = false, opts = {}, - config = function() end, + config = function() + -- vim.cmd 'colorscheme zenwritten' + end, }, } diff --git a/lua/custom/plugins/lsp_completions.lua b/lua/custom/plugins/lsp_completions.lua index 9db3cbca867..c84900d87fe 100644 --- a/lua/custom/plugins/lsp_completions.lua +++ b/lua/custom/plugins/lsp_completions.lua @@ -1,5 +1,5 @@ return { - -- SNIPPETS + -- NOTE: [[ SNIPPETS ]] { 'L3MON4D3/LuaSnip', dependencies = { @@ -95,7 +95,7 @@ return { end, }, - -- Built-in LSP + -- NOTE: [[ LSP ]] { 'williamboman/mason-lspconfig.nvim', dependencies = { @@ -103,6 +103,66 @@ return { 'neovim/nvim-lspconfig', }, config = function() + -- NOTE: from `kickstart/plugins/lspconfig.lua` + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Jump to the definition of the word under your cursor. + -- This is where a variable was first declared, or where a function is defined, etc. + -- To jump back, press . + map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + + -- Find references for the word under your cursor. + map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + + -- Jump to the implementation of the word under your cursor. + -- Useful when your language has ways of declaring types without an actual implementation. + map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + + -- Jump to the type of the word under your cursor. + -- Useful when you're not sure what type a variable is and you want to see + -- the definition of its *type*, not where it was *defined*. + map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + -- map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + + -- Execute a code action, usually your cursor needs to be on top of an error + -- or a suggestion from your LSP for this to activate. + map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + -- The following code creates a keymap to toggle inlay hints in your + -- code, if the language server you are using supports them + -- + -- This may be unwanted, since they displace some of your code + if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then + map('th', function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) + end, '[T]oggle Inlay [H]ints') + end + end, + }) + require('mason').setup() require('mason-lspconfig').setup_handlers { -- These are the setups for specific LSP servers diff --git a/lua/custom/plugins/test.R b/lua/custom/plugins/test.R deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index dfc9bc25b6e..2490398c673 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -5,6 +5,7 @@ return { version = '*', opts = { open_mapping = '', + size = 80, autochdir = true, shading_factor = 1, close_on_exit = false, diff --git a/lua/options.lua b/lua/options.lua index f53e4a1ef67..8d762b8ca04 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,6 +4,7 @@ vim.o.conceallevel = 2 vim.opt.cursorline = true vim.o.wrap = true +vim.o.linebreak = true vim.opt.number = true vim.o.numberwidth = 2 diff --git a/snippets/README.md b/snippets/README.md new file mode 100644 index 00000000000..6136e6076cb --- /dev/null +++ b/snippets/README.md @@ -0,0 +1,109 @@ +- [Intro](#intro) +- [Snippet template](#snippet-template) +- [Nodes](#nodes) + - [text node](#text-node) + - [insert node](#insert-node) + - [fmt()](#fmt) + +## Intro + +Configuration za `luasnip` imaš v `nvim/lua/kickstart/plugins/cmp.lua`, pomemben +je line, kjer je required directory za snippet (load_... nekaj). + + return { + { -- Autocompletion + ... + ... + ... + ... + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets/' } } + end, + ... + ... + ... + }, + } + +## Snippet template + + local ls = require('luasnip') + local s = ls.snippet + local t = ls.text_node + local i = ls.insert_node + + return { + s( + { -- Table 1: parameters + trig = 'hello', + dscr = "spremeni 'hello' v 'Hello world'", + }, + + { -- Table 2: nodes + t("Hello world") + }, + + { -- Table 3: advanced parameters } + ) + } + +## Nodes + +### text node + +Imaš one-liner. + + "hello" + +in multi-liner: + + [[ + to je multi line, + zato lahko pises z + line breaks :) + ]] + +### insert node + +Kam ti prleti cursor v snipetu. Za skakanje levo in desno se uporabljata `luasnip-jump-next` in `luasnip-jump-prev`. +[Več lah prebereš tuki](https://ejmastnak.com/tutorials/vim-latex/luasnip/#keymaps). + +### fmt() + + s({ + ... + }, fmt() + ) + +basically... + + fmt( + `tuki pride snippet replacement`, + { `tuki pridejo nodes` }, + { `tuki pridejo delimiters` } + ) + +Delimiter je znak, ki se uporabi za placanje cursorja. + +#### primer fmt() uporabe + +``` +s({ + trig = "halo", + dscr = "neki", + }, fmt( + [[ + moje ime: <> + moj priimek: <> + ]], + { + i(1, 'ime'), + i(2, 'priimek') + }, + { delimiters = '<>' } + ) +) +``` + +`fmta` je samo fmt, le da so delimiters nastimani na `<>` po default. diff --git a/snippets/all.lua b/snippets/all.lua index 48910c45433..46ac6fcc0f7 100644 --- a/snippets/all.lua +++ b/snippets/all.lua @@ -19,4 +19,20 @@ return { { i(1) } ) ), + + -- advent of code + s( + { trig = 'aoc', dscr = 'start template s tidyverse in util.R za advent of code' }, + fmta( + [[ + library(tidyverse) + source("C:/Users/joene/Documents/progAAAAAAA/adventOfCode2023/util.R", chdir = TRUE, echo = TRUE) + <> + ]], + { i(1) } + ) + ), + + -- pipe operator + s({ trig = 'pap', dscr = 'pipe operator v R-ju', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('%>>% <>', { i(1) })), } From b31f5a06576bf9adfa11ba21d8b0f22138ab79ef Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sat, 28 Sep 2024 02:26:53 +0200 Subject: [PATCH 24/34] Auto commit --- init.lua | 1 + lazy-lock.json | 55 ++++---- lua/custom/plugins/indent-line.lua | 1 + lua/custom/plugins/oil.lua | 199 +++++++++++++++++++++++++++++ lua/keymaps.lua | 3 +- lua/kickstart/plugins/neo-tree.lua | 2 +- snippets/all.lua | 3 + 7 files changed, 235 insertions(+), 29 deletions(-) create mode 100644 lua/custom/plugins/oil.lua diff --git a/init.lua b/init.lua index 68dde92f852..f55369ceb8a 100644 --- a/init.lua +++ b/init.lua @@ -3,6 +3,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.g.have_nerd_font = true +vim.g.background = 'dark' require 'options' require 'keymaps' diff --git a/lazy-lock.json b/lazy-lock.json index c3806a8aeaf..4bd45a34c35 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "Nvim-R": { "branch": "master", "commit": "b7cdc9bcd6879465023e20b4a3ae16968edda776" }, "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, - "bamboo.nvim": { "branch": "master", "commit": "02230fc2461e916d9e2a44b5f3487376d9ca3042" }, + "bamboo.nvim": { "branch": "master", "commit": "c245d90c490c681470389e28782b161491bec97c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -10,18 +10,18 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, - "conform.nvim": { "branch": "master", "commit": "936f2413e6c57185cd873623a29a0685bce4b423" }, + "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "darkearth-nvim": { "branch": "main", "commit": "14369f828f4b09ee89b18bfa3f58b02720e8e20a" }, "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, - "gruvbox-material": { "branch": "master", "commit": "559b4a9abb6781699404dfd98fb7d6ec83113337" }, + "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, + "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, + "gruvbox-material": { "branch": "master", "commit": "25425c4feea270951c33de67c595ab3bbe8b0e7e" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lackluster.nvim": { "branch": "main", "commit": "31cac1f30891281bbb3c45bcc12ab79466cec948" }, - "lavish.nvim": { "branch": "main", "commit": "e6e20c26cba13ac587652f4b77a75672588daa50" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "lackluster.nvim": { "branch": "main", "commit": "59d03c9e92cb03351af2904a26e16b6627d2d5db" }, + "lavish.nvim": { "branch": "main", "commit": "d0865b69dad51f9f54e31fc9d046badaa15a7b4e" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -30,34 +30,35 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.icons": { "branch": "main", "commit": "2d89252993fec829b24720097a687412d10f6c85" }, - "mini.nvim": { "branch": "main", "commit": "f0d6e89515c6b055c20d257da717bd30211532f1" }, - "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, + "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, + "mini.nvim": { "branch": "main", "commit": "73af55e44865f2ede67a772b0972a5d34dcedd0e" }, + "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516" }, + "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" }, "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, - "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" }, - "nvim-lspconfig": { "branch": "master", "commit": "d88ae6623fef09251e3aa20001bb761686eae730" }, + "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" }, + "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "d22166e3d8d375b761c32b303176f3e955560b0c" }, - "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, + "nvim-treesitter": { "branch": "master", "commit": "f027762845fa35ff27fe0487c86537a74a480a0c" }, + "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, + "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "render-markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "render-markdown.nvim": { "branch": "main", "commit": "91ce0b5a6314b091bcba1541f557f591c7ddfe06" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, + "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, - "vim-sleuth": { "branch": "master", "commit": "cd9d382e33bb817abe7f10cdc3a606bf1d491d75" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, - "yorumi.nvim": { "branch": "main", "commit": "7bd484b82d1d7748d2ed73a12dbafad016c558fe" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }, + "yorumi.nvim": { "branch": "main", "commit": "e27ac640972da13d593ba9cc152355de2fd2c7a1" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, - "zenbones.nvim": { "branch": "main", "commit": "006f15ad3437d85884ad50347bcbc60c9a377640" } + "zenbones.nvim": { "branch": "main", "commit": "12daea796d5079a65dd7032bb85540443e8b30e8" } } diff --git a/lua/custom/plugins/indent-line.lua b/lua/custom/plugins/indent-line.lua index e277f2b2fba..ef3ecd906d1 100644 --- a/lua/custom/plugins/indent-line.lua +++ b/lua/custom/plugins/indent-line.lua @@ -5,5 +5,6 @@ return { ---@module "ibl" ---@type ibl.config opts = {}, + enabled = false, }, } diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua new file mode 100644 index 00000000000..f2cd440272f --- /dev/null +++ b/lua/custom/plugins/oil.lua @@ -0,0 +1,199 @@ +return { + { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + dependencies = { 'nvim-tree/nvim-web-devicons' }, + + config = function() + require('oil').setup { + -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) + -- Set to false if you want some other plugin (e.g. netrw) to open when you edit directories. + default_file_explorer = true, + -- Id is automatically added at the beginning, and name at the end + -- See :help oil-columns + columns = { + 'icon', + -- "permissions", + -- "size", + -- "mtime", + }, + -- Buffer-local options to use for oil buffers + buf_options = { + buflisted = false, + bufhidden = 'hide', + }, + -- Window-local options to use for oil buffers + win_options = { + wrap = false, + signcolumn = 'no', + cursorcolumn = true, + foldcolumn = '0', + spell = false, + list = false, + conceallevel = 3, + concealcursor = 'nvic', + }, + -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash) + delete_to_trash = false, + -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits) + skip_confirm_for_simple_edits = false, + -- Selecting a new/moved/renamed file or directory will prompt you to save changes first + -- (:help prompt_save_on_select_new_entry) + prompt_save_on_select_new_entry = true, + -- Oil will automatically delete hidden buffers after this delay + -- You can set the delay to false to disable cleanup entirely + -- Note that the cleanup process only starts when none of the oil buffers are currently displayed + cleanup_delay_ms = false, + lsp_file_methods = { + -- Enable or disable LSP file operations + enabled = true, + -- Time to wait for LSP file operations to complete before skipping + timeout_ms = 1000, + -- Set to true to autosave buffers that are updated with LSP willRenameFiles + -- Set to "unmodified" to only save unmodified buffers + autosave_changes = false, + }, + -- Constrain the cursor to the editable parts of the oil buffer + -- Set to `false` to disable, or "name" to keep it on the file names + constrain_cursor = 'editable', + -- Set to true to watch the filesystem for changes and reload oil + watch_for_changes = false, + + -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap + -- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" }) + -- Additionally, if it is a string that matches "actions.", + -- it will use the mapping at require("oil.actions"). + -- Set to `false` to remove a keymap + -- See :help oil-actions for a list of all available actions + keymaps = { + ['g?'] = 'actions.show_help', + [''] = 'actions.select', + [''] = { 'actions.select', opts = { vertical = true }, desc = 'Open the entry in a vertical split' }, + [''] = { 'actions.select', opts = { horizontal = true }, desc = 'Open the entry in a horizontal split' }, + [''] = { 'actions.select', opts = { tab = true }, desc = 'Open the entry in new tab' }, + [''] = 'actions.preview', + [''] = 'actions.close', + [''] = 'actions.refresh', + ['-'] = 'actions.parent', + ['_'] = 'actions.open_cwd', + ['`'] = 'actions.cd', + ['~'] = { 'actions.cd', opts = { scope = 'tab' }, desc = ':tcd to the current oil directory' }, + ['gs'] = 'actions.change_sort', + ['gx'] = 'actions.open_external', + ['g.'] = 'actions.toggle_hidden', + ['g\\'] = 'actions.toggle_trash', + }, + -- Set to false to disable all of the above keymaps + use_default_keymaps = true, + view_options = { + -- Show files and directories that start with "." + show_hidden = true, + -- This function defines what is considered a "hidden" file + is_hidden_file = function(name, bufnr) + return vim.startswith(name, '.') + end, + -- This function defines what will never be shown, even when `show_hidden` is set + is_always_hidden = function(name, bufnr) + return false + end, + -- Sort file names in a more intuitive order for humans. Is less performant, + -- so you may want to set to false if you work with large directories. + natural_order = true, + -- Sort file and directory names case insensitive + case_insensitive = false, + sort = { + -- sort order can be "asc" or "desc" + -- see :help oil-columns to see which columns are sortable + { 'type', 'asc' }, + { 'name', 'asc' }, + }, + }, + -- Extra arguments to pass to SCP when moving/copying files over SSH + extra_scp_args = {}, + + -- BUG: EXPERIMENTAL support for performing file operations with git + git = { + -- Return true to automatically git add/mv/rm files + add = function(path) + return false + end, + mv = function(src_path, dest_path) + return false + end, + rm = function(path) + return false + end, + }, + + -- Configuration for the floating window in oil.open_float + float = { + -- Padding around the floating window + padding = 2, + max_width = 0, + max_height = 0, + border = 'rounded', + win_options = { + winblend = 0, + }, + -- preview_split: Split direction: "auto", "left", "right", "above", "below". + preview_split = 'auto', + -- This is the config that will be passed to nvim_open_win. + -- Change values here to customize the layout + override = function(conf) + return conf + end, + }, + + -- Configuration for the actions floating preview window + preview = { + -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_width and max_width can be a single value or a list of mixed integer/float types. + -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" + max_width = 0.9, + -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" + min_width = { 40, 0.4 }, + -- optionally define an integer/float for the exact width of the preview window + width = nil, + -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_height and max_height can be a single value or a list of mixed integer/float types. + -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" + max_height = 0.9, + -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" + min_height = { 5, 0.1 }, + -- optionally define an integer/float for the exact height of the preview window + height = nil, + border = 'rounded', + win_options = { + winblend = 0, + }, + -- Whether the preview window is automatically updated when the cursor is moved + update_on_cursor_moved = true, + }, + -- Configuration for the floating progress window + progress = { + max_width = 0.9, + min_width = { 40, 0.4 }, + width = nil, + max_height = { 10, 0.9 }, + min_height = { 5, 0.1 }, + height = nil, + border = 'rounded', + minimized_border = 'none', + win_options = { + winblend = 0, + }, + }, + -- Configuration for the floating SSH window + ssh = { + border = 'rounded', + }, + -- Configuration for the floating keymaps help window + keymaps_help = { + border = 'rounded', + }, + } + end, + }, +} diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 84300224481..cd912d8bbe5 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,10 +1,11 @@ local map = vim.keymap.set map('i', '', '') -map('n', 'pl', 'Explore') map('n', '', 'nohlsearch') +map('n', 'pl', 'Explore') map('n', 'mp', 'MarkdownPreviewToggle') map('n', 'ibl', 'IBLToggle') +map('n', 'cs', 'Telescope colorscheme') map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 4db59d0ae3c..7e9c0cadc23 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -17,7 +17,7 @@ return { filesystem = { window = { width = 30, - position = 'current', + position = 'float', mappings = { ['\\'] = 'close_window', ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, diff --git a/snippets/all.lua b/snippets/all.lua index 46ac6fcc0f7..58ac3c0a85b 100644 --- a/snippets/all.lua +++ b/snippets/all.lua @@ -35,4 +35,7 @@ return { -- pipe operator s({ trig = 'pap', dscr = 'pipe operator v R-ju', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('%>>% <>', { i(1) })), + + -- R documentation + s({ trig = 'doc', dscr = 'documentation znak za R funkcije', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta("#' <>", { i(1) })), } From 60c76e7f28efb5e09589b39e79f478469810c9e0 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 29 Sep 2024 13:34:41 +0200 Subject: [PATCH 25/34] Auto commit --- lazy-lock.json | 2 +- lua/custom/plugins/colors.lua | 4 +- lua/custom/plugins/oil.lua | 199 ---------------------------------- lua/options.lua | 4 +- snippets/markdown.lua | 62 ++++++++++- snippets/math-util.lua | 58 ---------- 6 files changed, 65 insertions(+), 264 deletions(-) delete mode 100644 lua/custom/plugins/oil.lua diff --git a/lazy-lock.json b/lazy-lock.json index 4bd45a34c35..6ceaf858cb7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -44,7 +44,7 @@ "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "f027762845fa35ff27fe0487c86537a74a480a0c" }, "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, - "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" }, + "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 3216ea31f5e..d421a15bf7b 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -2,7 +2,7 @@ return { { 'yorumicolors/yorumi.nvim', config = function() - vim.cmd 'colorscheme yorumi' + -- vim.cmd 'colorscheme yorumi' end, }, @@ -77,7 +77,7 @@ return { { 'rebelot/kanagawa.nvim', config = function() - -- vim.cmd 'colorscheme kanagawa' + vim.cmd 'colorscheme kanagawa' end, }, diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua deleted file mode 100644 index f2cd440272f..00000000000 --- a/lua/custom/plugins/oil.lua +++ /dev/null @@ -1,199 +0,0 @@ -return { - { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = {}, - dependencies = { 'nvim-tree/nvim-web-devicons' }, - - config = function() - require('oil').setup { - -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) - -- Set to false if you want some other plugin (e.g. netrw) to open when you edit directories. - default_file_explorer = true, - -- Id is automatically added at the beginning, and name at the end - -- See :help oil-columns - columns = { - 'icon', - -- "permissions", - -- "size", - -- "mtime", - }, - -- Buffer-local options to use for oil buffers - buf_options = { - buflisted = false, - bufhidden = 'hide', - }, - -- Window-local options to use for oil buffers - win_options = { - wrap = false, - signcolumn = 'no', - cursorcolumn = true, - foldcolumn = '0', - spell = false, - list = false, - conceallevel = 3, - concealcursor = 'nvic', - }, - -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash) - delete_to_trash = false, - -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits) - skip_confirm_for_simple_edits = false, - -- Selecting a new/moved/renamed file or directory will prompt you to save changes first - -- (:help prompt_save_on_select_new_entry) - prompt_save_on_select_new_entry = true, - -- Oil will automatically delete hidden buffers after this delay - -- You can set the delay to false to disable cleanup entirely - -- Note that the cleanup process only starts when none of the oil buffers are currently displayed - cleanup_delay_ms = false, - lsp_file_methods = { - -- Enable or disable LSP file operations - enabled = true, - -- Time to wait for LSP file operations to complete before skipping - timeout_ms = 1000, - -- Set to true to autosave buffers that are updated with LSP willRenameFiles - -- Set to "unmodified" to only save unmodified buffers - autosave_changes = false, - }, - -- Constrain the cursor to the editable parts of the oil buffer - -- Set to `false` to disable, or "name" to keep it on the file names - constrain_cursor = 'editable', - -- Set to true to watch the filesystem for changes and reload oil - watch_for_changes = false, - - -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap - -- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" }) - -- Additionally, if it is a string that matches "actions.", - -- it will use the mapping at require("oil.actions"). - -- Set to `false` to remove a keymap - -- See :help oil-actions for a list of all available actions - keymaps = { - ['g?'] = 'actions.show_help', - [''] = 'actions.select', - [''] = { 'actions.select', opts = { vertical = true }, desc = 'Open the entry in a vertical split' }, - [''] = { 'actions.select', opts = { horizontal = true }, desc = 'Open the entry in a horizontal split' }, - [''] = { 'actions.select', opts = { tab = true }, desc = 'Open the entry in new tab' }, - [''] = 'actions.preview', - [''] = 'actions.close', - [''] = 'actions.refresh', - ['-'] = 'actions.parent', - ['_'] = 'actions.open_cwd', - ['`'] = 'actions.cd', - ['~'] = { 'actions.cd', opts = { scope = 'tab' }, desc = ':tcd to the current oil directory' }, - ['gs'] = 'actions.change_sort', - ['gx'] = 'actions.open_external', - ['g.'] = 'actions.toggle_hidden', - ['g\\'] = 'actions.toggle_trash', - }, - -- Set to false to disable all of the above keymaps - use_default_keymaps = true, - view_options = { - -- Show files and directories that start with "." - show_hidden = true, - -- This function defines what is considered a "hidden" file - is_hidden_file = function(name, bufnr) - return vim.startswith(name, '.') - end, - -- This function defines what will never be shown, even when `show_hidden` is set - is_always_hidden = function(name, bufnr) - return false - end, - -- Sort file names in a more intuitive order for humans. Is less performant, - -- so you may want to set to false if you work with large directories. - natural_order = true, - -- Sort file and directory names case insensitive - case_insensitive = false, - sort = { - -- sort order can be "asc" or "desc" - -- see :help oil-columns to see which columns are sortable - { 'type', 'asc' }, - { 'name', 'asc' }, - }, - }, - -- Extra arguments to pass to SCP when moving/copying files over SSH - extra_scp_args = {}, - - -- BUG: EXPERIMENTAL support for performing file operations with git - git = { - -- Return true to automatically git add/mv/rm files - add = function(path) - return false - end, - mv = function(src_path, dest_path) - return false - end, - rm = function(path) - return false - end, - }, - - -- Configuration for the floating window in oil.open_float - float = { - -- Padding around the floating window - padding = 2, - max_width = 0, - max_height = 0, - border = 'rounded', - win_options = { - winblend = 0, - }, - -- preview_split: Split direction: "auto", "left", "right", "above", "below". - preview_split = 'auto', - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - override = function(conf) - return conf - end, - }, - - -- Configuration for the actions floating preview window - preview = { - -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- min_width and max_width can be a single value or a list of mixed integer/float types. - -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" - max_width = 0.9, - -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" - min_width = { 40, 0.4 }, - -- optionally define an integer/float for the exact width of the preview window - width = nil, - -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- min_height and max_height can be a single value or a list of mixed integer/float types. - -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" - max_height = 0.9, - -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" - min_height = { 5, 0.1 }, - -- optionally define an integer/float for the exact height of the preview window - height = nil, - border = 'rounded', - win_options = { - winblend = 0, - }, - -- Whether the preview window is automatically updated when the cursor is moved - update_on_cursor_moved = true, - }, - -- Configuration for the floating progress window - progress = { - max_width = 0.9, - min_width = { 40, 0.4 }, - width = nil, - max_height = { 10, 0.9 }, - min_height = { 5, 0.1 }, - height = nil, - border = 'rounded', - minimized_border = 'none', - win_options = { - winblend = 0, - }, - }, - -- Configuration for the floating SSH window - ssh = { - border = 'rounded', - }, - -- Configuration for the floating keymaps help window - keymaps_help = { - border = 'rounded', - }, - } - end, - }, -} diff --git a/lua/options.lua b/lua/options.lua index 8d762b8ca04..27fb6057ecd 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,7 +1,7 @@ -- vim.opts.rocks.hererocks = true -vim.o.conceallevel = 2 -vim.opt.cursorline = true +vim.o.conceallevel = 1 +vim.opt.cursorline = false vim.o.wrap = true vim.o.linebreak = true diff --git a/snippets/markdown.lua b/snippets/markdown.lua index cd082330b15..45ef8c73b37 100644 --- a/snippets/markdown.lua +++ b/snippets/markdown.lua @@ -5,9 +5,67 @@ local i = ls.insert_node local fmta = require('luasnip.extras.fmt').fmta local rep = require('luasnip.extras').rep -local is_math_mode = require 'snippets.math-util' +-- NOTE: HELP FUNCTIONS FOR MATH MODE +-- https://github.com/frankroeder/dotfiles/blob/657a5dc559e9ff526facc2e74f9cc07a1875cac6/nvim/lua/tsutils.lua#L59 +local has_treesitter, ts = pcall(require, 'vim.treesitter') +local _, query = pcall(require, 'vim.treesitter.query') --- NOTE: Tukaj vstavljaš snippets za markdown +local MATH_ENVIRONMENTS = { + displaymath = true, + equation = true, + eqnarray = true, + align = true, + math = true, + array = true, +} + +local MATH_NODES = { + displayed_equation = true, + inline_formula = true, +} + +local function get_node_at_cursor() + local cursor = vim.api.nvim_win_get_cursor(0) + local cursor_range = { cursor[1] - 1, cursor[2] } + local buf = vim.api.nvim_get_current_buf() + local ok, parser = pcall(ts.get_parser, buf, 'latex') + if not ok or not parser then + return + end + local root_tree = parser:parse()[1] + local root = root_tree and root_tree:root() + + if not root then + return + end + + return root:named_descendant_for_range(cursor_range[1], cursor_range[2], cursor_range[1], cursor_range[2]) +end + +-- NOTE: https://github.com/nvim-treesitter/nvim-treesitter/issues/1184#issuecomment-830388856 +local is_math_mode = function() + if has_treesitter then + local buf = vim.api.nvim_get_current_buf() + local node = get_node_at_cursor() + while node do + if MATH_NODES[node:type()] then + return true + elseif node:type() == 'math_environment' or node:type() == 'generic_environment' then + local begin = node:child(0) + local names = begin and begin:field 'name' + if names and names[1] and MATH_ENVIRONMENTS[query.get_node_text(names[1], buf):match '[A-Za-z]+'] then + return true + end + end + node = node:parent() + end + return false + end +end + +-- [[ +-- Tukaj vstavljaš snippets za markdown +-- ]] return { -- Get in math mode s({ trig = 'mk', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('$<>$', { i(1) })), diff --git a/snippets/math-util.lua b/snippets/math-util.lua index d2eedf7033c..935b9495eb1 100644 --- a/snippets/math-util.lua +++ b/snippets/math-util.lua @@ -1,63 +1,5 @@ -- standardna praksa baje local M = {} --- NOTE: HELP FUNCTIONS FOR MATH MODE --- https://github.com/frankroeder/dotfiles/blob/657a5dc559e9ff526facc2e74f9cc07a1875cac6/nvim/lua/tsutils.lua#L59 -local has_treesitter, ts = pcall(require, 'vim.treesitter') -local _, query = pcall(require, 'vim.treesitter.query') - -local MATH_ENVIRONMENTS = { - displaymath = true, - equation = true, - eqnarray = true, - align = true, - math = true, - array = true, -} - -local MATH_NODES = { - displayed_equation = true, - inline_formula = true, -} - -local function get_node_at_cursor() - local cursor = vim.api.nvim_win_get_cursor(0) - local cursor_range = { cursor[1] - 1, cursor[2] } - local buf = vim.api.nvim_get_current_buf() - local ok, parser = pcall(ts.get_parser, buf, 'latex') - if not ok or not parser then - return - end - local root_tree = parser:parse()[1] - local root = root_tree and root_tree:root() - - if not root then - return - end - - return root:named_descendant_for_range(cursor_range[1], cursor_range[2], cursor_range[1], cursor_range[2]) -end - --- NOTE: https://github.com/nvim-treesitter/nvim-treesitter/issues/1184#issuecomment-830388856 -function M.is_math_mode() - if has_treesitter then - local buf = vim.api.nvim_get_current_buf() - local node = get_node_at_cursor() - while node do - if MATH_NODES[node:type()] then - return true - elseif node:type() == 'math_environment' or node:type() == 'generic_environment' then - local begin = node:child(0) - local names = begin and begin:field 'name' - if names and names[1] and MATH_ENVIRONMENTS[query.get_node_text(names[1], buf):match '[A-Za-z]+'] then - return true - end - end - node = node:parent() - end - return false - end -end - -- return modul with is_math_mode function return M From 4236cdc077de156ec3797e669b0fe61624f5d9a8 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Mon, 30 Sep 2024 15:25:13 +0200 Subject: [PATCH 26/34] Auto commit --- lazy-lock.json | 20 ++++++++++---------- lua/custom/plugins/colors.lua | 21 +++++++++++++++++++-- lua/custom/plugins/markdown.lua | 4 ++-- lua/options.lua | 2 +- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6ceaf858cb7..1d8115f48d9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,40 +15,40 @@ "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "gruvbox-material": { "branch": "master", "commit": "25425c4feea270951c33de67c595ab3bbe8b0e7e" }, + "gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, + "kanagawa-paper.nvim": { "branch": "master", "commit": "928f0f4f28475111d0b507c27b243744648bac1f" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "59d03c9e92cb03351af2904a26e16b6627d2d5db" }, "lavish.nvim": { "branch": "main", "commit": "d0865b69dad51f9f54e31fc9d046badaa15a7b4e" }, "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, - "markview.nvim": { "branch": "main", "commit": "4695a699ebd87889c815de07e1408331e5c1df61" }, + "markview.nvim": { "branch": "main", "commit": "f16486e49561740f33b6773df43c9bc2c3c34c7b" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, - "mini.nvim": { "branch": "main", "commit": "73af55e44865f2ede67a772b0972a5d34dcedd0e" }, + "mini.nvim": { "branch": "main", "commit": "848c5e8f428faf843051768e0d56104cd02aea1f" }, + "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" }, + "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" }, - "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" }, + "nvim-lspconfig": { "branch": "master", "commit": "0678aa439b82965daf03679cd146e84f10e299c3" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "f027762845fa35ff27fe0487c86537a74a480a0c" }, - "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "nvim-treesitter": { "branch": "master", "commit": "d1e1f17cea23f14cbe230635b9bb654a835f02d7" }, + "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "render-markdown.nvim": { "branch": "main", "commit": "91ce0b5a6314b091bcba1541f557f591c7ddfe06" }, + "render-markdown.nvim": { "branch": "main", "commit": "35c37ca9f7955f9fa57eaee1c16edb3c80c40462" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index d421a15bf7b..7c6dd7ef531 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -1,8 +1,15 @@ return { + { + 'kdheepak/monochrome.nvim', + config = function() + -- vim.cmd 'colorscheme monochrome' + end, + }, + { 'yorumicolors/yorumi.nvim', config = function() - -- vim.cmd 'colorscheme yorumi' + vim.cmd 'colorscheme yorumi' end, }, @@ -74,10 +81,20 @@ return { end, }, + { + 'sho-87/kanagawa-paper.nvim', + lazy = false, + priority = 1000, + opts = {}, + config = function() + -- vim.cmd 'colorscheme kanagawa-paper' + end, + }, + { 'rebelot/kanagawa.nvim', config = function() - vim.cmd 'colorscheme kanagawa' + -- vim.cmd 'colorscheme kanagawa' end, }, diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua index 33c3c1bcbaa..834822d475c 100644 --- a/lua/custom/plugins/markdown.lua +++ b/lua/custom/plugins/markdown.lua @@ -3,6 +3,7 @@ return { 'iamcco/markdown-preview.nvim', cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' }, ft = { 'markdown' }, + enabled = false, build = function() vim.fn['mkdp#util#install']() end, @@ -10,11 +11,11 @@ return { { 'MeanderingProgrammer/render-markdown.nvim', - enabled = true, opts = {}, dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + enabled = true, }, { @@ -33,7 +34,6 @@ return { ft = 'markdown', -- or 'event = "VeryLazy"' enabled = true, opts = {}, - config = function() require('markdown').setup { -- Disable all keymaps by setting mappings field to 'false'. diff --git a/lua/options.lua b/lua/options.lua index 27fb6057ecd..9a82b079f99 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,6 +1,6 @@ -- vim.opts.rocks.hererocks = true -vim.o.conceallevel = 1 +vim.o.conceallevel = 2 vim.opt.cursorline = false vim.o.wrap = true From 75cef76d7703e1b3c5d3256cf43031c6e7685772 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Tue, 1 Oct 2024 13:50:58 +0200 Subject: [PATCH 27/34] Auto commit --- init.lua | 4 ++-- lazy-lock.json | 10 ++++++---- lua/custom/plugins/colors.lua | 8 +++++--- lua/custom/plugins/markdown.lua | 2 +- lua/custom/plugins/vimtex.lua | 10 ++++++++++ lua/options.lua | 2 +- snippets/markdown.lua | 4 ++-- 7 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 lua/custom/plugins/vimtex.lua diff --git a/init.lua b/init.lua index f55369ceb8a..ab0d07b9889 100644 --- a/init.lua +++ b/init.lua @@ -12,5 +12,5 @@ require 'lazy-plugins' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) diff --git a/lazy-lock.json b/lazy-lock.json index 1d8115f48d9..8b5c1b9ed64 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "Nvim-R": { "branch": "master", "commit": "b7cdc9bcd6879465023e20b4a3ae16968edda776" }, - "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "bamboo.nvim": { "branch": "master", "commit": "c245d90c490c681470389e28782b161491bec97c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -25,6 +25,7 @@ "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, "markview.nvim": { "branch": "main", "commit": "f16486e49561740f33b6773df43c9bc2c3c34c7b" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, @@ -35,7 +36,7 @@ "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, + "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, @@ -43,12 +44,12 @@ "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" }, "nvim-lspconfig": { "branch": "master", "commit": "0678aa439b82965daf03679cd146e84f10e299c3" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "d1e1f17cea23f14cbe230635b9bb654a835f02d7" }, + "nvim-treesitter": { "branch": "master", "commit": "ef52e44bb24161e5138b3de5beadab3f3fcff233" }, "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "render-markdown.nvim": { "branch": "main", "commit": "35c37ca9f7955f9fa57eaee1c16edb3c80c40462" }, + "render-markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, @@ -57,6 +58,7 @@ "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "vimtex": { "branch": "master", "commit": "be2c13c76eb4c72b2d036900aa17b4b8200ddfb5" }, "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }, "yorumi.nvim": { "branch": "main", "commit": "e27ac640972da13d593ba9cc152355de2fd2c7a1" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 7c6dd7ef531..6af7bdc6a03 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -9,7 +9,7 @@ return { { 'yorumicolors/yorumi.nvim', config = function() - vim.cmd 'colorscheme yorumi' + -- vim.cmd 'colorscheme yorumi' end, }, @@ -48,7 +48,9 @@ return { { 'mstcl/ivory', lazy = false, - config = function() end, + config = function() + -- vim.cmd 'colorscheme ivory' + end, }, { @@ -121,7 +123,7 @@ return { lazy = false, opts = {}, config = function() - -- vim.cmd 'colorscheme zenwritten' + -- vim.cmd 'colorscheme zenwritten' end, }, } diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua index 834822d475c..ecc474be90c 100644 --- a/lua/custom/plugins/markdown.lua +++ b/lua/custom/plugins/markdown.lua @@ -3,7 +3,7 @@ return { 'iamcco/markdown-preview.nvim', cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' }, ft = { 'markdown' }, - enabled = false, + enabled = true, build = function() vim.fn['mkdp#util#install']() end, diff --git a/lua/custom/plugins/vimtex.lua b/lua/custom/plugins/vimtex.lua new file mode 100644 index 00000000000..3681f9587c3 --- /dev/null +++ b/lua/custom/plugins/vimtex.lua @@ -0,0 +1,10 @@ +return { + { + 'lervag/vimtex', + lazy = false, -- we don't want to lazy load VimTeX + init = function() + -- VimTeX configuration goes here, e.g. + vim.g.vimtex_view_method = 'zathura' + end, + }, +} diff --git a/lua/options.lua b/lua/options.lua index 9a82b079f99..a4178b68241 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -10,7 +10,7 @@ vim.opt.number = true vim.o.numberwidth = 2 vim.opt.relativenumber = true vim.opt.scrolloff = 999 -vim.o.textwidth = 0 +vim.o.textwidth = 80 vim.opt.mouse = 'a' diff --git a/snippets/markdown.lua b/snippets/markdown.lua index 45ef8c73b37..5236e0d9044 100644 --- a/snippets/markdown.lua +++ b/snippets/markdown.lua @@ -7,8 +7,8 @@ local rep = require('luasnip.extras').rep -- NOTE: HELP FUNCTIONS FOR MATH MODE -- https://github.com/frankroeder/dotfiles/blob/657a5dc559e9ff526facc2e74f9cc07a1875cac6/nvim/lua/tsutils.lua#L59 -local has_treesitter, ts = pcall(require, 'vim.treesitter') -local _, query = pcall(require, 'vim.treesitter.query') +-- local has_treesitter, ts = pcall(require, 'vim.treesitter') +-- local _, query = pcall(require, 'vim.treesitter.query') local MATH_ENVIRONMENTS = { displaymath = true, From ff223fe3a5976e9aa17d255002fd3f31778a0df0 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Tue, 1 Oct 2024 15:38:14 +0200 Subject: [PATCH 28/34] Auto commit --- lazy-lock.json | 2 +- lua/custom/plugins/colors.lua | 2 +- lua/options.lua | 6 ++---- snippets/all.lua | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 8b5c1b9ed64..0d81af37fe3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -42,7 +42,7 @@ "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" }, - "nvim-lspconfig": { "branch": "master", "commit": "0678aa439b82965daf03679cd146e84f10e299c3" }, + "nvim-lspconfig": { "branch": "master", "commit": "8ab8f4cf48425dcb4845a61d3caa2d2a7e3d9df7" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-treesitter": { "branch": "master", "commit": "ef52e44bb24161e5138b3de5beadab3f3fcff233" }, "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 6af7bdc6a03..3b299f1be37 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -28,7 +28,7 @@ return { priority = 1000, config = function() -- require('lavish').apply 'light' - -- require('lavish').apply 'dark' + require('lavish').apply 'dark' end, }, diff --git a/lua/options.lua b/lua/options.lua index a4178b68241..02a0fa49cf3 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,7 +1,5 @@ --- vim.opts.rocks.hererocks = true - vim.o.conceallevel = 2 -vim.opt.cursorline = false +vim.opt.cursorline = true vim.o.wrap = true vim.o.linebreak = true @@ -10,7 +8,7 @@ vim.opt.number = true vim.o.numberwidth = 2 vim.opt.relativenumber = true vim.opt.scrolloff = 999 -vim.o.textwidth = 80 +vim.o.textwidth = 0 vim.opt.mouse = 'a' diff --git a/snippets/all.lua b/snippets/all.lua index 58ac3c0a85b..78175fdfad8 100644 --- a/snippets/all.lua +++ b/snippets/all.lua @@ -34,8 +34,8 @@ return { ), -- pipe operator - s({ trig = 'pap', dscr = 'pipe operator v R-ju', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('%>>% <>', { i(1) })), + s({ trig = 'pap', dscr = 'pipe operator v R-ju', regTrig = false, wordTrig = true }, fmta('%>>% <>', { i(1) })), -- R documentation - s({ trig = 'doc', dscr = 'documentation znak za R funkcije', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta("#' <>", { i(1) })), + s({ trig = 'doc', dscr = 'documentation znak za R funkcije', regTrig = false, wordTrig = true }, fmta("#' <>", { i(1) })), } From 62f1bd4f0e85c257a015499786191b56ac6bd0e8 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 3 Oct 2024 18:22:26 +0200 Subject: [PATCH 29/34] rehaul od neovim ui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit spremenil konfiguracije od nvim-cmp, lualine (not much), gitsigns (spremenil vse v vertical bars). spremeniti moram še neo-tree. --- init.lua | 1 + lazy-lock.json | 30 +-- lua/chadrc.lua | 89 ++++++++ lua/custom/plugins/colors.lua | 17 +- lua/custom/plugins/indent-line.lua | 2 +- lua/custom/plugins/init.lua | 12 +- lua/custom/plugins/lsp_completions.lua | 259 ------------------------ lua/custom/plugins/lualine.lua | 48 +++++ lua/custom/plugins/markdown.lua | 1 + lua/custom/plugins/minifiles.lua | 57 ++++++ lua/custom/plugins/nvim-r.lua | 1 + lua/custom/plugins/toggle-terminal.lua | 3 +- lua/custom/plugins/typescript-tools.lua | 8 + lua/custom/plugins/vimtex.lua | 2 +- lua/keymaps.lua | 1 + lua/kickstart/plugins/cmp.lua | 152 ++++++++++---- lua/kickstart/plugins/gitsigns.lua | 111 +++++----- lua/kickstart/plugins/lspconfig.lua | 244 ++++++++++------------ lua/lazy-plugins.lua | 4 +- lua/options.lua | 2 +- snippets/all.lua | 2 +- todo.md | 12 ++ 22 files changed, 518 insertions(+), 540 deletions(-) create mode 100644 lua/chadrc.lua delete mode 100644 lua/custom/plugins/lsp_completions.lua create mode 100644 lua/custom/plugins/lualine.lua create mode 100644 lua/custom/plugins/minifiles.lua create mode 100644 lua/custom/plugins/typescript-tools.lua create mode 100644 todo.md diff --git a/init.lua b/init.lua index ab0d07b9889..6ef38c742ec 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,5 @@ -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) + vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' diff --git a/lazy-lock.json b/lazy-lock.json index 0d81af37fe3..919ff522cee 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,13 +3,13 @@ "Nvim-R": { "branch": "master", "commit": "b7cdc9bcd6879465023e20b4a3ae16968edda776" }, "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "bamboo.nvim": { "branch": "master", "commit": "c245d90c490c681470389e28782b161491bec97c" }, + "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codi.vim": { "branch": "master", "commit": "83b9859aaf8066d95892e01eb9c01571a4b325dd" }, "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "darkearth-nvim": { "branch": "main", "commit": "14369f828f4b09ee89b18bfa3f58b02720e8e20a" }, "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, @@ -21,8 +21,9 @@ "kanagawa-paper.nvim": { "branch": "master", "commit": "928f0f4f28475111d0b507c27b243744648bac1f" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "59d03c9e92cb03351af2904a26e16b6627d2d5db" }, - "lavish.nvim": { "branch": "main", "commit": "d0865b69dad51f9f54e31fc9d046badaa15a7b4e" }, - "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "lavish.nvim": { "branch": "main", "commit": "a994435c6e4db7c19e2ce65f29d4acafff0f89cf" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -31,36 +32,39 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.files": { "branch": "main", "commit": "a3a9cce82115a69dba161ac45bda16f4e606f73b" }, "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, - "mini.nvim": { "branch": "main", "commit": "848c5e8f428faf843051768e0d56104cd02aea1f" }, + "mini.nvim": { "branch": "main", "commit": "61e5d46fc0cf71306c51275383767d996f559a60" }, "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, - "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, - "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, - "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" }, - "nvim-lspconfig": { "branch": "master", "commit": "8ab8f4cf48425dcb4845a61d3caa2d2a7e3d9df7" }, + "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" }, + "nvim-lspconfig": { "branch": "master", "commit": "1c2595e38da319a1a58c94f58afe6fe6fe02e292" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "ef52e44bb24161e5138b3de5beadab3f3fcff233" }, + "nvim-treesitter": { "branch": "master", "commit": "cc2c11c403a9143827501223b4ee64432dcaf246" }, "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "render-markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, + "tokyonight.nvim": { "branch": "main", "commit": "efd1417aa01af618426fe1cf507c5458090458f2" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, + "typescript-tools.nvim": { "branch": "master", "commit": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vimtex": { "branch": "master", "commit": "be2c13c76eb4c72b2d036900aa17b4b8200ddfb5" }, - "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }, - "yorumi.nvim": { "branch": "main", "commit": "e27ac640972da13d593ba9cc152355de2fd2c7a1" }, + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, + "yorumi.nvim": { "branch": "main", "commit": "0d0c995ecb90cd21e701fd30b7c5e794cb1e41ce" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, - "zenbones.nvim": { "branch": "main", "commit": "12daea796d5079a65dd7032bb85540443e8b30e8" } + "zenbones.nvim": { "branch": "main", "commit": "88960c8aa3ad8aff0bcccdce7cd23629c7a3c510" } } diff --git a/lua/chadrc.lua b/lua/chadrc.lua new file mode 100644 index 00000000000..564bced7790 --- /dev/null +++ b/lua/chadrc.lua @@ -0,0 +1,89 @@ +local options = { + + base46 = { + theme = 'gruvchad', -- default theme + hl_add = {}, + hl_override = {}, + integrations = {}, + changed_themes = {}, + transparency = false, + theme_toggle = { 'onedark', 'one_light' }, + }, + + ui = { + cmp = { + icons = true, + lspkind_text = true, + style = 'default', -- default/flat_light/flat_dark/atom/atom_colored + }, + + telescope = { style = 'borderless' }, -- borderless / bordered + + statusline = { + theme = 'default', -- default/vscode/vscode_colored/minimal + -- default/round/block/arrow separators work only for default statusline theme + -- round and block will work for minimal theme only + separator_style = 'default', + order = nil, + modules = nil, + }, + + -- lazyload it when there are 1+ buffers + tabufline = { + enabled = true, + lazyload = true, + order = { 'treeOffset', 'buffers', 'tabs', 'btns' }, + modules = nil, + }, + + nvdash = { + load_on_startup = false, + + header = { + ' ▄ ▄ ', + ' ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ', + ' █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ', + ' ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ', + ' ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ', + ' █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄', + '▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █', + '█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █', + ' █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ', + }, + + buttons = { + { ' Find File', 'Spc f f', 'Telescope find_files' }, + { '󰈚 Recent Files', 'Spc f o', 'Telescope oldfiles' }, + { '󰈭 Find Word', 'Spc f w', 'Telescope live_grep' }, + { ' Bookmarks', 'Spc m a', 'Telescope marks' }, + { ' Themes', 'Spc t h', 'Telescope themes' }, + { ' Mappings', 'Spc c h', 'NvCheatsheet' }, + }, + }, + }, + + term = { + winopts = { number = false, relativenumber = false }, + sizes = { sp = 0.3, vsp = 0.2, ['bo sp'] = 0.3, ['bo vsp'] = 0.2 }, + float = { + relative = 'editor', + row = 0.3, + col = 0.25, + width = 0.5, + height = 0.4, + border = 'single', + }, + }, + + lsp = { signature = true }, + + cheatsheet = { + theme = 'simple¸', -- simple/grid + excluded_groups = { 'terminal (t)', 'autopairs', 'Nvim', 'Opens' }, -- can add group name or with mode + }, + + mason = { cmd = true, pkgs = {} }, +} + +local status, chadrc = pcall(require, 'chadrc') +return vim.tbl_deep_extend('force', options, status and chadrc or {}) diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index 3b299f1be37..b9a3dadfc96 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -1,4 +1,12 @@ return { + { + 'catppuccin/nvim', + name = 'catppuccin', + config = function() + -- vim.cmd 'colorscheme catppuccin' + end, + }, + { 'kdheepak/monochrome.nvim', config = function() @@ -28,7 +36,7 @@ return { priority = 1000, config = function() -- require('lavish').apply 'light' - require('lavish').apply 'dark' + -- require('lavish').apply 'dark' end, }, @@ -61,6 +69,7 @@ return { style = 'vulgaris', -- Choose between 'vulgaris' (regular), 'multiplex' (greener), and 'light' transparent = false, -- Show/hide background } + vim.cmd 'colorscheme bamboo-multiplex' end, }, @@ -89,7 +98,7 @@ return { priority = 1000, opts = {}, config = function() - -- vim.cmd 'colorscheme kanagawa-paper' + vim.cmd 'colorscheme kanagawa-paper' end, }, @@ -103,7 +112,6 @@ return { { 'slugbyte/lackluster.nvim', lazy = false, - config = function() end, config = function() -- vim.cmd 'colorscheme lackluster-dark' end, @@ -124,6 +132,9 @@ return { opts = {}, config = function() -- vim.cmd 'colorscheme zenwritten' + -- vim.cmd 'colorscheme zenbones' + -- vim.cmd 'colorscheme duckbones' + -- vim.cmd 'colorscheme tokyobones' end, }, } diff --git a/lua/custom/plugins/indent-line.lua b/lua/custom/plugins/indent-line.lua index ef3ecd906d1..c0b10992748 100644 --- a/lua/custom/plugins/indent-line.lua +++ b/lua/custom/plugins/indent-line.lua @@ -5,6 +5,6 @@ return { ---@module "ibl" ---@type ibl.config opts = {}, - enabled = false, + enabled = true, }, } diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 73478848337..f885539a420 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -3,7 +3,7 @@ -- -- See the kickstart.nvim README for more information return { - { 'metakirby5/codi.vim' }, + -- { 'metakirby5/codi.vim' }, { 'echasnovski/mini.nvim', @@ -13,16 +13,6 @@ return { end, }, - { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup { - options = { theme = 'auto' }, - } - end, - }, - { 'folke/zen-mode.nvim', opts = { diff --git a/lua/custom/plugins/lsp_completions.lua b/lua/custom/plugins/lsp_completions.lua deleted file mode 100644 index c84900d87fe..00000000000 --- a/lua/custom/plugins/lsp_completions.lua +++ /dev/null @@ -1,259 +0,0 @@ -return { - -- NOTE: [[ SNIPPETS ]] - { - 'L3MON4D3/LuaSnip', - dependencies = { - 'rafamadriz/friendly-snippets', - -- Tu importamo snippets - config = function() - require('luasnip.loaders.from_vscode').lazy_load() - require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } - end, - }, - config = function() - require('luasnip').config.setup { - store_selection_keys = '', - } - end, - }, - - { 'saadparwaiz1/cmp_luasnip' }, - { 'hrsh7th/cmp-nvim-lsp' }, - { 'hrsh7th/cmp-nvim-lua' }, - { 'hrsh7th/cmp-buffer' }, - { 'hrsh7th/cmp-path' }, - { 'hrsh7th/cmp-cmdline' }, - { - 'hrsh7th/nvim-cmp', - config = function() - local cmp = require 'cmp' - local luasnip = require 'luasnip' - - luasnip.config.setup { enable_autosnippets = true } - - cmp.setup { - snippet = { - -- REQUIRED - you must specify a snippet engine - expand = function(args) - require('luasnip').lsp_expand(args.body) -- For `luasnip` users. - end, - }, - ---[==[ - mapping = cmp.mapping.preset.insert { - -- suggestions - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.confirm { select = false }, - - -- snippet insert nodes - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), - }, - --]==] - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'luasnip' }, -- For luasnip users. - { name = 'nvim_lua' }, - { name = 'path' }, - }, { - { name = 'buffer' }, - }), - } - - -- Set configuration for specific filetype. - cmp.setup.filetype('gitcommit', { - sources = cmp.config.sources({ - { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it. - }, { - { name = 'buffer' }, - }), - }) - -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline('/', { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' }, - }, - }) - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' }, - }, { - { name = 'cmdline' }, - }), - }) - end, - }, - - -- NOTE: [[ LSP ]] - { - 'williamboman/mason-lspconfig.nvim', - dependencies = { - 'williamboman/mason.nvim', - 'neovim/nvim-lspconfig', - }, - config = function() - -- NOTE: from `kickstart/plugins/lspconfig.lua` - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), - callback = function(event) - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- Find references for the word under your cursor. - map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - -- map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') - - -- Execute a code action, usually your cursor needs to be on top of an error - -- or a suggestion from your LSP for this to activate. - map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then - map('th', function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') - end - end, - }) - - require('mason').setup() - require('mason-lspconfig').setup_handlers { - -- These are the setups for specific LSP servers - -- Default setup function - function(server_name) - local capabilities = require('cmp_nvim_lsp').default_capabilities() - require('lspconfig')[server_name].setup { capabilities = capabilities } - end, - - -- Every entry is a custom lsp config - ['marksman'] = function() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require 'lspconfig' - - lspconfig.clangd.setup { - capabilities = capabilities, - } - end, - - ['clangd'] = function() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require 'lspconfig' - - lspconfig.clangd.setup { - capabilities = capabilities, - } - end, - - ['lua_ls'] = function() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require 'lspconfig' - - lspconfig.lua_ls.setup { - capabilities = capabilities, - on_init = function(client) - local path = client.workspace_folders[1].name - if not vim.loop.fs_stat(path .. '/.luarc.json') and not vim.loop.fs_stat(path .. '/.luarc.jsonc') then - client.config.settings = vim.tbl_deep_extend('force', client.config.settings, { - Lua = { - runtime = { - version = 'LuaJIT', - }, - -- Make the server aware of Neovim runtime files - workspace = { - checkThirdParty = false, - library = { - vim.env.VIMRUNTIME, - }, - }, - }, - }) - client.notify('workspace/didChangeConfiguration', { settings = client.config.settings }) - end - return true - end, - } - end, - - ['texlab'] = function() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require 'lspconfig' - lspconfig.texlab.setup { - capabilities = capabilities, - filetypes = { 'tex', 'bib', 'rnoweb' }, - } - end, - - ['r_language_server'] = function() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require 'lspconfig' - - lspconfig.r_language_server.setup { - capabilities = capabilities, - settings = { - r = { - lsp = { - rich_documentation = true, - diagnostics = true, - }, - }, - }, - on_attach = function(client, bufnr) - vim.diagnostic.config { - virtual_text = false, -- Virtual text (the inline hints) - signs = true, -- Show signs in the gutter - underline = false, -- Underline problematic code - } - end, - } - end, - } - end, - }, -} diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua new file mode 100644 index 00000000000..73b162cc1fd --- /dev/null +++ b/lua/custom/plugins/lualine.lua @@ -0,0 +1,48 @@ +return { + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + component_separators = { left = '', right = '' }, + section_separators = { left = '', right = '' }, + disabled_filetypes = { + statusline = {}, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + globalstatus = false, + refresh = { + statusline = 1000, + tabline = 1000, + winbar = 1000, + }, + }, + sections = { + lualine_a = { 'mode' }, + lualine_b = { 'branch', 'diff', 'diagnostics' }, + lualine_c = { 'filename' }, + lualine_x = { 'buffers', 'filetype', 'searchcount' }, + lualine_y = { 'progress' }, + lualine_z = { 'location' }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { 'filename' }, + lualine_x = { 'location' }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {}, + } + end, + }, +} diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua index ecc474be90c..4ecf6c7ab57 100644 --- a/lua/custom/plugins/markdown.lua +++ b/lua/custom/plugins/markdown.lua @@ -4,6 +4,7 @@ return { cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' }, ft = { 'markdown' }, enabled = true, + lazy = true, build = function() vim.fn['mkdp#util#install']() end, diff --git a/lua/custom/plugins/minifiles.lua b/lua/custom/plugins/minifiles.lua new file mode 100644 index 00000000000..25f5da16bd9 --- /dev/null +++ b/lua/custom/plugins/minifiles.lua @@ -0,0 +1,57 @@ +return { + 'echasnovski/mini.files', + version = '*', + config = function() + require('mini.files').setup { + -- Customization of shown content + content = { + -- Predicate for which file system entries to show + filter = nil, + -- What prefix to show to the left of file system entry + prefix = nil, + -- In which order to show file system entries + sort = nil, + }, + + -- Module mappings created only inside explorer. + -- Use `''` (empty string) to not create one. + mappings = { + close = 'q', + go_in = 'l', + go_in_plus = 'L', + go_out = 'h', + go_out_plus = 'H', + mark_goto = "'", + mark_set = 'm', + reset = '', + reveal_cwd = '@', + show_help = 'g?', + synchronize = '=', + trim_left = '<', + trim_right = '>', + }, + + -- General options + options = { + -- Whether to delete permanently or move into module-specific trash + permanent_delete = true, + -- Whether to use for editing directories + use_as_default_explorer = true, + }, + + -- Customization of explorer windows + windows = { + -- Maximum number of windows to show side by side + max_number = math.huge, + -- Whether to show preview of file/directory under cursor + preview = false, + -- Width of focused window + width_focus = 50, + -- Width of non-focused window + width_nofocus = 15, + -- Width of preview window + width_preview = 25, + }, + } + end, +} diff --git a/lua/custom/plugins/nvim-r.lua b/lua/custom/plugins/nvim-r.lua index b2b49907b87..d29dd9c2ce5 100644 --- a/lua/custom/plugins/nvim-r.lua +++ b/lua/custom/plugins/nvim-r.lua @@ -2,6 +2,7 @@ return { { 'jalvesaq/Nvim-R', ft = { 'r', 'rmd' }, -- Load the plugin for R and R Markdown files + lazy = true, config = function() vim.g.R_auto_start = 1 vim.g.R_hl_term = 1 diff --git a/lua/custom/plugins/toggle-terminal.lua b/lua/custom/plugins/toggle-terminal.lua index 2490398c673..e5bc3bf7a30 100644 --- a/lua/custom/plugins/toggle-terminal.lua +++ b/lua/custom/plugins/toggle-terminal.lua @@ -5,11 +5,10 @@ return { version = '*', opts = { open_mapping = '', - size = 80, autochdir = true, shading_factor = 1, close_on_exit = false, - direction = 'vertical', -- vertical, horizontal, tab, float + direction = 'horizontal', -- vertical, horizontal, tab, float }, }, } diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua new file mode 100644 index 00000000000..661badfcad6 --- /dev/null +++ b/lua/custom/plugins/typescript-tools.lua @@ -0,0 +1,8 @@ +return { + { + 'pmizio/typescript-tools.nvim', + dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' }, + lazy = true, + opts = {}, + }, +} diff --git a/lua/custom/plugins/vimtex.lua b/lua/custom/plugins/vimtex.lua index 3681f9587c3..ddfd6071d67 100644 --- a/lua/custom/plugins/vimtex.lua +++ b/lua/custom/plugins/vimtex.lua @@ -1,7 +1,7 @@ return { { 'lervag/vimtex', - lazy = false, -- we don't want to lazy load VimTeX + lazy = true, -- we don't want to lazy load VimTeX init = function() -- VimTeX configuration goes here, e.g. vim.g.vimtex_view_method = 'zathura' diff --git a/lua/keymaps.lua b/lua/keymaps.lua index cd912d8bbe5..ada83cfcec2 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -6,6 +6,7 @@ map('n', 'pl', 'Explore') map('n', 'mp', 'MarkdownPreviewToggle') map('n', 'ibl', 'IBLToggle') map('n', 'cs', 'Telescope colorscheme') +map('n', 'mf', 'lua MiniFiles.open()') map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index 8b29791225f..dea302283f8 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -1,61 +1,99 @@ return { - { -- Autocompletion + { + 'L3MON4D3/LuaSnip', + dependencies = { + 'rafamadriz/friendly-snippets', + -- Tu importamo snippets + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } + end, + }, + + config = function() + require('luasnip').config.setup { + store_selection_keys = '', + } + end, + }, + + { 'saadparwaiz1/cmp_luasnip' }, + { 'hrsh7th/cmp-nvim-lsp' }, + { 'hrsh7th/cmp-nvim-lua' }, + { 'hrsh7th/cmp-buffer' }, + { 'hrsh7th/cmp-path' }, + { 'hrsh7th/cmp-cmdline' }, + + { 'hrsh7th/nvim-cmp', event = 'InsertEnter', dependencies = { - { - 'L3MON4D3/LuaSnip', - build = (function() - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - { - 'rafamadriz/friendly-snippets', - -- Tu importamo snippets - config = function() - require('luasnip.loaders.from_vscode').lazy_load() - require('luasnip.loaders.from_lua').load { paths = { 'C:/Users/joene/AppData/Local/nvim/snippets' } } - end, - }, - }, - }, - 'saadparwaiz1/cmp_luasnip', - - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-path', + 'onsails/lspkind.nvim', + 'roobert/tailwindcss-colorizer-cmp.nvim', }, config = function() local cmp = require 'cmp' + local lspkind = require 'lspkind' local luasnip = require 'luasnip' + luasnip.config.setup { enable_autosnippets = true } cmp.setup { + performance = { + max_view_entries = 30, + }, + snippet = { + -- REQUIRED - you must specify a snippet engine expand = function(args) - luasnip.lsp_expand(args.body) + luasnip.lsp_expand(args.body) -- For `luasnip` users. end, }, - completion = { completeopt = 'menu,menuone,noinsert' }, - mapping = cmp.mapping.preset.insert { - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), + view = { + entries = { + name = 'custom', -- can be "custom", "wildmenu" or "native" + selection_order = 'near_cursor', + }, + }, - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), + window = { + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + }, + + formatting = { + format = lspkind.cmp_format { + mode = 'text', + maxwidth = 50, + }, + }, + + mapping = cmp.mapping.preset.insert { + -- suggestions + [''] = cmp.mapping.confirm { select = false }, - [''] = cmp.mapping.confirm { select = true }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + else + fallback() + end + end, - -- - [''] = cmp.mapping.confirm { select = true }, - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + else + fallback() + end + end, - [''] = cmp.mapping.complete {}, + -- documentation + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + -- snippet insert nodes [''] = cmp.mapping(function() if luasnip.expand_or_locally_jumpable() then luasnip.expand_or_jump() @@ -67,17 +105,41 @@ return { end end, { 'i', 's' }), }, - sources = { - { - name = 'lazydev', - group_index = 0, - }, + + sources = cmp.config.sources({ { name = 'nvim_lsp' }, - { name = 'luasnip' }, + { name = 'luasnip' }, -- For luasnip users. + { name = 'nvim_lua' }, { name = 'path' }, - }, + }, { + { name = 'buffer' }, + }), } + + -- Set configuration for specific filetype. + cmp.setup.filetype('gitcommit', { + sources = cmp.config.sources({ + { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it. + }, { + { name = 'buffer' }, + }), + }) + -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore). + cmp.setup.cmdline('/', { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = 'buffer' }, + }, + }) + -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). + cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' }, + }, { + { name = 'cmdline' }, + }), + }) end, }, } --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua index b8918ce8fcd..d82a83fbecc 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/kickstart/plugins/gitsigns.lua @@ -6,65 +6,58 @@ return { { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - on_attach = function(bufnr) - local gitsigns = require 'gitsigns' - - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end - - -- Navigation - map('n', ']c', function() - if vim.wo.diff then - vim.cmd.normal { ']c', bang = true } - else - gitsigns.nav_hunk 'next' - end - end, { desc = 'Jump to next git [c]hange' }) - - map('n', '[c', function() - if vim.wo.diff then - vim.cmd.normal { '[c', bang = true } - else - gitsigns.nav_hunk 'prev' - end - end, { desc = 'Jump to previous git [c]hange' }) - - -- Actions - -- visual mode - map('v', 'hs', function() - gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'stage git hunk' }) - map('v', 'hr', function() - gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'reset git hunk' }) - -- normal mode - map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) - map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) - map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) - map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) - map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) - map('n', 'hD', function() - gitsigns.diffthis '@' - end, { desc = 'git [D]iff against last commit' }) - -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) - end, - }, + config = function() + require('gitsigns').setup { + signs = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '┃' }, + topdelete = { text = '┃' }, + changedelete = { text = '┃' }, + untracked = { text = '┃' }, + }, + signs_staged = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '┃' }, + topdelete = { text = '┃' }, + changedelete = { text = '┃' }, + untracked = { text = '┃' }, + }, + signs_staged_enable = true, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + follow_files = true, + }, + auto_attach = true, + attach_to_untracked = false, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + virt_text_priority = 100, + use_focus = true, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, -- Disable if file is longer than this (in lines) + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1, + }, + } + end, }, } -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index b4879371b39..27a7c4c1ed1 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -1,68 +1,39 @@ --- LSP Plugins return { { - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { - { path = 'luvit-meta/library', words = { 'vim%.uv' } }, - }, - }, - }, - - { 'Bilal2453/luvit-meta', lazy = true }, - - { - -- Main LSP Configuration - 'neovim/nvim-lspconfig', + 'williamboman/mason-lspconfig.nvim', dependencies = { - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants - 'williamboman/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', - 'j-hui/fidget.nvim', - 'hrsh7th/cmp-nvim-lsp', + 'williamboman/mason.nvim', + 'neovim/nvim-lspconfig', }, config = function() + -- NOTE: from `kickstart/plugins/lspconfig.lua` vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), callback = function(event) - -- NOTE: Remember that Lua is a real programming language, and as such it is possible - -- to define small helper and utility functions so you don't have to repeat yourself. - -- - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. local map = function(keys, func, desc, mode) mode = mode or 'n' vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) end -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') -- Find references for the word under your cursor. map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. + -- Fuzzy find all the symbols in your current workspace (project). map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. map('rn', vim.lsp.buf.rename, '[R]e[n]ame') -- Execute a code action, usually your cursor needs to be on top of an error @@ -72,122 +43,111 @@ return { -- WARN: This is not Goto Definition, this is Goto Declaration. -- For example, in C this would take you to the header. map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + end, + }) - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). - local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) - - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - end + require('mason').setup() + require('mason-lspconfig').setup_handlers { + -- The first entry (without a key) will be the default handler + -- and will be called for each installed server that doesn't have + -- a dedicated handler. + function(server_name) + local capabilities = require('cmp_nvim_lsp').default_capabilities() + require('lspconfig')[server_name].setup { capabilities = capabilities } + end, - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then - map('th', function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') - end + -- Every entry is a custom lsp config + -- [[ + ['marksman'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.clangd.setup { + capabilities = capabilities, + } end, - }) - -- LSP servers and clients are able to communicate to each other what features they support. - -- By default, Neovim doesn't support everything that is in the LSP specification. - -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- - -- Add any additional override configuration in the following tables. Available keys are: - -- - cmd (table): Override the default command used to start the server - -- - filetypes (table): Override the default list of associated filetypes for the server - -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. - -- - settings (table): Override the default settings passed when initializing the server. - -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ - local servers = { - -- clangd = {}, - -- gopls = {}, - pyright = {}, - r_language_server = {}, - -- rust_analyzer = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`tsserver`) will work just fine - -- tsserver = {}, - -- - - lua_ls = { - -- cmd = {...}, - -- filetypes = { ...}, - -- capabilities = {}, - settings = { - Lua = { - completion = { - callSnippet = 'Replace', + ['clangd'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.clangd.setup { + capabilities = capabilities, + } + end, + + ['lua_ls'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.lua_ls.setup { + capabilities = capabilities, + + settings = { + Lua = { + diagnostics = { + globals = { 'vim' }, + }, }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, }, - }, - }, - } - -- Ensure the servers and tools above are installed - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - require('mason').setup() + on_init = function(client) + local path = client.workspace_folders[1].name + if not vim.loop.fs_stat(path .. '/.luarc.json') and not vim.loop.fs_stat(path .. '/.luarc.jsonc') then + client.config.settings = vim.tbl_deep_extend('force', client.config.settings, { + Lua = { + runtime = { + version = 'LuaJIT', + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + }, + }, + }, + }) + client.notify('workspace/didChangeConfiguration', { settings = client.config.settings }) + end + return true + end, + } + end, - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code - }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - - require('mason-lspconfig').setup { - handlers = { - function(server_name) - local server = servers[server_name] or {} - -- This handles overriding only values explicitly passed - -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for tsserver) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, + ['texlab'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + lspconfig.texlab.setup { + capabilities = capabilities, + filetypes = { 'tex', 'bib', 'rnoweb' }, + } + end, + + ['r_language_server'] = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() + local lspconfig = require 'lspconfig' + + lspconfig.r_language_server.setup { + capabilities = capabilities, + settings = { + r = { + lsp = { + rich_documentation = true, + diagnostics = true, + }, + }, + }, + on_attach = function(client, bufnr) + vim.diagnostic.config { + virtual_text = false, -- Virtual text (the inline hints) + signs = true, -- Show signs in the gutter + underline = false, -- Underline problematic code + } + end, + } + end, + -- ]] } end, }, diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index b273937c4aa..897c4a0531e 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -3,9 +3,9 @@ require('lazy').setup({ require 'kickstart/plugins/gitsigns', require 'kickstart/plugins/which-key', require 'kickstart/plugins/telescope', - -- require 'kickstart/plugins/lspconfig', + require 'kickstart/plugins/lspconfig', require 'kickstart/plugins/conform', - -- require 'kickstart/plugins/cmp', + require 'kickstart/plugins/cmp', require 'kickstart/plugins/tokyonight', require 'kickstart/plugins/todo-comments', require 'kickstart/plugins/mini', diff --git a/lua/options.lua b/lua/options.lua index 02a0fa49cf3..31d3c538f5e 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -20,7 +20,7 @@ end) vim.opt.breakindent = true vim.opt.smartindent = true -vim.opt.tabstop = 4 +vim.opt.tabstop = 2 vim.opt.shiftwidth = 4 vim.opt.undofile = true diff --git a/snippets/all.lua b/snippets/all.lua index 78175fdfad8..992b7b46e9b 100644 --- a/snippets/all.lua +++ b/snippets/all.lua @@ -34,7 +34,7 @@ return { ), -- pipe operator - s({ trig = 'pap', dscr = 'pipe operator v R-ju', regTrig = false, wordTrig = true }, fmta('%>>% <>', { i(1) })), + s({ trig = 'pap', dscr = 'pipe operator v R-ju', regTrig = false, wordTrig = true, snippetType = 'autosnippet' }, fmta('%>>% <>', { i(1) })), -- R documentation s({ trig = 'doc', dscr = 'documentation znak za R funkcije', regTrig = false, wordTrig = true }, fmta("#' <>", { i(1) })), diff --git a/todo.md b/todo.md new file mode 100644 index 00000000000..346ef1b9c17 --- /dev/null +++ b/todo.md @@ -0,0 +1,12 @@ +# todo + +## UI + +- signcolumn +- neo-tree + +## Util + +- lsp configuration +- zakaj bold v .md ne dela +- java compiling in shit idk From 694705c8b11a7de5173a41a8071f0b56d37a50a3 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 3 Oct 2024 20:41:40 +0200 Subject: [PATCH 30/34] ui done i think --- init.lua | 4 +- lazy-lock.json | 3 +- lua/chadrc.lua | 89 ----- lua/custom/plugins/colors.lua | 4 +- lua/custom/plugins/nvimtree.lua | 12 + lua/kickstart/plugins/cmp.lua | 1 + lua/kickstart/plugins/neo-tree.lua | 5 +- lua/options.lua | 2 +- startup/nvimStartTime.txt | 15 + startup/pluginsStartTime.txt | 559 +++++++++++++++++++++++++++ startup/startTimeAnalysis.R | 62 +++ startup/startuptime.log | 588 +++++++++++++++++++++++++++++ todo.md | 3 - 13 files changed, 1247 insertions(+), 100 deletions(-) delete mode 100644 lua/chadrc.lua create mode 100644 lua/custom/plugins/nvimtree.lua create mode 100644 startup/nvimStartTime.txt create mode 100644 startup/pluginsStartTime.txt create mode 100644 startup/startTimeAnalysis.R create mode 100644 startup/startuptime.log diff --git a/init.lua b/init.lua index 6ef38c742ec..18aa081bba1 100644 --- a/init.lua +++ b/init.lua @@ -13,5 +13,5 @@ require 'lazy-plugins' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) --- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) --- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) diff --git a/lazy-lock.json b/lazy-lock.json index 919ff522cee..cb0804c0fa2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -44,8 +44,9 @@ "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" }, - "nvim-lspconfig": { "branch": "master", "commit": "1c2595e38da319a1a58c94f58afe6fe6fe02e292" }, + "nvim-lspconfig": { "branch": "master", "commit": "09074a29315dfe1c1bd5081a43481bd9af97bd3c" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, "nvim-treesitter": { "branch": "master", "commit": "cc2c11c403a9143827501223b4ee64432dcaf246" }, "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, diff --git a/lua/chadrc.lua b/lua/chadrc.lua deleted file mode 100644 index 564bced7790..00000000000 --- a/lua/chadrc.lua +++ /dev/null @@ -1,89 +0,0 @@ -local options = { - - base46 = { - theme = 'gruvchad', -- default theme - hl_add = {}, - hl_override = {}, - integrations = {}, - changed_themes = {}, - transparency = false, - theme_toggle = { 'onedark', 'one_light' }, - }, - - ui = { - cmp = { - icons = true, - lspkind_text = true, - style = 'default', -- default/flat_light/flat_dark/atom/atom_colored - }, - - telescope = { style = 'borderless' }, -- borderless / bordered - - statusline = { - theme = 'default', -- default/vscode/vscode_colored/minimal - -- default/round/block/arrow separators work only for default statusline theme - -- round and block will work for minimal theme only - separator_style = 'default', - order = nil, - modules = nil, - }, - - -- lazyload it when there are 1+ buffers - tabufline = { - enabled = true, - lazyload = true, - order = { 'treeOffset', 'buffers', 'tabs', 'btns' }, - modules = nil, - }, - - nvdash = { - load_on_startup = false, - - header = { - ' ▄ ▄ ', - ' ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ', - ' █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ', - ' ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ', - ' ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ', - ' █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄', - '▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █', - '█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █', - ' █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ', - }, - - buttons = { - { ' Find File', 'Spc f f', 'Telescope find_files' }, - { '󰈚 Recent Files', 'Spc f o', 'Telescope oldfiles' }, - { '󰈭 Find Word', 'Spc f w', 'Telescope live_grep' }, - { ' Bookmarks', 'Spc m a', 'Telescope marks' }, - { ' Themes', 'Spc t h', 'Telescope themes' }, - { ' Mappings', 'Spc c h', 'NvCheatsheet' }, - }, - }, - }, - - term = { - winopts = { number = false, relativenumber = false }, - sizes = { sp = 0.3, vsp = 0.2, ['bo sp'] = 0.3, ['bo vsp'] = 0.2 }, - float = { - relative = 'editor', - row = 0.3, - col = 0.25, - width = 0.5, - height = 0.4, - border = 'single', - }, - }, - - lsp = { signature = true }, - - cheatsheet = { - theme = 'simple¸', -- simple/grid - excluded_groups = { 'terminal (t)', 'autopairs', 'Nvim', 'Opens' }, -- can add group name or with mode - }, - - mason = { cmd = true, pkgs = {} }, -} - -local status, chadrc = pcall(require, 'chadrc') -return vim.tbl_deep_extend('force', options, status and chadrc or {}) diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index b9a3dadfc96..c45b70321a8 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -3,7 +3,7 @@ return { 'catppuccin/nvim', name = 'catppuccin', config = function() - -- vim.cmd 'colorscheme catppuccin' + vim.cmd 'colorscheme catppuccin-mocha' end, }, @@ -69,7 +69,7 @@ return { style = 'vulgaris', -- Choose between 'vulgaris' (regular), 'multiplex' (greener), and 'light' transparent = false, -- Show/hide background } - vim.cmd 'colorscheme bamboo-multiplex' + -- vim.cmd 'colorscheme bamboo-multiplex' end, }, diff --git a/lua/custom/plugins/nvimtree.lua b/lua/custom/plugins/nvimtree.lua new file mode 100644 index 00000000000..69b0b4faaec --- /dev/null +++ b/lua/custom/plugins/nvimtree.lua @@ -0,0 +1,12 @@ +return { + 'nvim-tree/nvim-tree.lua', + version = '*', + lazy = false, + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + + config = function() + require('nvim-tree').setup {} + end, +} diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index dea302283f8..6c6edf87cc5 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -1,6 +1,7 @@ return { { 'L3MON4D3/LuaSnip', + lazy = true, dependencies = { 'rafamadriz/friendly-snippets', -- Tu importamo snippets diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 7e9c0cadc23..d869486f61c 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -2,6 +2,7 @@ -- https://github.com/nvim-neo-tree/neo-tree.nvim return { + enabled = true, 'nvim-neo-tree/neo-tree.nvim', version = '*', dependencies = { @@ -17,10 +18,10 @@ return { filesystem = { window = { width = 30, - position = 'float', + position = 'left', -- float, left, right, current mappings = { ['\\'] = 'close_window', - ['P'] = { 'toggle_preview', config = { use_float = true, use_image_nvim = true } }, + ['P'] = 'toggle_preview', ['l'] = 'focus_preview', ['S'] = 'open_split', ['s'] = 'open_vsplit', diff --git a/lua/options.lua b/lua/options.lua index 31d3c538f5e..cba5567ea6f 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -5,7 +5,7 @@ vim.o.wrap = true vim.o.linebreak = true vim.opt.number = true -vim.o.numberwidth = 2 +vim.o.numberwidth = 3 vim.opt.relativenumber = true vim.opt.scrolloff = 999 vim.o.textwidth = 0 diff --git a/startup/nvimStartTime.txt b/startup/nvimStartTime.txt new file mode 100644 index 00000000000..97bbfa6c51a --- /dev/null +++ b/startup/nvimStartTime.txt @@ -0,0 +1,15 @@ +9.337 "004.606" "--- NVIM STARTED ---" +4.721 "001.311" "000.107: require('vim._init_packages')" +4.717 "000.884" "000.400: require('vim._editor')" +4.732 "000.834" "init lua interpreter" +1.669 "000.821" "inits 1" +2.586 "000.730" "parsing arguments" +0.524 "000.330" "early init" +3.825 "000.321" "000.321: require('vim.shared')" +4.712 "000.301" "000.301: require('vim._options')" +0.736 "000.211" "locale set" +1.856 "000.187" "window checked" +4.397 "000.183" "000.183: require('vim.inspect')" +0.194 "000.181" "event init" +0.848 "000.112" "init first window" +0.013 "000.013" "--- NVIM STARTING ---" diff --git a/startup/pluginsStartTime.txt b/startup/pluginsStartTime.txt new file mode 100644 index 00000000000..a0a1a7e63f1 --- /dev/null +++ b/startup/pluginsStartTime.txt @@ -0,0 +1,559 @@ +0.011 "" "000.011: --- NVIM STARTING ---" +0.107 "" "000.097: event init" +0.298 "" "000.190: early init" +0.422 "" "000.124: locale set" +0.499 "" "000.077: init first window" +1.019 "" "000.519: inits 1" +1.131 "" "000.112: window checked" +1.427 "" "000.297: parsing arguments" +2.443 "" "000.314 000.314: require('vim.shared')" +2.999 "" "000.181 000.181: require('vim.inspect')" +3.346 "" "000.333 000.333: require('vim._options')" +3.352 "" "000.901 000.387: require('vim._editor')" +3.356 "" "001.317 000.103: require('vim._init_packages')" +3.368 "" "000.623: init lua interpreter" +3.697 "" "000.329: expanding arguments" +3.719 "" "000.022: inits 2" +3.943 "" "000.224: init highlight" +3.949 "" "000.006: waiting for UI" +4.064 "" "000.115: done waiting for UI" +4.069 "" "000.005: clear screen" +4.378 "" "000.040 000.040: require('vim.keymap')" +6.211 "" "001.184 001.184: require('vim.termcap')" +6.429 "" "000.170 000.170: require('vim.text')" +9.057 "" "004.984 003.589: require('vim._defaults')" +9.065 "" "000.013: init default mappings & autocommands" +9.45 "" "000.135 000.135: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin.vim" +9.762 "" "000.079 000.079: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\indent.vim" +10.524 "" "000.372 000.372: require('options')" +12.337 "" "000.026 000.026: require('vim.F')" +12.407 "" "001.528 001.502: require('vim.diagnostic')" +12.671 "" "002.134 000.606: require('keymaps')" +13.083 "" "000.406 000.406: require('lazy-bootstrap')" +14.582 "" "000.346 000.346: require('lazy')" +14.799 "" "000.203 000.203: require('kickstart/plugins/gitsigns')" +14.973 "" "000.165 000.165: require('kickstart/plugins/which-key')" +15.156 "" "000.176 000.176: require('kickstart/plugins/telescope')" +15.372 "" "000.210 000.210: require('kickstart/plugins/lspconfig')" +15.545 "" "000.165 000.165: require('kickstart/plugins/conform')" +15.756 "" "000.199 000.199: require('kickstart/plugins/cmp')" +15.91 "" "000.145 000.145: require('kickstart/plugins/tokyonight')" +16.046 "" "000.128 000.128: require('kickstart/plugins/todo-comments')" +16.198 "" "000.146 000.146: require('kickstart/plugins/mini')" +16.356 "" "000.152 000.152: require('kickstart/plugins/treesitter')" +16.552 "" "000.184 000.184: require('kickstart.plugins.debug')" +16.712 "" "000.152 000.152: require('kickstart.plugins.lint')" +16.865 "" "000.146 000.146: require('kickstart.plugins.autopairs')" +17.045 "" "000.172 000.172: require('kickstart.plugins.neo-tree')" +17.105 "" "000.022 000.022: require('ffi')" +17.6 "" "000.236 000.236: require('vim.fs')" +18.021 "" "000.341 000.341: require('vim.uri')" +18.057 "" "000.945 000.368: require('vim.loader')" +18.547 "" "000.388 000.388: require('lazy.stats')" +19.103 "" "000.261 000.261: require('lazy.core.util')" +19.347 "" "000.232 000.232: require('lazy.core.config')" +19.837 "" "000.239 000.239: require('lazy.core.handler')" +20.506 "" "000.211 000.211: require('lazy.pkg')" +20.519 "" "000.438 000.227: require('lazy.core.meta')" +20.529 "" "000.683 000.245: require('lazy.core.plugin')" +20.541 "" "001.187 000.266: require('lazy.core.loader')" +21.277 "" "000.259 000.259: require('lazy.core.fragments')" +32.042 "" "000.209 000.209: require('lazy.core.handler.cmd')" +32.223 "" "000.165 000.165: require('lazy.core.handler.keys')" +32.524 "" "000.151 000.151: require('lazy.core.handler.event')" +32.532 "" "000.300 000.149: require('lazy.core.handler.ft')" +33.291 "" "000.095 000.095: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/Nvim-R/ftdetect/r.vim" +35.478 "" "000.388 000.388: require('dap.utils')" +35.626 "" "002.300 001.912: require('dap')" +37.088 "" "000.264 000.264: require('nio.tasks')" +37.382 "" "000.254 000.254: require('nio.control')" +38.289 "" "000.872 000.872: require('nio.uv')" +38.895 "" "000.567 000.567: require('nio.tests')" +39.343 "" "000.154 000.154: require('vim.ui')" +39.385 "" "000.448 000.295: require('nio.ui')" +39.801 "" "000.182 000.182: require('nio.streams')" +39.837 "" "000.420 000.238: require('nio.file')" +40.539 "" "000.177 000.177: require('nio.util')" +40.815 "" "000.764 000.587: require('nio.logger')" +40.855 "" "000.990 000.226: require('nio.lsp')" +41.088 "" "000.203 000.203: require('nio.process')" +41.152 "" "004.867 000.849: require('nio')" +42.246 "" "000.236 000.236: require('dapui.config.highlights')" +42.453 "" "000.834 000.599: require('dapui.config')" +42.467 "" "001.042 000.208: require('dapui.util')" +42.744 "" "000.270 000.270: require('dapui.windows.layout')" +42.755 "" "001.565 000.253: require('dapui.windows')" +43.053 "" "000.294 000.294: require('dapui.controls')" +43.064 "" "007.404 000.678: require('dapui')" +44.288 "" "000.422 000.422: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/filetype.lua" +50.909 "" "000.252 000.252: require('kanagawa-paper.config')" +50.924 "" "000.674 000.423: require('kanagawa-paper')" +51.117 "" "000.176 000.176: require('kanagawa-paper.colors')" +51.321 "" "000.157 000.157: require('kanagawa-paper.themes')" +51.556 "" "000.182 000.182: require('kanagawa-paper.highlights')" +51.739 "" "000.176 000.176: require('kanagawa-paper.highlights.editor')" +51.995 "" "000.206 000.206: require('kanagawa-paper.highlights.syntax')" +52.223 "" "000.171 000.171: require('kanagawa-paper.highlights.treesitter')" +52.446 "" "000.176 000.176: require('kanagawa-paper.highlights.lsp')" +52.831 "" "000.374 000.374: require('kanagawa-paper.highlights.plugins')" +53.265 "" "000.247 000.247: require('kanagawa-paper.lib.hsluv')" +53.279 "" "000.440 000.193: require('kanagawa-paper.lib.color')" +54.335 "" "000.226 000.226: require('kanagawa-paper.highlights.ft')" +55.036 "" "004.851 001.893: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\kanagawa-paper.nvim\colors\kanagawa-paper.vim" +57.365 "" "000.199 000.199: require('tokyonight.config')" +57.384 "" "001.706 001.507: require('tokyonight')" +60.465 "" "000.137 000.137: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/lush.nvim/plugin/lush.vim" +64.067 "" "000.085 000.085: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/plenary.nvim/plugin/plenary.vim" +65.873 "" "001.696 001.696: require('alpha')" +68.145 "" "000.100 000.100: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-web-devicons/plugin/nvim-web-devicons.vim" +70.68 "" "001.832 001.832: require('nvim-web-devicons.icons-default')" +70.849 "" "004.329 002.397: require('nvim-web-devicons')" +71.805 "" "000.951 000.951: require('mini.icons')" +71.82 "" "005.656 000.376: require('alpha.utils')" +72.308 "" "000.185 000.185: require('plenary.bit')" +72.468 "" "000.151 000.151: require('plenary.functional')" +72.486 "" "000.661 000.325: require('plenary.path')" +72.654 "" "000.164 000.164: require('alpha.themes.dashboard')" +72.668 "" "006.779 000.297: require('alpha.themes.theta')" +79.115 "" "000.279 000.279: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-dap/plugin/dap.lua" +81.483 "" "000.265 000.265: require('mason-core.functional')" +81.67 "" "000.174 000.174: require('mason-core.path')" +81.854 "" "000.178 000.178: require('mason.settings')" +81.884 "" "000.997 000.380: require('mason-core.log')" +81.891 "" "002.704 001.707: require('mason-nvim-dap')" +82.076 "" "000.179 000.179: require('mason-nvim-dap.settings')" +82.678 "" "000.181 000.181: require('mason-core.EventEmitter')" +82.843 "" "000.157 000.157: require('mason-core.optional')" +83.242 "" "000.228 000.228: require('mason-core.async')" +83.397 "" "000.147 000.147: require('mason-core.async.uv')" +83.406 "" "000.557 000.182: require('mason-core.fs')" +83.607 "" "000.197 000.197: require('mason-registry.sources')" +83.944 "" "000.157 000.157: require('mason-core.functional.data')" +84.11 "" "000.160 000.160: require('mason-core.functional.function')" +84.146 "" "000.529 000.212: require('mason-core.functional.list')" +84.178 "" "001.839 000.218: require('mason-registry')" +84.52 "" "000.168 000.168: require('mason-core.functional.table')" +84.529 "" "000.347 000.179: require('mason-nvim-dap.mappings.source')" +84.535 "" "002.359 000.173: require('mason-nvim-dap.ensure_installed')" +87.963 "" "000.182 000.182: require('mason-core.functional.string')" +88.257 "" "000.172 000.172: require('mason-nvim-dap.automatic_installation')" +88.465 "" "000.191 000.191: require('mason-core.notify')" +88.919 "" "000.199 000.199: require('mason-nvim-dap.mappings.adapters')" +89.105 "" "000.176 000.176: require('mason-nvim-dap.mappings.filetypes')" +103.152 "" "013.954 013.954: require('mason-nvim-dap.mappings.configurations')" +108.694 "" "005.517 005.517: require('mason-nvim-dap.mappings.adapters.python')" +109.021 "" "000.310 000.310: require('mason-nvim-dap.automatic_setup')" +109.278 "" "000.233 000.233: require('dap.ext.vscode')" +109.767 "" "000.180 000.180: require('mason-core.functional.number')" +110.061 "" "000.280 000.280: require('mason-core.functional.logic')" +110.093 "" "000.722 000.261: require('mason-nvim-dap.api.command')" +112.32 "" "001.204 001.204: require('dapui.client.types')" +112.356 "" "001.810 000.606: require('dapui.client')" +112.948 "" "000.582 000.582: require('dap.breakpoints')" +113.395 "" "000.369 000.369: require('dapui.client.lib')" +114.218 "" "000.394 000.394: require('dapui.render.canvas')" +114.235 "" "000.777 000.383: require('dapui.elements.breakpoints')" +114.456 "" "000.196 000.196: require('dapui.components.breakpoints')" +114.627 "" "000.144 000.144: require('dapui.elements.repl')" +114.77 "" "000.134 000.134: require('dapui.elements.scopes')" +114.931 "" "000.141 000.141: require('dapui.components.scopes')" +115.104 "" "000.167 000.167: require('dapui.components.variables')" +115.268 "" "000.140 000.140: require('dapui.elements.stacks')" +115.559 "" "000.138 000.138: require('dapui.components.frames')" +115.568 "" "000.281 000.143: require('dapui.components.threads')" +115.746 "" "000.157 000.157: require('dapui.elements.watches')" +115.978 "" "000.208 000.208: require('dapui.components.watches')" +116.17 "" "000.146 000.146: require('dapui.elements.hover')" +116.338 "" "000.147 000.147: require('dapui.components.hover')" +116.489 "" "000.141 000.141: require('dapui.elements.console')" +116.956 "" "000.179 000.179: require('dap-go-ts')" +116.981 "" "000.426 000.248: require('dap-go')" +120.328 "" "000.089 000.089: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/twilight.nvim/plugin/twilight.vim" +122.477 "" "000.146 000.146: require('twilight.util')" +122.533 "" "000.361 000.216: require('twilight.config')" +122.71 "" "000.170 000.170: require('twilight.view')" +122.721 "" "002.217 001.685: require('twilight')" +123.142 "" "000.064 000.064: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/zen-mode.nvim/plugin/zen-mode.vim" +125.442 "" "000.187 000.187: require('zen-mode.util')" +125.456 "" "000.347 000.161: require('zen-mode.config')" +125.786 "" "000.158 000.158: require('zen-mode.plugins')" +125.799 "" "000.340 000.181: require('zen-mode.view')" +125.808 "" "002.472 001.785: require('zen-mode')" +128.366 "" "002.268 002.268: require('mini.surround')" +129.093 "" "000.309 000.309: require('mini.pairs')" +132.352 "" "000.170 000.170: require('ibl.utils')" +132.368 "" "000.339 000.168: require('ibl.config')" +132.684 "" "000.143 000.143: require('ibl.indent')" +132.697 "" "000.324 000.181: require('ibl.hooks')" +132.701 "" "000.849 000.186: require('ibl.highlights')" +132.857 "" "000.152 000.152: require('ibl.autocmds')" +133.041 "" "000.173 000.173: require('ibl.inlay_hints')" +133.196 "" "000.148 000.148: require('ibl.virt_text')" +133.727 "" "000.320 000.320: require('ibl.scope_languages')" +133.741 "" "000.539 000.219: require('ibl.scope')" +133.751 "" "003.855 001.993: require('ibl')" +134.006 "" "000.226 000.226: require('vim.iter')" +134.581 "" "000.271 000.271: require('vim.lsp.log')" +135.039 "" "000.447 000.447: require('vim.lsp.protocol')" +135.717 "" "000.296 000.296: require('vim.lsp._snippet_grammar')" +135.937 "" "000.204 000.204: require('vim.highlight')" +135.962 "" "000.912 000.413: require('vim.lsp.util')" +136.368 "" "000.182 000.182: require('vim.lsp.sync')" +136.382 "" "000.414 000.232: require('vim.lsp._changetracking')" +136.748 "" "000.360 000.360: require('vim.lsp.rpc')" +136.864 "" "002.822 000.417: require('vim.lsp')" +137.237 "" "000.367 000.367: require('vim.lsp.handlers')" +143 "" "000.318 000.318: require('nvim-treesitter.utils')" +145.399 "" "000.322 000.322: require('vim.treesitter.language')" +145.59 "" "000.173 000.173: require('vim.func')" +145.812 "" "000.210 000.210: require('vim.func._memoize')" +145.881 "" "001.169 000.464: require('vim.treesitter.query')" +146.144 "" "000.257 000.257: require('vim.treesitter._range')" +146.243 "" "001.939 000.512: require('vim.treesitter.languagetree')" +146.259 "" "002.633 000.694: require('vim.treesitter')" +147.768 "" "004.753 002.120: require('nvim-treesitter.parsers')" +150.244 "" "000.652 000.652: require('nvim-treesitter.compat')" +151.152 "" "000.585 000.585: require('nvim-treesitter.ts_utils')" +151.171 "" "000.910 000.325: require('nvim-treesitter.tsrange')" +151.367 "" "000.190 000.190: require('nvim-treesitter.caching')" +151.384 "" "002.655 000.903: require('nvim-treesitter.query')" +151.404 "" "003.163 000.508: require('nvim-treesitter.configs')" +151.411 "" "003.633 000.469: require('nvim-treesitter.info')" +151.616 "" "000.201 000.201: require('nvim-treesitter.shell_command_selectors')" +151.648 "" "009.267 000.361: require('nvim-treesitter.install')" +151.808 "" "000.155 000.155: require('nvim-treesitter.statusline')" +152.048 "" "000.234 000.234: require('nvim-treesitter.query_predicates')" +152.055 "" "012.024 002.369: require('nvim-treesitter')" +152.386 "" "012.546 000.521: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-treesitter/plugin/nvim-treesitter.lua" +164.635 "" "000.305 000.305: require('nvim-treesitter.indent')" +164.968 "" "000.252 000.252: require('nvim-treesitter.highlight')" +170.763 "" "000.156 000.156: require('luasnip.util.types')" +170.962 "" "000.180 000.180: require('luasnip.util.lazy_table')" +171.172 "" "000.197 000.197: require('luasnip.extras.filetype_functions')" +171.197 "" "000.804 000.272: require('luasnip.default_config')" +171.203 "" "001.093 000.289: require('luasnip.session')" +171.216 "" "001.407 000.314: require('luasnip.util.util')" +171.776 "" "000.339 000.339: require('luasnip.util.path')" +172.279 "" "000.192 000.192: require('luasnip.session.snippet_collection.source')" +172.455 "" "000.159 000.159: require('luasnip.util.table')" +172.648 "" "000.181 000.181: require('luasnip.util.auto_table')" +172.67 "" "000.881 000.351: require('luasnip.session.snippet_collection')" +173.043 "" "000.368 000.368: require('luasnip.util.log')" +173.058 "" "001.838 000.249: require('luasnip.loaders.util')" +173.372 "" "000.308 000.308: require('luasnip.loaders.fs_watchers')" +173.579 "" "000.197 000.197: require('luasnip.loaders.data')" +173.772 "" "000.183 000.183: require('luasnip.session.enqueueable_operations')" +174.843 "" "000.158 000.158: require('luasnip.util.ext_opts')" +175.011 "" "000.152 000.152: require('luasnip.nodes.key_indexer')" +175.024 "" "000.520 000.211: require('luasnip.nodes.util')" +175.196 "" "000.167 000.167: require('luasnip.util.events')" +175.214 "" "000.948 000.260: require('luasnip.nodes.node')" +175.7 "" "000.165 000.165: require('luasnip.util.extend_decorator')" +175.715 "" "000.496 000.331: require('luasnip.nodes.insertNode')" +175.947 "" "000.228 000.228: require('luasnip.nodes.textNode')" +176.191 "" "000.232 000.232: require('luasnip.util.mark')" +176.812 "" "000.188 000.188: require('luasnip.util.select')" +177.035 "" "000.211 000.211: require('luasnip.util.time')" +177.469 "" "001.052 000.653: require('luasnip.util._builtin_vars')" +177.674 "" "001.472 000.420: require('luasnip.util.environ')" +178.034 "" "000.350 000.350: require('luasnip.util.pattern_tokenizer')" +178.295 "" "000.248 000.248: require('luasnip.util.dict')" +190.304 "" "011.800 011.800: require('luasnip.util.jsregexp')" +190.33 "" "012.023 000.223: require('luasnip.nodes.util.trig_engines')" +190.419 "" "016.401 000.404: require('luasnip.nodes.snippet')" +191.402 "" "000.415 000.415: require('luasnip.util.parser.neovim_ast')" +191.868 "" "000.443 000.443: require('luasnip.util.str')" +193.364 "" "001.473 001.473: require('luasnip.util.jsregexp')" +193.565 "" "000.189 000.189: require('luasnip.util.directed_graph')" +193.575 "" "002.805 000.285: require('luasnip.util.parser.ast_utils')" +193.802 "" "000.222 000.222: require('luasnip.nodes.functionNode')" +194.024 "" "000.213 000.213: require('luasnip.nodes.choiceNode')" +194.281 "" "000.250 000.250: require('luasnip.nodes.dynamicNode')" +194.55 "" "000.257 000.257: require('luasnip.util.functions')" +194.565 "" "004.141 000.393: require('luasnip.util.parser.ast_parser')" +194.794 "" "000.224 000.224: require('luasnip.util.parser.neovim_parser')" +194.806 "" "021.024 000.259: require('luasnip.util.parser')" +194.985 "" "000.174 000.174: require('luasnip.nodes.snippetProxy')" +195.239 "" "000.242 000.242: require('luasnip.util.jsonc')" +195.78 "" "000.178 000.178: require('luasnip.nodes.duplicate')" +195.794 "" "000.459 000.281: require('luasnip.loaders.snippet_cache')" +195.806 "" "028.625 002.794: require('luasnip.loaders.from_vscode')" +210.229 "" "000.227 000.227: require('luasnip.nodes.multiSnippet')" +211.582 "" "000.361 000.361: require('luasnip.loaders.from_lua')" +212.879 "" "000.206 000.206: require('luasnip.loaders')" +213.108 "" "000.186 000.186: require('luasnip.config')" +213.118 "" "000.709 000.317: require('luasnip')" +213.504 "" "000.186 000.186: require('luasnip.extras')" +213.515 "" "000.391 000.205: require('luasnip.extras.fmt')" +234.722 "" "002.327 002.327: require('vim.filetype')" +235.079 "" "002.883 000.555: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/LuaSnip/plugin/luasnip.lua" +235.53 "" "000.099 000.099: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/LuaSnip/plugin/luasnip.vim" +239.183 "" "002.352 002.352: require('render-markdown')" +239.826 "" "000.173 000.173: require('render-markdown.core.range')" +239.84 "" "000.415 000.242: require('render-markdown.config')" +240.212 "" "000.182 000.182: require('render-markdown.core.util')" +240.223 "" "000.378 000.196: require('render-markdown.core.log')" +240.41 "" "000.182 000.182: require('render-markdown.presets')" +240.584 "" "000.168 000.168: require('render-markdown.core.treesitter')" +240.595 "" "001.398 000.255: require('render-markdown.state')" +241.276 "" "000.192 000.192: require('render-markdown.core.buffer_state')" +241.689 "" "000.216 000.216: require('render-markdown.core.node_info')" +241.876 "" "000.174 000.174: require('render-markdown.core.str')" +241.89 "" "000.604 000.214: require('render-markdown.core.context')" +242.054 "" "000.161 000.161: require('render-markdown.core.extmark')" +242.254 "" "000.193 000.193: require('render-markdown.core.iter')" +242.634 "" "000.191 000.191: require('render-markdown.core.list')" +242.644 "" "000.383 000.192: require('render-markdown.handler.markdown')" +242.875 "" "000.226 000.226: require('render-markdown.handler.markdown_inline')" +243.062 "" "000.180 000.180: require('render-markdown.handler.latex')" +243.076 "" "002.223 000.284: require('render-markdown.core.ui')" +243.33 "" "000.247 000.247: require('render-markdown.colors')" +243.999 "" "000.221 000.221: require('render-markdown.manager')" +244.016 "" "000.422 000.201: require('render-markdown.api')" +244.022 "" "000.612 000.190: require('render-markdown.command')" +244.054 "" "007.432 000.601: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/render-markdown.nvim/plugin/render-markdown.lua" +252.613 "" "001.613 001.613: require('mini.files')" +256.144 "" "000.556 000.556: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/vim-sleuth/plugin/sleuth.vim" +261.814 "" "000.297 000.297: require('gitsigns.async')" +262.047 "" "000.217 000.217: require('gitsigns.debug.log')" +262.681 "" "000.621 000.621: require('gitsigns.config')" +262.715 "" "004.037 002.902: require('gitsigns')" +265.895 "" "000.782 000.782: require('gitsigns.highlight')" +267.229 "" "000.479 000.479: require('gitsigns.debounce')" +283.747 "" "000.968 000.968: require('lualine_require')" +286.589 "" "007.953 006.985: require('lualine')" +307.234 "" "007.671 007.671: require('lualine.utils.mode')" +339.025 "" "003.196 003.196: require('onedark')" +349.277 "" "000.271 000.271: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-lspconfig/plugin/lspconfig.lua" +350.162 "" "000.237 000.237: require('mason-core.functional.relation')" +350.205 "" "000.525 000.288: require('mason-core.platform')" +350.212 "" "000.767 000.242: require('mason')" +350.565 "" "000.305 000.305: require('mason.api.command')" +354.172 "" "000.185 000.185: require('mason-lspconfig.settings')" +354.189 "" "003.594 003.410: require('mason-lspconfig')" +354.478 "" "000.284 000.284: require('mason-lspconfig.mappings.server')" +354.646 "" "000.157 000.157: require('mason-lspconfig.notify')" +359.074 "" "003.633 003.633: require('cmp_nvim_lsp.source')" +359.095 "" "004.332 000.699: require('cmp_nvim_lsp')" +359.85 "" "000.306 000.306: require('lspconfig.util')" +360.034 "" "000.170 000.170: require('lspconfig.async')" +360.041 "" "000.712 000.237: require('lspconfig.configs')" +360.053 "" "000.947 000.235: require('lspconfig')" +360.233 "" "000.175 000.175: require('lspconfig.configs.pyright')" +361.12 "" "000.298 000.298: require('lspconfig.manager')" +361.468 "" "000.250 000.250: require('lspconfig.configs.r_language_server')" +365.227 "" "000.321 000.321: require('lspconfig.configs.clangd')" +366.294 "" "000.246 000.246: require('lspconfig.configs.ts_ls')" +367.055 "" "000.271 000.271: require('lspconfig.configs.texlab')" +367.848 "" "000.248 000.248: require('lspconfig.configs.lua_ls')" +368.452 "" "000.213 000.213: require('lspconfig.configs.markdown_oxide')" +369.133 "" "000.213 000.213: require('lspconfig.configs.matlab_ls')" +379.691 "" "003.635 003.635: require('bamboo')" +391.273 "" "000.189 000.189: require('bamboo')" +392.516 "" "000.175 000.175: require('bamboo.palette')" +392.557 "" "000.393 000.218: require('bamboo.colors')" +392.765 "" "000.200 000.200: require('bamboo.util')" +392.972 "" "001.304 000.711: require('bamboo.highlights')" +394.224 "" "000.401 000.401: require('bamboo.terminal')" +394.254 "" "004.111 002.217: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\bamboo.nvim\colors\bamboo-multiplex.lua" +406.284 "" "000.271 000.271: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/editorconfig.lua" +406.786 "" "000.259 000.259: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/gzip.vim" +407.278 "" "000.224 000.224: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/man.lua" +412.876 "" "000.314 000.314: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\pack\dist\opt\matchit\plugin\matchit.vim" +412.967 "" "005.431 005.117: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/matchit.vim" +413.633 "" "000.336 000.336: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/matchparen.vim" +414.389 "" "000.484 000.484: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/netrwPlugin.vim" +414.897 "" "000.236 000.236: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/osc52.lua" +415.838 "" "000.664 000.664: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/rplugin.vim" +416.303 "" "000.141 000.141: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/shada.vim" +416.651 "" "000.073 000.073: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/spellfile.vim" +417.16 "" "000.219 000.219: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/tarPlugin.vim" +417.727 "" "000.281 000.281: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/tohtml.lua" +418.143 "" "000.088 000.088: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/tutor.vim" +418.586 "" "000.219 000.219: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/zipPlugin.vim" +437.536 "" "004.088 004.088: require('cmp.utils.api')" +437.881 "" "000.144 000.144: require('cmp.types.cmp')" +438.26 "" "000.163 000.163: require('cmp.utils.misc')" +438.274 "" "000.386 000.223: require('cmp.types.lsp')" +438.415 "" "000.136 000.136: require('cmp.types.vim')" +438.422 "" "000.872 000.206: require('cmp.types')" +438.566 "" "000.140 000.140: require('cmp.utils.highlight')" +438.863 "" "000.147 000.147: require('cmp.utils.debug')" +438.884 "" "000.312 000.165: require('cmp.utils.autocmd')" +439.196 "" "005.971 000.560: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-cmp/plugin/cmp.lua" +440.027 "" "000.174 000.174: require('cmp.utils.char')" +440.041 "" "000.337 000.162: require('cmp.utils.str')" +440.539 "" "000.169 000.169: require('cmp.utils.buffer')" +440.553 "" "000.354 000.185: require('cmp.utils.keymap')" +440.558 "" "000.512 000.159: require('cmp.utils.feedkeys')" +441.027 "" "000.152 000.152: require('cmp.config.mapping')" +441.186 "" "000.150 000.150: require('cmp.utils.cache')" +441.507 "" "000.159 000.159: require('cmp.config.compare')" +441.514 "" "000.321 000.161: require('cmp.config.default')" +441.539 "" "000.815 000.191: require('cmp.config')" +441.563 "" "001.002 000.187: require('cmp.utils.async')" +441.871 "" "000.138 000.138: require('cmp.utils.pattern')" +441.879 "" "000.312 000.175: require('cmp.context')" +442.482 "" "000.196 000.196: require('cmp.utils.snippet')" +442.653 "" "000.163 000.163: require('cmp.matcher')" +442.663 "" "000.564 000.205: require('cmp.entry')" +442.672 "" "000.788 000.224: require('cmp.source')" +443.009 "" "000.172 000.172: require('cmp.utils.event')" +443.515 "" "000.140 000.140: require('cmp.utils.options')" +443.526 "" "000.304 000.164: require('cmp.utils.window')" +443.531 "" "000.485 000.180: require('cmp.view.docs_view')" +443.736 "" "000.201 000.201: require('cmp.view.custom_entries_view')" +443.98 "" "000.236 000.236: require('cmp.view.wildmenu_entries_view')" +444.203 "" "000.215 000.215: require('cmp.view.native_entries_view')" +444.433 "" "000.221 000.221: require('cmp.view.ghost_text_view')" +444.45 "" "001.773 000.244: require('cmp.view')" +444.844 "" "005.345 000.620: require('cmp.core')" +445.261 "" "000.287 000.287: require('cmp.config.sources')" +445.437 "" "000.167 000.167: require('cmp.config.window')" +445.541 "" "006.258 000.460: require('cmp')" +445.813 "" "000.267 000.267: require('lspkind')" +447.523 "" "028.142 015.646: require('cmp')" +447.819 "" "000.288 000.288: require('cmp_luasnip')" +447.874 "" "028.717 000.287: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp_luasnip\after/plugin/cmp_luasnip.lua" +448.338 "" "000.153 000.153: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-nvim-lsp\after/plugin/cmp_nvim_lsp.lua" +448.885 "" "000.154 000.154: require('cmp_nvim_lua')" +448.915 "" "000.328 000.173: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-nvim-lua\after/plugin/cmp_nvim_lua.lua" +449.913 "" "000.140 000.140: require('cmp_buffer.timer')" +449.924 "" "000.298 000.159: require('cmp_buffer.buffer')" +449.929 "" "000.475 000.177: require('cmp_buffer.source')" +449.933 "" "000.614 000.139: require('cmp_buffer')" +449.951 "" "000.756 000.141: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-buffer\after/plugin/cmp_buffer.lua" +450.523 "" "000.170 000.170: require('cmp_path')" +450.542 "" "000.317 000.147: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-path\after/plugin/cmp_path.lua" +451.212 "" "000.208 000.208: require('cmp_cmdline')" +451.266 "" "000.421 000.213: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-cmdline\after/plugin/cmp_cmdline.lua" +451.716 "" "000.160 000.160: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\indent-blankline.nvim\after/plugin/commands.lua" +451.789 "" "438.698 218.204: require('lazy-plugins')" +451.794 "" "441.723 000.113: sourcing C:\Users\joene\AppData\Local\nvim\init.lua" +451.844 "" "000.842: sourcing vimrc file(s)" +453.628 "" "000.163 000.163: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\filetype.lua" +455.597 "" "000.114 000.114: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\synload.vim" +455.845 "" "001.462 001.348: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/syntax/syntax.vim" +455.873 "" "002.405: inits 3" +459.094 "" "003.220: reading ShaDa" +464.42 "" "003.866 003.866: require('lint')" +467.508 "" "000.436 000.436: require('vim.filetype.detect')" +476.07 "" "000.406 000.406: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\autoload\htmlcomplete.vim" +476.252 "" "001.737 001.331: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\html.vim" +477.32 "" "005.853 004.116: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\markdown.vim" +484.657 "" "003.739 003.739: require('markdown')" +484.85 "" "004.103 000.365: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/markdown.nvim/plugin/markdown.lua" +487.359 "" "000.221 000.221: require('markdown.config')" +487.687 "" "000.176 000.176: require('markdown.cmd')" +488.015 "" "000.145 000.145: require('markdown.treesitter')" +488.165 "" "000.144 000.144: require('markdown.util')" +494.163 "" "006.463 006.174: require('markdown.list')" +494.986 "" "000.181 000.181: require('markdown.notify')" +496.227 "" "001.822 001.641: require('markdown.link')" +497.117 "" "000.221 000.221: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/markdown-preview.nvim/plugin/mkdp.vim" +508.092 "" "000.240 000.240: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\html.vim" +509.118 "" "004.553 004.314: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\markdown.vim" +519.682 "" "000.264 000.264: require('vim.treesitter.highlighter')" +520.059 "" "000.223 000.223: require('luasnip.loaders.from_snipmate')" +528.49 "" "000.499 000.499: require('vim.lsp.client')" +529.177 "" "000.204 000.204: require('vim.glob')" +529.198 "" "000.466 000.261: require('vim.lsp._dynamic')" +529.501 "" "000.225 000.225: require('vim._system')" +537.948 "" "000.395 000.395: require('vim.version')" +552.185 "" "000.362 000.362: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax/dtd.vim" +552.315 "" "001.494 001.131: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\xml.vim" +554.956 "" "000.518 000.518: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\javascript.vim" +557.508 "" "000.881 000.881: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\vb.vim" +567.876 "" "008.793 008.793: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\css.vim" +569.96 "" "020.374 008.688: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\html.vim" +572.952 "" "001.064 001.064: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\yaml.vim" +573.329 "" "025.117 003.679: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\markdown.vim" +589.709 "" "000.292 000.292: require('gitsigns.status')" +590.281 "" "000.326 000.326: require('gitsigns.util')" +590.984 "" "000.176 000.176: require('gitsigns.system')" +590.995 "" "000.436 000.260: require('gitsigns.git.cmd')" +591.394 "" "000.212 000.212: require('gitsigns.message')" +591.406 "" "000.406 000.193: require('gitsigns.git.version')" +597.585 "" "007.293 006.451: require('gitsigns.git.repo')" +597.619 "" "007.896 000.277: require('gitsigns.git')" +598.1 "" "000.475 000.475: require('gitsigns.cache')" +598.789 "" "000.258 000.258: require('gitsigns.diff')" +599.126 "" "000.321 000.321: require('gitsigns.hunks')" +599.423 "" "000.282 000.282: require('gitsigns.signs')" +599.453 "" "001.337 000.475: require('gitsigns.manager')" +599.475 "" "010.462 000.463: require('gitsigns.attach')" +599.84 "" "000.308 000.308: require('gitsigns.current_line_blame')" +604.983 "" "000.594 000.594: require('editorconfig')" +605.736 "" "080.376: opening buffers" +612.054 "" "000.425 000.425: require('lint.parser')" +612.077 "" "000.854 000.429: require('lint.linters.markdownlint')" +623.537 "" "016.947: BufEnter autocommands" +623.556 "" "000.019: editing files in windows" +625.346 "" "000.153 000.153: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/todo-comments.nvim/plugin/todo.vim" +634.471 "" "000.328 000.328: require('todo-comments.util')" +634.517 "" "000.786 000.458: require('todo-comments.config')" +635.554 "" "000.604 000.604: require('todo-comments.highlight')" +635.581 "" "001.056 000.452: require('todo-comments.jump')" +635.591 "" "009.924 008.082: require('todo-comments')" +643.9 "" "000.899 000.899: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/telescope.nvim/plugin/telescope.lua" +651.802 "" "000.491 000.491: require('telescope._extensions')" +651.83 "" "007.683 007.191: require('telescope')" +652.292 "" "000.455 000.455: require('telescope.themes')" +653.326 "" "000.491 000.491: require('plenary.strings')" +653.701 "" "000.356 000.356: require('telescope.deprecated')" +656.698 "" "001.014 001.014: require('plenary.log')" +656.804 "" "002.066 001.052: require('telescope.log')" +659.681 "" "000.771 000.771: require('plenary.compat')" +659.733 "" "002.030 001.259: require('plenary.job')" +660.176 "" "000.436 000.436: require('telescope.state')" +660.301 "" "003.488 001.021: require('telescope.utils')" +660.338 "" "006.620 001.066: require('telescope.sorters')" +665.213 "" "012.824 005.357: require('telescope.config')" +671.335 "" "000.685 000.685: require('telescope._extensions.ui-select')" +674.386 "" "000.193 000.193: require('plenary.tbl')" +674.408 "" "000.436 000.243: require('plenary.vararg.rotate')" +674.415 "" "000.671 000.235: require('plenary.vararg')" +674.615 "" "000.195 000.195: require('plenary.errors')" +674.631 "" "001.183 000.317: require('plenary.async.async')" +675.62 "" "000.280 000.280: require('plenary.async.structs')" +675.65 "" "000.538 000.258: require('plenary.async.control')" +675.665 "" "000.770 000.233: require('plenary.async.util')" +675.674 "" "001.035 000.264: require('plenary.async.tests')" +675.681 "" "002.990 000.772: require('plenary.async')" +676.44 "" "000.338 000.338: require('plenary.window.border')" +676.829 "" "000.370 000.370: require('plenary.window')" +677.189 "" "000.335 000.335: require('plenary.popup.utils')" +677.217 "" "001.528 000.485: require('plenary.popup')" +678.401 "" "000.363 000.363: require('telescope.pickers.scroller')" +678.744 "" "000.321 000.321: require('telescope.actions.state')" +679.076 "" "000.315 000.315: require('telescope.actions.utils')" +679.715 "" "000.311 000.311: require('telescope.actions.mt')" +679.759 "" "000.672 000.361: require('telescope.actions.set')" +680.593 "" "000.435 000.435: require('telescope.config.resolve')" +680.618 "" "000.852 000.416: require('telescope.pickers.entry_display')" +681.016 "" "000.390 000.390: require('telescope.from_entry')" +681.313 "" "003.977 001.065: require('telescope.actions')" +681.755 "" "000.433 000.433: require('telescope.debounce')" +682.141 "" "000.369 000.369: require('telescope.mappings')" +682.5 "" "000.344 000.344: require('telescope.pickers.highlights')" +682.808 "" "000.292 000.292: require('telescope.pickers.window')" +683.558 "" "000.343 000.343: require('telescope.algos.linked_list')" +683.575 "" "000.756 000.413: require('telescope.entry_manager')" +683.808 "" "000.225 000.225: require('telescope.pickers.multi')" +683.844 "" "012.470 001.556: require('telescope.pickers')" +684.606 "" "000.472 000.472: require('telescope.make_entry')" +685.003 "" "000.378 000.378: require('telescope.finders.async_static_finder')" +685.905 "" "000.258 000.258: require('plenary.class')" +685.941 "" "000.628 000.370: require('telescope._')" +685.947 "" "000.929 000.301: require('telescope.finders.async_oneshot_finder')" +686.239 "" "000.287 000.287: require('telescope.finders.async_job_finder')" +686.257 "" "002.409 000.343: require('telescope.finders')" +686.603 "" "000.321 000.321: require('telescope.builtin')" +687.624 "" "000.196 000.196: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/which-key.nvim/plugin/which-key.lua" +691.934 "" "004.182 004.182: require('which-key')" +692.244 "" "000.283 000.283: require('which-key.config')" +692.936 "" "016.897: VimEnter autocommands" +693.156 "" "000.220: UIEnter autocommands" +695.582 "" "002.426: before starting main loop" +727.956 "" "032.374: first screen update" +727.97 "" "000.014: --- NVIM STARTED ---" diff --git a/startup/startTimeAnalysis.R b/startup/startTimeAnalysis.R new file mode 100644 index 00000000000..646a49201b7 --- /dev/null +++ b/startup/startTimeAnalysis.R @@ -0,0 +1,62 @@ +library(tidyverse) + +log <- read.delim("startuptime.log", header = F) %>% + unlist() %>% + setNames(NULL) + +nvim_start <- data.frame(name = log[5:19]) +plugins_start <- data.frame(name = log[24:length(log)]) + +nvim_start <- lapply(nvim_start, gsub, pattern = "\\s+", replacement = " ") %>% + as.data.frame() + +plugins_start <- lapply(plugins_start, gsub, pattern = "\\s+", replacement = " ") %>% + as.data.frame() + +nvim_df <- nvim_start %>% + separate( + col = name, + into = c("total_time", "self_time", "dscr"), + sep = " ", + extra = "merge" + ) %>% + { + .[, "total_time"] <- as.numeric(.[, "total_time"]) + . + } %>% + { + .[, "self_time"] %>% + sapply(., sub, pattern = ":", replacement = "") %>% + setNames(NULL) -> mod + + .[, "self_time"] <- mod + . + } + +plugins_df <- plugins_start %>% + separate( + col = name, + into = c("total_time", "self_time", "dscr"), + sep = " ", + extra = "merge" + ) %>% + { + .[, "total_time"] <- as.numeric(.[, "total_time"]) + . + } %>% + { + .[, "self_time"] %>% + sapply(., sub, pattern = ":", replacement = "") %>% + setNames(NULL) -> mod + + .[, "self_time"] <- mod + . + } + +nvim_df %>% + arrange(desc(self_time)) %>% + write.table(., "nvimStartTime.txt", row.names = F, col.names = F) + +plugins_df %>% + arrange(desc(self_time)) %>% + write.table(., "pluginsStartTime.txt", row.names = F, col.names = F) diff --git a/startup/startuptime.log b/startup/startuptime.log new file mode 100644 index 00000000000..2017ba02829 --- /dev/null +++ b/startup/startuptime.log @@ -0,0 +1,588 @@ +--- Startup times for process: Primary/TUI --- + +times in msec + clock self+sourced self: sourced script + clock elapsed: other lines + +000.013 000.013: --- NVIM STARTING --- +000.194 000.181: event init +000.524 000.330: early init +000.736 000.211: locale set +000.848 000.112: init first window +001.669 000.821: inits 1 +001.856 000.187: window checked +002.586 000.730: parsing arguments +003.825 000.321 000.321: require('vim.shared') +004.397 000.183 000.183: require('vim.inspect') +004.712 000.301 000.301: require('vim._options') +004.717 000.884 000.400: require('vim._editor') +004.721 001.311 000.107: require('vim._init_packages') +004.732 000.834: init lua interpreter +009.337 004.606: --- NVIM STARTED --- + +--- Startup times for process: Embedded --- + +times in msec + clock self+sourced self: sourced script + clock elapsed: other lines + +000.011 000.011: --- NVIM STARTING --- +000.107 000.097: event init +000.298 000.190: early init +000.422 000.124: locale set +000.499 000.077: init first window +001.019 000.519: inits 1 +001.131 000.112: window checked +001.427 000.297: parsing arguments +002.443 000.314 000.314: require('vim.shared') +002.999 000.181 000.181: require('vim.inspect') +003.346 000.333 000.333: require('vim._options') +003.352 000.901 000.387: require('vim._editor') +003.356 001.317 000.103: require('vim._init_packages') +003.368 000.623: init lua interpreter +003.697 000.329: expanding arguments +003.719 000.022: inits 2 +003.943 000.224: init highlight +003.949 000.006: waiting for UI +004.064 000.115: done waiting for UI +004.069 000.005: clear screen +004.378 000.040 000.040: require('vim.keymap') +006.211 001.184 001.184: require('vim.termcap') +006.429 000.170 000.170: require('vim.text') +009.057 004.984 003.589: require('vim._defaults') +009.065 000.013: init default mappings & autocommands +009.450 000.135 000.135: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin.vim +009.762 000.079 000.079: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\indent.vim +010.524 000.372 000.372: require('options') +012.337 000.026 000.026: require('vim.F') +012.407 001.528 001.502: require('vim.diagnostic') +012.671 002.134 000.606: require('keymaps') +013.083 000.406 000.406: require('lazy-bootstrap') +014.582 000.346 000.346: require('lazy') +014.799 000.203 000.203: require('kickstart/plugins/gitsigns') +014.973 000.165 000.165: require('kickstart/plugins/which-key') +015.156 000.176 000.176: require('kickstart/plugins/telescope') +015.372 000.210 000.210: require('kickstart/plugins/lspconfig') +015.545 000.165 000.165: require('kickstart/plugins/conform') +015.756 000.199 000.199: require('kickstart/plugins/cmp') +015.910 000.145 000.145: require('kickstart/plugins/tokyonight') +016.046 000.128 000.128: require('kickstart/plugins/todo-comments') +016.198 000.146 000.146: require('kickstart/plugins/mini') +016.356 000.152 000.152: require('kickstart/plugins/treesitter') +016.552 000.184 000.184: require('kickstart.plugins.debug') +016.712 000.152 000.152: require('kickstart.plugins.lint') +016.865 000.146 000.146: require('kickstart.plugins.autopairs') +017.045 000.172 000.172: require('kickstart.plugins.neo-tree') +017.105 000.022 000.022: require('ffi') +017.600 000.236 000.236: require('vim.fs') +018.021 000.341 000.341: require('vim.uri') +018.057 000.945 000.368: require('vim.loader') +018.547 000.388 000.388: require('lazy.stats') +019.103 000.261 000.261: require('lazy.core.util') +019.347 000.232 000.232: require('lazy.core.config') +019.837 000.239 000.239: require('lazy.core.handler') +020.506 000.211 000.211: require('lazy.pkg') +020.519 000.438 000.227: require('lazy.core.meta') +020.529 000.683 000.245: require('lazy.core.plugin') +020.541 001.187 000.266: require('lazy.core.loader') +021.277 000.259 000.259: require('lazy.core.fragments') +032.042 000.209 000.209: require('lazy.core.handler.cmd') +032.223 000.165 000.165: require('lazy.core.handler.keys') +032.524 000.151 000.151: require('lazy.core.handler.event') +032.532 000.300 000.149: require('lazy.core.handler.ft') +033.291 000.095 000.095: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/Nvim-R/ftdetect/r.vim +035.478 000.388 000.388: require('dap.utils') +035.626 002.300 001.912: require('dap') +037.088 000.264 000.264: require('nio.tasks') +037.382 000.254 000.254: require('nio.control') +038.289 000.872 000.872: require('nio.uv') +038.895 000.567 000.567: require('nio.tests') +039.343 000.154 000.154: require('vim.ui') +039.385 000.448 000.295: require('nio.ui') +039.801 000.182 000.182: require('nio.streams') +039.837 000.420 000.238: require('nio.file') +040.539 000.177 000.177: require('nio.util') +040.815 000.764 000.587: require('nio.logger') +040.855 000.990 000.226: require('nio.lsp') +041.088 000.203 000.203: require('nio.process') +041.152 004.867 000.849: require('nio') +042.246 000.236 000.236: require('dapui.config.highlights') +042.453 000.834 000.599: require('dapui.config') +042.467 001.042 000.208: require('dapui.util') +042.744 000.270 000.270: require('dapui.windows.layout') +042.755 001.565 000.253: require('dapui.windows') +043.053 000.294 000.294: require('dapui.controls') +043.064 007.404 000.678: require('dapui') +044.288 000.422 000.422: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/filetype.lua +050.909 000.252 000.252: require('kanagawa-paper.config') +050.924 000.674 000.423: require('kanagawa-paper') +051.117 000.176 000.176: require('kanagawa-paper.colors') +051.321 000.157 000.157: require('kanagawa-paper.themes') +051.556 000.182 000.182: require('kanagawa-paper.highlights') +051.739 000.176 000.176: require('kanagawa-paper.highlights.editor') +051.995 000.206 000.206: require('kanagawa-paper.highlights.syntax') +052.223 000.171 000.171: require('kanagawa-paper.highlights.treesitter') +052.446 000.176 000.176: require('kanagawa-paper.highlights.lsp') +052.831 000.374 000.374: require('kanagawa-paper.highlights.plugins') +053.265 000.247 000.247: require('kanagawa-paper.lib.hsluv') +053.279 000.440 000.193: require('kanagawa-paper.lib.color') +054.335 000.226 000.226: require('kanagawa-paper.highlights.ft') +055.036 004.851 001.893: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\kanagawa-paper.nvim\colors\kanagawa-paper.vim +057.365 000.199 000.199: require('tokyonight.config') +057.384 001.706 001.507: require('tokyonight') +060.465 000.137 000.137: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/lush.nvim/plugin/lush.vim +064.067 000.085 000.085: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/plenary.nvim/plugin/plenary.vim +065.873 001.696 001.696: require('alpha') +068.145 000.100 000.100: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-web-devicons/plugin/nvim-web-devicons.vim +070.680 001.832 001.832: require('nvim-web-devicons.icons-default') +070.849 004.329 002.397: require('nvim-web-devicons') +071.805 000.951 000.951: require('mini.icons') +071.820 005.656 000.376: require('alpha.utils') +072.308 000.185 000.185: require('plenary.bit') +072.468 000.151 000.151: require('plenary.functional') +072.486 000.661 000.325: require('plenary.path') +072.654 000.164 000.164: require('alpha.themes.dashboard') +072.668 006.779 000.297: require('alpha.themes.theta') +079.115 000.279 000.279: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-dap/plugin/dap.lua +081.483 000.265 000.265: require('mason-core.functional') +081.670 000.174 000.174: require('mason-core.path') +081.854 000.178 000.178: require('mason.settings') +081.884 000.997 000.380: require('mason-core.log') +081.891 002.704 001.707: require('mason-nvim-dap') +082.076 000.179 000.179: require('mason-nvim-dap.settings') +082.678 000.181 000.181: require('mason-core.EventEmitter') +082.843 000.157 000.157: require('mason-core.optional') +083.242 000.228 000.228: require('mason-core.async') +083.397 000.147 000.147: require('mason-core.async.uv') +083.406 000.557 000.182: require('mason-core.fs') +083.607 000.197 000.197: require('mason-registry.sources') +083.944 000.157 000.157: require('mason-core.functional.data') +084.110 000.160 000.160: require('mason-core.functional.function') +084.146 000.529 000.212: require('mason-core.functional.list') +084.178 001.839 000.218: require('mason-registry') +084.520 000.168 000.168: require('mason-core.functional.table') +084.529 000.347 000.179: require('mason-nvim-dap.mappings.source') +084.535 002.359 000.173: require('mason-nvim-dap.ensure_installed') +087.963 000.182 000.182: require('mason-core.functional.string') +088.257 000.172 000.172: require('mason-nvim-dap.automatic_installation') +088.465 000.191 000.191: require('mason-core.notify') +088.919 000.199 000.199: require('mason-nvim-dap.mappings.adapters') +089.105 000.176 000.176: require('mason-nvim-dap.mappings.filetypes') +103.152 013.954 013.954: require('mason-nvim-dap.mappings.configurations') +108.694 005.517 005.517: require('mason-nvim-dap.mappings.adapters.python') +109.021 000.310 000.310: require('mason-nvim-dap.automatic_setup') +109.278 000.233 000.233: require('dap.ext.vscode') +109.767 000.180 000.180: require('mason-core.functional.number') +110.061 000.280 000.280: require('mason-core.functional.logic') +110.093 000.722 000.261: require('mason-nvim-dap.api.command') +112.320 001.204 001.204: require('dapui.client.types') +112.356 001.810 000.606: require('dapui.client') +112.948 000.582 000.582: require('dap.breakpoints') +113.395 000.369 000.369: require('dapui.client.lib') +114.218 000.394 000.394: require('dapui.render.canvas') +114.235 000.777 000.383: require('dapui.elements.breakpoints') +114.456 000.196 000.196: require('dapui.components.breakpoints') +114.627 000.144 000.144: require('dapui.elements.repl') +114.770 000.134 000.134: require('dapui.elements.scopes') +114.931 000.141 000.141: require('dapui.components.scopes') +115.104 000.167 000.167: require('dapui.components.variables') +115.268 000.140 000.140: require('dapui.elements.stacks') +115.559 000.138 000.138: require('dapui.components.frames') +115.568 000.281 000.143: require('dapui.components.threads') +115.746 000.157 000.157: require('dapui.elements.watches') +115.978 000.208 000.208: require('dapui.components.watches') +116.170 000.146 000.146: require('dapui.elements.hover') +116.338 000.147 000.147: require('dapui.components.hover') +116.489 000.141 000.141: require('dapui.elements.console') +116.956 000.179 000.179: require('dap-go-ts') +116.981 000.426 000.248: require('dap-go') +120.328 000.089 000.089: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/twilight.nvim/plugin/twilight.vim +122.477 000.146 000.146: require('twilight.util') +122.533 000.361 000.216: require('twilight.config') +122.710 000.170 000.170: require('twilight.view') +122.721 002.217 001.685: require('twilight') +123.142 000.064 000.064: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/zen-mode.nvim/plugin/zen-mode.vim +125.442 000.187 000.187: require('zen-mode.util') +125.456 000.347 000.161: require('zen-mode.config') +125.786 000.158 000.158: require('zen-mode.plugins') +125.799 000.340 000.181: require('zen-mode.view') +125.808 002.472 001.785: require('zen-mode') +128.366 002.268 002.268: require('mini.surround') +129.093 000.309 000.309: require('mini.pairs') +132.352 000.170 000.170: require('ibl.utils') +132.368 000.339 000.168: require('ibl.config') +132.684 000.143 000.143: require('ibl.indent') +132.697 000.324 000.181: require('ibl.hooks') +132.701 000.849 000.186: require('ibl.highlights') +132.857 000.152 000.152: require('ibl.autocmds') +133.041 000.173 000.173: require('ibl.inlay_hints') +133.196 000.148 000.148: require('ibl.virt_text') +133.727 000.320 000.320: require('ibl.scope_languages') +133.741 000.539 000.219: require('ibl.scope') +133.751 003.855 001.993: require('ibl') +134.006 000.226 000.226: require('vim.iter') +134.581 000.271 000.271: require('vim.lsp.log') +135.039 000.447 000.447: require('vim.lsp.protocol') +135.717 000.296 000.296: require('vim.lsp._snippet_grammar') +135.937 000.204 000.204: require('vim.highlight') +135.962 000.912 000.413: require('vim.lsp.util') +136.368 000.182 000.182: require('vim.lsp.sync') +136.382 000.414 000.232: require('vim.lsp._changetracking') +136.748 000.360 000.360: require('vim.lsp.rpc') +136.864 002.822 000.417: require('vim.lsp') +137.237 000.367 000.367: require('vim.lsp.handlers') +143.000 000.318 000.318: require('nvim-treesitter.utils') +145.399 000.322 000.322: require('vim.treesitter.language') +145.590 000.173 000.173: require('vim.func') +145.812 000.210 000.210: require('vim.func._memoize') +145.881 001.169 000.464: require('vim.treesitter.query') +146.144 000.257 000.257: require('vim.treesitter._range') +146.243 001.939 000.512: require('vim.treesitter.languagetree') +146.259 002.633 000.694: require('vim.treesitter') +147.768 004.753 002.120: require('nvim-treesitter.parsers') +150.244 000.652 000.652: require('nvim-treesitter.compat') +151.152 000.585 000.585: require('nvim-treesitter.ts_utils') +151.171 000.910 000.325: require('nvim-treesitter.tsrange') +151.367 000.190 000.190: require('nvim-treesitter.caching') +151.384 002.655 000.903: require('nvim-treesitter.query') +151.404 003.163 000.508: require('nvim-treesitter.configs') +151.411 003.633 000.469: require('nvim-treesitter.info') +151.616 000.201 000.201: require('nvim-treesitter.shell_command_selectors') +151.648 009.267 000.361: require('nvim-treesitter.install') +151.808 000.155 000.155: require('nvim-treesitter.statusline') +152.048 000.234 000.234: require('nvim-treesitter.query_predicates') +152.055 012.024 002.369: require('nvim-treesitter') +152.386 012.546 000.521: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-treesitter/plugin/nvim-treesitter.lua +164.635 000.305 000.305: require('nvim-treesitter.indent') +164.968 000.252 000.252: require('nvim-treesitter.highlight') +170.763 000.156 000.156: require('luasnip.util.types') +170.962 000.180 000.180: require('luasnip.util.lazy_table') +171.172 000.197 000.197: require('luasnip.extras.filetype_functions') +171.197 000.804 000.272: require('luasnip.default_config') +171.203 001.093 000.289: require('luasnip.session') +171.216 001.407 000.314: require('luasnip.util.util') +171.776 000.339 000.339: require('luasnip.util.path') +172.279 000.192 000.192: require('luasnip.session.snippet_collection.source') +172.455 000.159 000.159: require('luasnip.util.table') +172.648 000.181 000.181: require('luasnip.util.auto_table') +172.670 000.881 000.351: require('luasnip.session.snippet_collection') +173.043 000.368 000.368: require('luasnip.util.log') +173.058 001.838 000.249: require('luasnip.loaders.util') +173.372 000.308 000.308: require('luasnip.loaders.fs_watchers') +173.579 000.197 000.197: require('luasnip.loaders.data') +173.772 000.183 000.183: require('luasnip.session.enqueueable_operations') +174.843 000.158 000.158: require('luasnip.util.ext_opts') +175.011 000.152 000.152: require('luasnip.nodes.key_indexer') +175.024 000.520 000.211: require('luasnip.nodes.util') +175.196 000.167 000.167: require('luasnip.util.events') +175.214 000.948 000.260: require('luasnip.nodes.node') +175.700 000.165 000.165: require('luasnip.util.extend_decorator') +175.715 000.496 000.331: require('luasnip.nodes.insertNode') +175.947 000.228 000.228: require('luasnip.nodes.textNode') +176.191 000.232 000.232: require('luasnip.util.mark') +176.812 000.188 000.188: require('luasnip.util.select') +177.035 000.211 000.211: require('luasnip.util.time') +177.469 001.052 000.653: require('luasnip.util._builtin_vars') +177.674 001.472 000.420: require('luasnip.util.environ') +178.034 000.350 000.350: require('luasnip.util.pattern_tokenizer') +178.295 000.248 000.248: require('luasnip.util.dict') +190.304 011.800 011.800: require('luasnip.util.jsregexp') +190.330 012.023 000.223: require('luasnip.nodes.util.trig_engines') +190.419 016.401 000.404: require('luasnip.nodes.snippet') +191.402 000.415 000.415: require('luasnip.util.parser.neovim_ast') +191.868 000.443 000.443: require('luasnip.util.str') +193.364 001.473 001.473: require('luasnip.util.jsregexp') +193.565 000.189 000.189: require('luasnip.util.directed_graph') +193.575 002.805 000.285: require('luasnip.util.parser.ast_utils') +193.802 000.222 000.222: require('luasnip.nodes.functionNode') +194.024 000.213 000.213: require('luasnip.nodes.choiceNode') +194.281 000.250 000.250: require('luasnip.nodes.dynamicNode') +194.550 000.257 000.257: require('luasnip.util.functions') +194.565 004.141 000.393: require('luasnip.util.parser.ast_parser') +194.794 000.224 000.224: require('luasnip.util.parser.neovim_parser') +194.806 021.024 000.259: require('luasnip.util.parser') +194.985 000.174 000.174: require('luasnip.nodes.snippetProxy') +195.239 000.242 000.242: require('luasnip.util.jsonc') +195.780 000.178 000.178: require('luasnip.nodes.duplicate') +195.794 000.459 000.281: require('luasnip.loaders.snippet_cache') +195.806 028.625 002.794: require('luasnip.loaders.from_vscode') +210.229 000.227 000.227: require('luasnip.nodes.multiSnippet') +211.582 000.361 000.361: require('luasnip.loaders.from_lua') +212.879 000.206 000.206: require('luasnip.loaders') +213.108 000.186 000.186: require('luasnip.config') +213.118 000.709 000.317: require('luasnip') +213.504 000.186 000.186: require('luasnip.extras') +213.515 000.391 000.205: require('luasnip.extras.fmt') +234.722 002.327 002.327: require('vim.filetype') +235.079 002.883 000.555: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/LuaSnip/plugin/luasnip.lua +235.530 000.099 000.099: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/LuaSnip/plugin/luasnip.vim +239.183 002.352 002.352: require('render-markdown') +239.826 000.173 000.173: require('render-markdown.core.range') +239.840 000.415 000.242: require('render-markdown.config') +240.212 000.182 000.182: require('render-markdown.core.util') +240.223 000.378 000.196: require('render-markdown.core.log') +240.410 000.182 000.182: require('render-markdown.presets') +240.584 000.168 000.168: require('render-markdown.core.treesitter') +240.595 001.398 000.255: require('render-markdown.state') +241.276 000.192 000.192: require('render-markdown.core.buffer_state') +241.689 000.216 000.216: require('render-markdown.core.node_info') +241.876 000.174 000.174: require('render-markdown.core.str') +241.890 000.604 000.214: require('render-markdown.core.context') +242.054 000.161 000.161: require('render-markdown.core.extmark') +242.254 000.193 000.193: require('render-markdown.core.iter') +242.634 000.191 000.191: require('render-markdown.core.list') +242.644 000.383 000.192: require('render-markdown.handler.markdown') +242.875 000.226 000.226: require('render-markdown.handler.markdown_inline') +243.062 000.180 000.180: require('render-markdown.handler.latex') +243.076 002.223 000.284: require('render-markdown.core.ui') +243.330 000.247 000.247: require('render-markdown.colors') +243.999 000.221 000.221: require('render-markdown.manager') +244.016 000.422 000.201: require('render-markdown.api') +244.022 000.612 000.190: require('render-markdown.command') +244.054 007.432 000.601: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/render-markdown.nvim/plugin/render-markdown.lua +252.613 001.613 001.613: require('mini.files') +256.144 000.556 000.556: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/vim-sleuth/plugin/sleuth.vim +261.814 000.297 000.297: require('gitsigns.async') +262.047 000.217 000.217: require('gitsigns.debug.log') +262.681 000.621 000.621: require('gitsigns.config') +262.715 004.037 002.902: require('gitsigns') +265.895 000.782 000.782: require('gitsigns.highlight') +267.229 000.479 000.479: require('gitsigns.debounce') +283.747 000.968 000.968: require('lualine_require') +286.589 007.953 006.985: require('lualine') +307.234 007.671 007.671: require('lualine.utils.mode') +339.025 003.196 003.196: require('onedark') +349.277 000.271 000.271: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-lspconfig/plugin/lspconfig.lua +350.162 000.237 000.237: require('mason-core.functional.relation') +350.205 000.525 000.288: require('mason-core.platform') +350.212 000.767 000.242: require('mason') +350.565 000.305 000.305: require('mason.api.command') +354.172 000.185 000.185: require('mason-lspconfig.settings') +354.189 003.594 003.410: require('mason-lspconfig') +354.478 000.284 000.284: require('mason-lspconfig.mappings.server') +354.646 000.157 000.157: require('mason-lspconfig.notify') +359.074 003.633 003.633: require('cmp_nvim_lsp.source') +359.095 004.332 000.699: require('cmp_nvim_lsp') +359.850 000.306 000.306: require('lspconfig.util') +360.034 000.170 000.170: require('lspconfig.async') +360.041 000.712 000.237: require('lspconfig.configs') +360.053 000.947 000.235: require('lspconfig') +360.233 000.175 000.175: require('lspconfig.configs.pyright') +361.120 000.298 000.298: require('lspconfig.manager') +361.468 000.250 000.250: require('lspconfig.configs.r_language_server') +365.227 000.321 000.321: require('lspconfig.configs.clangd') +366.294 000.246 000.246: require('lspconfig.configs.ts_ls') +367.055 000.271 000.271: require('lspconfig.configs.texlab') +367.848 000.248 000.248: require('lspconfig.configs.lua_ls') +368.452 000.213 000.213: require('lspconfig.configs.markdown_oxide') +369.133 000.213 000.213: require('lspconfig.configs.matlab_ls') +379.691 003.635 003.635: require('bamboo') +391.273 000.189 000.189: require('bamboo') +392.516 000.175 000.175: require('bamboo.palette') +392.557 000.393 000.218: require('bamboo.colors') +392.765 000.200 000.200: require('bamboo.util') +392.972 001.304 000.711: require('bamboo.highlights') +394.224 000.401 000.401: require('bamboo.terminal') +394.254 004.111 002.217: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\bamboo.nvim\colors\bamboo-multiplex.lua +406.284 000.271 000.271: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/editorconfig.lua +406.786 000.259 000.259: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/gzip.vim +407.278 000.224 000.224: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/man.lua +412.876 000.314 000.314: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\pack\dist\opt\matchit\plugin\matchit.vim +412.967 005.431 005.117: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/matchit.vim +413.633 000.336 000.336: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/matchparen.vim +414.389 000.484 000.484: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/netrwPlugin.vim +414.897 000.236 000.236: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/osc52.lua +415.838 000.664 000.664: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/rplugin.vim +416.303 000.141 000.141: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/shada.vim +416.651 000.073 000.073: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/spellfile.vim +417.160 000.219 000.219: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/tarPlugin.vim +417.727 000.281 000.281: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/tohtml.lua +418.143 000.088 000.088: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/tutor.vim +418.586 000.219 000.219: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/plugin/zipPlugin.vim +437.536 004.088 004.088: require('cmp.utils.api') +437.881 000.144 000.144: require('cmp.types.cmp') +438.260 000.163 000.163: require('cmp.utils.misc') +438.274 000.386 000.223: require('cmp.types.lsp') +438.415 000.136 000.136: require('cmp.types.vim') +438.422 000.872 000.206: require('cmp.types') +438.566 000.140 000.140: require('cmp.utils.highlight') +438.863 000.147 000.147: require('cmp.utils.debug') +438.884 000.312 000.165: require('cmp.utils.autocmd') +439.196 005.971 000.560: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/nvim-cmp/plugin/cmp.lua +440.027 000.174 000.174: require('cmp.utils.char') +440.041 000.337 000.162: require('cmp.utils.str') +440.539 000.169 000.169: require('cmp.utils.buffer') +440.553 000.354 000.185: require('cmp.utils.keymap') +440.558 000.512 000.159: require('cmp.utils.feedkeys') +441.027 000.152 000.152: require('cmp.config.mapping') +441.186 000.150 000.150: require('cmp.utils.cache') +441.507 000.159 000.159: require('cmp.config.compare') +441.514 000.321 000.161: require('cmp.config.default') +441.539 000.815 000.191: require('cmp.config') +441.563 001.002 000.187: require('cmp.utils.async') +441.871 000.138 000.138: require('cmp.utils.pattern') +441.879 000.312 000.175: require('cmp.context') +442.482 000.196 000.196: require('cmp.utils.snippet') +442.653 000.163 000.163: require('cmp.matcher') +442.663 000.564 000.205: require('cmp.entry') +442.672 000.788 000.224: require('cmp.source') +443.009 000.172 000.172: require('cmp.utils.event') +443.515 000.140 000.140: require('cmp.utils.options') +443.526 000.304 000.164: require('cmp.utils.window') +443.531 000.485 000.180: require('cmp.view.docs_view') +443.736 000.201 000.201: require('cmp.view.custom_entries_view') +443.980 000.236 000.236: require('cmp.view.wildmenu_entries_view') +444.203 000.215 000.215: require('cmp.view.native_entries_view') +444.433 000.221 000.221: require('cmp.view.ghost_text_view') +444.450 001.773 000.244: require('cmp.view') +444.844 005.345 000.620: require('cmp.core') +445.261 000.287 000.287: require('cmp.config.sources') +445.437 000.167 000.167: require('cmp.config.window') +445.541 006.258 000.460: require('cmp') +445.813 000.267 000.267: require('lspkind') +447.523 028.142 015.646: require('cmp') +447.819 000.288 000.288: require('cmp_luasnip') +447.874 028.717 000.287: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp_luasnip\after/plugin/cmp_luasnip.lua +448.338 000.153 000.153: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-nvim-lsp\after/plugin/cmp_nvim_lsp.lua +448.885 000.154 000.154: require('cmp_nvim_lua') +448.915 000.328 000.173: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-nvim-lua\after/plugin/cmp_nvim_lua.lua +449.913 000.140 000.140: require('cmp_buffer.timer') +449.924 000.298 000.159: require('cmp_buffer.buffer') +449.929 000.475 000.177: require('cmp_buffer.source') +449.933 000.614 000.139: require('cmp_buffer') +449.951 000.756 000.141: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-buffer\after/plugin/cmp_buffer.lua +450.523 000.170 000.170: require('cmp_path') +450.542 000.317 000.147: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-path\after/plugin/cmp_path.lua +451.212 000.208 000.208: require('cmp_cmdline') +451.266 000.421 000.213: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\cmp-cmdline\after/plugin/cmp_cmdline.lua +451.716 000.160 000.160: sourcing C:\Users\joene\AppData\Local\nvim-data\lazy\indent-blankline.nvim\after/plugin/commands.lua +451.789 438.698 218.204: require('lazy-plugins') +451.794 441.723 000.113: sourcing C:\Users\joene\AppData\Local\nvim\init.lua +451.844 000.842: sourcing vimrc file(s) +453.628 000.163 000.163: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\filetype.lua +455.597 000.114 000.114: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\synload.vim +455.845 001.462 001.348: sourcing C:\tools\neovim\nvim-win64\share/nvim/runtime/syntax/syntax.vim +455.873 002.405: inits 3 +459.094 003.220: reading ShaDa +464.420 003.866 003.866: require('lint') +467.508 000.436 000.436: require('vim.filetype.detect') +476.070 000.406 000.406: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\autoload\htmlcomplete.vim +476.252 001.737 001.331: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\html.vim +477.320 005.853 004.116: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\markdown.vim +484.657 003.739 003.739: require('markdown') +484.850 004.103 000.365: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/markdown.nvim/plugin/markdown.lua +487.359 000.221 000.221: require('markdown.config') +487.687 000.176 000.176: require('markdown.cmd') +488.015 000.145 000.145: require('markdown.treesitter') +488.165 000.144 000.144: require('markdown.util') +494.163 006.463 006.174: require('markdown.list') +494.986 000.181 000.181: require('markdown.notify') +496.227 001.822 001.641: require('markdown.link') +497.117 000.221 000.221: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/markdown-preview.nvim/plugin/mkdp.vim +508.092 000.240 000.240: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\html.vim +509.118 004.553 004.314: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\ftplugin\markdown.vim +519.682 000.264 000.264: require('vim.treesitter.highlighter') +520.059 000.223 000.223: require('luasnip.loaders.from_snipmate') +528.490 000.499 000.499: require('vim.lsp.client') +529.177 000.204 000.204: require('vim.glob') +529.198 000.466 000.261: require('vim.lsp._dynamic') +529.501 000.225 000.225: require('vim._system') +537.948 000.395 000.395: require('vim.version') +552.185 000.362 000.362: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax/dtd.vim +552.315 001.494 001.131: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\xml.vim +554.956 000.518 000.518: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\javascript.vim +557.508 000.881 000.881: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\vb.vim +567.876 008.793 008.793: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\css.vim +569.960 020.374 008.688: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\html.vim +572.952 001.064 001.064: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\yaml.vim +573.329 025.117 003.679: sourcing C:\tools\neovim\nvim-win64\share\nvim\runtime\syntax\markdown.vim +589.709 000.292 000.292: require('gitsigns.status') +590.281 000.326 000.326: require('gitsigns.util') +590.984 000.176 000.176: require('gitsigns.system') +590.995 000.436 000.260: require('gitsigns.git.cmd') +591.394 000.212 000.212: require('gitsigns.message') +591.406 000.406 000.193: require('gitsigns.git.version') +597.585 007.293 006.451: require('gitsigns.git.repo') +597.619 007.896 000.277: require('gitsigns.git') +598.100 000.475 000.475: require('gitsigns.cache') +598.789 000.258 000.258: require('gitsigns.diff') +599.126 000.321 000.321: require('gitsigns.hunks') +599.423 000.282 000.282: require('gitsigns.signs') +599.453 001.337 000.475: require('gitsigns.manager') +599.475 010.462 000.463: require('gitsigns.attach') +599.840 000.308 000.308: require('gitsigns.current_line_blame') +604.983 000.594 000.594: require('editorconfig') +605.736 080.376: opening buffers +612.054 000.425 000.425: require('lint.parser') +612.077 000.854 000.429: require('lint.linters.markdownlint') +623.537 016.947: BufEnter autocommands +623.556 000.019: editing files in windows +625.346 000.153 000.153: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/todo-comments.nvim/plugin/todo.vim +634.471 000.328 000.328: require('todo-comments.util') +634.517 000.786 000.458: require('todo-comments.config') +635.554 000.604 000.604: require('todo-comments.highlight') +635.581 001.056 000.452: require('todo-comments.jump') +635.591 009.924 008.082: require('todo-comments') +643.900 000.899 000.899: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/telescope.nvim/plugin/telescope.lua +651.802 000.491 000.491: require('telescope._extensions') +651.830 007.683 007.191: require('telescope') +652.292 000.455 000.455: require('telescope.themes') +653.326 000.491 000.491: require('plenary.strings') +653.701 000.356 000.356: require('telescope.deprecated') +656.698 001.014 001.014: require('plenary.log') +656.804 002.066 001.052: require('telescope.log') +659.681 000.771 000.771: require('plenary.compat') +659.733 002.030 001.259: require('plenary.job') +660.176 000.436 000.436: require('telescope.state') +660.301 003.488 001.021: require('telescope.utils') +660.338 006.620 001.066: require('telescope.sorters') +665.213 012.824 005.357: require('telescope.config') +671.335 000.685 000.685: require('telescope._extensions.ui-select') +674.386 000.193 000.193: require('plenary.tbl') +674.408 000.436 000.243: require('plenary.vararg.rotate') +674.415 000.671 000.235: require('plenary.vararg') +674.615 000.195 000.195: require('plenary.errors') +674.631 001.183 000.317: require('plenary.async.async') +675.620 000.280 000.280: require('plenary.async.structs') +675.650 000.538 000.258: require('plenary.async.control') +675.665 000.770 000.233: require('plenary.async.util') +675.674 001.035 000.264: require('plenary.async.tests') +675.681 002.990 000.772: require('plenary.async') +676.440 000.338 000.338: require('plenary.window.border') +676.829 000.370 000.370: require('plenary.window') +677.189 000.335 000.335: require('plenary.popup.utils') +677.217 001.528 000.485: require('plenary.popup') +678.401 000.363 000.363: require('telescope.pickers.scroller') +678.744 000.321 000.321: require('telescope.actions.state') +679.076 000.315 000.315: require('telescope.actions.utils') +679.715 000.311 000.311: require('telescope.actions.mt') +679.759 000.672 000.361: require('telescope.actions.set') +680.593 000.435 000.435: require('telescope.config.resolve') +680.618 000.852 000.416: require('telescope.pickers.entry_display') +681.016 000.390 000.390: require('telescope.from_entry') +681.313 003.977 001.065: require('telescope.actions') +681.755 000.433 000.433: require('telescope.debounce') +682.141 000.369 000.369: require('telescope.mappings') +682.500 000.344 000.344: require('telescope.pickers.highlights') +682.808 000.292 000.292: require('telescope.pickers.window') +683.558 000.343 000.343: require('telescope.algos.linked_list') +683.575 000.756 000.413: require('telescope.entry_manager') +683.808 000.225 000.225: require('telescope.pickers.multi') +683.844 012.470 001.556: require('telescope.pickers') +684.606 000.472 000.472: require('telescope.make_entry') +685.003 000.378 000.378: require('telescope.finders.async_static_finder') +685.905 000.258 000.258: require('plenary.class') +685.941 000.628 000.370: require('telescope._') +685.947 000.929 000.301: require('telescope.finders.async_oneshot_finder') +686.239 000.287 000.287: require('telescope.finders.async_job_finder') +686.257 002.409 000.343: require('telescope.finders') +686.603 000.321 000.321: require('telescope.builtin') +687.624 000.196 000.196: sourcing C:/Users/joene/AppData/Local/nvim-data/lazy/which-key.nvim/plugin/which-key.lua +691.934 004.182 004.182: require('which-key') +692.244 000.283 000.283: require('which-key.config') +692.936 016.897: VimEnter autocommands +693.156 000.220: UIEnter autocommands +695.582 002.426: before starting main loop +727.956 032.374: first screen update +727.970 000.014: --- NVIM STARTED --- + diff --git a/todo.md b/todo.md index 346ef1b9c17..bfe2fdb2a7a 100644 --- a/todo.md +++ b/todo.md @@ -2,9 +2,6 @@ ## UI -- signcolumn -- neo-tree - ## Util - lsp configuration From 55e85a2bf3d557e77d28669a3b0c6a9bffcfffe7 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Thu, 3 Oct 2024 23:49:06 +0200 Subject: [PATCH 31/34] Auto commit --- init.lua | 4 ++-- lua/custom/plugins/lualine.lua | 2 +- lua/kickstart/plugins/lspconfig.lua | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 18aa081bba1..6ef38c742ec 100644 --- a/init.lua +++ b/init.lua @@ -13,5 +13,5 @@ require 'lazy-plugins' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'LineNr', { bg = 'none' }) diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua index 73b162cc1fd..82c93e2b465 100644 --- a/lua/custom/plugins/lualine.lua +++ b/lua/custom/plugins/lualine.lua @@ -26,7 +26,7 @@ return { lualine_a = { 'mode' }, lualine_b = { 'branch', 'diff', 'diagnostics' }, lualine_c = { 'filename' }, - lualine_x = { 'buffers', 'filetype', 'searchcount' }, + lualine_x = { 'searchcount' }, lualine_y = { 'progress' }, lualine_z = { 'location' }, }, diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index 27a7c4c1ed1..500a30714bc 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -28,7 +28,7 @@ return { map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') -- Fuzzy find all the symbols in your current document. - map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + -- map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') -- Fuzzy find all the symbols in your current workspace (project). map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') @@ -141,7 +141,7 @@ return { on_attach = function(client, bufnr) vim.diagnostic.config { virtual_text = false, -- Virtual text (the inline hints) - signs = true, -- Show signs in the gutter + signs = false, -- Show signs in the gutter underline = false, -- Underline problematic code } end, From cc8b67917aa7ea2372a9c91aa52dbc3f3cbfdf98 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Fri, 4 Oct 2024 13:25:49 +0200 Subject: [PATCH 32/34] Auto commit --- lazy-lock.json | 12 ++++++------ lua/custom/plugins/vimtex.lua | 1 + lua/kickstart/plugins/cmp.lua | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index cb0804c0fa2..c189ad0f664 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,18 +10,18 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, + "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, "darkearth-nvim": { "branch": "main", "commit": "14369f828f4b09ee89b18bfa3f58b02720e8e20a" }, "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "2e57e1bbda970317dce4b7878ccf9a831dc7067d" }, "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, "kanagawa-paper.nvim": { "branch": "master", "commit": "928f0f4f28475111d0b507c27b243744648bac1f" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "lackluster.nvim": { "branch": "main", "commit": "59d03c9e92cb03351af2904a26e16b6627d2d5db" }, - "lavish.nvim": { "branch": "main", "commit": "a994435c6e4db7c19e2ce65f29d4acafff0f89cf" }, + "lavish.nvim": { "branch": "main", "commit": "8a2d73b21c382be35642d78aae0b56369bc19a00" }, "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, @@ -44,15 +44,15 @@ "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" }, - "nvim-lspconfig": { "branch": "master", "commit": "09074a29315dfe1c1bd5081a43481bd9af97bd3c" }, + "nvim-lspconfig": { "branch": "master", "commit": "f5c2a085110923d2f6aa8d62306b02a563b965b7" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, - "nvim-treesitter": { "branch": "master", "commit": "cc2c11c403a9143827501223b4ee64432dcaf246" }, + "nvim-treesitter": { "branch": "master", "commit": "45386764cc9535200d2288cab929c5093d33660e" }, "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "render-markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, + "render-markdown.nvim": { "branch": "main", "commit": "bdf03ef2a87082ef48bb1b471d102c295e97602c" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/lua/custom/plugins/vimtex.lua b/lua/custom/plugins/vimtex.lua index ddfd6071d67..31d0eb2902c 100644 --- a/lua/custom/plugins/vimtex.lua +++ b/lua/custom/plugins/vimtex.lua @@ -2,6 +2,7 @@ return { { 'lervag/vimtex', lazy = true, -- we don't want to lazy load VimTeX + enabled = false, init = function() -- VimTeX configuration goes here, e.g. vim.g.vimtex_view_method = 'zathura' diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index 6c6edf87cc5..e38fd78f63e 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -60,7 +60,7 @@ return { window = { -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), }, formatting = { From db6d7b336866f1571b7e6df54f1903667330a69d Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Fri, 4 Oct 2024 22:46:40 +0200 Subject: [PATCH 33/34] Auto commit --- lazy-lock.json | 12 +++++++----- lua/custom/plugins/init.lua | 4 ++++ lua/custom/plugins/vimtex.lua | 3 ++- lua/keymaps.lua | 15 ++++++++++++++- lua/kickstart/plugins/conform.lua | 4 ++-- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index c189ad0f664..9e9cdf0ae83 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,7 +16,7 @@ "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "2e57e1bbda970317dce4b7878ccf9a831dc7067d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3af6493bf69e4a857a8b1fab36f333629d413a18" }, "ivory": { "branch": "master", "commit": "4f66eafaf67f519d1399d017913491728d3440c5" }, "kanagawa-paper.nvim": { "branch": "master", "commit": "928f0f4f28475111d0b507c27b243744648bac1f" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, @@ -36,6 +36,7 @@ "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, "mini.nvim": { "branch": "main", "commit": "61e5d46fc0cf71306c51275383767d996f559a60" }, "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, + "nabla.nvim": { "branch": "master", "commit": "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, @@ -43,8 +44,9 @@ "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" }, "nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" }, - "nvim-lspconfig": { "branch": "master", "commit": "f5c2a085110923d2f6aa8d62306b02a563b965b7" }, + "nvim-lspconfig": { "branch": "master", "commit": "39f31e178466e4ed23c8ea6fddd5b7a4d9699398" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, "nvim-treesitter": { "branch": "master", "commit": "45386764cc9535200d2288cab929c5093d33660e" }, @@ -52,18 +54,18 @@ "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "render-markdown.nvim": { "branch": "main", "commit": "bdf03ef2a87082ef48bb1b471d102c295e97602c" }, + "render-markdown.nvim": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "tokyonight.nvim": { "branch": "main", "commit": "efd1417aa01af618426fe1cf507c5458090458f2" }, + "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "typescript-tools.nvim": { "branch": "master", "commit": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vimtex": { "branch": "master", "commit": "be2c13c76eb4c72b2d036900aa17b4b8200ddfb5" }, + "vimtex": { "branch": "master", "commit": "fcbaf66887bd19f5d973406848cf2a5ac46bd65e" }, "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, "yorumi.nvim": { "branch": "main", "commit": "0d0c995ecb90cd21e701fd30b7c5e794cb1e41ce" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index f885539a420..8b1559ea584 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -5,6 +5,10 @@ return { -- { 'metakirby5/codi.vim' }, + { + 'jbyuki/nabla.nvim', + }, + { 'echasnovski/mini.nvim', config = function() diff --git a/lua/custom/plugins/vimtex.lua b/lua/custom/plugins/vimtex.lua index 31d0eb2902c..40d7e9d1412 100644 --- a/lua/custom/plugins/vimtex.lua +++ b/lua/custom/plugins/vimtex.lua @@ -5,7 +5,8 @@ return { enabled = false, init = function() -- VimTeX configuration goes here, e.g. - vim.g.vimtex_view_method = 'zathura' + vim.g.vimtex_viewer_method = 'SumatraPDF' + vim.g.vimtex_compiler_method = 'latexrun' end, }, } diff --git a/lua/keymaps.lua b/lua/keymaps.lua index ada83cfcec2..999c1174c95 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,23 +1,36 @@ local map = vim.keymap.set +-- Basic map('i', '', '') map('n', '', 'nohlsearch') map('n', 'pl', 'Explore') + +-- Markdown preview map('n', 'mp', 'MarkdownPreviewToggle') + +-- Indent blankline map('n', 'ibl', 'IBLToggle') + +-- Telescope colorscheme map('n', 'cs', 'Telescope colorscheme') -map('n', 'mf', 'lua MiniFiles.open()') +-- nabla +map('n', 'pp', 'lua require"nabla".popup()') + +-- diagnostics map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) +-- Window movement map('n', '', '', { desc = 'Move focus to the left window' }) map('n', '', '', { desc = 'Move focus to the right window' }) map('n', '', '', { desc = 'Move focus to the lower window' }) map('n', '', '', { desc = 'Move focus to the upper window' }) +-- Comments map('n', '/', 'gcc', { desc = 'Toggle Comment', remap = true }) map('v', '/', 'gc', { desc = 'Toggle comment', remap = true }) +-- Yanking and highlighting vim.api.nvim_create_autocmd('TextYankPost', { desc = 'Highlight when yanking (copying) text', group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), diff --git a/lua/kickstart/plugins/conform.lua b/lua/kickstart/plugins/conform.lua index e7fc728d85a..6d1bd294962 100644 --- a/lua/kickstart/plugins/conform.lua +++ b/lua/kickstart/plugins/conform.lua @@ -28,10 +28,10 @@ return { formatters_by_ft = { lua = { 'stylua' }, -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, + python = { "isort", "black" }, -- -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, + javascript = { "prettierd", "prettier", stop_after_first = true }, }, }, }, From f4e3470979c045a40981a4176ed07c4ef9c08154 Mon Sep 17 00:00:00 2001 From: pogacha <89231282@student.upr.si> Date: Sun, 6 Oct 2024 14:17:05 +0200 Subject: [PATCH 34/34] "misc" --- lazy-lock.json | 12 ++++++------ lua/custom/plugins/colors.lua | 14 +++++++++++++- lua/custom/plugins/markdown.lua | 6 +++--- lua/options.lua | 2 +- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 9e9cdf0ae83..dd4627827ca 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,7 +3,7 @@ "Nvim-R": { "branch": "master", "commit": "b7cdc9bcd6879465023e20b4a3ae16968edda776" }, "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "bamboo.nvim": { "branch": "master", "commit": "c245d90c490c681470389e28782b161491bec97c" }, - "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" }, + "catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -28,7 +28,7 @@ "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, - "markview.nvim": { "branch": "main", "commit": "f16486e49561740f33b6773df43c9bc2c3c34c7b" }, + "markview.nvim": { "branch": "main", "commit": "42b57e8f9a0fa69f1b2937342cdd27921346c990" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, @@ -44,16 +44,16 @@ "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, - "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" }, "nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" }, - "nvim-lspconfig": { "branch": "master", "commit": "39f31e178466e4ed23c8ea6fddd5b7a4d9699398" }, + "nvim-lspconfig": { "branch": "master", "commit": "dcf511d53fae9675c6fde4241d94b2daaa5e0cd5" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, - "nvim-treesitter": { "branch": "master", "commit": "45386764cc9535200d2288cab929c5093d33660e" }, - "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, + "nvim-treesitter": { "branch": "master", "commit": "4f04fb7027ce786ac4adfd1c629ca40aea96ffec" }, + "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, "okcolors.nvim": { "branch": "main", "commit": "2fd9be7ee5efb2a9d87f781c9f27a5298a13bd8a" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "posterpole.nvim": { "branch": "master", "commit": "5dee8b1741164d3ff4416f8743e2be92009a49ec" }, "render-markdown.nvim": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" }, "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, diff --git a/lua/custom/plugins/colors.lua b/lua/custom/plugins/colors.lua index c45b70321a8..f51ed5c55bd 100644 --- a/lua/custom/plugins/colors.lua +++ b/lua/custom/plugins/colors.lua @@ -1,4 +1,16 @@ return { + { + 'ilof2/posterpole.nvim', + priority = 1000, + config = function() + require('posterpole').setup { + colorless_bg = true, + brightnes = -200, + } + -- vim.cmd 'colorscheme posterpole' + end, + }, + { 'catppuccin/nvim', name = 'catppuccin', @@ -98,7 +110,7 @@ return { priority = 1000, opts = {}, config = function() - vim.cmd 'colorscheme kanagawa-paper' + -- vim.cmd 'colorscheme kanagawa-paper' end, }, diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua index 4ecf6c7ab57..491e3811a92 100644 --- a/lua/custom/plugins/markdown.lua +++ b/lua/custom/plugins/markdown.lua @@ -16,14 +16,14 @@ return { dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons - enabled = true, + enabled = false, }, { 'OXY2DEV/markview.nvim', lazy = false, -- Recommended -- ft = "markdown" -- If you decide to lazy-load anyway - enabled = false, + enabled = true, dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons', @@ -33,7 +33,7 @@ return { { 'tadmccorkle/markdown.nvim', ft = 'markdown', -- or 'event = "VeryLazy"' - enabled = true, + enabled = false, opts = {}, config = function() require('markdown').setup { diff --git a/lua/options.lua b/lua/options.lua index cba5567ea6f..4fc6c4da113 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,4 +1,4 @@ -vim.o.conceallevel = 2 +vim.o.conceallevel = 3 vim.opt.cursorline = true vim.o.wrap = true