chore: sync nvim with latop config
This commit is contained in:
@@ -11,15 +11,34 @@ if not vim.loop.fs_stat(lazypath) then
|
||||
end
|
||||
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
-- coq used for completion
|
||||
vim.g.coq_settings = {
|
||||
auto_start = true,
|
||||
xdg = true,
|
||||
completion = {
|
||||
always = false,
|
||||
},
|
||||
keymap = {
|
||||
manual_complete = '<c-n>',
|
||||
}
|
||||
}
|
||||
|
||||
-- code completion
|
||||
require('lazy').setup('plugins')
|
||||
|
||||
local coq = require 'coq'
|
||||
require("mason").setup() -- used for automatically enabling lsp and coq
|
||||
require("mason-lspconfig").setup()
|
||||
|
||||
-- Settings
|
||||
vim.cmd('source ~/.config/nvim/settings.vim')
|
||||
|
||||
-- colorscheme
|
||||
vim.o.termguicolors = true
|
||||
vim.o.background = "dark" -- or "light" for light mode
|
||||
vim.cmd("colorscheme gruvbox ")
|
||||
vim.opt.winborder = 'rounded'
|
||||
--vim.o.background = "dark" -- or "light" for light mode
|
||||
--vim.cmd("colorscheme gruvbox ")
|
||||
--vim.cmd("colorscheme retrobox")
|
||||
|
||||
-- keymaps
|
||||
vim.keymap.set('n', '<leader>/', ':nohlsearch<CR>')
|
||||
|
||||
@@ -1,42 +1,22 @@
|
||||
{
|
||||
<<<<<<< Updated upstream
|
||||
"LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
|
||||
"async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"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" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
|
||||
"gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
|
||||
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lsp-zero.nvim": { "branch": "v2.x", "commit": "9a686513eaaa13d737d0fec8956a18268ead8b29" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"mini.nvim": { "branch": "main", "commit": "0a8a1072137d916406507c941698a4bfa9dbbe7a" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
|
||||
=======
|
||||
"auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" },
|
||||
"black-metal-theme-neovim": { "branch": "main", "commit": "6d0207871387077f40d5396ab1ae90520e688d36" },
|
||||
"conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" },
|
||||
"copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" },
|
||||
"coq_nvim": { "branch": "coq", "commit": "d2aeb3221cb46bfd1c51afd1b247d092c52ec0d6" },
|
||||
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
>>>>>>> Stashed changes
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "92d2501d698e0fe855bd222540f9648890fab6c7" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||
<<<<<<< Updated upstream
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
|
||||
"mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "ea3678daff66656a9e1c20914d204b7c841c5030" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
|
||||
"vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" },
|
||||
=======
|
||||
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
|
||||
>>>>>>> Stashed changes
|
||||
"vim-tmux-navigator": { "branch": "master", "commit": "97e58f2b3b4f8fd30ce149302f10202f363cc361" }
|
||||
"vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" },
|
||||
"zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" }
|
||||
}
|
||||
|
||||
19
.config/nvim/lua/plugins/auto-save.lua
Normal file
19
.config/nvim/lua/plugins/auto-save.lua
Normal file
@@ -0,0 +1,19 @@
|
||||
return{
|
||||
"okuuva/auto-save.nvim",
|
||||
--version = '*', -- see https://devhints.io/semver, alternatively use '*' to use the latest tagged release
|
||||
cmd = "ASToggle", -- optional for lazy loading on command
|
||||
execution_message = {
|
||||
message = function() -- message to print on save
|
||||
return ("AutoSave: saved at " .. vim.fn.strftime("%H:%M:%S"))
|
||||
end,
|
||||
dim = 0.18, -- dim the color of `message`
|
||||
cleaning_interval = 1250, -- (milliseconds) automatically clean MsgArea after displaying `message`. See :h MsgArea
|
||||
},
|
||||
event = { "InsertLeave", "TextChanged" }, -- optional for lazy loading on trigger events
|
||||
opts = {
|
||||
-- your config goes here
|
||||
-- or just leave it empty :)
|
||||
enabled = false,
|
||||
debug = true,
|
||||
},
|
||||
}
|
||||
13
.config/nvim/lua/plugins/colorscheme.lua
Normal file
13
.config/nvim/lua/plugins/colorscheme.lua
Normal file
@@ -0,0 +1,13 @@
|
||||
return {
|
||||
"metalelf0/black-metal-theme-neovim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
config = function()
|
||||
require("black-metal").setup({
|
||||
-- optional configuration here
|
||||
term_colors = true,
|
||||
})
|
||||
|
||||
require("black-metal").load()
|
||||
end,
|
||||
}
|
||||
19
.config/nvim/lua/plugins/conform.lua
Normal file
19
.config/nvim/lua/plugins/conform.lua
Normal file
@@ -0,0 +1,19 @@
|
||||
return {
|
||||
'stevearc/conform.nvim',
|
||||
opts = {},
|
||||
config = function ()
|
||||
require("conform").setup({
|
||||
formatters_by_ft = {
|
||||
tex = { "latexindent" },
|
||||
--lua = { "stylua" },
|
||||
-- Conform will run multiple formatters sequentially
|
||||
--python = { "isort", "black" },
|
||||
-- You can customize some of the format options for the filetype (:help conform.format)
|
||||
--rust = { "rustfmt", lsp_format = "fallback" },
|
||||
-- Conform will run the first available formatter
|
||||
--javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||
},
|
||||
})
|
||||
|
||||
end
|
||||
}
|
||||
12
.config/nvim/lua/plugins/copilot.lua
Normal file
12
.config/nvim/lua/plugins/copilot.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
return {
|
||||
'github/copilot.vim',
|
||||
config = function()
|
||||
vim.keymap.set('i', '<C-J>', 'copilot#Accept("\\<CR>")', {
|
||||
expr = true,
|
||||
replace_keycodes = false
|
||||
})
|
||||
vim.keymap.set('i', '<C-L>', '<Plug>(copilot-accept-word)')
|
||||
vim.g.copilot_enabled = 'v:false'
|
||||
end
|
||||
}
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
return {
|
||||
"ellisonleao/gruvbox.nvim",
|
||||
priority = 1000,
|
||||
config = function ()
|
||||
require("gruvbox").setup({
|
||||
undercurl = true,
|
||||
underline = true,
|
||||
bold = true,
|
||||
italic = {
|
||||
strings = true,
|
||||
comments = true,
|
||||
operators = false,
|
||||
folds = true,
|
||||
},
|
||||
strikethrough = true,
|
||||
invert_selection = false,
|
||||
invert_signs = false,
|
||||
invert_tabline = false,
|
||||
invert_intend_guides = false,
|
||||
inverse = true, -- invert background for search, diffs, statuslines and errors
|
||||
contrast = "hard", -- can be "hard", "soft" or empty string
|
||||
palette_overrides = {},
|
||||
overrides = {},
|
||||
dim_inactive = false,
|
||||
transparent_mode = true,
|
||||
})
|
||||
end
|
||||
}
|
||||
|
||||
12
.config/nvim/lua/plugins/lsp-config.lua
Normal file
12
.config/nvim/lua/plugins/lsp-config.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
return {
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
dependencies = {
|
||||
"mason-org/mason.nvim",
|
||||
"neovim/nvim-lspconfig",
|
||||
"ms-jpq/coq_nvim", -- Optional (auto complete)
|
||||
},
|
||||
config = function()
|
||||
--vim.lsp.config('lua_ls',coq.lsp_ensure_capabilities())
|
||||
--vim.lsp.config('clangd',coq.lsp_ensure_capabilities())
|
||||
end
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
return {
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
branch = 'v2.x',
|
||||
dependencies = {
|
||||
-- LSP Support
|
||||
{'neovim/nvim-lspconfig'}, -- Required
|
||||
{'williamboman/mason.nvim'}, -- Optional
|
||||
{'williamboman/mason-lspconfig.nvim'}, -- Optional
|
||||
|
||||
-- Autocompletion
|
||||
{'hrsh7th/nvim-cmp'}, -- Required
|
||||
{'hrsh7th/cmp-nvim-lsp'}, -- Required
|
||||
{'hrsh7th/cmp-buffer'}, -- Optional
|
||||
{'hrsh7th/cmp-path'}, -- Optional
|
||||
{'saadparwaiz1/cmp_luasnip'}, -- Optional
|
||||
{'hrsh7th/cmp-nvim-lua'}, -- Optional
|
||||
|
||||
|
||||
-- snippets
|
||||
{'L3MON4D3/LuaSnip'}, -- Required
|
||||
{'rafamadriz/friendly-snippets'}, -- Optional
|
||||
},
|
||||
|
||||
config = function()
|
||||
local lsp = require('lsp-zero')
|
||||
lsp.preset('recommended')
|
||||
|
||||
lsp.on_attach(function(client, bufnr)
|
||||
local opts = {buffer = bufnr, remap = false}
|
||||
|
||||
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
||||
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
|
||||
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
|
||||
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
|
||||
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
|
||||
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
|
||||
vim.keymap.set("n", "<leader>ca", function() vim.lsp.buf.code_action() end, opts)
|
||||
vim.keymap.set("n", "<leader>rr", function() vim.lsp.buf.references() end, opts)
|
||||
vim.keymap.set("n", "<leader>rn", function() vim.lsp.buf.rename() end, opts)
|
||||
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
||||
|
||||
end)
|
||||
|
||||
local lspconfig = require('lspconfig')
|
||||
local root_pattern = require('lspconfig.util').root_pattern
|
||||
|
||||
lspconfig['jedi_language_server'].setup{
|
||||
root_dir = root_pattern('.git', 'setup.py')
|
||||
}
|
||||
|
||||
lspconfig['lua_ls'].setup{
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
-- Get the language server to recognize the `vim` global
|
||||
globals = {'vim'},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
local cmp = require('cmp')
|
||||
local cmp_action = require('lsp-zero').cmp_action()
|
||||
require('luasnip.loaders.from_vscode').lazy_load()
|
||||
|
||||
cmp.setup({
|
||||
mapping = {
|
||||
['<CR>'] = cmp.mapping.confirm({select = false}),
|
||||
['<C-f>'] = cmp_action.luasnip_jump_forward(),
|
||||
['<C-b>'] = cmp_action.luasnip_jump_backward(),
|
||||
},
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end
|
||||
},
|
||||
})
|
||||
|
||||
lsp.setup()
|
||||
end
|
||||
}
|
||||
@@ -1,15 +1,26 @@
|
||||
return {
|
||||
'MeanderingProgrammer/render-markdown.nvim',
|
||||
dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite
|
||||
-- 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
|
||||
---@module 'render-markdown'
|
||||
---@type render.md.UserConfig
|
||||
opts = {},
|
||||
|
||||
config = function()
|
||||
require('render-markdown').setup({
|
||||
opts = {
|
||||
completions = { lsp = { enabled = true } },
|
||||
render_modes = true,
|
||||
})
|
||||
end
|
||||
heading = {
|
||||
width = 'block',
|
||||
min_width = 80,
|
||||
},
|
||||
code = {
|
||||
disable_background = { 'diff' },
|
||||
},
|
||||
indent = {
|
||||
enabled = true,
|
||||
skip_heading = true,
|
||||
},
|
||||
sign = {
|
||||
enabled = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
11
.config/nvim/lua/plugins/zen-mode.lua
Normal file
11
.config/nvim/lua/plugins/zen-mode.lua
Normal file
@@ -0,0 +1,11 @@
|
||||
return {
|
||||
"folke/zen-mode.nvim",
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
window = {
|
||||
width = 90, -- width of the Zen window
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,17 @@
|
||||
set nocompatible
|
||||
syntax on
|
||||
filetype plugin on
|
||||
set autoread " Set to auto read when a file is changed from the outside
|
||||
filetype plugin indent on
|
||||
set number
|
||||
set relativenumber
|
||||
set expandtab
|
||||
set shiftwidth=4
|
||||
set softtabstop=4
|
||||
set tabstop=4
|
||||
set smartindent
|
||||
set backspace=indent,eol,start
|
||||
|
||||
|
||||
set autoread " Set to auto read when a file is changed from the outside
|
||||
set path+=**
|
||||
set wildmenu
|
||||
set showcmd
|
||||
@@ -17,49 +26,31 @@ set showmatch
|
||||
set ruler
|
||||
set wrap
|
||||
set showbreak=↳\ \
|
||||
set textwidth=79
|
||||
set hidden
|
||||
set backspace=indent,eol,start
|
||||
set hlsearch
|
||||
set noswapfile
|
||||
set mouse= "remove mouse
|
||||
set clipboard=unnamedplus
|
||||
"set clipboard=unnamedplus
|
||||
|
||||
" Rendering
|
||||
set ttyfast
|
||||
set laststatus=1
|
||||
set t_Co=256
|
||||
set background=dark
|
||||
let &t_ut=''
|
||||
|
||||
set colorcolumn=81
|
||||
hi ColorColumn ctermbg=lightgrey guibg=lightgrey
|
||||
"hi ColorColumn ctermbg=lightgrey guibg=lightgrey
|
||||
|
||||
" Show bad whitespace in an obvious but not obnoxious color
|
||||
highlight pythonSpaceError ctermbg=darkgreen guibg=darkgreen
|
||||
highlight BadWhitespace ctermbg=darkgreen guibg=darkgreen
|
||||
au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\+$/
|
||||
"highlight pythonSpaceError ctermbg=darkgreen guibg=darkgreen
|
||||
"highlight BadWhitespace ctermbg=darkgreen guibg=darkgreen
|
||||
"au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\+$/
|
||||
|
||||
" File settings
|
||||
au FileType *
|
||||
\ set tabstop=2
|
||||
\ softtabstop=2
|
||||
\ shiftwidth=2
|
||||
\ textwidth=79
|
||||
\ autoindent
|
||||
\ smartindent
|
||||
|
||||
"Python Specific Config
|
||||
au FileType python
|
||||
\ set fileformat=unix
|
||||
\ tabstop=4
|
||||
\ softtabstop=4
|
||||
\ shiftwidth=4
|
||||
\ encoding=utf-8
|
||||
|
||||
au FileType markdown
|
||||
au FileType markdown,tex
|
||||
\ set spell spelllang=en_us
|
||||
\ tabstop=4
|
||||
\ softtabstop=4
|
||||
\ shiftwidth=4
|
||||
|
||||
|
||||
|
||||
2
.config/nvim/spell/en.utf-8.add
Normal file
2
.config/nvim/spell/en.utf-8.add
Normal file
@@ -0,0 +1,2 @@
|
||||
Generative
|
||||
ansible
|
||||
BIN
.config/nvim/spell/en.utf-8.add.spl
Normal file
BIN
.config/nvim/spell/en.utf-8.add.spl
Normal file
Binary file not shown.
@@ -28,7 +28,7 @@ exec swayidle -w \
|
||||
|
||||
# Auto start .desktop files using dex
|
||||
exec dex -a
|
||||
exec nohup pipewire
|
||||
#exec nohup pipewire
|
||||
exec nohup swaync
|
||||
exec nohup sway-audio-idle-inhibit
|
||||
exec nohup waybar
|
||||
|
||||
Reference in New Issue
Block a user