servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[update] Replace coq with cmp

Browse Source 
[update] Tmux scratchpad size change
[update] Remove redundant redline.so
This commit is contained in:
Uttarayan Mondal
2023-09-11 11:31:13 +05:30
parent c43aaddeea
commit 46d7664359
8 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
config/nvim/lazy-lock.json
View File

@@ -1,9 +1,10 @@
{
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
"copilot.vim": { "branch": "release", "commit": "172955782814a49fbebca2d1a2ccce2059103329" },
"coq.artifacts": { "branch": "artifacts", "commit": "af92b636ceee8c657463fd816146b28d43ace732" },
"coq.thirdparty": { "branch": "3p", "commit": "47a748c18d6378df7aa033527d1b56d6dec94dc5" },
"coq_nvim": { "branch": "coq", "commit": "cb44d4df9caa4a5a1534f4919d9f595e7c9bf6bf" },
"copilot.vim": { "branch": "release", "commit": "719dd8d0beab993dbad47a9e86ecb0dbd4a99da5" },
"d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" },
"diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
@@ -14,19 +15,20 @@
"indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
"lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lspsaga.nvim": { "branch": "main", "commit": "76f9464aaf130c9fbb958403f53cb560f69a0e2f" },
"lspsaga.nvim": { "branch": "main", "commit": "c9b17bc7dc694bdbeb3788a583518073a30a6de2" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
"mason.nvim": { "branch": "main", "commit": "c811fbf09c7642eebb37d6694f1a016a043f6ed3" },
"neorg": { "branch": "main", "commit": "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3" },
"mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" },
"neorg": { "branch": "main", "commit": "a6c2c4d17c139e942c069cac458c12e65d7e75d3" },
"no-neck-pain.nvim": { "branch": "main", "commit": "6000e12d13188e008e9539085c24ff34794da40b" },
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-dap": { "branch": "master", "commit": "4377a05b9476587b7b485d6a9d9745768c4e4b37" },
"nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" },
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
"nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
"nvim-lspconfig": { "branch": "master", "commit": "0517d8522dcec286b1dba47aa3ee1ed8f523aed6" },
"nvim-nu": { "branch": "main", "commit": "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b" },
"nvim-treesitter": { "branch": "master", "commit": "d94e1ad9575cc211b5726f09b28ca9454aba22fe" },
"nvim-treesitter-context": { "branch": "master", "commit": "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1" },
"nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
"nvim-treesitter": { "branch": "master", "commit": "80b4fa7970ee159e5c2c715bbcd386143c48dcb1" },
"nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
"nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" },
"octo.nvim": { "branch": "master", "commit": "d1e52f9b3c755fcebb93d635821663a2c0f53281" },
"plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
@@ -38,14 +40,14 @@
"symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
"telescope.nvim": { "branch": "master", "commit": "1dfa66b845673effc8771f9ebe511bb36a09f560" },
"telescope.nvim": { "branch": "master", "commit": "20a37e43bb43c74c6091f9fea6551af0964ad45a" },
"todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
"toggleterm.nvim": { "branch": "main", "commit": "12cba0a1967b4f3f31903484dec72a6100dcf515" },
"toggleterm.nvim": { "branch": "main", "commit": "f2c720746238bc3ec620fe4bf92b58368317c266" },
"tree-sitter-just": { "branch": "main", "commit": "4e5f5f3ff37b12a1bbf664eb3966b3019e924594" },
"trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
"trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
"vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" },
"vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
"vim-fugitive": { "branch": "master", "commit": "572c8510123cbde02e8a1dafcd376c98e1e13f43" },
"vim-fugitive": { "branch": "master", "commit": "d4914b361b081c4d983e924f1dd337c143152833" },
"vim-mergetool": { "branch": "master", "commit": "0275a85256ad173e3cde586d54f66566c01b607f" },
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },

5
config/nvim/lua/lsp/clangd.lua
View File

@@ -1,9 +1,10 @@
local lspconfig = require'lspconfig'
local lspstatus = require'lsp-status'
local coq = require'coq'
-- local coq = require'coq'
lspconfig.clangd.setup {
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
capabilities = lspstatus.capabilities,
cmd = { "clangd" },
filetypes = { "c", "cpp", "objc", "objcpp" },
root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),

4
config/nvim/lua/lsp/init.lua
View File

@@ -29,13 +29,13 @@ vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
local lspconfig = require 'lspconfig'
local lspstatus = require 'lsp-status'
local coq = require 'coq'
-- local coq = require 'coq'
require('mason-lspconfig').setup_handlers({
function(server_name)
lspconfig[server_name].setup({
on_attach = lspstatus.on_attach,
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
capabilities = lspstatus.capabilities,
})
end,
})

5
config/nvim/lua/lsp/lua-language-server.lua
View File

@@ -1,11 +1,12 @@
local lspconfig = require 'lspconfig'
local lspstatus = require('lsp-status')
local coq = require 'coq'
-- local coq = require 'coq'
lspconfig.lua_ls.setup {
cmd = { "lua-language-server" },
on_attach = function(client) lspstatus.on_attach(client) end,
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
capabilities = lspstatus.capabilities,
-- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
filetypes = { "lua" },
log_level = 2,
settings = {

82
config/nvim/lua/plugins.lua
View File

@@ -45,7 +45,11 @@ return require('lazy').setup({
{ 'rest-nvim/rest.nvim', event = "BufEnter" },
-- 'b0o/SchemaStore.nvim',
-- 'rcarriga/nvim-notify',
{ 'folke/todo-comments.nvim', event = "BufEnter" },
{
'folke/todo-comments.nvim',
event = "BufEnter",
config = function() require('todo-comments').setup() end,
},
{
'github/copilot.vim',
event = "LspAttach",
@@ -235,6 +239,11 @@ return require('lazy').setup({
require("lsp")
end
},
{ 'hrsh7th/cmp-nvim-lsp', lazy = false },
{ 'hrsh7th/cmp-buffer', lazy = false },
{ 'hrsh7th/cmp-path', lazy = false },
{ 'hrsh7th/cmp-cmdline', lazy = false },
{ 'hrsh7th/nvim-cmp', lazy = false },
{
'nvim-lua/lsp-status.nvim',
event = "LspAttach"
@@ -261,34 +270,34 @@ return require('lazy').setup({
})
end
},
{
'ms-jpq/coq_nvim',
ft = { "rust", "toml", "lua" },
dependencies = { 'ms-jpq/coq.artifacts', 'ms-jpq/coq.thirdparty' },
build = ':COQdeps',
config = function()
vim.g.coq_settings.keymap = { jump_to_mark = "<c-j>" }
end
},
-- {
-- 'ms-jpq/coq_nvim',
-- ft = { "rust", "toml", "lua" },
-- dependencies = { 'ms-jpq/coq.artifacts', 'ms-jpq/coq.thirdparty' },
-- build = ':COQdeps',
-- config = function()
-- vim.g.coq_settings.keymap = { jump_to_mark = "<c-j>" }
-- end
-- },
-- { 'ms-jpq/chadtree', build = ':CHADdeps' },
{
'ms-jpq/coq.thirdparty',
config = function()
require("coq_3p")({
{
src = "repl",
sh = "sh",
shell = { p = "perl", n = "node" },
max_lines = 99,
deadline = 500,
unsafe = { "rm", "poweroff", "mv" }
},
{ src = "bc", short_name = "MATH", precision = 6 },
{ src = "copilot", short_name = "COP", accept_key = "<C-l>" },
{ src = "dap" }
})
end
},
-- {
-- 'ms-jpq/coq.thirdparty',
-- config = function()
-- require("coq_3p")({
-- {
-- src = "repl",
-- sh = "sh",
-- shell = { p = "perl", n = "node" },
-- max_lines = 99,
-- deadline = 500,
-- unsafe = { "rm", "poweroff", "mv" }
-- },
-- { src = "bc", short_name = "MATH", precision = 6 },
-- { src = "copilot", short_name = "COP", accept_key = "<C-l>" },
-- { src = "dap" }
-- })
-- end
-- },
-- use 'airblade/vim-rooter'
-- use({
-- "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
@@ -349,8 +358,23 @@ return require('lazy').setup({
config = function()
require 'setup.rust-tools'
end,
dependencies = "ms-jpq/coq_nvim"
-- dependencies = "ms-jpq/coq_nvim"
},
-- " For luasnip users.
-- " Plug 'L3MON4D3/LuaSnip'
-- " Plug 'saadparwaiz1/cmp_luasnip'
-- " For ultisnips users.
-- " Plug 'SirVer/ultisnips'
-- " Plug 'quangnguyen30192/cmp-nvim-ultisnips'
-- " For snippy users.
-- " Plug 'dcampos/nvim-snippy'
-- " Plug 'dcampos/cmp-snippy'
{
"rcarriga/nvim-dap-ui",
dependencies = { "mfussenegger/nvim-dap" },

4
config/nvim/lua/setup/rust-tools.lua
View File

@@ -7,7 +7,7 @@ local liblldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb
local rt = require('rust-tools')
local lspstatus = require('lsp-status')
-- local lsp_signature = require('lsp_signature')
local coq = require('coq')
-- local coq = require('coq')
local opts = {
tools = { -- rust-tools options
@@ -230,7 +230,7 @@ local opts = {
-- lsp_signature.on_attach(client, bufnr)
lspstatus.on_attach(client)
end,
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
capabilities = lspstatus.capabilities,
}, -- rust-analyer options
-- debugging stuff

1
config/nvim/redline.so
View File

@@ -1 +0,0 @@
/home/fs0c131y/.local/share/cargo-target/release/libredline.so

4
config/tmux/scratch
View File

@@ -1,7 +1,7 @@
#!/bin/sh
width=${2:-80%}
height=${2:-80%}
width=${2:-90%}
height=${2:-90%}
if [ "$(tmux display-message -p -F "#{session_name}")" = "scratch" ];then
tmux detach-client
else