summaryrefslogtreecommitdiff
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/after/ftdetect/prr.vim1
-rw-r--r--.config/nvim/after/ftplugin/dockerfile.vim1
-rw-r--r--.config/nvim/after/ftplugin/json.vim1
-rw-r--r--.config/nvim/after/ftplugin/markdown.vim1
-rw-r--r--.config/nvim/after/syntax/prr.vim22
-rw-r--r--.config/nvim/init.vim233
-rw-r--r--.config/nvim/lua/git.lua35
-rw-r--r--.config/nvim/lua/lsp_conf.lua120
8 files changed, 0 insertions, 414 deletions
diff --git a/.config/nvim/after/ftdetect/prr.vim b/.config/nvim/after/ftdetect/prr.vim
deleted file mode 100644
index 15a474c..0000000
--- a/.config/nvim/after/ftdetect/prr.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead *.prr set filetype=prr
diff --git a/.config/nvim/after/ftplugin/dockerfile.vim b/.config/nvim/after/ftplugin/dockerfile.vim
deleted file mode 100644
index b388056..0000000
--- a/.config/nvim/after/ftplugin/dockerfile.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:indentLine_enabled = 0
diff --git a/.config/nvim/after/ftplugin/json.vim b/.config/nvim/after/ftplugin/json.vim
deleted file mode 100644
index b388056..0000000
--- a/.config/nvim/after/ftplugin/json.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:indentLine_enabled = 0
diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim
deleted file mode 100644
index b388056..0000000
--- a/.config/nvim/after/ftplugin/markdown.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:indentLine_enabled = 0
diff --git a/.config/nvim/after/syntax/prr.vim b/.config/nvim/after/syntax/prr.vim
deleted file mode 100644
index 43a0557..0000000
--- a/.config/nvim/after/syntax/prr.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-" Vim syntax file
-" Language: prr
-" Maintainer: Daniel Xu <dxu@dxuuu.xyz>
-" Last Change: 2022 Mar 25
-" Credits: Bram Moolenaar <Bram@vim.org>
-"
-" This version is copied and edited from diff.vim
-
-" Check whether an earlier file has defined a syntax already
-if exists("b:current_syntax")
- finish
-endif
-
-syn match diffAdded "^> +.*"
-syn match diffRemoved "^> -.*"
-
-" Define the default highlighting.
-" Only used when an item doesn't have highlighting yet
-hi def link diffAdded Type
-hi def link diffRemoved Statement
-
-let b:current_syntax = "prr"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
deleted file mode 100644
index de139f0..0000000
--- a/.config/nvim/init.vim
+++ /dev/null
@@ -1,233 +0,0 @@
-autocmd! bufwritepost .vimrc source %
-
-call plug#begin('~/.vim/plugged')
-
-Plug 'cespare/vim-toml', { 'branch': 'main' }
-Plug 'rust-lang/rust.vim'
-Plug 'nvim-lua/plenary.nvim'
-Plug 'lewis6991/gitsigns.nvim'
-Plug 'nvim-lualine/lualine.nvim'
-Plug 'kyazdani42/nvim-web-devicons'
-Plug 'luochen1990/rainbow' " color parentheses
-Plug 'mg979/vim-visual-multi', {'branch': 'master'}
-Plug 'tpope/vim-fugitive' " git extension for commit logs and etc.
-Plug 'editorconfig/editorconfig-vim'
-Plug 'ap/vim-css-color'
-Plug 'Yggdroot/indentLine'
-
-Plug 'google/vim-searchindex'
-
-Plug 'kazhala/close-buffers.nvim'
-Plug 'numToStr/Comment.nvim'
-
-Plug 'matze/vim-move'
-
-Plug 'togglebyte/togglerust' " Debug Rust projects
-
-Plug 'chriskempson/base16-vim'
-
-if has('nvim')
- " Plug 'rktjmp/lush.nvim'
- Plug 'dcariotti/gruvbox.nvim'
-
- Plug 'nvim-telescope/telescope.nvim'
- Plug 'neovim/nvim-lspconfig'
-
- Plug 'hrsh7th/nvim-cmp'
- Plug 'hrsh7th/cmp-nvim-lsp'
- Plug 'saadparwaiz1/cmp_luasnip'
- Plug 'L3MON4D3/LuaSnip'
-
- " Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
- " Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
- Plug 'kyazdani42/nvim-tree.lua'
- Plug 'ray-x/lsp_signature.nvim'
- Plug 'folke/todo-comments.nvim'
- Plug 'saecki/crates.nvim'
- "Plug 'gelguy/wilder.nvim', { 'do': ':UpdateRemotePlugins' }
- Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-
- "Plug 'sakhnik/nvim-gdb', { 'do': ':!./install.sh' }
-
- Plug 'jose-elias-alvarez/null-ls.nvim'
- Plug 'folke/trouble.nvim'
- Plug 'folke/lsp-colors.nvim'
-
-
- Plug 'sindrets/diffview.nvim'
-
- Plug 'windwp/nvim-ts-autotag'
-
- " Used as light theme
- Plug 'yorik1984/newpaper.nvim'
-endif
-
-
-call plug#end() " required
-
-syntax on
-
-set runtimepath+=~/.vim-plugins/LanguageClient-neovim
-
-set completeopt=menu,menuone,noselect
-
-set clipboard=unnamed
-set mouse=a " click with mouse
-set wildmenu
-set wildmode=full
-set wildignore=*~,*.png,*.jpg,*.gif,Thumbs.db,*.min.js,*.swp,*.o,vendor
-
-set number " number of the current line
-set relativenumber " relative number, ..-2 -1 x 1 2, where x is current line
-set textwidth=80
-set colorcolumn=80
-set nowrap
-set fo-=t
-
-set tabstop=4
-set shiftwidth=4
-set expandtab " convert tabs in spaces
-
-set ai " auto indent
-set autoread
-
-set encoding=UTF-8
-set history=1000
-set wildignore+=*.pyc
-
-set hlsearch " highlight search
-set incsearch
-
-set nowritebackup
-set laststatus=2
-
-set list " spaces as characters
-set listchars=eol:⏎,tab:»·,trail:ˑ,nbsp:⎵
-
-set foldmethod=indent
-
-set splitright " split on right side
-set splitbelow
-set lazyredraw
-set ttyfast
-
-set noswapfile
-
-" rust
-" let g:rustfmt_autosave = 1
-" let g:rustfmt_emit_files = 1
-" let g:rustfmt_fail_silently = 0
-" let g:rust_clip_command = 'xclip -selection clipboard'
-
-set termguicolors
-set background=dark
-
-if has('nvim')
- colorscheme gruvbox
-
- let base16colorspace=256
- colorscheme base16-irblack
-
- highlight LineNr guibg=NONE
- highlight CursorLine guibg=NONE
- highlight CursorLineNr guibg=NONE guifg=YELLOW
- highlight StatusLine guibg=#111111 guifg=YELLOW
- highlight StatusLineNC guibg=NONE guifg=#dddddd
-
- lua require('git')
- let g:coq_settings = { 'auto_start': v:true }
- lua require('lsp_conf')
-
- lua require('nvim-tree').setup({ actions = { open_file = { quit_on_open = true } } })
- lua require('todo-comments').setup()
- lua require('crates').setup()
-
- lua require('nvim-treesitter.configs').setup({ highlight = { enable = true, }, })
-
- lua require('lsp-colors').setup()
-
- lua require('Comment').setup()
-
- lua require('diffview').setup()
- ca do DiffviewOpen
- ca dc DiffviewClose
- ca dh DiffviewFileHistory
-
- set cursorline " need for Neovim 0.6 for highlight CursorLineNr
-else
- colorscheme gruvbox
-endif
-
-" Figure out the system Python for Neovim.
-if exists("$VIRTUAL_ENV")
- let g:python3_host_prog=substitute(system("which -a python3 | head -n2 | tail -n1"), "\n", '', 'g')
-else
- let g:python3_host_prog=substitute(system("which python3"), "\n", '', 'g')
-endif
-
-" indentline
-let g:indentLine_char = '¦'
-let g:vim_json_syntax_conceal = 0
-
-let g:netrw_liststyle=1
-
-filetype plugin indent on
-set nocompatible
-
-set showcmd " show commands at bottom
-
-" nvim-tree
-nnoremap <C-t> :NvimTreeToggle<CR>
-
-" vim-move
-let g:move_key_modifier = 'C'
-
-" ------------
-" MAPS
-" -----------
-let mapleader = ","
-
-nnoremap j gj
-nnoremap k gk
-
-nnoremap tn :tabnew<cr>
-ca rt RainbowToggle
-
-nnoremap <leader>xx :TroubleToggle<cr>
-
-" buffers
-nnoremap ]b :bnext<CR>
-nnoremap [b :bprev<CR>
-nnoremap <leader>b <cmd>Telescope buffers<cr>
-
-" tabs
-nnoremap ]t :tabn<CR>
-nnoremap [t :tabp<CR>
-
-" only one window
-nnoremap <leader>o :only<CR>
-
-
-nnoremap <leader>ff <cmd>Telescope find_files<cr>
-nnoremap <leader>fg <cmd>Telescope live_grep<cr>
-nnoremap <leader>fh <cmd>Telescope help_tags<cr>
-
-nnoremap <leader>pa :set paste<CR>
-nnoremap <leader>npa :set nopaste<CR>
-
-
-nmap <leader>cr :Cargo run<CR>
-nmap <F6> :EditorConfigReload<CR>
-
-if &diff
- "Get from remote
- nnoremap dr :diffget<Space>RE<CR>
- "Get from base
- nnoremap db :diffget<Space>BA<CR>
- "Get from local
- nnoremap dl :diffget<Space>LO<CR>
-endif
-
-packadd termdebug
-let g:termdebug_wide = 1
-let g:TermDebugging = 0
diff --git a/.config/nvim/lua/git.lua b/.config/nvim/lua/git.lua
deleted file mode 100644
index 987a70e..0000000
--- a/.config/nvim/lua/git.lua
+++ /dev/null
@@ -1,35 +0,0 @@
-require('gitsigns').setup {
- signs = {
- -- add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'},
- -- change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
- -- delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
- -- topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
- -- changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
- add = {hl = 'GitSignsAdd' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'},
- change = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
- delete = {hl = 'GitSignsDelete', text = '-', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
- topdelete = {hl = 'GitSignsDelete', text = '-', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
- changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
- untracked = {hl = 'GitSignsUntracked' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'},
- },
- keymaps = {
- -- Default keymap options
- noremap = true,
-
- ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
- ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
-
- ['n hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
- ['v hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
- ['n hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
- ['n hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
- ['n hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
- ['n hB'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
- },
- signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
- --numhl = true, -- Toggle with `:Gitsigns toggle_numhl`
- watch_gitdir = {
- interval = 1000,
- follow_files = true
- },
-}
diff --git a/.config/nvim/lua/lsp_conf.lua b/.config/nvim/lua/lsp_conf.lua
deleted file mode 100644
index 591f51e..0000000
--- a/.config/nvim/lua/lsp_conf.lua
+++ /dev/null
@@ -1,120 +0,0 @@
-local nvim_lsp = require('lspconfig')
--- local coq = require('coq')
---
-
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
-local null_ls = require("null-ls")
-local trouble = require("trouble")
-
--- Redefine sign.
-local signs = { Error = 'E', Warning = 'W', Hint = 'H', Information = 'I' }
-
-for type, icon in pairs(signs) do
- local hl = 'LspDiagnosticsSign' .. type
- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = '' })
-end
-
---local function vim.keymap.set(...) vim.api.nvim_vim.keymap.set(bufnr, ...) end
-local opts = { noremap=true, silent=true }
-
-null_ls.setup({
- debug = false,
- sources = {
- -- Python
- null_ls.builtins.formatting.black,
- null_ls.builtins.formatting.isort,
- null_ls.builtins.diagnostics.ruff,
- -- null_ls.builtins.diagnostics.flake8,
- -- Rust
- null_ls.builtins.formatting.rustfmt,
- -- C
- null_ls.builtins.formatting.clang_format,
- -- JS/TS
- null_ls.builtins.formatting.prettier,
- },
- on_attach = common_on_attach
-})
-
--- Setup lspconfig.
-
-require "lsp_signature".setup()
-
---- Use a loop to conveniently call 'setup' on multiple servers and
--- map buffer local keybindings when the language server attaches
-
-local common_on_attach = function(client, bufnr)
- -- Mappings.
- vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
- vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
- vim.api.nvim_buf_set_keymap(bufnr, "n", "ga", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
- vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
- vim.api.nvim_buf_set_keymap(bufnr, "n", "<space>e", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", opts)
- vim.keymap.set('n', '<A-f>', '<cmd>lua vim.lsp.buf.format {async = true}<cr>', opts)
- vim.cmd "autocmd BufWritePre <buffer> lua vim.lsp.buf.format {async = true}"
-
- -- lsp_status.on_attach(client)
-end
-
-
-local servers = { 'pyright', 'rust_analyzer', 'tsserver', 'clangd' }
--- local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities.offsetEncoding = { "utf-16" }
-for _, lsp in ipairs(servers) do
- nvim_lsp[lsp].setup {
- capabilities = capabilities,
- on_attach = common_on_attach,
- flags = {
- debounce_text_changes = 150,
- }
- }
-end
-
-trouble.setup({
- use_diagnostic_signs = true,
- auto_close = true,
- auto_open = false
-})
-
-
--- nvim-cmp setup
-local luasnip = require 'luasnip'
-local cmp = require 'cmp'
-cmp.setup {
- snippet = {
- expand = function(args)
- luasnip.lsp_expand(args.body)
- end,
- },
- mapping = cmp.mapping.preset.insert({
- ['<C-d>'] = cmp.mapping.scroll_docs(-4),
- ['<C-f>'] = cmp.mapping.scroll_docs(4),
- ['<C-Space>'] = cmp.mapping.complete(),
- ['<CR>'] = cmp.mapping.confirm {
- behavior = cmp.ConfirmBehavior.Replace,
- select = true,
- },
- ['<Tab>'] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_next_item()
- elseif luasnip.expand_or_jumpable() then
- luasnip.expand_or_jump()
- else
- fallback()
- end
- end, { 'i', 's' }),
- ['<S-Tab>'] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_prev_item()
- elseif luasnip.jumpable(-1) then
- luasnip.jump(-1)
- else
- fallback()
- end
- end, { 'i', 's' }),
- }),
- sources = {
- { name = 'nvim_lsp' },
- { name = 'luasnip' },
- },
-}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-12-18 15:45:36 +0000