Compare commits
20 Commits
main
...
feature/nv
| Author | SHA1 | Date | |
|---|---|---|---|
| 08585a0010 | |||
| 48ad61643f | |||
| 959cc167c6 | |||
| ba425ecf49 | |||
| b2be54b2b9 | |||
| ffb7d66888 | |||
| 924ba5c280 | |||
| 641fac3142 | |||
| d575ec44e0 | |||
| f45a4bd8c1 | |||
| dcb4e6e71d | |||
| 2bf187255a | |||
| b951634ce6 | |||
| 24fd231176 | |||
| 800ce599e9 | |||
| 9aba8cd855 | |||
| 52d0fd3efa | |||
| 2f902123a9 | |||
| 8ace6f1d1c | |||
| de2734ba98 |
8
nvim/.config/nvim/.luarc.json
Normal file
8
nvim/.config/nvim/.luarc.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"runtime.version": "LuaJIT",
|
||||
"rutime.path": ["lua/?.lua", "lua/?/init.lua"],
|
||||
"diagnostics.globals": ["vim"],
|
||||
"workspace.checkThirdParty": false,
|
||||
"workspace.library": ["$VIMRUNTIME"]
|
||||
}
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
# neovim config
|
||||
|
||||
`neovim` configuration files.
|
||||
|
||||
## Usage
|
||||
|
||||
1. Install depencencies
|
||||
* See one of the Dockerfiles in `dockerfiles` for the necessary packages
|
||||
* Use a patched font (see, e.g., [nerd fonts](https://www.nerdfonts.com/))
|
||||
2. Clone repository into configuration directory:
|
||||
```bash
|
||||
$ git clone ssh://git@git.mercurial-manifold.eu:2224/an.tsouchlos/config-nvim.git ~/.config/nvim
|
||||
```
|
||||
3. If desired, configure github copilot by running `:Copilot setup`
|
||||
|
||||
## Build docker images
|
||||
|
||||
### Arch linux
|
||||
|
||||
Because AUR package installation requires the `fakeroot` command, which is
|
||||
extremely slow when [no limit has been set on the maximum number of file
|
||||
descriptors](https://github.com/moby/moby/issues/45436), the image has to
|
||||
be build using the `--ulimit "nofile=1024:1048576"` option:
|
||||
|
||||
```bash
|
||||
$ docker build . -f dockerfiles/Dockerfile.archlinux --ulimit "nofile=1024:1048576" -t config
|
||||
$ docker run --rm -it config
|
||||
```
|
||||
|
||||
### Ubuntu
|
||||
|
||||
Because neovim is installed through an `AppImage`, the container has to be
|
||||
started with `--privileged` to be able to run `nvim`.
|
||||
|
||||
```bash
|
||||
$ docker build . -f dockerfiles/Dockerfile.ubuntu -t config
|
||||
$ docker run --rm -it --privileged config
|
||||
```
|
||||
@@ -1,61 +0,0 @@
|
||||
FROM archlinux:latest
|
||||
|
||||
|
||||
#
|
||||
# General boiler plate
|
||||
#
|
||||
|
||||
|
||||
# Add mock non-root user for AUR package compilation
|
||||
|
||||
RUN useradd --no-create-home --shell=/bin/false build && usermod -L build
|
||||
RUN echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
|
||||
|
||||
# Ready image for installation
|
||||
|
||||
RUN pacman-key --init
|
||||
RUN pacman-key --populate archlinux
|
||||
RUN pacman -Sy archlinux-keyring --noconfirm && pacman -Su --noconfirm
|
||||
RUN pacman -Syu --noconfirm
|
||||
|
||||
# Install generic dependencies
|
||||
|
||||
RUN pacman -S git wget sudo base-devel --noconfirm
|
||||
|
||||
|
||||
#
|
||||
# Neovim specific
|
||||
#
|
||||
|
||||
|
||||
# Install nvim
|
||||
|
||||
RUN pacman -S neovim --noconfirm
|
||||
|
||||
# Install nvim module dependencies
|
||||
|
||||
RUN pacman -S python-pynvim --noconfirm # python3 provider
|
||||
RUN pacman -S npm --noconfirm # mason requirements
|
||||
RUN pacman -S fd ripgrep --noconfirm # Telescope requirements
|
||||
RUN pacman -S powerline-fonts --noconfirm # vim-airline requirements
|
||||
#RUN pacman -S autopep8 texlive-binextra \
|
||||
# perl-yaml-tiny perl-file-homedir --noconfirm # neoformat requirements
|
||||
|
||||
WORKDIR /tmp
|
||||
|
||||
USER build
|
||||
ARG HOME=/tmp
|
||||
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/neovim-remote.tar.gz
|
||||
RUN tar xzvf neovim-remote.tar.gz
|
||||
RUN cd neovim-remote && makepkg -s --noconfirm
|
||||
|
||||
USER root
|
||||
RUN pacman -U neovim-remote/*.pkg.tar.zst --noconfirm # vimtex requirements
|
||||
|
||||
WORKDIR /
|
||||
|
||||
# Copy configuration
|
||||
|
||||
RUN mkdir -p /root/.config/nvim
|
||||
COPY . /root/.config/nvim
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
FROM ubuntu:22.04
|
||||
|
||||
|
||||
#
|
||||
# General boiler plate
|
||||
#
|
||||
|
||||
|
||||
# Ready image for installation
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt update -y && apt upgrade -y
|
||||
|
||||
# Install generic dependencies
|
||||
|
||||
RUN apt install git python3 python3-pip sudo -y
|
||||
|
||||
# Set up user
|
||||
|
||||
ARG UNAME=dev
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
RUN groupadd -g $GID -o $UNAME
|
||||
RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
|
||||
RUN adduser $UNAME sudo
|
||||
RUN echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers.d/nopassword
|
||||
|
||||
|
||||
#
|
||||
# Install neovim
|
||||
#
|
||||
|
||||
|
||||
# Install neovim
|
||||
|
||||
WORKDIR /tmp
|
||||
RUN git clone https://github.com/neovim/neovim.git
|
||||
WORKDIR /tmp/neovim
|
||||
RUN git checkout stable
|
||||
RUN apt install ninja-build gettext cmake unzip curl -y
|
||||
RUN make CMAKE_BUILD_TYPE=Release -j `nproc` && make install
|
||||
WORKDIR /
|
||||
|
||||
# Install package dependencies
|
||||
|
||||
RUN python3 -m pip install pynvim # python3 provider
|
||||
RUN python3 -m pip install jupytext # jupytext requirements
|
||||
RUN apt install fd-find ripgrep -y # Telescope requirements
|
||||
RUN apt install fonts-powerline -y # vim-airline requirements
|
||||
RUN python3 -m pip install neovim-remote # vimtex requirements
|
||||
RUN apt install curl -y # vim-doge requirements
|
||||
RUN apt install npm python3-venv luarocks -y # mason build requirements
|
||||
RUN python3 -m pip install cairosvg pnglatex plotly kaleido pyperclip jupyter-client ipykernel # molten requirements
|
||||
|
||||
# Configure
|
||||
|
||||
RUN mkdir -p "/home/${UNAME}/.config/nvim"
|
||||
COPY . "/home/${UNAME}/.config/nvim"
|
||||
RUN chown -R $UNAME:$UNAME "/home/${UNAME}/.config"
|
||||
USER $UNAME
|
||||
RUN nvim --headless "+Lazy! sync" +qa
|
||||
RUN nvim --headless "+MasonInstall clangd pyright cmake-language-server bash-language-server texlab clang-format latexindent mdformat autopep8" +qa
|
||||
RUN nvim --headless "+TSInstallSync markdown" +qa # For some reason, without this markdown installation fails the first time
|
||||
USER root
|
||||
|
||||
|
||||
#
|
||||
# Install other tools
|
||||
#
|
||||
|
||||
|
||||
# Install firefox
|
||||
# (Taken from https://askubuntu.com/a/1404401)
|
||||
|
||||
RUN apt install software-properties-common -y
|
||||
RUN add-apt-repository ppa:mozillateam/ppa
|
||||
RUN echo '\n\
|
||||
Package: *\n\
|
||||
Pin: release o=LP-PPA-mozillateam\n\
|
||||
Pin-Priority: 1001\n\n\
|
||||
Package: firefox\n\
|
||||
Pin: version 1:1snap1-0ubuntu2\n\
|
||||
Pin-Priority: -1\n\
|
||||
' | tee /etc/apt/preferences.d/mozilla-firefox
|
||||
RUN apt install firefox -y
|
||||
RUN echo 'Unattended-Upgrade::Allowed-Origins:: "LP-PPA-mozillateam:${distro_codename}";' | tee /etc/apt/apt.conf.d/51unattended-upgrades-firefox
|
||||
|
||||
# Other stuff
|
||||
|
||||
RUN apt install fzf xclip -y
|
||||
|
||||
USER $UNAME
|
||||
WORKDIR /home/$UNAME
|
||||
CMD /bin/bash
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
FROM ubuntu:22.04
|
||||
|
||||
|
||||
#
|
||||
# General boiler plate
|
||||
#
|
||||
|
||||
|
||||
# Ready image for installation
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt update -y && apt upgrade -y
|
||||
|
||||
# Install generic dependencies
|
||||
|
||||
RUN apt install git python3 python3-pip -y
|
||||
|
||||
#
|
||||
# Install neovim
|
||||
#
|
||||
|
||||
|
||||
# Install neovim
|
||||
|
||||
WORKDIR /tmp
|
||||
RUN git clone https://github.com/neovim/neovim.git
|
||||
WORKDIR /tmp/neovim
|
||||
RUN git checkout stable
|
||||
RUN apt install ninja-build gettext cmake unzip curl -y
|
||||
RUN make CMAKE_BUILD_TYPE=Release -j `nproc` && make install
|
||||
WORKDIR /
|
||||
|
||||
# Install package dependencies
|
||||
|
||||
RUN python3 -m pip install pynvim # python3 provider
|
||||
RUN python3 -m pip install jupytext # jupytext requirements
|
||||
RUN apt install fd-find ripgrep -y # Telescope requirements
|
||||
RUN apt install fonts-powerline -y # vim-airline requirements
|
||||
RUN python3 -m pip install neovim-remote # vimtex requirements
|
||||
RUN apt install curl -y # vim-doge requirements
|
||||
RUN apt install npm python3-venv luarocks -y # mason build requirements
|
||||
RUN python3 -m pip install cairosvg pnglatex plotly kaleido pyperclip jupyter-client ipykernel # molten requirements
|
||||
|
||||
# Configure
|
||||
|
||||
RUN mkdir -p /root/.config/nvim
|
||||
COPY . /root/.config/nvim
|
||||
RUN nvim --headless "+Lazy! sync" +qa
|
||||
RUN nvim --headless "+MasonInstall clangd pyright cmake-language-server bash-language-server texlab clang-format latexindent luaformatter mdformat autopep8" +qa
|
||||
RUN nvim --headless "+TSInstallSync markdown" +qa # For some reason, without this markdown installation fails the first time
|
||||
|
||||
@@ -1,17 +1,27 @@
|
||||
require("set")
|
||||
require("remap")
|
||||
require('set')
|
||||
require('keymaps')
|
||||
require('lsp')
|
||||
|
||||
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("lazy").setup("plugins")
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
{ import = "plugins" },
|
||||
},
|
||||
change_detection = { enabled = false },
|
||||
})
|
||||
|
||||
@@ -1,58 +1,39 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
||||
"alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" },
|
||||
"auto-session": { "branch": "main", "commit": "fffb13dcbe8731b8650e5bf1caa749a485d20556" },
|
||||
"cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
|
||||
"LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
|
||||
"alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
|
||||
"auto-session": { "branch": "main", "commit": "292492ab7af4bd8b9e37e28508bc8ce995722fd5" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
|
||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
|
||||
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||
"copilot.lua": { "branch": "master", "commit": "e919876a5523b06406f0bc7285477da87a338a61" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
|
||||
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
||||
"image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" },
|
||||
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
|
||||
"lsp-zero.nvim": { "branch": "v3.x", "commit": "77550f2f6cbf0959ef1583d845661af075f3442b" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"markdown-toc.nvim": { "branch": "main", "commit": "5f51c86a416d7da6c0708d4ea354722fec7bb2b0" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "bb30c422329e86fcaa4e4920181f6715d634e516" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
|
||||
"neoformat": { "branch": "master", "commit": "9d2e28993e06e86b88c364b6176612b917468f3e" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
|
||||
"harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "b1d9a914b02ba5660f1e272a03314b31d4576fe2" },
|
||||
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
|
||||
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-dap": { "branch": "master", "commit": "2edd6375692d9ac1053d50acfe415c1eb2ba92d0" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "99d3a0f26bfe402f45257c1398287aef252cbe2d" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "d78fb3b64eedb701c9939f97361c06483af575e0" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "abf6d190f2c06818489c0bd4b926e7e3a06c5e51" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
|
||||
"otter.nvim": { "branch": "main", "commit": "f3a401851c25c64220dcf2470252a1adc28308d5" },
|
||||
"overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" },
|
||||
"pastify.nvim": { "branch": "main", "commit": "4a1d1e03c3ae725ee4af796deca8c7c169ef626e" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"quarto-nvim": { "branch": "main", "commit": "5325af3731ac9840b308791f08ad660958d76163" },
|
||||
"session-lens": { "branch": "main", "commit": "eae46b472b3150f5ec0f977556e8085683d49eb0" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
|
||||
"oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
|
||||
"outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"sqlite.nvim": { "branch": "master", "commit": "a8466c830a89794c2eafa41b41dd11fdf4a0d7ca" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
||||
"time-tracker.nvim": { "branch": "master", "commit": "c84998bbadb1afca8e09943b1c14bafe1711bb9a" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
|
||||
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
|
||||
"vim-doge": { "branch": "master", "commit": "03a84072ef21b205237c77986c78914395d646c3" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "3a12a853ebf21ec1cce9a92290e3013f8ae75f02" },
|
||||
"time-tracker.nvim": { "branch": "master", "commit": "4127c4b5fecaf5f5cb3aa840707e58bb88eb9bf0" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
|
||||
"undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
|
||||
"vim-flog": { "branch": "master", "commit": "665b16ac8915f746bc43c9572b4581a5e9047216" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
|
||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||
"vimtex": { "branch": "master", "commit": "e10525a5aa65e2544f11e680dd81c77fba800248" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
"vimtex": { "branch": "master", "commit": "32bcb3922c20588e00de68f73c86312eda2141ad" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
return {
|
||||
"yetone/avante.nvim",
|
||||
event = "VeryLazy",
|
||||
lazy = false,
|
||||
version = false, -- set this if you want to always pull the latest change
|
||||
opts = {
|
||||
provider = "copilot"
|
||||
},
|
||||
build = "make",
|
||||
dependencies = {
|
||||
"stevearc/dressing.nvim",
|
||||
"nvim-lua/plenary.nvim",
|
||||
"MunifTanjim/nui.nvim",
|
||||
--- The below dependencies are optional,
|
||||
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
|
||||
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
|
||||
"zbirenbaum/copilot.lua" -- for providers='copilot'
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
cmd = {
|
||||
"NvimTreeToggle",
|
||||
"NvimTreeFocus"
|
||||
},
|
||||
init = function()
|
||||
vim.opt.termguicolors = true
|
||||
vim.keymap.set('n', '<leader>e', '<cmd>NvimTreeToggle<cr>', {
|
||||
noremap = true,
|
||||
silent = true,
|
||||
desc = "Explorer"
|
||||
})
|
||||
end,
|
||||
config = function() require("nvim-tree").setup() end
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"ThePrimeagen/vim-be-good",
|
||||
cmd = {
|
||||
"VimBeGood"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,5 +20,3 @@ vim.keymap.set("n", "q:", "<nop>")
|
||||
vim.cmd [[call nvim_create_user_command('W', 'w', {'nargs': 0})]]
|
||||
|
||||
vim.keymap.set("n", "QQ", ":q!<CR>")
|
||||
|
||||
-- vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])
|
||||
119
nvim/.config/nvim/lua/lsp.lua
Normal file
119
nvim/.config/nvim/lua/lsp.lua
Normal file
@@ -0,0 +1,119 @@
|
||||
--
|
||||
--
|
||||
-- LSP configs
|
||||
--
|
||||
--
|
||||
|
||||
|
||||
vim.lsp.config("texlab", {
|
||||
settings = {
|
||||
texlab = {
|
||||
rootDirectory = nil,
|
||||
build = {
|
||||
executable = 'latexmk',
|
||||
args = { '-pdf', '-interaction=nonstopmode', '-synctex=1', '%f' },
|
||||
onSave = false,
|
||||
forwardSearchAfter = false,
|
||||
},
|
||||
forwardSearch = {
|
||||
executable = nil,
|
||||
args = {},
|
||||
},
|
||||
chktex = {
|
||||
onOpenAndSave = false,
|
||||
onEdit = false,
|
||||
},
|
||||
diagnosticsDelay = 300,
|
||||
latexFormatter = 'tex-fmt',
|
||||
bibtexFormatter = 'tex-fmt',
|
||||
},
|
||||
},
|
||||
|
||||
})
|
||||
|
||||
vim.lsp.config('clangd', {
|
||||
cmd = {
|
||||
"clangd",
|
||||
"--background-index",
|
||||
"--clang-tidy",
|
||||
"--completion-style=bundled",
|
||||
"--cross-file-rename",
|
||||
"--header-insertion=iwyu",
|
||||
-- Required for embedded system compilers
|
||||
"--query-driver=/**/*g++",
|
||||
"--offset-encoding=utf-16"
|
||||
-- "-j=8",
|
||||
-- "--malloc-trim",
|
||||
-- "--pch-storage=memory"
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
--
|
||||
--
|
||||
-- Diagnostics config
|
||||
--
|
||||
--
|
||||
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true,
|
||||
severity_sort = true,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("CursorHold", {
|
||||
callback = function()
|
||||
local width = vim.api.nvim_win_get_width(0);
|
||||
|
||||
vim.diagnostic.open_float(nil, {
|
||||
scope = "cursor",
|
||||
close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
|
||||
source = true,
|
||||
relative = "editor",
|
||||
width = 40,
|
||||
focusable = false,
|
||||
focused = false,
|
||||
border = "rounded",
|
||||
title = "Diagnostics",
|
||||
header = "",
|
||||
title_pos = "center",
|
||||
offset_x = width,
|
||||
offset_y = -1,
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
--
|
||||
--
|
||||
-- Keymaps
|
||||
--
|
||||
--
|
||||
|
||||
|
||||
-- TODO: Do I need this if I use nvim-cmp?
|
||||
vim.o.completeopt = "menu,menuone,noinsert,fuzzy"
|
||||
|
||||
vim.api.nvim_set_keymap("i", "<C-Space>", "<C-x><C-o>", { noremap = true })
|
||||
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('my.lsp', {}),
|
||||
callback = function(args)
|
||||
vim.keymap.set('n', '<M-L>',
|
||||
function() vim.lsp.buf.format() end, {
|
||||
desc = "Format",
|
||||
noremap = true,
|
||||
silent = true
|
||||
})
|
||||
vim.keymap.set('i', '<M-L>',
|
||||
function() vim.lsp.buf.format() end, {
|
||||
desc = "Format",
|
||||
noremap = true,
|
||||
silent = true
|
||||
})
|
||||
vim.keymap.set("n", "gd",
|
||||
function() vim.lsp.buf.definition() end, {
|
||||
desc = "Go to definition"
|
||||
})
|
||||
end,
|
||||
})
|
||||
@@ -1,7 +1,8 @@
|
||||
-------------------
|
||||
--
|
||||
--
|
||||
-- Helper functions
|
||||
-------------------
|
||||
local function clamp(x, min, max) return math.max(math.min(x, max), min) end
|
||||
--
|
||||
--
|
||||
|
||||
local function get_random_image()
|
||||
local images = {
|
||||
@@ -54,11 +55,11 @@ local function get_random_image()
|
||||
}
|
||||
}
|
||||
|
||||
local pmf = {0.25, 0.25, 0.25, 0.25}
|
||||
local pmf = { 0.25, 0.25, 0.25, 0.25 }
|
||||
local cdf = {}
|
||||
|
||||
cdf[1] = 0
|
||||
for j = 2, #pmf+1 do
|
||||
for j = 2, #pmf + 1 do
|
||||
cdf[j] = cdf[j - 1] + pmf[j - 1]
|
||||
end
|
||||
|
||||
@@ -73,17 +74,18 @@ local function get_random_image()
|
||||
|
||||
for j = 2, #cdf do
|
||||
if r <= cdf[j] * 100 then
|
||||
return images[j-1]
|
||||
return images[j - 1]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-----------------
|
||||
-- Configurtation
|
||||
-----------------
|
||||
--
|
||||
--
|
||||
-- Plugin configuration
|
||||
--
|
||||
--
|
||||
|
||||
return {
|
||||
{
|
||||
"goolord/alpha-nvim",
|
||||
lazy = false,
|
||||
config = function()
|
||||
@@ -101,5 +103,4 @@ return {
|
||||
|
||||
require("alpha").setup(dashboard.opts)
|
||||
end
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"rmagatti/auto-session",
|
||||
lazy = false,
|
||||
dependencies = {
|
||||
"nvim-lualine/lualine.nvim"
|
||||
},
|
||||
event = "VimEnter",
|
||||
init = function()
|
||||
vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
|
||||
|
||||
vim.keymap.set('n', '<leader>ss', '<cmd>SessionSave<CR>', {
|
||||
desc = "Save"
|
||||
})
|
||||
vim.keymap.set('n', '<leader>sd', '<cmd>SessionDelete<CR>', {
|
||||
desc = "Delete"
|
||||
})
|
||||
end,
|
||||
opts = {
|
||||
log_level = "error",
|
||||
auto_save_enabled = false
|
||||
}
|
||||
},
|
||||
{
|
||||
'rmagatti/session-lens',
|
||||
cmd = {
|
||||
"Autosession",
|
||||
"SearchSession"
|
||||
},
|
||||
dependencies = {
|
||||
'rmagatti/auto-session',
|
||||
'nvim-telescope/telescope.nvim'
|
||||
},
|
||||
init = function()
|
||||
vim.keymap.set('n', '<leader>sf', function() require('session-lens').search_session() end, {
|
||||
desc = "Find"
|
||||
})
|
||||
end,
|
||||
config = function()
|
||||
require('session-lens').setup({
|
||||
prompt_title = 'Sessions'
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
32
nvim/.config/nvim/lua/plugins/autosession.lua
Normal file
32
nvim/.config/nvim/lua/plugins/autosession.lua
Normal file
@@ -0,0 +1,32 @@
|
||||
return {
|
||||
"https://github.com/rmagatti/auto-session",
|
||||
-- TODO: This forces telescope to be loaded non-lazily. Fix this
|
||||
dependencies = {
|
||||
"https://github.com/nvim-lua/plenary.nvim",
|
||||
"https://github.com/nvim-telescope/telescope.nvim",
|
||||
"https://github.com/nvim-lualine/lualine.nvim"
|
||||
},
|
||||
init = function()
|
||||
vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
|
||||
end,
|
||||
keys = {
|
||||
{ '<leader>ss', '<cmd>AutoSession save<CR>', desc = "Save" },
|
||||
{ '<leader>sd', '<cmd>AutoSession delete<CR>', desc = "Delete" },
|
||||
{ '<leader>fs', '<cmd>Telescope session-lens<CR>', desc = "Session" }
|
||||
},
|
||||
opts = {
|
||||
suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
|
||||
log_level = "error",
|
||||
auto_save_enabled = false,
|
||||
session_lens = {
|
||||
picker = "telescope",
|
||||
load_on_setup = true,
|
||||
mappings = {
|
||||
delete_session = { "i", "<C-d>" },
|
||||
alternate_session = { "i", "<C-s>" },
|
||||
copy_session = { "i", "<C-y>" },
|
||||
},
|
||||
}
|
||||
},
|
||||
lazy = false,
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'Eandrju/cellular-automaton.nvim',
|
||||
cmd = {
|
||||
"CellularAutomaton"
|
||||
},
|
||||
init = function() vim.keymap.set("n", "<leader>fu", "<cmd>CellularAutomaton make_it_rain<CR>") end
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,12 @@
|
||||
return {
|
||||
"zbirenbaum/copilot.lua",
|
||||
cmd = "Copilot",
|
||||
-- event = "InsertEnter",
|
||||
opts = {
|
||||
suggestion = {
|
||||
enabled = true,
|
||||
auto_trigger = true,
|
||||
keymap = {
|
||||
accept = "<C-l>"
|
||||
-- accept_word = false,
|
||||
-- accept_line = false,
|
||||
-- next = "<M-]>",
|
||||
-- prev = "<M-[>",
|
||||
-- dismiss = "<C-]>"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
return {
|
||||
"hat0uma/csvview.nvim",
|
||||
---@module "csvview"
|
||||
---@type CsvView.Options
|
||||
opts = {
|
||||
parser = { comments = { "#", "//" } },
|
||||
keymaps = {
|
||||
-- Text objects for selecting fields
|
||||
textobject_field_inner = { "if", mode = { "o", "x" } },
|
||||
textobject_field_outer = { "af", mode = { "o", "x" } },
|
||||
-- Excel-like navigation:
|
||||
-- Use <Tab> and <S-Tab> to move horizontally between fields.
|
||||
-- Use <Enter> and <S-Enter> to move vertically between rows and place the cursor at the end of the field.
|
||||
-- Note: In terminals, you may need to enable CSI-u mode to use <S-Tab> and <S-Enter>.
|
||||
jump_next_field_end = { "<Tab>", mode = { "n", "v" } },
|
||||
jump_prev_field_end = { "<S-Tab>", mode = { "n", "v" } },
|
||||
jump_next_row = { "<Enter>", mode = { "n", "v" } },
|
||||
jump_prev_row = { "<S-Enter>", mode = { "n", "v" } },
|
||||
},
|
||||
},
|
||||
cmd = { "CsvViewEnable", "CsvViewDisable", "CsvViewToggle" },
|
||||
init = function()
|
||||
vim.keymap.set("n", "<leader>ce", ":CsvViewEnable display_mode=border header_lnum=1<CR>")
|
||||
vim.keymap.set("n", "<leader>cd", ":CsvViewDisable<CR>")
|
||||
end
|
||||
}
|
||||
@@ -1,154 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'mfussenegger/nvim-dap',
|
||||
config = function()
|
||||
local dap = require("dap")
|
||||
dap.adapters.gdb = {
|
||||
type = "executable",
|
||||
command = "gdb",
|
||||
args = {
|
||||
"-i",
|
||||
"dap"
|
||||
}
|
||||
}
|
||||
dap.adapters.python = function(cb, config)
|
||||
if config.request == 'attach' then
|
||||
local port = (config.connect or config).port
|
||||
local host = (config.connect or config).host or '127.0.0.1'
|
||||
cb({
|
||||
type = 'server',
|
||||
port = assert(port, '`connect.port` is required for a python `attach` configuration'),
|
||||
host = host,
|
||||
options = {
|
||||
source_filetype = 'python'
|
||||
}
|
||||
})
|
||||
else
|
||||
cb({
|
||||
type = 'executable',
|
||||
command = 'python',
|
||||
args = {
|
||||
'-m',
|
||||
'debugpy.adapter'
|
||||
},
|
||||
options = {
|
||||
source_filetype = 'python'
|
||||
}
|
||||
})
|
||||
end
|
||||
end
|
||||
dap.configurations.c = {
|
||||
{
|
||||
name = "Launch",
|
||||
type = "gdb",
|
||||
request = "launch",
|
||||
program = function()
|
||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||
end,
|
||||
cwd = "${workspaceFolder}",
|
||||
stopAtBeginningOfMainSubprogram = false
|
||||
}
|
||||
}
|
||||
dap.configurations.cpp = {
|
||||
{
|
||||
name = "Launch",
|
||||
type = "gdb",
|
||||
request = "launch",
|
||||
program = function()
|
||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||
end,
|
||||
cwd = "${workspaceFolder}",
|
||||
stopAtBeginningOfMainSubprogram = false
|
||||
}
|
||||
}
|
||||
dap.configurations.python = {
|
||||
{
|
||||
type = 'python',
|
||||
request = 'launch',
|
||||
name = "Launch file",
|
||||
|
||||
program = "${file}",
|
||||
pythonPath = function()
|
||||
local cwd = vim.fn.getcwd()
|
||||
if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
|
||||
return cwd .. '/venv/bin/python'
|
||||
elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
|
||||
return cwd .. '/.venv/bin/python'
|
||||
else
|
||||
return '/usr/bin/python'
|
||||
end
|
||||
end
|
||||
}
|
||||
}
|
||||
|
||||
vim.keymap.set("n", "<leader>db", "<cmd>DapToggleBreakpoint<cr>", {
|
||||
desc = "Toggle breakpoint"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>dc", "<cmd>DapContinue<cr>", {
|
||||
desc = "Continue"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>dt", "<cmd>DapTerminate<cr>", {
|
||||
desc = "Terminate"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>di", "<cmd>DapStepInto<cr>", {
|
||||
desc = "Step into"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>dn", "<cmd>DapStepOver<cr>", {
|
||||
desc = "Step over"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>do", "<cmd>DapStepOut<cr>", {
|
||||
desc = "Step out"
|
||||
})
|
||||
vim.keymap.set("n", '<Leader>dh', function() require('dap.ui.widgets').hover() end, {
|
||||
desc = "Hover"
|
||||
})
|
||||
end
|
||||
},
|
||||
{
|
||||
"rcarriga/nvim-dap-ui",
|
||||
dependencies = {
|
||||
"mfussenegger/nvim-dap",
|
||||
"nvim-neotest/nvim-nio"
|
||||
},
|
||||
config = function()
|
||||
require("dapui").setup({
|
||||
controls = {
|
||||
enabled = false
|
||||
},
|
||||
layouts = {
|
||||
{
|
||||
elements = {
|
||||
{
|
||||
id = "scopes",
|
||||
size = 0.33
|
||||
},
|
||||
{
|
||||
id = "breakpoints",
|
||||
size = 0.33
|
||||
},
|
||||
{
|
||||
id = "stacks",
|
||||
size = 0.33
|
||||
}
|
||||
},
|
||||
position = "left",
|
||||
size = 60
|
||||
},
|
||||
{
|
||||
elements = {
|
||||
{
|
||||
id = "repl",
|
||||
size = 1
|
||||
}
|
||||
},
|
||||
position = "bottom",
|
||||
size = 15
|
||||
}
|
||||
}
|
||||
})
|
||||
vim.keymap.set("n", "<leader>du", function() require("dapui").toggle() end, {
|
||||
desc = " Toggle UI"
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'kkoomen/vim-doge',
|
||||
build = ':call doge#install()',
|
||||
init = function()
|
||||
vim.g.doge_enable_mappings = 0
|
||||
vim.g.doge_doc_standard_cpp = 'doxygen_cpp_comment_slash'
|
||||
vim.g.doge_mapping_comment_jump_forward = '<c-j>'
|
||||
vim.g.doge_mapping_comment_jump_backward = '<c-k>'
|
||||
|
||||
vim.keymap.set('n', '<leader>gd', '<Plug>(doge-generate)', { silent = true, desc = "Generate doc"})
|
||||
-- nmap <silent> <Leader>d <Plug>(doge-generate)
|
||||
end
|
||||
}
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'stevearc/dressing.nvim',
|
||||
event = 'VimEnter'
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,13 @@
|
||||
return {
|
||||
{
|
||||
'tpope/vim-fugitive',
|
||||
cmd = {
|
||||
"Git"
|
||||
},
|
||||
init = function() vim.keymap.set("n", "<leader>gs", vim.cmd.Git) end
|
||||
"https://github.com/tpope/vim-fugitive",
|
||||
keys = { { "<leader>gs", vim.cmd.Git } }
|
||||
},
|
||||
{
|
||||
'rbong/vim-flog',
|
||||
cmd = {
|
||||
"Flog",
|
||||
"Floggit",
|
||||
"Flogsplit"
|
||||
},
|
||||
"https://github.com/rbong/vim-flog",
|
||||
dependencies = {
|
||||
{
|
||||
'tpope/vim-fugitive'
|
||||
}
|
||||
}
|
||||
"https://github.com/tpope/vim-fugitive"
|
||||
},
|
||||
cmd = "Flog"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +1,37 @@
|
||||
return {
|
||||
{
|
||||
return
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
-- branch = "harpoon2",
|
||||
dependencies = {
|
||||
{
|
||||
"nvim-lua/plenary.nvim"
|
||||
}
|
||||
branch = "harpoon2",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
keys = {
|
||||
{ "<leader>a", function() require("harpoon"):list():add() end },
|
||||
{ "<C-e>", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end },
|
||||
{ "<C-h>", function() require("harpoon"):list():select(1) end },
|
||||
{ "<C-t>", function() require("harpoon"):list():select(2) end },
|
||||
{ "<C-n>", function() require("harpoon"):list():select(3) end },
|
||||
{ "<C-s>", function() require("harpoon"):list():select(4) end },
|
||||
},
|
||||
init = function()
|
||||
vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end, {desc = "Toggle harpoon ui"})
|
||||
vim.keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end, {desc = "Add to harpoon list"})
|
||||
|
||||
vim.keymap.set("n", "<C-h>", function() require("harpoon.ui").nav_file(1) end)
|
||||
vim.keymap.set("n", "<C-t>", function() require("harpoon.ui").nav_file(2) end)
|
||||
vim.keymap.set("n", "<C-n>", function() require("harpoon.ui").nav_file(3) end)
|
||||
vim.keymap.set("n", "<C-s>", function() require("harpoon.ui").nav_file(4) end)
|
||||
end
|
||||
}
|
||||
|
||||
config = true
|
||||
}
|
||||
|
||||
-- vim.pack.add({
|
||||
-- {
|
||||
-- src = "https://github.com/nvim-lua/plenary.nvim"
|
||||
-- },
|
||||
-- {
|
||||
-- src = "https://github.com/ThePrimeagen/harpoon",
|
||||
-- version = "harpoon2",
|
||||
-- }
|
||||
-- })
|
||||
--
|
||||
-- local harpoon = require("harpoon")
|
||||
--
|
||||
-- harpoon:setup()
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
|
||||
-- vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
|
||||
--
|
||||
-- vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
|
||||
-- vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end)
|
||||
-- vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end)
|
||||
-- vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) end)
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"folke/lazy.nvim",
|
||||
tag = "stable"
|
||||
}
|
||||
}
|
||||
@@ -1,193 +0,0 @@
|
||||
return {
|
||||
{
|
||||
{
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
branch = 'v3.x',
|
||||
lazy = true,
|
||||
config = false,
|
||||
init = function()
|
||||
-- Disable automatic setup, we are doing it manually
|
||||
vim.g.lsp_zero_extend_cmp = 0
|
||||
vim.g.lsp_zero_extend_lspconfig = 0
|
||||
end
|
||||
},
|
||||
{
|
||||
'williamboman/mason.nvim',
|
||||
lazy = false,
|
||||
opts = {
|
||||
registries = {
|
||||
"github:antsouchlos/mason-registry",
|
||||
"github:mason-org/mason-registry"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
-- Autocompletion
|
||||
{
|
||||
'hrsh7th/nvim-cmp',
|
||||
event = 'InsertEnter',
|
||||
dependencies = {
|
||||
'L3MON4D3/LuaSnip',
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-cmdline',
|
||||
'hrsh7th/cmp-nvim-lsp-signature-help',
|
||||
'saadparwaiz1/cmp_luasnip'
|
||||
},
|
||||
config = function()
|
||||
local lsp_zero = require('lsp-zero')
|
||||
lsp_zero.extend_cmp()
|
||||
|
||||
local cmp = require('cmp')
|
||||
|
||||
cmp.setup({
|
||||
sources = {
|
||||
-- LuaFormatter off
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'nvim_lua' },
|
||||
{ name = 'luasnip', keyword_length = 2 },
|
||||
{ name = 'buffer', keyword_length = 3 },
|
||||
{ name = 'nvim_lsp_signature_help' }
|
||||
-- LuaFormatter on
|
||||
},
|
||||
formatting = lsp_zero.cmp_format(),
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<Tab>'] = cmp.mapping.confirm({
|
||||
select = true
|
||||
}),
|
||||
['<C-Space>'] = cmp.mapping.complete()
|
||||
}),
|
||||
snippet = {
|
||||
expand = function(args) require('luasnip').lsp_expand(args.body) end
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.filetype('gitcommit', {
|
||||
-- LuaFormatter off
|
||||
sources = cmp.config.sources(
|
||||
{ { name = 'git' } },
|
||||
{ { name = 'buffer' } }
|
||||
)
|
||||
-- LuaFormatter on
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({
|
||||
'/',
|
||||
'?'
|
||||
}, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{
|
||||
name = 'buffer'
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{
|
||||
name = 'path'
|
||||
}
|
||||
}, {
|
||||
{
|
||||
name = 'cmdline'
|
||||
}
|
||||
})
|
||||
})
|
||||
end
|
||||
},
|
||||
|
||||
-- LSP
|
||||
{
|
||||
'neovim/nvim-lspconfig',
|
||||
cmd = {
|
||||
'LspInfo',
|
||||
'LspInstall',
|
||||
'LspStart'
|
||||
},
|
||||
event = {
|
||||
'BufReadPre',
|
||||
'BufNewFile'
|
||||
},
|
||||
dependencies = {
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
"folke/trouble.nvim"
|
||||
},
|
||||
config = function()
|
||||
local lsp_zero = require('lsp-zero')
|
||||
lsp_zero.extend_lspconfig()
|
||||
|
||||
lsp_zero.on_attach(function(client, bufnr)
|
||||
vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, {
|
||||
desc = "Go to definition"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>lh", function() vim.lsp.buf.hover() end, {
|
||||
desc = "Hover"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>lr", ":Trouble lsp_references<CR>", {
|
||||
desc = "Show references"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>ln", function() vim.lsp.buf.rename() end, {
|
||||
desc = "Rename"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, {
|
||||
desc = "Signature help"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
|
||||
desc = "Code actions"
|
||||
})
|
||||
end)
|
||||
|
||||
require('mason-lspconfig').setup({
|
||||
ensure_installed = {
|
||||
'clangd',
|
||||
'pyright',
|
||||
'cmake',
|
||||
'texlab'
|
||||
},
|
||||
handlers = {
|
||||
lsp_zero.default_setup,
|
||||
lua_ls = function()
|
||||
local lua_opts = lsp_zero.nvim_lua_ls()
|
||||
require('lspconfig').lua_ls.setup(lua_opts)
|
||||
end
|
||||
}
|
||||
})
|
||||
|
||||
require('lspconfig')['clangd'].setup {
|
||||
cmd = {
|
||||
"clangd",
|
||||
"--background-index",
|
||||
"--clang-tidy",
|
||||
"--completion-style=bundled",
|
||||
"--cross-file-rename",
|
||||
"--header-insertion=iwyu",
|
||||
-- Required for embedded system compilers
|
||||
"--query-driver=/**/*g++",
|
||||
"--offset-encoding=utf-16"
|
||||
-- "-j=8",
|
||||
-- "--malloc-trim",
|
||||
-- "--pch-storage=memory"
|
||||
}
|
||||
}
|
||||
|
||||
-- require('lspconfig').matlab_ls.setup({
|
||||
-- settings = {
|
||||
-- filetypes = {
|
||||
-- "matlab"
|
||||
-- },
|
||||
-- matlab = {
|
||||
-- installPath = "/opt/matlab/R2023a/"
|
||||
-- }
|
||||
-- },
|
||||
-- single_file_support = true
|
||||
-- })
|
||||
end
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,34 @@
|
||||
return {
|
||||
{
|
||||
'nvim-lualine/lualine.nvim',
|
||||
event = "VimEnter",
|
||||
dependencies = {
|
||||
'nvim-tree/nvim-web-devicons'
|
||||
},
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
options = {
|
||||
theme = 'gruvbox_dark'
|
||||
},
|
||||
options = { theme = 'gruvbox_dark' },
|
||||
extensions = {
|
||||
'nvim-tree',
|
||||
'trouble',
|
||||
'mason',
|
||||
'lazy',
|
||||
'toggleterm'
|
||||
},
|
||||
sections = {
|
||||
lualine_x = {
|
||||
lualine_c = {
|
||||
{
|
||||
require("noice").api.statusline.mode.get,
|
||||
cond = require("noice").api.statusline.mode.has,
|
||||
color = {
|
||||
fg = "#ff9e64"
|
||||
}
|
||||
"filename",
|
||||
path = 1,
|
||||
shorting_target = 50,
|
||||
}
|
||||
},
|
||||
lualine_b = { 'branch' },
|
||||
lualine_x = { 'encoding' },
|
||||
lualine_y = {
|
||||
{
|
||||
function()
|
||||
local reg = vim.fn.reg_recording()
|
||||
if reg ~= "" then
|
||||
return "Recording @" .. reg
|
||||
else
|
||||
return ""
|
||||
end
|
||||
end,
|
||||
color = { fg = "#fabd2f" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,48 +1,17 @@
|
||||
return {
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
dependencies = {
|
||||
{
|
||||
'rafamadriz/friendly-snippets'
|
||||
}
|
||||
},
|
||||
version = "v2.*",
|
||||
build = "make install_jsregexp",
|
||||
event = {
|
||||
"InsertEnter"
|
||||
},
|
||||
init = function()
|
||||
vim.keymap.set({
|
||||
"i"
|
||||
}, "<c-j>", function() require("luasnip").expand() end, {
|
||||
silent = true
|
||||
})
|
||||
vim.keymap.set({
|
||||
"i",
|
||||
"s"
|
||||
}, "<c-j>", function() require("luasnip").jump(1) end, {
|
||||
silent = true
|
||||
})
|
||||
vim.keymap.set({
|
||||
"i",
|
||||
"s"
|
||||
}, "<c-k>", function() require("luasnip").jump(-1) end, {
|
||||
silent = true
|
||||
})
|
||||
|
||||
end,
|
||||
"https://github.com/rafamadriz/friendly-snippets",
|
||||
dependencies = { "https://github.com/L3MON4D3/LuaSnip" },
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
local loader = require("luasnip.loaders.from_lua")
|
||||
loader.lazy_load({
|
||||
paths = {
|
||||
"./snippets"
|
||||
}
|
||||
})
|
||||
loader.lazy_load({ paths = { "./snippets" } })
|
||||
|
||||
require("luasnip").config.set_config({
|
||||
enable_autosnippets = true,
|
||||
store_selection_keys = "<leader>v"
|
||||
})
|
||||
|
||||
vim.keymap.set({ "i", "s" }, "<c-j>", function() require("luasnip").jump(1) end, { silent = true })
|
||||
vim.keymap.set({ "i", "s" }, "<c-k>", function() require("luasnip").jump(-1) end, { silent = true })
|
||||
end
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
return {
|
||||
-- Install markdown preview, use npx if available.
|
||||
"iamcco/markdown-preview.nvim",
|
||||
cmd = {
|
||||
"MarkdownPreviewToggle",
|
||||
"MarkdownPreview",
|
||||
"MarkdownPreviewStop"
|
||||
},
|
||||
ft = {
|
||||
"markdown"
|
||||
},
|
||||
build = function(plugin)
|
||||
if vim.fn.executable "npx" then
|
||||
vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install")
|
||||
else
|
||||
vim.cmd [[Lazy load markdown-preview.nvim]]
|
||||
vim.fn["mkdp#util#install"]()
|
||||
end
|
||||
end,
|
||||
init = function()
|
||||
if vim.fn.executable "npx" then
|
||||
vim.g.mkdp_filetypes = {
|
||||
"markdown"
|
||||
}
|
||||
end
|
||||
end
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
return {
|
||||
"hedyhli/markdown-toc.nvim",
|
||||
cmd = {
|
||||
"Mtoc"
|
||||
}, -- Or, lazy load on "Mtoc" command
|
||||
opts = {}
|
||||
}
|
||||
9
nvim/.config/nvim/lua/plugins/mason.lua
Normal file
9
nvim/.config/nvim/lua/plugins/mason.lua
Normal file
@@ -0,0 +1,9 @@
|
||||
return {
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
dependencies = {
|
||||
{ "mason-org/mason.nvim", config = true },
|
||||
"neovim/nvim-lspconfig",
|
||||
},
|
||||
event = "VeryLazy",
|
||||
config = true,
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
return {
|
||||
{ -- Ability to show images in the output
|
||||
"3rd/image.nvim",
|
||||
opts = {}
|
||||
}, { -- Use LSP in markdown files
|
||||
"quarto-dev/quarto-nvim",
|
||||
dependencies = {"jmbuhr/otter.nvim", "nvim-treesitter/nvim-treesitter"},
|
||||
ft = {"quarto", "markdown"},
|
||||
init = function()
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = 'markdown',
|
||||
callback = function()
|
||||
require("quarto").activate()
|
||||
end
|
||||
})
|
||||
|
||||
-- local runner = require("quarto.runner")
|
||||
-- vim.keymap.set("n", "<localleader>rc", runner.run_cell, {
|
||||
-- desc = "run cell",
|
||||
-- silent = true
|
||||
-- })
|
||||
-- vim.keymap.set("n", "<localleader>ra", runner.run_above, {
|
||||
-- desc = "run cell and above",
|
||||
-- silent = true
|
||||
-- })
|
||||
-- vim.keymap.set("n", "<localleader>rA", runner.run_all, {
|
||||
-- desc = "run all cells",
|
||||
-- silent = true
|
||||
-- })
|
||||
-- vim.keymap.set("n", "<localleader>rl", runner.run_line, {
|
||||
-- desc = "run line",
|
||||
-- silent = true
|
||||
-- })
|
||||
-- vim.keymap.set("v", "<localleader>r", runner.run_range, {
|
||||
-- desc = "run visual range",
|
||||
-- silent = true
|
||||
-- })
|
||||
-- vim.keymap.set("n", "<localleader>RA", function() runner.run_all(true) end, {
|
||||
-- desc = "run all cells of all languages",
|
||||
-- silent = true
|
||||
-- })
|
||||
end,
|
||||
opts = {
|
||||
lspFeatures = {
|
||||
languages = {"r", "python", "rust", "julia"},
|
||||
chunks = "all",
|
||||
diagnostics = {enabled = true, triggers = {"BufWritePost"}},
|
||||
completion = {enabled = true}
|
||||
},
|
||||
keymap = {
|
||||
hover = "H",
|
||||
definition = "gd",
|
||||
rename = "<leader>rn",
|
||||
references = "gr",
|
||||
format = "<leader>gf"
|
||||
},
|
||||
codeRunner = {enabled = true, default_method = "molten"}
|
||||
}
|
||||
}, { -- Convert ipynb to markdown and back
|
||||
"GCBallesteros/jupytext.nvim",
|
||||
opts = {
|
||||
style = "markdown",
|
||||
output_extension = "md",
|
||||
force_ft = "markdown"
|
||||
}
|
||||
}, { -- Interactive code evaluation
|
||||
"benlubas/molten-nvim",
|
||||
version = "^1.0.0", -- use version <2.0.0 to avoid breaking changes
|
||||
build = ":UpdateRemotePlugins",
|
||||
init = function()
|
||||
vim.keymap.set("n", "<localleader>mi", ":MoltenInit<CR>",
|
||||
{silent = true, desc = "Initialize the plugin"})
|
||||
vim.keymap.set("n", "<localleader>e", ":MoltenEvaluateOperator<CR>",
|
||||
{silent = true, desc = "run operator selection"})
|
||||
vim.keymap.set("n", "<localleader>rl", ":MoltenEvaluateLine<CR>",
|
||||
{silent = true, desc = "evaluate line"})
|
||||
vim.keymap.set("n", "<localleader>rr", ":MoltenReevaluateCell<CR>",
|
||||
{silent = true, desc = "re-evaluate cell"})
|
||||
vim.keymap.set("v", "<localleader>r",
|
||||
":<C-u>MoltenEvaluateVisual<CR>gv",
|
||||
{silent = true, desc = "evaluate visual selection"})
|
||||
|
||||
vim.g.molten_image_provider = "image.nvim"
|
||||
|
||||
vim.g.molten_auto_open_output = false
|
||||
vim.g.molten_virt_text_output = true
|
||||
vim.g.molten_virt_text_max_lines = 32
|
||||
end
|
||||
}
|
||||
}
|
||||
@@ -1,127 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'sbdchd/neoformat',
|
||||
event = {
|
||||
"BufReadPost",
|
||||
"BufNewFile"
|
||||
},
|
||||
init = function()
|
||||
----------------
|
||||
-- Formatters
|
||||
----------------
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "python",
|
||||
callback = function()
|
||||
-- vim.g.neoformat_python_autopep8 = {
|
||||
-- exe = 'autopep8',
|
||||
-- args = {'--max-line-length', '79', '--experimental'},
|
||||
-- -- replace = 1
|
||||
-- }
|
||||
-- vim.g.neoformat_enabled_python = {
|
||||
-- 'autopep8'
|
||||
-- }
|
||||
vim.g.neoformat_enabled_python = {
|
||||
'ruff'
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = {
|
||||
"cpp",
|
||||
"c"
|
||||
},
|
||||
callback = function()
|
||||
vim.g.neoformat_enabled_cpp = {
|
||||
'clangformat'
|
||||
}
|
||||
vim.g.neoformat_enabled_c = {
|
||||
'clangformat'
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "lua",
|
||||
callback = function()
|
||||
vim.g.neoformat_enable_lua = {
|
||||
'luaformatter'
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "cmake",
|
||||
callback = function()
|
||||
vim.g.neoformat_enabled_cmake = {
|
||||
'cmake-format'
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
-- Commented out rust formatter
|
||||
-- vim.api.nvim_create_autocmd("FileType", {
|
||||
-- pattern = "rust",
|
||||
-- callback = function()
|
||||
-- vim.g.neoformat_enabled_rust = {'rustfmt'}
|
||||
-- end
|
||||
-- })
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "markdown",
|
||||
callback = function()
|
||||
vim.g.neoformat_markdown_mdformat = {
|
||||
exe = 'mdformat',
|
||||
args = {
|
||||
'--wrap=79',
|
||||
'--number'
|
||||
},
|
||||
replace = 1
|
||||
}
|
||||
vim.g.neoformat_enabled_markdown = {
|
||||
'mdformat'
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "tex",
|
||||
callback = function()
|
||||
vim.g.neoformat_tex_texfmt = {
|
||||
exe = "tex-fmt",
|
||||
args = {
|
||||
"--stdin",
|
||||
"--tabsize",
|
||||
"4"
|
||||
},
|
||||
stdin = 1
|
||||
}
|
||||
vim.g.neoformat_enabled_tex = {
|
||||
"texfmt"
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
----------------
|
||||
-- Other
|
||||
----------------
|
||||
|
||||
-- vim.cmd([[
|
||||
-- augroup Neoformat
|
||||
-- autocmd!
|
||||
-- autocmd BufWritePre * undojoin | Neoformat
|
||||
-- augroup END
|
||||
-- ]])
|
||||
|
||||
vim.api.nvim_set_keymap('n', '<M-L>', '<cmd>Neoformat<cr>', {
|
||||
noremap = true,
|
||||
silent = true
|
||||
})
|
||||
vim.api.nvim_set_keymap('i', '<M-L>', '<cmd>Neoformat<cr>', {
|
||||
noremap = true,
|
||||
silent = true
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,13 @@
|
||||
-- lazy.nvim
|
||||
return {
|
||||
"folke/noice.nvim",
|
||||
"https://github.com/folke/noice.nvim",
|
||||
dependencies = { "https://github.com/MunifTanjim/nui.nvim" },
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
lsp = {
|
||||
signature = {
|
||||
enabled = false
|
||||
},
|
||||
hover = {
|
||||
enabled = false
|
||||
}
|
||||
},
|
||||
-- messages = { enabled = false },
|
||||
views = {
|
||||
history = {
|
||||
{ event = "lsp", kind = "" },
|
||||
},
|
||||
cmdline_popup = {
|
||||
backend = "popup",
|
||||
relative = "editor",
|
||||
@@ -19,9 +15,7 @@ return {
|
||||
row = -1,
|
||||
col = "0%"
|
||||
},
|
||||
border = {
|
||||
style = "none"
|
||||
}
|
||||
border = { style = "none" }
|
||||
},
|
||||
cmdline_popupmenu = {
|
||||
relative = "editor",
|
||||
@@ -29,10 +23,18 @@ return {
|
||||
row = -2,
|
||||
col = "0%"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
dependencies = {
|
||||
"MunifTanjim/nui.nvim"
|
||||
mini = {
|
||||
border = { style = "rounded" },
|
||||
position = {
|
||||
row = -2,
|
||||
col = "100%",
|
||||
},
|
||||
size = {
|
||||
max_width = 50,
|
||||
max_height = 4,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
70
nvim/.config/nvim/lua/plugins/nvim-cmp.lua
Normal file
70
nvim/.config/nvim/lua/plugins/nvim-cmp.lua
Normal file
@@ -0,0 +1,70 @@
|
||||
return
|
||||
{
|
||||
'hrsh7th/nvim-cmp',
|
||||
event = 'InsertEnter',
|
||||
dependencies = {
|
||||
'L3MON4D3/LuaSnip',
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
-- TODO: Do I need these?
|
||||
'hrsh7th/cmp-cmdline',
|
||||
-- 'hrsh7th/cmp-nvim-lsp-signature-help',
|
||||
'saadparwaiz1/cmp_luasnip'
|
||||
},
|
||||
config = function()
|
||||
local cmp = require('cmp')
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
-- window = {
|
||||
-- -- completion = cmp.config.window.bordered(),
|
||||
-- -- documentation = cmp.config.window.bordered(),
|
||||
-- },
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<Tab>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
})
|
||||
})
|
||||
|
||||
-- -- To use git you need to install the plugin petertriho/cmp-git and uncomment lines below
|
||||
-- -- Set configuration for specific filetype.
|
||||
-- cmp.setup.filetype('gitcommit', {
|
||||
-- sources = cmp.config.sources({
|
||||
-- { name = 'git' },
|
||||
-- }, {
|
||||
-- { name = 'buffer' },
|
||||
-- })
|
||||
-- })
|
||||
-- require("cmp_git").setup()
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
|
||||
-- -- Set up lspconfig.
|
||||
-- local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
-- -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
|
||||
-- vim.lsp.config('<YOUR_LSP_SERVER>', {
|
||||
-- capabilities = capabilities
|
||||
-- })
|
||||
-- vim.lsp.enable('<YOUR_LSP_SERVER>')
|
||||
end
|
||||
|
||||
}
|
||||
@@ -1,13 +1,11 @@
|
||||
return {
|
||||
'stevearc/oil.nvim',
|
||||
opts = {},
|
||||
"stevearc/oil.nvim",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons"
|
||||
},
|
||||
lazy = false, -- Make sure oil is available for, e.g., `nvim .`
|
||||
init = function()
|
||||
vim.keymap.set("n", "-", "<CMD>Oil<CR>", {
|
||||
desc = "Open parent directory"
|
||||
})
|
||||
vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
|
||||
end,
|
||||
lazy = false
|
||||
config = true
|
||||
}
|
||||
|
||||
15
nvim/.config/nvim/lua/plugins/outline.lua
Normal file
15
nvim/.config/nvim/lua/plugins/outline.lua
Normal file
@@ -0,0 +1,15 @@
|
||||
return {
|
||||
"https://github.com/hedyhli/outline.nvim",
|
||||
keys = {
|
||||
{ "<leader>l", "<cmd>Outline<CR>", desc = "Toggle Outline" }
|
||||
},
|
||||
opts = {
|
||||
outline_window = {
|
||||
focus_on_open = false,
|
||||
},
|
||||
symbol_folding = {
|
||||
autofold_depth = 3,
|
||||
markers = { '', '' },
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
return {
|
||||
"stevearc/overseer.nvim",
|
||||
config = function()
|
||||
require("overseer").setup({
|
||||
templates = {
|
||||
-- "builtin",
|
||||
"user.cargo_build",
|
||||
"user.cargo_clean",
|
||||
"user.cargo_run",
|
||||
"user.cargo_test",
|
||||
"user.cmake_generate",
|
||||
"user.cmake_build",
|
||||
"user.cmake_clean",
|
||||
"user.cmake_test",
|
||||
"user.python_run"
|
||||
}
|
||||
})
|
||||
|
||||
vim.keymap.set("n", "<leader>oo", function() require("overseer").toggle() end, {
|
||||
desc = "Toggle"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>or", ":OverseerRun<CR>", {
|
||||
desc = "Run"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>oq", ":OverseerQuickAction<CR>", {
|
||||
desc = "Quick Action"
|
||||
})
|
||||
vim.keymap.set("n", "<leader>of", ":OverseerQuickAction open float<CR>", {
|
||||
desc = "Open Float"
|
||||
})
|
||||
end
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
return {
|
||||
'TobinPalmer/pastify.nvim',
|
||||
cmd = {
|
||||
'Pastify',
|
||||
'PastifyAfter'
|
||||
},
|
||||
-- event = {
|
||||
-- 'BufReadPost'
|
||||
-- }, -- Load after the buffer is read, I like to be able to paste right away
|
||||
keys = {
|
||||
{
|
||||
noremap = true,
|
||||
mode = "x",
|
||||
'<leader>v',
|
||||
"<cmd>PastifyAfter<CR>"
|
||||
},
|
||||
{
|
||||
noremap = true,
|
||||
mode = "n",
|
||||
'<leader>v',
|
||||
"<cmd>PastifyAfter<CR>"
|
||||
},
|
||||
{
|
||||
noremap = true,
|
||||
mode = "n",
|
||||
'<leader>V',
|
||||
"<cmd>Pastify<CR>"
|
||||
}
|
||||
},
|
||||
config = function()
|
||||
require('pastify').setup {
|
||||
opts = {
|
||||
local_path = '/res/'
|
||||
},
|
||||
ft = {
|
||||
markdown = ""
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
return {
|
||||
{
|
||||
"tpope/vim-surround",
|
||||
"https://github.com/tpope/vim-surround",
|
||||
event = "InsertEnter"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,50 +1,24 @@
|
||||
-- -----------------
|
||||
-- -- Helper Functions
|
||||
-- -------------------
|
||||
-- -- If in a git repo, execute the given function with the option
|
||||
-- -- "cwd=<git root>". Otherwise, execute the function with no options.
|
||||
-- local function execute_in_repo_root(func)
|
||||
-- local function is_git_repo()
|
||||
-- vim.fn.system("git rev-parse --is-inside-work-tree")
|
||||
--
|
||||
-- return vim.v.shell_error == 0
|
||||
-- end
|
||||
--
|
||||
-- local function get_git_root()
|
||||
-- local dot_git_path = vim.fn.finddir(".git", ".;")
|
||||
-- return vim.fn.fnamemodify(dot_git_path, ":h")
|
||||
-- end
|
||||
--
|
||||
-- local opts = {}
|
||||
--
|
||||
-- if is_git_repo() then opts = {cwd = get_git_root()} end
|
||||
--
|
||||
-- func(opts)
|
||||
-- end
|
||||
-----------------------
|
||||
-- Plugin Configuration
|
||||
-----------------------
|
||||
return {
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
version = '0.1.5',
|
||||
"https://github.com/nvim-telescope/telescope.nvim",
|
||||
dependencies = {
|
||||
{
|
||||
'nvim-lua/plenary.nvim'
|
||||
}
|
||||
"https://github.com/nvim-lua/plenary.nvim",
|
||||
"https://github.com/nvim-telescope/telescope-ui-select.nvim",
|
||||
},
|
||||
cmd = "Telescope",
|
||||
init = function()
|
||||
-- LuaFormatter off
|
||||
vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,{desc = "Files"})
|
||||
vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end,{desc = "grep"})
|
||||
vim.keymap.set('n', '<leader>fa', function()
|
||||
require("telescope.builtin").find_files({hidden = true})
|
||||
end, {desc = "All files"})
|
||||
|
||||
vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, {desc = "Buffers"})
|
||||
vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end, {desc = "Help tags"})
|
||||
-- LuaFormatter on
|
||||
end
|
||||
cmd = { "Telescope" },
|
||||
keys = {
|
||||
{ "<leader>ff", function() require("telescope.builtin").find_files() end, desc = "Files" },
|
||||
{ "<leader>fg", function() require("telescope.builtin").live_grep() end, desc = "grep" },
|
||||
{ "<leader>fa", function() require("telescope.builtin").find_files({ hidden = true }) end, desc = "All files" },
|
||||
{ "<leader>fb", function() require("telescope.builtin").buffers() end, desc = "Buffers" },
|
||||
{ "<leader>fh", function() require("telescope.builtin").help_tags() end, desc = "Help tags" }
|
||||
},
|
||||
config = function()
|
||||
require("telescope").setup {
|
||||
extensions = {
|
||||
["ui-select"] = {
|
||||
require("telescope.themes").get_dropdown()
|
||||
}
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
|
||||
12
nvim/.config/nvim/lua/plugins/theme.lua
Normal file
12
nvim/.config/nvim/lua/plugins/theme.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
return {
|
||||
"ellisonleao/gruvbox.nvim",
|
||||
priority = 1000,
|
||||
opts = {
|
||||
contrast = "hard",
|
||||
transparent_mode = true
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("gruvbox").setup(opts)
|
||||
vim.cmd("colorscheme gruvbox")
|
||||
end
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
return {
|
||||
-- {'doums/darcula', config = function() vim.cmd('colorscheme darcula') end}
|
||||
-- {
|
||||
-- "folke/tokyonight.nvim",
|
||||
-- lazy = false,
|
||||
-- priority = 1000,
|
||||
-- opts = {},
|
||||
-- config = function() vim.cmd('colorscheme tokyonight-moon') end
|
||||
-- }
|
||||
-- {
|
||||
-- 'rose-pine/neovim',
|
||||
-- config = function()
|
||||
-- vim.cmd('colorscheme rose-pine-moon')
|
||||
|
||||
-- -- LuaFormatter off
|
||||
-- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||
-- vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none", fg = "none" })
|
||||
-- vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = "none" })
|
||||
-- vim.api.nvim_set_hl(0, "TelescopeBorder", { bg = "none" })
|
||||
-- -- LuaFormatter on
|
||||
-- end
|
||||
-- }
|
||||
-- {
|
||||
-- 'AlexvZyl/nordic.nvim',
|
||||
-- lazy = false,
|
||||
-- priority = 1000,
|
||||
-- init = function()
|
||||
-- require('nordic').setup {
|
||||
-- telescope = {
|
||||
-- style = 'classic'
|
||||
-- -- style = 'flat'
|
||||
-- }
|
||||
-- }
|
||||
-- require'nordic'.load()
|
||||
-- end
|
||||
-- }
|
||||
-- {
|
||||
-- "briones-gabriel/darcula-solid.nvim",
|
||||
-- dependencies = "rktjmp/lush.nvim",
|
||||
-- config = function()
|
||||
-- vim.cmd 'colorscheme darcula-solid'
|
||||
-- vim.cmd 'set termguicolors'
|
||||
-- end
|
||||
-- }
|
||||
{
|
||||
"ellisonleao/gruvbox.nvim",
|
||||
priority = 1000,
|
||||
config = true,
|
||||
opts = {
|
||||
contrast = "hard"
|
||||
},
|
||||
init = function()
|
||||
vim.cmd("colorscheme gruvbox")
|
||||
|
||||
-- LuaFormatter off
|
||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||
vim.api.nvim_set_hl(0, "NoiceCmdlineIcon", { bg = "#1d2021" })
|
||||
vim.api.nvim_set_hl(0, "NoiceCmdlinePopupBorder", { bg = "#1d2021" })
|
||||
vim.api.nvim_set_hl(0, "NoiceCmdlinePopupTitle", { bg = "#1d2021" })
|
||||
-- LuaFormatter on
|
||||
end
|
||||
}
|
||||
}
|
||||
9
nvim/.config/nvim/lua/plugins/todo-comments.lua
Normal file
9
nvim/.config/nvim/lua/plugins/todo-comments.lua
Normal file
@@ -0,0 +1,9 @@
|
||||
return {
|
||||
"folke/todo-comments.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
event = "BufEnter",
|
||||
keys = {
|
||||
{"<leader>ft", ":TodoTelescope<CR>", desc = "TODOs"}
|
||||
},
|
||||
config = true
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"folke/todo-comments.nvim",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim"
|
||||
},
|
||||
opts = {}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +1,10 @@
|
||||
return {
|
||||
{
|
||||
"akinsho/toggleterm.nvim",
|
||||
version = '*',
|
||||
"https://github.com/akinsho/toggleterm.nvim",
|
||||
keys = {
|
||||
"<c-\\>"
|
||||
},
|
||||
opts = {
|
||||
size = 30,
|
||||
open_mapping = [[<c-\>]]
|
||||
},
|
||||
cmd = {
|
||||
"ToggleTerm",
|
||||
"TermExec",
|
||||
"ToggleTermToggleAll",
|
||||
"ToggleTermSendCurrentLine",
|
||||
"ToggleTermSendVisualLines",
|
||||
"ToggleTermSendVisualSelection"
|
||||
},
|
||||
keys = {
|
||||
[[<c-\>]]
|
||||
}
|
||||
open_mapping = "<c-\\>"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,17 +2,8 @@ return {
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
event = {
|
||||
"BufReadPost",
|
||||
"BufNewFile"
|
||||
},
|
||||
cmd = {
|
||||
"TSInstall",
|
||||
"TSBufEnable",
|
||||
"TSBufDisable",
|
||||
"TSModuleInfo",
|
||||
"TSInstallSync"
|
||||
},
|
||||
branxh = "main",
|
||||
lazy = false, -- This plugin doesn't support lazy loading
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = {
|
||||
@@ -25,13 +16,9 @@ return {
|
||||
},
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
|
||||
highlight = {
|
||||
-- disable = { "latex" },
|
||||
enable = true,
|
||||
-- additional_vim_regex_highlighting = false,
|
||||
-- disable = {
|
||||
-- "latex"
|
||||
-- },
|
||||
additional_vim_regex_highlighting = {
|
||||
"latex"
|
||||
}
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
tag="v3.4.1",
|
||||
dependencies = {
|
||||
{
|
||||
"nvim-tree/nvim-web-devicons"
|
||||
},
|
||||
{
|
||||
'folke/lsp-colors.nvim'
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope.nvim'
|
||||
}
|
||||
},
|
||||
opts = {
|
||||
modes = {
|
||||
symbols = {
|
||||
win = {
|
||||
size = 50,
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
cmd = "Trouble",
|
||||
keys = {
|
||||
{
|
||||
"<leader>xw",
|
||||
"<cmd>Trouble diagnostics toggle<cr>",
|
||||
desc = "Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xd",
|
||||
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
|
||||
desc = "Buffer Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xs",
|
||||
"<cmd>Trouble symbols toggle focus=false<cr>",
|
||||
desc = "Symbols (Trouble)",
|
||||
},
|
||||
-- {
|
||||
-- "<leader>cl",
|
||||
-- "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
|
||||
-- desc = "LSP Definitions / references / ... (Trouble)",
|
||||
-- },
|
||||
-- {
|
||||
-- "<leader>xl",
|
||||
-- "<cmd>Trouble loclist toggle<cr>",
|
||||
-- desc = "Location List (Trouble)",
|
||||
-- },
|
||||
{
|
||||
"<leader>xq",
|
||||
"<cmd>Trouble qflist toggle<cr>",
|
||||
desc = "Quickfix List (Trouble)",
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,6 @@
|
||||
return {
|
||||
{
|
||||
'mbbill/undotree',
|
||||
cmd = {
|
||||
"UndotreeToggle",
|
||||
"UndotreeHide",
|
||||
"UndotreeShow",
|
||||
"UndotreeFocus",
|
||||
"UndotreePersistUndo"
|
||||
},
|
||||
init = function()
|
||||
vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>", {
|
||||
desc = "Undotree"
|
||||
})
|
||||
end
|
||||
"https://github.com/mbbill/undotree",
|
||||
keys = {
|
||||
{ "<leader>u", "<cmd>UndotreeToggle<CR>", desc = "Undotree" }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
return {
|
||||
{
|
||||
"lervag/vimtex",
|
||||
ft = {
|
||||
"tex",
|
||||
"bib"
|
||||
},
|
||||
lazy = false, -- For backward search to work, :VimtexInverseSearch must always be available
|
||||
config = function()
|
||||
-- General configuration
|
||||
|
||||
@@ -21,43 +17,31 @@ return {
|
||||
}
|
||||
}
|
||||
|
||||
vim.g.vimtex_view_method = 'zathura'
|
||||
vim.g.vimtex_view_method = 'zathura_simple'
|
||||
vim.g.vimtex_quickfix_mode = 0
|
||||
|
||||
-- Concealment
|
||||
|
||||
vim.cmd([[set conceallevel=1]])
|
||||
vim.cmd([[
|
||||
let g:vimtex_syntax_conceal = {
|
||||
\ 'accents': 1,
|
||||
\ 'ligatures': 1,
|
||||
\ 'cites': 1,
|
||||
\ 'fancy': 1,
|
||||
\ 'spacing': 0,
|
||||
\ 'greek': 1,
|
||||
\ 'math_bounds': 1,
|
||||
\ 'math_delimiters': 1,
|
||||
\ 'math_fracs': 1,
|
||||
\ 'math_super_sub': 0,
|
||||
\ 'math_symbols': 1,
|
||||
\ 'sections': 0,
|
||||
\ 'styles': 0,
|
||||
\}
|
||||
vim.o.conceallevel = 1
|
||||
|
||||
let g:vimtex_syntax_custom_cmds = [
|
||||
\ {'name': 'bm', 'mathmode': 1, 'argstyle': 'bold', 'conceal': 1},
|
||||
\]
|
||||
]])
|
||||
|
||||
-- Synctex configuration
|
||||
|
||||
vim.g.vimtex_compiler_progname = 'nvr'
|
||||
|
||||
local options = string.format(
|
||||
'--reuse-window --inverse-search="nvr --servername %s +%%2 %%1" --forward-search-file @tex --forward-search-line @line @pdf',
|
||||
vim.v.servername)
|
||||
local command = string.format("let g:vimtex_view_general_options='%s'", options)
|
||||
vim.cmd(command)
|
||||
end
|
||||
vim.g.vimtex_syntax_conceal = {
|
||||
accents = 1,
|
||||
ligatures = 1,
|
||||
cites = 1,
|
||||
fancy = 1,
|
||||
spacing = 0,
|
||||
greek = 1,
|
||||
math_bounds = 1,
|
||||
math_delimiters = 1,
|
||||
math_fracs = 1,
|
||||
math_super_sub = 0,
|
||||
math_symbols = 1,
|
||||
sections = 0,
|
||||
styles = 0,
|
||||
}
|
||||
|
||||
vim.g.vimtex_syntax_custom_cmds = {
|
||||
{ name = 'bm', mathmode = 1, argstyle = 'bold', conceal = 1 },
|
||||
}
|
||||
end
|
||||
}
|
||||
|
||||
@@ -1,46 +1,26 @@
|
||||
return {
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
"https://github.com/folke/which-key.nvim",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>x"] = {
|
||||
name = "+Trouble"
|
||||
}
|
||||
}
|
||||
-- TODO: Add names for other nameless keymaps, e.g.,
|
||||
-- defaults = {
|
||||
-- ["<leader>x"] = { name = "+Trouble" }
|
||||
-- }
|
||||
},
|
||||
config = function()
|
||||
local wk = require("which-key")
|
||||
wk.add({
|
||||
{
|
||||
"<leader>d",
|
||||
group = "Debug"
|
||||
},
|
||||
{
|
||||
"<leader>f",
|
||||
group = "Find"
|
||||
},
|
||||
{
|
||||
"<leader>l",
|
||||
group = "LSP"
|
||||
},
|
||||
{
|
||||
"<leader>o",
|
||||
group = "Overseer"
|
||||
},
|
||||
{
|
||||
"<leader>s",
|
||||
group = "Session"
|
||||
},
|
||||
{
|
||||
"<leader>x",
|
||||
group = "Trouble"
|
||||
}
|
||||
config = function(_, opts)
|
||||
require("which-key").setup(opts)
|
||||
|
||||
require("which-key").add({
|
||||
{ "<leader>d", group = "Debug" },
|
||||
{ "<leader>f", group = "Find" },
|
||||
{ "<leader>l", group = "LSP" },
|
||||
{ "<leader>o", group = "Overseer" },
|
||||
{ "<leader>s", group = "Session" },
|
||||
{ "<leader>x", group = "Trouble" }
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,64 +1,60 @@
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = "\\"
|
||||
|
||||
vim.opt.nu = true
|
||||
vim.opt.relativenumber = true
|
||||
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.softtabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
vim.opt.expandtab = true
|
||||
|
||||
vim.opt.smartindent = true
|
||||
|
||||
vim.opt.wrap = false
|
||||
|
||||
vim.opt.swapfile = false
|
||||
vim.opt.backup = false
|
||||
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||
vim.opt.undofile = true
|
||||
|
||||
vim.opt.signcolumn = "yes"
|
||||
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.incsearch = true
|
||||
|
||||
vim.opt.termguicolors = true
|
||||
|
||||
vim.opt.scrolloff = 8
|
||||
vim.opt.signcolumn = "yes"
|
||||
|
||||
vim.opt.updatetime = 50
|
||||
vim.opt.exrc = true
|
||||
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = 'cpp',
|
||||
callback = function() vim.bo.commentstring = '// %s' end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = 'rust',
|
||||
callback = function()
|
||||
vim.cmd [[
|
||||
let &efm = ''
|
||||
" Random non issue stuff
|
||||
let &efm .= '%-G%.%#aborting due to previous error%.%#,'
|
||||
let &efm .= '%-G%.%#test failed, to rerun pass%.%#,'
|
||||
" Capture enter directory events for doc tests
|
||||
let &efm .= '%D%*\sDoc-tests %f%.%#,'
|
||||
" Doc Tests
|
||||
let &efm .= '%E---- %f - %o (line %l) stdout ----,'
|
||||
let &efm .= '%Cerror%m,'
|
||||
let &efm .= '%-Z%*\s--> %f:%l:%c,'
|
||||
" Unit tests && `tests/` dir failures
|
||||
" This pattern has to come _after_ the doc test one
|
||||
let &efm .= '%E---- %o stdout ----,'
|
||||
let &efm .= '%Zthread %.%# panicked at %m\, %f:%l:%c,'
|
||||
let &efm .= '%Cthread %.%# panicked at %m,'
|
||||
let &efm .= '%+C%*\sleft: %.%#,'
|
||||
let &efm .= '%+Z%*\sright: %.%#\, %f:%l:%c,'
|
||||
" Compiler Errors and Warnings
|
||||
let &efm .= '%Eerror%m,'
|
||||
let &efm .= '%Wwarning: %m,'
|
||||
let &efm .= '%-Z%*\s--> %f:%l:%c,'
|
||||
]]
|
||||
end
|
||||
})
|
||||
-- TODO: Is this necessary?
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- pattern = 'rust',
|
||||
-- callback = function()
|
||||
-- vim.cmd [[
|
||||
-- let &efm = ''
|
||||
-- " Random non issue stuff
|
||||
-- let &efm .= '%-G%.%#aborting due to previous error%.%#,'
|
||||
-- let &efm .= '%-G%.%#test failed, to rerun pass%.%#,'
|
||||
-- " Capture enter directory events for doc tests
|
||||
-- let &efm .= '%D%*\sDoc-tests %f%.%#,'
|
||||
-- " Doc Tests
|
||||
-- let &efm .= '%E---- %f - %o (line %l) stdout ----,'
|
||||
-- let &efm .= '%Cerror%m,'
|
||||
-- let &efm .= '%-Z%*\s--> %f:%l:%c,'
|
||||
-- " Unit tests && `tests/` dir failures
|
||||
-- " This pattern has to come _after_ the doc test one
|
||||
-- let &efm .= '%E---- %o stdout ----,'
|
||||
-- let &efm .= '%Zthread %.%# panicked at %m\, %f:%l:%c,'
|
||||
-- let &efm .= '%Cthread %.%# panicked at %m,'
|
||||
-- let &efm .= '%+C%*\sleft: %.%#,'
|
||||
-- let &efm .= '%+Z%*\sright: %.%#\, %f:%l:%c,'
|
||||
-- " Compiler Errors and Warnings
|
||||
-- let &efm .= '%Eerror%m,'
|
||||
-- let &efm .= '%Wwarning: %m,'
|
||||
-- let &efm .= '%-Z%*\s--> %f:%l:%c,'
|
||||
-- ]]
|
||||
-- end
|
||||
-- })
|
||||
|
||||
vim.opt.exrc = true
|
||||
vim.opt.cmdheight = 0
|
||||
|
||||
vim.o.updatetime = 50
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
#
|
||||
#
|
||||
# General options
|
||||
#
|
||||
#
|
||||
|
||||
|
||||
set-option -g default-shell /bin/zsh
|
||||
setw -g mode-keys vi
|
||||
|
||||
@@ -13,42 +20,33 @@ set -s escape-time 0
|
||||
|
||||
set -g allow-passthrough on
|
||||
|
||||
## COLORSCHEME: gruvbox dark (medium)
|
||||
# TODO: Do we need this? What does it do?
|
||||
# vim: set ft=tmux tw=0 nowrap:
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
# Theme: gruvbox dark (medium)
|
||||
#
|
||||
#
|
||||
|
||||
|
||||
set-option -g status "on"
|
||||
|
||||
# default statusbar color
|
||||
set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1
|
||||
|
||||
# default window title colors
|
||||
set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1
|
||||
|
||||
# default window with an activity alert
|
||||
set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3
|
||||
|
||||
# active window title colors
|
||||
set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1
|
||||
|
||||
# pane border
|
||||
set-option -g pane-active-border-style fg=colour250 #fg2
|
||||
set-option -g pane-border-style fg=colour237 #bg1
|
||||
|
||||
# message infos
|
||||
set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1
|
||||
|
||||
# writing commands inactive
|
||||
set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1
|
||||
|
||||
# pane number display
|
||||
set-option -g display-panes-active-colour colour250 #fg2
|
||||
set-option -g display-panes-colour colour237 #bg1
|
||||
|
||||
# clock
|
||||
set-window-option -g clock-mode-colour colour109 #blue
|
||||
|
||||
# bell
|
||||
set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg
|
||||
|
||||
## Theme settings mixed with colors (unfortunately, but there is no cleaner way)
|
||||
set-option -g status-justify "left"
|
||||
set-option -g status-left-style none
|
||||
set-option -g status-left-length "80"
|
||||
@@ -57,10 +55,9 @@ set-option -g status-right-length "80"
|
||||
set-window-option -g window-status-separator ""
|
||||
|
||||
set-option -g status-left "#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]"
|
||||
set-option -g status-right "#[bg=colour237,fg=colour239 nobold, nounderscore, noitalics]#[bg=colour239,fg=colour246] %Y-%m-%d %H:%M #[bg=colour239,fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237] #h "
|
||||
set-option -g status-right "#[fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237] #h "
|
||||
|
||||
set-window-option -g window-status-current-format "#[bg=colour214,fg=colour237,nobold,noitalics,nounderscore]#[bg=colour214,fg=colour239] #I #[bg=colour214,fg=colour239,bold] #W#{?window_zoomed_flag,*Z,} #[bg=colour237,fg=colour214,nobold,noitalics,nounderscore]"
|
||||
set-window-option -g window-status-format "#[bg=colour239,fg=colour237,noitalics]#[bg=colour239,fg=colour223] #I #[bg=colour239,fg=colour223] #W #[bg=colour237,fg=colour239,noitalics]"
|
||||
|
||||
# vim: set ft=tmux tw=0 nowrap:
|
||||
|
||||
|
||||
@@ -13,10 +13,10 @@ set completion-highlight-bg "rgba(131,165,152,1)" # bright:blue
|
||||
set completion-highlight-fg "rgba(80,73,69,1)" # bg2
|
||||
|
||||
# Define the color in index mode
|
||||
set index-bg "rgba(80,73,69,1)" # bg2
|
||||
set index-fg "rgba(235,219,178,1)" # fg
|
||||
set index-active-bg "rgba(131,165,152,1)" # bright:blue
|
||||
set index-active-fg "rgba(80,73,69,1)" # bg2
|
||||
# set index-bg "rgba(80,73,69,1)" # bg2
|
||||
# set index-fg "rgba(235,219,178,1)" # fg
|
||||
# set index-active-bg "rgba(131,165,152,1)" # bright:blue
|
||||
# set index-active-fg "rgba(80,73,69,1)" # bg2
|
||||
|
||||
set inputbar-bg "rgba(29,32,33,1)" # bg
|
||||
set inputbar-fg "rgba(235,219,178,1)" # fg
|
||||
|
||||
Reference in New Issue
Block a user