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

[fix] I don't even know

Browse Source
This commit is contained in:
Uttarayan Mondal
2023-04-20 12:47:56 +05:30
parent c04858f233
commit 0528179756
8 changed files with 81 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
config/nvim/lua/colorscheme.lua
View File

@@ -1,36 +1,40 @@
local vim = vim
vim.o.termguicolors = true
vim.cmd [[colorscheme sonokai]]
vim.cmd.colorscheme "sonokai"
-- vim.cmd [[colorscheme sonokai]]
-- require("catppuccin").setup({
-- -- flavour = "mocha",
-- background = { -- :h background
-- light = "latte",
-- dark = "mocha",
-- },
-- })
local colors = {
black = '#181819',
bg0 = '#2c2e34',
bg1 = '#30323a',
bg2 = '#363944',
bg3 = '#3b3e48',
bg4 = '#414550',
bg_red = '#ff6077',
diff_red = '#55393d',
bg_green = '#a7df78',
diff_green = '#394634',
bg_blue = '#85d3f2',
diff_blue = '#354157',
black = '#181819',
bg0 = '#2c2e34',
bg1 = '#30323a',
bg2 = '#363944',
bg3 = '#3b3e48',
bg4 = '#414550',
bg_red = '#ff6077',
diff_red = '#55393d',
bg_green = '#a7df78',
diff_green = '#394634',
bg_blue = '#85d3f2',
diff_blue = '#354157',
diff_yellow = '#4e432f',
fg = '#e2e2e3',
red = '#fc5d7c',
orange = '#f39660',
yellow = '#e7c664',
green = '#9ed072',
blue = '#76cce0',
purple = '#b39df3',
grey = '#7f8490',
none = 'NONE',
red = '#fc5d7c',
orange = '#f39660',
yellow = '#e7c664',
green = '#9ed072',
blue = '#76cce0',
purple = '#b39df3',
grey = '#7f8490',
none = 'NONE',
}
-- vim.cmd.colorscheme "catppuccin"
-- Override some colors
vim.cmd('hi Normal guibg=' .. colors.black)
vim.cmd('hi NormalNC guibg=' .. colors.black)

4
config/nvim/lua/keymaps.lua
View File

@@ -47,7 +47,8 @@ local normal_mode_maps = {
{ key = '<leader>rr', map = [[<cmd>RustRunnables<cr>]] },
{ key = 'vff', map = [[<cmd>vertical Gdiffsplit<cr>]] },
{ key = 'vff!', map = [[<cmd>vertical Gdiffsplit!<cr>]] },
{ key = 'ssr', map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
-- { key = 'ssr', map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
{ key = 'ssr', map = [[<cmd>lua require("ssr").open()<cr>]] },
{ key = '<C-\\>', map = [[<cmd>ToggleTerm<cr>]] },
-- Session
@@ -77,7 +78,6 @@ local normal_mode_maps = {
map = [[<cmd>lua require('telescope.builtin').lsp_incoming_calls({fname_width = 40})<cr>]] },
{ key = '<leader>e',
map = [[<Plug>RestNvim<cr>]] },
{ key = '<C-c>', map = [[<cmd>Telescope commands<cr>]] },
-- { key = '<ScrollWheelDown>', map = [[<cmd>call comfortable_motion#flick(40)<cr>]], options = { silent = true } },
-- { key = '<ScrollWheelUp>', map = [[<cmd>call comfortable_motion#flick(-40)<cr>]], options = { silent = true } },

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

@@ -37,7 +37,7 @@ return require('lazy').setup({
-- 'b0o/SchemaStore.nvim',
-- 'rcarriga/nvim-notify',
{ 'folke/todo-comments.nvim', event = "BufEnter" },
{ 'github/copilot.vim', event = "LspAttach" },
{ 'github/copilot.vim', event = "LspAttach", cmd = "Copilot" },
-- 'ggandor/leap.nvim',
{
'shortcuts/no-neck-pain.nvim',
@@ -60,6 +60,14 @@ return require('lazy').setup({
require('colorscheme')
end
},
-- {
-- "catppuccin/nvim",
-- name = "catppuccin",
-- lazy = false,
-- config = function()
-- require('colorscheme')
-- end
-- },
{ 'folke/which-key.nvim', config = function() require("which-key").setup() end },
{ 'nvim-telescope/telescope.nvim',
cmd = "Telescope",
@@ -166,7 +174,7 @@ return require('lazy').setup({
end,
},
{ 'neovim/nvim-lspconfig',
ft = { "rust", "toml", "lua", "c", "cpp", "markdown" },
ft = { "rust", "toml", "lua", "c", "cpp", "markdown", "sql" },
config = function()
require("lsp")
end
@@ -175,15 +183,15 @@ return require('lazy').setup({
'nvim-lua/lsp-status.nvim',
event = "LspAttach"
},
{
'ray-x/lsp_signature.nvim',
event = "LspAttach",
config = function()
require("lsp_signature").setup({
floating_window_above_cur_line = true,
})
end,
},
-- {
-- 'ray-x/lsp_signature.nvim',
-- -- event = "LspAttach",
-- config = function()
-- require("lsp_signature").setup({
-- floating_window_above_cur_line = true,
-- })
-- end,
-- },
{
'terrastruct/d2-vim',
ft = "d2",
@@ -314,7 +322,29 @@ return require('lazy').setup({
config = function()
require("fidget").setup({})
end
},
{
"cshuaimin/ssr.nvim",
module = "ssr",
-- Calling setup is optional.
config = function()
require("ssr").setup {
border = "rounded",
min_width = 50,
min_height = 5,
max_width = 120,
max_height = 25,
keymaps = {
close = "q",
next_match = "n",
prev_match = "N",
replace_confirm = "<cr>",
replace_all = "<leader><cr>",
},
}
end
}
}, {
defaults = {
lazy = true,

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

@@ -6,7 +6,7 @@ local codelldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lld
local liblldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb-1.8.1-universal/lldb/lib/liblldb.dylib'
local rt = require('rust-tools')
local lspstatus = require('lsp-status')
local lsp_signature = require('lsp_signature')
-- local lsp_signature = require('lsp_signature')
local coq = require('coq')
local opts = {
@@ -227,7 +227,7 @@ local opts = {
vim.keymap.set("n", "<S-K>", rt.hover_actions.hover_actions, { buffer = bufnr })
-- Code action groups
vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
lsp_signature.on_attach(client, bufnr)
-- lsp_signature.on_attach(client, bufnr)
lspstatus.on_attach(client)
end,
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),